From 993b93be8d2c8ef639fb5b7d96d96f447bbb5ec4 Mon Sep 17 00:00:00 2001 From: Bharat Arimilli Date: Wed, 16 Jan 2019 14:27:39 -0600 Subject: [PATCH 1/2] Add FERPA disclaimer --- client/src/components/Form/index.js | 2 +- client/src/components/Form/styles.scss | 5 +++++ client/src/routes/Results/components/List/index.js | 13 ++++++++++++- .../src/routes/Results/components/List/styles.scss | 14 ++++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/client/src/components/Form/index.js b/client/src/components/Form/index.js index e7631fa..3dba15f 100644 --- a/client/src/components/Form/index.js +++ b/client/src/components/Form/index.js @@ -14,7 +14,7 @@ class HomeForm extends React.Component { render() { const { handleSubmit, onSearch, pristine, reset, submitting } = this.props; const content = ( -
+

You can search for:

  • A specific section: CS 1337.501
  • diff --git a/client/src/components/Form/styles.scss b/client/src/components/Form/styles.scss index 1573257..63d353d 100644 --- a/client/src/components/Form/styles.scss +++ b/client/src/components/Form/styles.scss @@ -13,3 +13,8 @@ font-family: 'Open Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif; color: #95989A; } + +.popover { + font-family: 'Open Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif; + width: 375px; +} diff --git a/client/src/routes/Results/components/List/index.js b/client/src/routes/Results/components/List/index.js index ff14f5c..87f2c42 100644 --- a/client/src/routes/Results/components/List/index.js +++ b/client/src/routes/Results/components/List/index.js @@ -2,7 +2,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import classes from './styles.scss'; import classNames from 'classnames'; -import { List, Spin, Icon } from 'antd'; +import { List, Spin, Icon, Popover } from 'antd'; import general from 'utils/general'; const IconText = ({ type, text }) => ( @@ -14,10 +14,21 @@ const IconText = ({ type, text }) => ( export default class ResultsList extends React.Component { render() { + const popover = ( +
    +

    Because of FERPA restrictions, grade data for certain classes — in particular, classes with a small number of students — is unavailable.

    +
    + ); + const empty = (

    We weren't able to find that. Try searching for something else!

    + + + Still can't find what you're looking for? Learn more. + +
    ); diff --git a/client/src/routes/Results/components/List/styles.scss b/client/src/routes/Results/components/List/styles.scss index 2cf02d9..befd491 100644 --- a/client/src/routes/Results/components/List/styles.scss +++ b/client/src/routes/Results/components/List/styles.scss @@ -55,3 +55,17 @@ color: #a4a4a4; font-weight: 300; } + +.hint { + margin-top: 25px; + margin-left: auto; + margin-right: auto; + display: block; + font-family: 'Open Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif; + color: #95989A; +} + +.popover { + font-family: 'Open Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif; + width: 200px; +} From 9f855bea8466c703e1d28ec1097503e389836aaa Mon Sep 17 00:00:00 2001 From: Bharat Arimilli Date: Wed, 16 Jan 2019 14:48:07 -0600 Subject: [PATCH 2/2] Update versions --- client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/package.json b/client/package.json index 3e7d1c8..d5c1295 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "utd-grades-client", - "version": "0.2.0", + "version": "0.2.1", "scripts": { "build": "nwb build-react-app", "clean": "nwb clean-app",