Merging develop-postgres branch into develop (#2677)

* adding vitest to avatar component Signed-off-by: NishantSinghhhhh <[email protected]> * Merging develop-postgres branch into develop branch Signed-off-by: NishantSinghhhhh <[email protected]> * changed faulty files Signed-off-by: NishantSinghhhhh <[email protected]> * changed faulty files Signed-off-by: NishantSinghhhhh <[email protected]> * New branch for merging Signed-off-by: NishantSinghhhhh <[email protected]> --------- Signed-off-by: NishantSinghhhhh <[email protected]>
PalisadoesFoundation · Dec 20, 2024 · 59b0879 · 59b0879
1 parent e409df1
commit 59b0879
Show file tree

Hide file tree

Showing 53 changed files with 1,368 additions and 865 deletions.
diff --git a/.github/workflows/check-tsdoc.js b/.github/workflows/check-tsdoc.js
@@ -23,6 +23,7 @@ async function findTsxFiles(dir) {
       } else if (
         filePath.endsWith('.tsx') &&
         !filePath.endsWith('.test.tsx') &&
+        !filePath.endsWith('.spec.tsx') &&
         !filesToSkip.includes(path.relative(dir, filePath))
       ) {
         results.push(filePath);

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -49,7 +49,7 @@ jobs:
 
       - name: Run formatting if check fails
         if: failure()
-        run: npm run format
+        run: npm run format:fix
 
       - name: Check for type errors
         if: steps.changed-files.outputs.only_changed != 'true'
@@ -101,6 +101,7 @@ jobs:
             .node-version
             .husky/**
             scripts/**
+            src/style/** 
             schema.graphql
             package.json
             tsconfig.json

diff --git a/Dockerfile b/Dockerfile
@@ -1,22 +1,15 @@
-# Step 1: Build Stage
-FROM node:20.10.0-alpine AS builder
-WORKDIR /talawa-admin
+FROM node:20.10.0 AS build
+
+WORKDIR /usr/src/app
 
 COPY package*.json ./
+
 RUN npm install
 
 COPY . .
 
-ENV NODE_ENV=production
-
 RUN npm run build
 
-#Step 2: Production
-FROM nginx:1.27.3-alpine AS production
-
-ENV NODE_ENV=production
+EXPOSE 4321
 
-COPY config/docker/setup/nginx.conf /etc/nginx/conf.d/default.conf
-COPY --from=builder /talawa-admin/build /usr/share/nginx/html
-EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["npm", "run", "serve"]
diff --git a/jest.config.js b/jest.config.js
@@ -36,6 +36,7 @@ export default {
     '<rootDir>/src',
   ],
   moduleNameMapper: {
+    '\\.(css|scss|sass|less)$': 'identity-obj-proxy',
     '^react-native$': 'react-native-web',
     '^@dicebear/core$': '<rootDir>/scripts/__mocks__/@dicebear/core.ts',
     '^@dicebear/collection$':
@@ -67,6 +68,7 @@ export default {
     'src/components/AddOn/support/services/Render.helper.ts',
     'src/components/SecuredRoute/SecuredRoute.tsx',
     'src/reportWebVitals.ts',
+    'src/screens/UserPortal/Volunteer/Actions/Actions.spec.tsx',
   ],
   coverageThreshold: {
     global: {
@@ -78,6 +80,7 @@ export default {
     '<rootDir>/node_modules/',
     '<rootDir>/build/',
     '<rootDir>/public/',
+    '<rootDir>/src/screens/UserPortal/Volunteer/Actions/Actions.spec.tsx',
   ],
   coverageDirectory: './coverage/jest',
   coverageReporters: ['text', 'html', 'text-summary', 'lcov'],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
     "babel-plugin-transform-import-meta": "^2.2.1",
     "bootstrap": "^5.3.3",
     "chart.js": "^4.4.6",
+    "customize-cra": "^1.0.0",
     "dayjs": "^1.11.13",
     "dotenv": "^16.4.5",
     "flag-icons": "^7.2.3",
@@ -136,6 +137,7 @@
     "@typescript-eslint/parser": "^8.5.0",
     "@vitest/coverage-istanbul": "^2.1.5",
     "babel-jest": "^29.7.0",
+    "cross-env": "^7.0.3",
     "eslint": "^8.49.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.31.0",
@@ -155,8 +157,7 @@
     "tsx": "^4.19.1",
     "vitest": "^2.1.5",
     "whatwg-fetch": "^3.6.20",
-    "vite-plugin-svgr": "^4.2.0",
-    "cross-env": "^7.0.3"
+    "vite-plugin-svgr": "^4.2.0"
   },
   "resolutions": {
     "@apollo/client": "^3.4.0-beta.19",

diff --git a/public/locales/en/errors.json b/public/locales/en/errors.json
@@ -7,5 +7,10 @@
   "emailNotRegistered": "Email not registered",
   "notFoundMsg": "Oops! The Page you requested was not found!",
   "errorOccurredCouldntCreate": "An error occurred. Couldn't create {{entity}}",
-  "errorLoading": "Error occured while loading {{entity}} data"
+  "errorLoading": "Error occured while loading {{entity}} data",
+  "invalidPhoneNumber": "Please enter a valid phone number",
+  "invalidEducationGrade": "Please select a valid education grade",
+  "invalidEmploymentStatus": "Please select a valid employment status",
+  "invalidMaritalStatus": "Please select a valid marital status",
+  "error400": "The submitted information is invalid. Please check your inputs and try again"
 }
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -923,7 +923,7 @@
     "register": "register"
   },
   "addOnStore": {
-    "title": "Add On Store",
+    "title": "Plugin Store",
     "searchName": "Ex: Donations",
     "search": "Search",
     "enable": "Enabled",
@@ -1227,7 +1227,7 @@
     "RstartDate": "Select Start Date",
     "RendDate": "Select End Date",
     "RClose": "Close the window",
-    "addNew": "Create new advertisement",
+    "addNew": "Create",
     "EXname": "Ex. Cookie Shop",
     "EXlink": "Ex. http://yourwebsite.com/photo",
     "createAdvertisement": "Create Advertisement",

diff --git a/public/locales/fr/errors.json b/public/locales/fr/errors.json
@@ -7,5 +7,10 @@
   "emailNotRegistered": "Email non enregistré",
   "notFoundMsg": "Oops! ",
   "errorOccurredCouldntCreate": "Une erreur s'est produite. Impossible de créer {{entity}}",
-  "errorLoading": "Une erreur s'est produite lors du chargement des données {{entity}}"
+  "errorLoading": "Une erreur s'est produite lors du chargement des données {{entity}}",
+  "invalidPhoneNumber": "Veuillez entrer un numéro de téléphone valide",
+  "invalidEducationGrade": "Veuillez sélectionner un niveau d'études valide",
+  "invalidEmploymentStatus": "Veuillez sélectionner un statut d'emploi valide",
+  "invalidMaritalStatus": "Veuillez sélectionner un état matrimonial valide",
+  "error400": "Réponse non réussie. Code d'état 400 reçu du serveur"
 }
diff --git a/public/locales/hi/errors.json b/public/locales/hi/errors.json
@@ -7,5 +7,10 @@
   "emailNotRegistered": "ईमेल पंजीकृत नहीं है",
   "notFoundMsg": "उफ़! ",
   "errorOccurredCouldntCreate": "एक त्रुटि हुई। {{entity}} नहीं बना सके",
-  "errorLoading": "{{entity}} डेटा लोड करते समय त्रुटि हुई"
+  "errorLoading": "{{entity}} डेटा लोड करते समय त्रुटि हुई",
+  "invalidPhoneNumber": "कृपया एक मान्य फोन-नंबर दर्ज करे",
+  "invalidEducationGrade": "कृपया एक शिक्षा ग्रेड चुनें",
+  "invalidEmploymentStatus": "कृपया वैध रोजगार स्थिति चुनें",
+  "invalidMaritalStatus": "कृपया वैध वैवाहिक स्थिति चुनें",
+  "error400": "आपकी जानकारी सहेजी नहीं जा सकी। कृपया अपनी प्रविष्टियों की जांच करें और पुनः प्रयास करें।"
 }
diff --git a/public/locales/sp/errors.json b/public/locales/sp/errors.json
@@ -7,5 +7,10 @@
   "emailNotRegistered": "Email not registered",
   "notFoundMsg": "Oops! The Page you requested was not found!",
   "errorOccurredCouldntCreate": "Ocurrió un error. No se pudo crear {{entity}}",
-  "errorLoading": "Ocurrió un error al cargar los datos de {{entity}}"
+  "errorLoading": "Ocurrió un error al cargar los datos de {{entity}}",
+  "invalidPhoneNumber": "Por favor, introduzca un número de teléfono válido",
+  "invalidEducationGrade": "Por favor seleccione un grado de educación válido",
+  "invalidEmploymentStatus": "Por favor seleccione un estado de empleo válido",
+  "invalidMaritalStatus": "Por favor seleccione un estado civil válido",
+  "error400": "Respuesta no exitosa. Se recibió el código de estado 400 del servidor"
 }
diff --git a/public/locales/zh/errors.json b/public/locales/zh/errors.json
@@ -7,5 +7,10 @@
   "emailNotRegistered": "邮箱未注册",
   "notFoundMsg": "哎呀！",
   "errorOccurredCouldntCreate": "发生错误。 无法创建{{entity}}",
-  "errorLoading": "加载{{entity}}数据时出错"
+  "errorLoading": "加载{{entity}}数据时出错",
+  "invalidPhoneNumber": "请选择一个有效的电话号码",
+  "invalidEducationGrade": "请选择教育年级",
+  "invalidEmploymentStatus": "请选择有效的就业状况",
+  "invalidMaritalStatus": "请选择有效的婚姻状况",
+  "error400": "响应不成功. 从服务器收到状态代码 400"
 }
diff --git a/src/components/AddOn/core/AddOnEntry/AddOnEntry.module.css b/src/components/AddOn/core/AddOnEntry/AddOnEntry.module.css
@@ -7,8 +7,12 @@
   margin-left: auto;
   display: flex !important;
   align-items: center;
+  background-color: transparent;
+  color: #31bb6b;
+}
+.card {
+  border: 4px solid green;
 }
-
 .entryaction i {
   margin-right: 8px;
 }