Merge branch 'main' into nancy_main

leafie8 · Sep 8, 2023 · 3c1cda8 · 3c1cda8
2 parents f96d41c + e55d476
commit 3c1cda8
Show file tree

Hide file tree

Showing 40 changed files with 766 additions and 601 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -106,12 +106,23 @@
         "code",
         "doc"
       ]
+    },
+    {
+      "login": "daviszung",
+      "name": "Davis Zung",
+      "avatar_url": "https://avatars.githubusercontent.com/u/95515224?v=4",
+      "profile": "https://github.com/daviszung",
+      "contributions": [
+        "code",
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,
   "skipCi": true,
   "repoType": "github",
   "repoHost": "https://github.com",
   "projectName": "internship-tracker",
-  "projectOwner": "BobaTalks"
+  "projectOwner": "BobaTalks",
+  "commitType": "docs"
 }
diff --git a/.github/workflows/lintchecks.yml b/.github/workflows/lintchecks.yml
@@ -13,10 +13,10 @@ name: Lint Checks
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "main" ]
+    branches: ["main"]
 
 jobs:
   eslint:
@@ -41,7 +41,7 @@ jobs:
           --ext .js,.jsx,.ts,.tsx
         continue-on-error: false
 
-      - name: Run Prettier
-        run: npx prettier client/.
-          --check
-        continue-on-error: false
+      # - name: Run Prettier
+      #   run: npx prettier client/.
+      #     --check
+      #   continue-on-error: false
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Internship Tracker
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-10-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-11-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 - [Internship Tracker](#internship-tracker)
@@ -78,12 +78,13 @@ Pull requests are built with [deploy previews](https://docs.netlify.com/site-dep
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/a-camarillo"><img src="https://avatars.githubusercontent.com/u/58638902?v=4?s=100" width="100px;" alt="Anthony Camarillo"/><br /><sub><b>Anthony Camarillo</b></sub></a><br /><a href="https://github.com/BobaTalks/internship-tracker/commits?author=a-camarillo" title="Code">💻</a> <a href="https://github.com/BobaTalks/internship-tracker/commits?author=a-camarillo" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://brandoncastillo.biz/"><img src="https://avatars.githubusercontent.com/u/7208570?v=4?s=100" width="100px;" alt="Brandon C"/><br /><sub><b>Brandon C</b></sub></a><br /><a href="#design-GeekJump" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/DarrenLee09"><img src="https://avatars.githubusercontent.com/u/89325703?v=4?s=100" width="100px;" alt="DarrenLee09"/><br /><sub><b>DarrenLee09</b></sub></a><br /><a href="#ideas-DarrenLee09" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/daviszung"><img src="https://avatars.githubusercontent.com/u/95515224?v=4?s=100" width="100px;" alt="Davis Zung"/><br /><sub><b>Davis Zung</b></sub></a><br /><a href="https://github.com/BobaTalks/internship-tracker/commits?author=daviszung" title="Code">💻</a> <a href="https://github.com/BobaTalks/internship-tracker/commits?author=daviszung" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/jenna-x-435a851b3/"><img src="https://avatars.githubusercontent.com/u/96795538?v=4?s=100" width="100px;" alt="Jenna Xiao"/><br /><sub><b>Jenna Xiao</b></sub></a><br /><a href="https://github.com/BobaTalks/internship-tracker/commits?author=JennaXiao3" title="Code">💻</a> <a href="https://github.com/BobaTalks/internship-tracker/commits?author=JennaXiao3" title="Documentation">📖</a> <a href="https://github.com/BobaTalks/internship-tracker/issues?q=author%3AJennaXiao3" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/aqvilala"><img src="https://avatars.githubusercontent.com/u/84333848?v=4?s=100" width="100px;" alt="Jessica Chen"/><br /><sub><b>Jessica Chen</b></sub></a><br /><a href="https://github.com/BobaTalks/internship-tracker/commits?author=aqvilala" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/kpxwinter"><img src="https://avatars.githubusercontent.com/u/118410579?v=4?s=100" width="100px;" alt="KP"/><br /><sub><b>KP</b></sub></a><br /><a href="#projectManagement-kpxwinter" title="Project Management">📆</a> <a href="#question-kpxwinter" title="Answering Questions">💬</a> <a href="#ideas-kpxwinter" title="Ideas, Planning, & Feedback">🤔</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://lilyxmeng.github.io/"><img src="https://avatars.githubusercontent.com/u/76577669?v=4?s=100" width="100px;" alt="Lily Meng"/><br /><sub><b>Lily Meng</b></sub></a><br /><a href="https://github.com/BobaTalks/internship-tracker/commits?author=lilyxmeng" title="Code">💻</a> <a href="https://github.com/BobaTalks/internship-tracker/commits?author=lilyxmeng" title="Documentation">📖</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://lilyxmeng.github.io/"><img src="https://avatars.githubusercontent.com/u/76577669?v=4?s=100" width="100px;" alt="Lily Meng"/><br /><sub><b>Lily Meng</b></sub></a><br /><a href="https://github.com/BobaTalks/internship-tracker/commits?author=lilyxmeng" title="Code">💻</a> <a href="https://github.com/BobaTalks/internship-tracker/commits?author=lilyxmeng" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/razlze"><img src="https://avatars.githubusercontent.com/u/68450734?v=4?s=100" width="100px;" alt="Razi Syed"/><br /><sub><b>Razi Syed</b></sub></a><br /><a href="https://github.com/BobaTalks/internship-tracker/commits?author=razlze" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/victoriatran17"><img src="https://avatars.githubusercontent.com/u/118402811?v=4?s=100" width="100px;" alt="Victoria Tran"/><br /><sub><b>Victoria Tran</b></sub></a><br /><a href="#business-victoriatran17" title="Business development">💼</a> <a href="#question-victoriatran17" title="Answering Questions">💬</a> <a href="#ideas-victoriatran17" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/BobaTalks/internship-tracker/commits?author=victoriatran17" title="Documentation">📖</a> <a href="#projectManagement-victoriatran17" title="Project Management">📆</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/leafie8"><img src="https://avatars.githubusercontent.com/u/112891624?v=4?s=100" width="100px;" alt="leafie8"/><br /><sub><b>leafie8</b></sub></a><br /><a href="https://github.com/BobaTalks/internship-tracker/commits?author=leafie8" title="Code">💻</a></td>

diff --git a/client/.eslintrc.json b/client/.eslintrc.json
@@ -7,17 +7,34 @@
     "eslint:recommended",
     "react-app",
     "plugin:react/recommended",
-    "plugin:jsx-a11y/recommended"
+    "plugin:jsx-a11y/recommended",
+    "plugin:prettier/recommended",
+    "prettier"
+  ],
+  "ignorePatterns": [
+    "node_modules/",
+    "build/",
+    "public/"
   ],
-  "ignorePatterns": ["node_modules/", "build/", "public/"],
   "overrides": [],
   "parserOptions": {
     "ecmaVersion": "latest",
     "sourceType": "module"
   },
-  "plugins": ["react", "react-hooks", "prettier"],
+  "plugins": [
+    "react",
+    "react-hooks",
+    "simple-import-sort"
+  ],
   "rules": {
-    "prettier/prettier": "error",
+    "prettier/prettier": [
+      "error",
+      {
+        "singleQuote": true
+      }
+    ],
+    "simple-import-sort/exports": "error",
+    "simple-import-sort/imports": "error",
     "react/prop-types": "off"
   }
 }
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -23,8 +23,8 @@
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "lint": "eslint .; prettier . --check",
-    "lint:fix": "eslint . --fix & prettier . --write"
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
   },
   "browserslist": {
     "production": [
@@ -43,13 +43,15 @@
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
     "eslint": "^8.32.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-config-recommended": "^4.1.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.32.1",
     "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
     "prettier": "2.8.4"
   }
 }
