lint fix and action add

talyaron · Jan 12, 2024 · cff0ca8 · cff0ca8
1 parent 4bc3e06
commit cff0ca8
Show file tree

Hide file tree

Showing 78 changed files with 1,191 additions and 4,678 deletions.
diff --git a/.github/workflows/superlinter.yml b/.github/workflows/superlinter.yml
@@ -1,19 +1,25 @@
-name: Super-Linter
+name: Frontend PR Tests
 
 on: push
 
 jobs:
-    super-linter:
-        name: Lint Code Base
+    build:
         runs-on: ubuntu-latest
+
         steps:
-            - name: Checkout Code
+            - name: Checkout repository
               uses: actions/checkout@v2
+
+            - name: Set up Node.js
+              uses: actions/setup-node@v2
               with:
-                  fetch-depth: 0
-            - name: Run Super-Linter
-              uses: github/super-linter@v4
-              env:
-                  VALIDATE_ALL_CODEBASE: true
-                  DEFAULT_BRANCH: main
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  node-version: 14
+
+            - name: Install dependencies
+              run: npm install
+
+            - name: Run ESLint
+              run: npm run lint
+
+            - name: Run TypeScript type checking
+              run: npm run typecheck
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,7 +9,8 @@
         "devf": "cd functions && npm run build:watch",
         "deve": "firebase emulators:start",
         "build": "tsc && vite build",
-        "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+        "lint": "eslint --fix \"src/**/*.{js,jsx,ts,tsx}\"",
+        "typecheck": "tsc",
         "preview": "vite preview",
         "deploy:h": "npm run build && firebase deploy --only hosting",
         "deploy:f": "cd functions && npm run build && firebase deploy --only functions",
@@ -22,6 +23,7 @@
         "@emotion/styled": "^11.11.0",
         "@reduxjs/toolkit": "^1.9.5",
         "delib-npm": "^1.1.67",
+        "eslint-plugin-import": "^2.29.1",
         "firebase": "^10.0.0",
         "i18next": "^23.7.6",
         "i18next-http-backend": "^2.4.1",
@@ -48,10 +50,13 @@
         "@typescript-eslint/eslint-plugin": "^5.61.0",
         "@typescript-eslint/parser": "^5.61.0",
         "@vitejs/plugin-react-swc": "^3.3.2",
-        "eslint": "^8.44.0",
+        "eslint": "^8.56.0",
+        "eslint-config-prettier": "^8.7.0",
+        "eslint-import-resolver-alias": "1.1.2",
         "eslint-plugin-react-hooks": "^4.6.0",
         "eslint-plugin-react-refresh": "^0.4.1",
-        "typescript": "^5.0.2",
+        "prettier": "^3.1.1",
+        "typescript": "^5.3.3",
         "vite": "^4.4.0",
         "vite-plugin-pwa": "^0.16.4",
         "workbox-window": "^7.0.0"

diff --git a/src/assets/icons/FrownIcon.tsx b/src/assets/icons/FrownIcon.tsx
@@ -1,4 +1,5 @@
 import { FC } from "react";
+
 interface Props {
     color?: string;
 }

diff --git a/src/assets/icons/InfoIcon.tsx b/src/assets/icons/InfoIcon.tsx
@@ -1,4 +1,5 @@
 import { FC } from "react";
+
 interface Props {
     color: string;
 }

diff --git a/src/functions/db/auth.ts b/src/functions/db/auth.ts
@@ -42,6 +42,7 @@ export function googleLogin() {
 
             // The AuthCredential type that was used.
             console.error(error);
+
             // const credential = GoogleAuthProvider.credentialFromError(error);
 
             // ...
@@ -80,6 +81,7 @@ export function listenToAuth(
                 cb(userDB);
 
                 const initialLocation = getIntialLocationSessionStorage();
+
                 //navigate to initial location
                 if (initialLocation) navigationCB(initialLocation);
             } else {

diff --git a/src/functions/db/config.ts b/src/functions/db/config.ts
@@ -6,6 +6,7 @@ import { getAnalytics } from "firebase/analytics";
 import { connectAuthEmulator, getAuth } from "firebase/auth";
 import { getStorage, connectStorageEmulator } from "firebase/storage";
 import { keys, vapidKey } from "./configKey";
+
 // TODO: Add SDKs for Firebase products that you want to use
 // https://firebase.google.com/docs/web/setup#available-libraries
 
@@ -36,11 +37,13 @@ getToken(messaging, { vapidKey })
             console.info(
                 "No registration token available. Request permission to generate one."
             );
+
             // ...
         }
     })
     .catch((err) => {
         console.error("An error occurred while retrieving token. ", err);
+
         // ...
     });
 

diff --git a/src/functions/db/evaluation/getEvaluation.ts b/src/functions/db/evaluation/getEvaluation.ts
@@ -26,7 +26,8 @@ export function listenToEvaluations(
             where("parentId", "==", parentId),
             where("evaluatorId", "==", evaluatorId)
         );
