Merge branch 'ac/see-all-notifications' of github.com:sandboxnu/searc…

…hneu into ac/see-all-notifications

.babelrc

@@ -16,6 +16,18 @@
         "legacy": true
       },
       "@emotion" // needed for react-spinners
+    ],
+    [
+      "@babel/plugin-proposal-private-property-in-object",
+      {
+        "loose": true
+      }
+    ],
+    [
+      "@babel/plugin-proposal-private-methods",
+      {
+        "loose": true
+      }
     ]
   ]
 }

.eslintrc.json

@@ -23,7 +23,22 @@
   "rules": {
     "react/react-in-jsx-scope": "off",
     "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/explicit-module-boundary-types": "off"
+    "@typescript-eslint/explicit-module-boundary-types": "off",
+    "no-restricted-syntax": [
+      "error",
+      {
+        "selector": "Literal[value=/^#[a-zA-Z0-9]/i]",
+        "message": "This project uses color variables for our styling to keep everything consistent with a single, unifying pallette; if the feature you're working on is using colors, please import Colors and use those variables instead! (_variables.scss for color variables in scss, _exports.module.scss for color variables in .tsx)"
+      },
+      {
+        "selector": "Literal[value=/^rgb[(]/i]",
+        "message": "This project uses color variables for our styling to keep everything consistent with a single, unifying pallette; if the feature you're working on is using colors, please import Colors and use those variables instead! (_variables.scss for color variables in scss, _exports.module.scss for color variables in .tsx)"
+      },
+      {
+        "selector": "Literal[value=/^rgba[(]/i]",
+        "message": "This project uses color variables for our styling to keep everything consistent with a single, unifying pallette; if the feature you're working on is using colors, please import Colors and use those variables instead! (_variables.scss for color variables in scss, _exports.module.scss for color variables in .tsx)"
+      }
+    ]
   },
   "overrides": [
     {

.github/workflows/lint.yml

@@ -8,9 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: install node v14.19
+      - name: install node v18
         uses: actions/setup-node@v1
         with:
-          node-version: 14.19
+          node-version: 18
       - uses: bahmutov/npm-install@v1
       - run: yarn lint
+      - run: yarn sass-lint

.github/workflows/test.yml

@@ -7,9 +7,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: install node v14.19
+      - name: install node v18
         uses: actions/setup-node@v1
         with:
-          node-version: '14.19'
+          node-version: '18'
       - run: yarn install
       - run: yarn test

.github/workflows/tsc.yml

@@ -8,9 +8,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: install node v14.19
+      - name: install node v18
         uses: actions/setup-node@v1
         with:
-          node-version: 14.19
+          node-version: 18
       - run: yarn install
       - run: yarn tsc

.nvmrc

@@ -1 +1 @@
-14.19
+18.x

.stylelintrc.json

@@ -0,0 +1,18 @@
+{
+  "extends": "stylelint-config-recommended-scss",
+  "rules": {
+    "color-named": [
+      "never",
+      {
+        "severity": "error"
+      }
+    ],
+    "color-no-hex": [
+      true,
+      {
+        "severity": "error"
+      }
+    ]
+  },
+  "defaultSeverity": "warning"
+}

components/ResultsPage/ResultsLoader.tsx

@@ -115,7 +115,12 @@ function ResultsLoader({
       <div className="five column row">
         <div className="page-home">
           {results
-            .filter((result) => result !== null && result !== undefined)
+            .filter(
+              (result) =>
+                result !== null &&
+                result !== undefined &&
+                result.class.subject !== 'NULL'
+            )
             .map((result) => {
               return (
                 <ResultItemMemoized

components/icons/Husky.tsx

@@ -2,6 +2,8 @@ import { ReactElement } from 'react';
 import { campusToColor } from '../../utils/campusToColor';
 import { Campus } from '../types';
 
+/* eslint-disable no-restricted-syntax */
+
 interface HuskyProps {
   className: string;
   /** Decides the color based on campus */

components/icons/IconGradcap.tsx

@@ -1,5 +1,7 @@
 import React, { ReactElement } from 'react';
 
+/* eslint-disable no-restricted-syntax */
+
 const IconGradcap = ({
   width = '27',
   height = '18',

components/icons/IconMessage.tsx

@@ -1,5 +1,7 @@
 import React, { ReactElement } from 'react';
 
+/* eslint-disable no-restricted-syntax */
+
 const IconMessage = ({
   width = '17',
   height = '24',

components/icons/IconNotepad.tsx

@@ -1,5 +1,7 @@
 import React, { ReactElement } from 'react';
 
+/* eslint-disable no-restricted-syntax */
+
 const IconNotepad = ({
   width = '17',
   height = '24',

components/icons/IconScale.tsx

@@ -1,5 +1,7 @@
 import React, { ReactElement } from 'react';
 
+/* eslint-disable no-restricted-syntax */
+
 const IconScale = ({
   width = '24',
   height = '24',

components/icons/IconTie.tsx

@@ -1,5 +1,7 @@
 import React, { ReactElement } from 'react';
 
+/* eslint-disable no-restricted-syntax */
+
 const IconTie = ({
   width = '24',
   height = '21',

components/icons/IconUser.tsx

@@ -1,5 +1,7 @@
 import React, { ReactElement } from 'react';
 
+/* eslint-disable no-restricted-syntax */
+
 const IconUser = ({
   width = '28',
   height = '28',

components/icons/Logo.tsx

@@ -2,6 +2,8 @@ import { ReactElement } from 'react';
 import { campusToColor } from '../../utils/campusToColor';
 import { Campus } from '../types';
 
+/* eslint-disable no-restricted-syntax */
+
 interface LogoProp {
   className: string;
   campus: Campus;

components/tests/integration/Result.test.jsx

@@ -30,8 +30,8 @@ jest.mock('../../../utils/TermInfoProvider', () => () => ({
   error: null,
   termInfos: {
     NEU: [{ text: TERM_TEXT, value: TERM_ID }],
-    CPS: [],
-    LAW: [],
+    CPS: [{ text: TERM_TEXT, value: TERM_ID }],
+    LAW: [{ text: TERM_TEXT, value: TERM_ID }],
   },
 }));
 
@@ -150,7 +150,7 @@ describe.only('Results page integration tests', () => {
     // click the apply button
     classIdRangeFilter.find('.RangeFilter__apply-input').simulate('click');
     expect(setQParams).toBeCalledWith({
-      classIdRange: { max: 5000, min: 1000 },
+      classIdRange: { max: 5000, min: 2000 },
     });
   });
 });