gcivil-nyu-org · ManaliTanna · Nov 27, 2023 · Nov 3, 2023 · Nov 3, 2023 · Nov 3, 2023
diff --git a/.github/workflows/django-unit-tests.yml b/.github/workflows/django-unit-tests.yml
@@ -24,11 +24,20 @@ jobs:
           python -m pip install --upgrade pip
           cd furbaby
           pip install -r requirements.txt
+      - name: Check Format
+        run: |
+          black .
+      - name: Check Link
+        run: |
+          pylint **/*.py --exit-zero
       - name: Run Tests
         run: |
           cd furbaby
           export AWS_RDS_DATABASE_PASSWORD="dummy-password"
           export DJANGO_SECRET_KEY="dummy-secret-key"
           export EMAIL_APP_PASSWORD="dummy-user-email-password"
           export EMAIL_APP_USERNAME="dummy-user-email"
+          export AWS_ACCESS_KEY_ID="dummy-user-key-id"
+          export AWS_SECRET_ACCESS_KEY="dummy-secret-access-key"
+          export AWS_BUCKET_NAME="dummy-aws-bucket-name"
           python manage.py test
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,5 @@
 **/.coveralls.yml
 
 **/*.coverage
+
+**/fakeData.json
diff --git a/.travis.yml b/.travis.yml
@@ -13,10 +13,8 @@ jobs:
       - export GIT_COMMIT_HASH=$(git rev-parse HEAD)
       - echo $GIT_COMMIT_HASH
       - echo $GIT_COMMIT_SHORT_HASH
-
-    before_script:
-      - python manage.py makemigrations --settings=furbaby.settings
-      - python manage.py migrate --settings=furbaby.settings
+      - export AWS_SECRET_ACCESS_KEY="$AWS_ACCESS_SECRET_KEY"
+      - export AWS_BUCKET_NAME="elasticbeanstalk-us-east-1-994011800090"
 
     script:
       - printenv > ./furbaby/.env
@@ -38,7 +36,7 @@ jobs:
         region: "us-east-1"
         app: "project-team-1-furbaby"
         env: "staging"
-        bucket: "elasticbeanstalk-us-east-1-994011800090"
+        bucket: $AWS_BUCKET_NAME
         on:
           branch: develop
 
@@ -48,7 +46,7 @@ jobs:
         region: "us-east-1"
         app: "project-team-1-furbaby"
         env: "production"
-        bucket: "elasticbeanstalk-us-east-1-994011800090"
+        bucket: $AWS_BUCKET_NAME
         skip_cleanup: true
         on:
           branch: master
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -17,5 +17,7 @@
     }
   },
   "typescript.tsdk": "frontend/node_modules/typescript/lib",
-  "editor.tabSize": 2
+  "editor.tabSize": 2,
+  "python.analysis.typeCheckingMode": "basic",
+  "python.analysis.autoImportCompletions": true
 }
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 
 #### Master Branch
 
-[![Coverage Status | Master](https://coveralls.io/repos/github/gcivil-nyu-org/INET-Monday-Fall2023-Team-1/badge.svg?branch=master)](https://coveralls.io/github/gcivil-nyu-org/INET-Monday-Fall2023-Team-1?branch=master)
+[![Coverage Status | Master](https://coveralls.io/repos/github/gcivil-nyu-org/INET-Monday-Fall2023-Team-1/badge.svg?branch=master)](https://coveralls.io/github/gcivil-nyu-org/INET-Monday-Fall2023-Team-1?branch=HEAD)
 
 [![Build Status | Master](https://app.travis-ci.com/gcivil-nyu-org/INET-Monday-Fall2023-Team-1.svg?branch=master)](https://app.travis-ci.com/gcivil-nyu-org/INET-Monday-Fall2023-Team-1)
 

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -55,10 +55,12 @@
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "7.21.11",
     "@tailwindcss/forms": "0.5.6",
+    "@tailwindcss/typography": "0.5.10",
     "@types/lodash": "4.14.200",
     "@types/react-helmet": "6.1.7",
     "@typescript-eslint/eslint-plugin": "5.10.2",
     "@typescript-eslint/parser": "5.10.2",
+    "daisyui": "3.9.4",
     "eslint": "8.8.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-import": "2.25.4",

diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en" class="h-full bg-white">
+<html lang="en" data-theme="emerald" class="h-full bg-white">
   <head>
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -27,7 +27,7 @@ const AppRouter = () => {
   const { pathname } = useLocation();
 
   useEffect(() => {
-    if (authenticationState.isSessionSet) {
+    if (authenticationState.isSessionSet && ROUTES.FORGOT_PASSWORD !== pathname) {
       if (Object.values(ROUTES.PROTECTED_ROUTES).find((route) => route === pathname)) {
         navigate(pathname, { replace: true });
       } else {
@@ -85,6 +85,16 @@ const AppRouter = () => {
           </ProtectedRoute>
         }
       />
+      <Route
+        path="locations"
+        element={
+          <ProtectedRoute>
+            <Home
+              authContext={{ onLogin, onRegister, passwordReset, authenticationState, ...rest }}
+            />
+          </ProtectedRoute>
+        }
+      />
       <Route path="*" element={<NotFound />} />
     </Routes>
   );