-        return onSnapshot(q, (evaluationsDB) => {
+
+return onSnapshot(q, (evaluationsDB) => {
             try {
                 evaluationsDB.forEach((evaluationDB) => {
                     try {
@@ -43,7 +44,8 @@ export function listenToEvaluations(
         });
     } catch (error) {
         console.error(error);
-        return () => {};
+
+return () => {};
     }
 }
 
@@ -59,7 +61,8 @@ export async function getEvaluations(parentId: string): Promise<Evaluation[]> {
             if (!evauatorsIds.has(evaluation.evaluatorId)) {
                 //prevent duplicate evaluators
                 evauatorsIds.add(evaluation.evaluatorId);
-                return evaluation;
+
+return evaluation;
             }
         }).filter((evaluation) => evaluation) as Evaluation[];
 
@@ -72,7 +75,8 @@ export async function getEvaluations(parentId: string): Promise<Evaluation[]> {
                     evaluation.evaluatorId
                 );
                 const promise = getDoc(evaluatorRef);
-                return promise;
+
+return promise;
             }
         }).filter((promise) => promise) as Promise<any>[];
 
@@ -87,9 +91,11 @@ export async function getEvaluations(parentId: string): Promise<Evaluation[]> {
             );
             if (evaluator) evaluation.evaluator = evaluator;
         });
-        return evaluations;
+
+return evaluations;
     } catch (error) {
         console.error(error);
-        return [] as Evaluation[];
+
+return [] as Evaluation[];
     }
 }
diff --git a/src/functions/db/results/getResults.ts b/src/functions/db/results/getResults.ts
@@ -29,7 +29,8 @@ export async function getResultsDB( statement:Statement): Promise<Statement[]> {
 
     } catch (error) {
         console.error(error);
-        return [];
+
+return [];
     }
 }
 
@@ -44,10 +45,12 @@ export async function getResultsByTopVoteDB(statement: Statement): Promise<State
         const statementRef = doc(DB, Collections.statements, topStatementId);
         const statementSnap = await getDoc(statementRef);
         const statementData = statementSnap.data() as Statement;
-        return [statementData];
+
+return [statementData];
     } catch (error) {
         console.error(error);
-        return [];
+
+return [];
     }
 }
 
@@ -61,9 +64,11 @@ async function getTopOtionsDB(statement: Statement): Promise<Statement[]> {
         const topOptionsSnap = await getDocs(q);
 
         const topOptions = topOptionsSnap.docs.map(doc => doc.data() as Statement);
-        return topOptions;
+
+return topOptions;
     } catch (error) {
         console.error(error);
-        return [];
+
+return [];
     }
 }
diff --git a/src/functions/db/results/setResults.ts b/src/functions/db/results/setResults.ts
@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { DB } from '../config';
 import { Collections, ResultsBy } from 'delib-npm';
 
-export async function updateResultsSettings(statementId: string, resultsBy: ResultsBy = ResultsBy.topOptions, numberOfResults: number = 3) {
+export async function updateResultsSettings(statementId: string, resultsBy: ResultsBy = ResultsBy.topOptions, numberOfResults = 3) {
     try {
         z.string().parse(statementId);
         z.number().parse(numberOfResults);

diff --git a/src/functions/db/rooms/getRooms.ts b/src/functions/db/rooms/getRooms.ts
@@ -37,7 +37,8 @@ export function listenToAllRoomsRquest(statement: Statement, cb: Function) {
         })
     } catch (error) {
         console.error(error)
-        return () => {}
+
+return () => {}
     }
 }
 
@@ -54,7 +55,8 @@ export function listenToRoomSolutions(statementId: string, cb: Function) {
                 )
             )
         )
-        return onSnapshot(q, (roomSolutionsDB) => {
+
+return onSnapshot(q, (roomSolutionsDB) => {
             try {
                 roomSolutionsDB.forEach((roomSolutionDB) => {
                     try {
@@ -73,6 +75,7 @@ export function listenToRoomSolutions(statementId: string, cb: Function) {
         })
     } catch (error) {
         console.error(error)
-        return () => {}
+
+return () => {}
     }
 }
diff --git a/src/functions/db/rooms/setRooms.ts b/src/functions/db/rooms/setRooms.ts
@@ -60,29 +60,33 @@ export async function askToJoinRoomDB(statement: Statement): Promise<boolean> {
 
 
                 await saveToDB(requestId, requestRef, statement);
-                return true;
+
+return true;
 
 
             } else if (request.statement.statementId !== statement.statementId) {
 
                 await saveToDB(requestId, requestRef, statement);
-                return true;
+
+return true;
 
             } else {
                 const { parentId, participant, requestId } = request;
                 const _request = { parentId, participant, requestId, lastUpdate: new Date().getTime() };
 
                 //set to undefined to show that the user is not in the room
                 await setDoc(requestRef, _request);
-                return false;
+
+return false;
             }
 
 
         }
 
     } catch (error) {
         console.error(error)
-        return false
+
+return false
     }
 
     async function saveToDB(requestId: string, requestRef: any, statement: Statement) {