Merge branch 'main' into dev

0xaaiden · Jun 18, 2023 · 6e5818d · 6e5818d
2 parents 6caa237 + 23888fa
commit 6e5818d
Show file tree

Hide file tree

Showing 25 changed files with 2,967 additions and 2,459 deletions.
diff --git a/.env b/.env
@@ -1,8 +1,8 @@
-REACT_APP_FIREBASE_API_KEY=AIzaSyDTRY5WPQm0v26OuJDvkZ-FwDiPMtoIg_U
-REACT_APP_FIREBASE_AUTH_DOMAIN=indexsc-80164.firebaseapp.com
-REACT_APP_FIREBASE_PROJECT_ID=indexsc-80164
-REACT_APP_FIREBASE_STORAGE_BUCKET=indexsc-80164.appspot.com
-REACT_APP_FIREBASE_MESSAGING_SENDER_ID=450893406130
-REACT_APP_FIREBASE_APP_ID=1:450893406130:web:5326cc19258ad6e83f8eab
-REACT_APP_FIREBASE_MEASUREMENT_ID=G-NN253G450K
-REACT_APP_FIREBASE_DATABASE_URL=https://indexsc-80164-default-rtdb.firebaseio.com/
+REACT_APP_FIREBASE_API_KEY=
+REACT_APP_FIREBASE_AUTH_DOMAIN=
+REACT_APP_FIREBASE_PROJECT_ID=
+REACT_APP_FIREBASE_STORAGE_BUCKET=
+REACT_APP_FIREBASE_MESSAGING_SENDER_ID=
+REACT_APP_FIREBASE_APP_ID=
+REACT_APP_FIREBASE_MEASUREMENT_ID=
+REACT_APP_FIREBASE_DATABASE_URL=
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -7,13 +7,9 @@ module.exports = {
   extends: ['eslint:recommended', 'plugin:react/recommended', 'plugin:prettier/recommended'],
   overrides: [],
   parserOptions: {
-    ecmaFeatures: {
-      jsx: true
-    },
-    ecmaVersion: 12,
+    ecmaVersion: 'latest',
     sourceType: 'module'
   },
-
   plugins: ['react'],
   rules: {
     'prettier/prettier': 'warn'

diff --git a/.firebase/hosting.YnVpbGQ.cache b/.firebase/hosting.YnVpbGQ.cache
@@ -1,3 +1,18 @@
+<<<<<<< HEAD
+404.html,1673575794380,05cbc6f94d7a69ce2e29646eab13be2c884e61ba93e3094df5028866876d18b3
+favicon.ico,1673575794381,b72f7455f00e4e58792d2bca892abb068e2213838c0316d6b7a0d6d16acd1955
+index.html,1673575809754,bf7f36f93b5fbcb951efb0e0c5fd53909e17d60a073c6e4df2dc4ab10d9749f5
+asset-manifest.json,1673575809754,684e29dc4786c33240166e9147ad939e3a50eb1c6d1e5213a43a34c7f52b5e3f
+logo192.png,1673575794381,caff018b7f1e8fd481eb1c50d75b0ef236bcd5078b1d15c8bb348453fee30293
+manifest.json,1673575794388,341d52628782f8ac9290bbfc43298afccb47b7cbfcee146ae30cf0f46bc30900
+robots.txt,1673575794388,391d14b3c2f8c9143a27a28c7399585142228d4d1bdbe2c87ac946de411fa9a2
+logo512.png,1673575794387,191fc21360b4ccfb1cda11a1efb97f489ed22672ca83f4064316802bbfdd750e
+static/js/main.585df148.js.LICENSE.txt,1673575809781,6714254f6a4c94ac8f694c0ec0bbfbc3b9927526a1da1a9742ac2a7d39116f93
+static/js/main.585df148.js,1673575809783,040b092aaf16408c955e67858280d8fccbcc5ce8ab69fdc0456d23f417e5d33e
+static/js/main.585df148.js.map,1673575809780,08ef8d4361d1c6f52e845aee59067050fc0b8648284cd21b28d685471b8a68e5
+static/css/main.200d2461.css,1673575809781,a0b70577658742d70cd11939f3f3aaf789fe543aca4df601128e863a26636f43
+static/css/main.200d2461.css.map,1673575809782,641231edada511de15580758aaa4fcbe7474b1396bca9c55e45395144e405d41
+=======
 index.html,1676176008105,8d1f2e23372519838c7a1ca9af792ea3f073206761714326501166ffa0779eae
 favicon.ico,1676175987278,b72f7455f00e4e58792d2bca892abb068e2213838c0316d6b7a0d6d16acd1955
 logo192.png,1676175987279,caff018b7f1e8fd481eb1c50d75b0ef236bcd5078b1d15c8bb348453fee30293
@@ -10,3 +25,4 @@ static/js/main.8abcbe5d.js,1676176008138,fc86fa9e5cb11fd1ccb0a2d2fe907ed76a06526
 static/css/main.a732c171.css,1676176008136,e6f8928c479b2c9805d9e534424c67f4f07400c9ded36ba09235f6bef27a4fa2
 static/css/main.a732c171.css.map,1676176008136,cc3c68589c99df54f821b90f2bdc6c542c451219ffaafd5c5f021688c1a5a078
 static/js/main.8abcbe5d.js.map,1676176008138,e29d31f165b8c1c6d5cd87da74ad1e6b9a5261a0ae04504f13cee34f53e0bb0a
+>>>>>>> dev
diff --git a/.firebase/hosting.cHVibGlj.cache b/.firebase/hosting.cHVibGlj.cache
@@ -0,0 +1,7 @@
+404.html,1673575516069,05cbc6f94d7a69ce2e29646eab13be2c884e61ba93e3094df5028866876d18b3
+favicon.ico,1672327965581,b72f7455f00e4e58792d2bca892abb068e2213838c0316d6b7a0d6d16acd1955
+index.html,1673575609211,1392f82d93c910f55bb9912110418313a1d8cb298446c65511cc70b8c7781e0b
+logo192.png,1672327965583,caff018b7f1e8fd481eb1c50d75b0ef236bcd5078b1d15c8bb348453fee30293
+logo512.png,1672327965583,191fc21360b4ccfb1cda11a1efb97f489ed22672ca83f4064316802bbfdd750e
+manifest.json,1672327965584,341d52628782f8ac9290bbfc43298afccb47b7cbfcee146ae30cf0f46bc30900
+robots.txt,1672327965585,391d14b3c2f8c9143a27a28c7399585142228d4d1bdbe2c87ac946de411fa9a2
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -0,0 +1,17 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on PR
+'on': pull_request
+jobs:
+  build_and_preview:
+    if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm ci && npm run build
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_INDEXSC_80164 }}'
+          projectId: indexsc-80164
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,9 @@
+
+{
+  "semi": true,
+  "tabWidth": 2,
+  "printWidth": 100,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "jsxBracketSameLine": true
+}
diff --git a/firebase.json b/firebase.json
@@ -5,6 +5,15 @@
       "firebase.json",
       "**/.*",
       "**/node_modules/**"
+<<<<<<< HEAD
+    ],
+    "rewrites": [
+      {
+        "source": "**",
+        "destination": "/index.html"
+      }
+=======
+>>>>>>> dev
     ]
   }
 }