diff --git a/client/src/App.jsx b/client/src/App.jsx
@@ -1,21 +1,22 @@
-import React, { Suspense } from "react";
-import { BrowserRouter, Route, Routes } from "react-router-dom";
-import { CssBaseline, ThemeProvider } from "@mui/material";
-import "@fontsource/poppins";
+import '@fontsource/poppins';
 
-import theme from "./theme";
-import Loading from "./components/Loading";
+import { CssBaseline, ThemeProvider } from '@mui/material';
+import React, { Suspense } from 'react';
+import { BrowserRouter, Route, Routes } from 'react-router-dom';
+
+import Loading from './components/Loading';
+import theme from './theme';
 
 const withSuspense = (Component) => (
   <Suspense fallback={<Loading />}>
     <Component />
   </Suspense>
 );
 
-const HomePage = React.lazy(() => import("./pages/HomePage"));
-const SearchResultsPage = React.lazy(() => import("./pages/SearchResultsPage"));
-const AboutPage = React.lazy(() => import("./pages/AboutPage"));
-const ErrorPage = React.lazy(() => import("./pages/ErrorPage"));
+const HomePage = React.lazy(() => import('./pages/HomePage'));
+const SearchResultsPage = React.lazy(() => import('./pages/SearchResultsPage'));
+const AboutPage = React.lazy(() => import('./pages/AboutPage'));
+const ErrorPage = React.lazy(() => import('./pages/ErrorPage'));
 
 const App = () => {
   return (

diff --git a/client/src/components/BackgroundShapes.jsx b/client/src/components/BackgroundShapes.jsx
@@ -1,57 +1,57 @@
-import { useTheme, Box } from "@mui/material";
-import React from "react";
+import { Box, useTheme } from '@mui/material';
+import React from 'react';
 
-import blobShape from "../assets/milk_tea_blob.svg";
-import circleShape from "../assets/milk_tea_circle.svg";
-import noodleShape from "../assets/milk_tea_noodle.svg";
+import blobShape from '../assets/milk_tea_blob.svg';
+import circleShape from '../assets/milk_tea_circle.svg';
+import noodleShape from '../assets/milk_tea_noodle.svg';
 
 const BackgroundShapes = () => {
   const theme = useTheme();
 
   return (
     <Box
       sx={{
-        position: "absolute",
+        position: 'absolute',
         left: 0,
         top: 0,
-        width: "100vw",
-        height: "100vh",
+        width: '100vw',
+        height: '100vh',
         zIndex: 0,
-        overflow: "hidden",
+        overflow: 'hidden',
       }}
     >
       <Box
         component="img"
         sx={{
-          position: "absolute",
-          bottom: "0",
-          left: "0",
-          [theme.breakpoints.down("md")]: {
-            width: "70%",
+          position: 'absolute',
+          bottom: '0',
+          left: '0',
+          [theme.breakpoints.down('md')]: {
+            width: '70%',
           },
         }}
         src={blobShape}
       />
       <Box
         component="img"
         sx={{
-          position: "absolute",
-          bottom: "35%",
-          left: "15%",
-          [theme.breakpoints.down("md")]: {
-            width: "50%",
+          position: 'absolute',
+          bottom: '35%',
+          left: '15%',
+          [theme.breakpoints.down('md')]: {
+            width: '50%',
           },
         }}
         src={circleShape}
       />
       <Box
         component="img"
         sx={{
-          position: "absolute",
-          top: "0",
-          right: "0",
-          [theme.breakpoints.down("md")]: {
-            width: "70%",
+          position: 'absolute',
+          top: '0',
+          right: '0',
+          [theme.breakpoints.down('md')]: {
+            width: '70%',
           },
         }}
         src={noodleShape}