fix(#156): Have a user be able to apply in different cycles

atlp-rwanda · Oct 17, 2024 · a412228 · a412228
2 parents dfe840e + 710bf6f
commit a412228
Show file tree

Hide file tree

Showing 35 changed files with 964 additions and 128 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -11,19 +11,19 @@ checks:
   file-lines:
     enabled: true
     config:
-      threshold: 25000
+      threshold: 250
   method-complexity:
     enabled: true
     config:
-      threshold: 50
+      threshold: 5
   method-count:
     enabled: true
     config:
       threshold: 20
   method-lines:
     enabled: true
     config:
-      threshold: 900
+      threshold: 90
   nested-control-flow:
     enabled: true
     config:
@@ -41,20 +41,20 @@ checks:
     config:
       threshold: #language-specific defaults. overrides affect all languages.
 plugins:
-  rubocop:
-    enabled: true
-  eslint:
-    enabled: false
-    channel: eslint-8
+ rubocop:
+  enabled: true
+ eslint:
+  enabled: false
+  channel: eslint-8
 exclude_patterns:
-  - "config/"
-  - "db/"
-  - "dist/"
-  - "features/"
-  - "**/node_modules/"
-  - "script/"
-  - "**/spec/"
-  - "**/test/"
-  - "**/tests/"
-  - "**/vendor/"
-  - "**/*.d.ts"
+- "config/"
+- "db/"
+- "dist/"
+- "features/"
+- "**/node_modules/"
+- "script/"
+- "**/spec/"
+- "**/test/"
+- "**/tests/"
+- "**/vendor/"
+- "**/*.d.ts"
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,5 @@ coverage
 dist
 buildcoverage
 package-lock.json
-yarn.lock
 .DS_Store
-build/
-yarn.lock
+build/
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "@babel/preset-env": "^7.19.3",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
-    "@expo/webpack-config": "^0.17.2",
+    "@expo/webpack-config": "^19.0.1",
     "@iconify/react": "^4.0.0",
     "@testing-library/dom": "^8.19.0",
     "@testing-library/jest-dom": "^5.16.5",
@@ -53,7 +53,7 @@
     "html-webpack-plugin": "^5.6.0",
     "i": "^0.3.7",
     "node-polyfill-webpack-plugin": "^2.0.1",
-    "npm": "^8.19.2",
+    "npm": "^10.8.3",
     "postcss": "^8.4.14",
     "postcss-loader": "^7.0.0",
     "process": "^0.11.10",
@@ -83,7 +83,7 @@
     "@mui/x-date-pickers": "^5.0.6",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
-    "@tinymce/tinymce-react": "^4.2.0",
+    "@tinymce/tinymce-react": "^5.1.1",
     "@types/react-i18next": "^8.1.0",
     "@types/react-router": "^5.1.19",
     "@types/react-router-dom": "^5.3.3",
@@ -120,14 +120,14 @@
     "react-hot-toast": "^2.4.1",
     "react-i18next": "^11.18.6",
     "react-icons": "^4.6.0",
-    "react-js-pagination": "^3.0.3",
+    "react-js-pagination": "^3.0.2",
     "react-loader-spinner": "^6.1.6",
     "react-modal": "^3.16.1",
     "react-paginate": "^8.1.3",
     "react-redux": "^8.0.4",
     "react-render-html": "^0.6.0",
     "react-router-dom": "^6.4.2",
-    "react-scripts": "^5.0.1",
+    "react-scripts": "^3.0.1",
     "react-select": "^5.7.4",
     "react-table": "^7.8.0",
     "react-toastify": "^9.0.8",

diff --git a/public/index.html b/public/index.html
@@ -10,6 +10,5 @@
   </head>
   <body>
     <div id="root"></div>
-
   </body>
 </html>
diff --git a/src/assets/assets/calendar.svg b/src/assets/assets/calendar.svg
diff --git a/src/assets/assets/collaborative-learning.svg b/src/assets/assets/collaborative-learning.svg
diff --git a/src/assets/assets/performance.svg b/src/assets/assets/performance.svg
diff --git a/src/assets/assets/strategy.svg b/src/assets/assets/strategy.svg
diff --git a/src/components/form/SignInForm.tsx b/src/components/form/SignInForm.tsx
@@ -77,8 +77,13 @@ const LoginForm = () => {
       const response = await loginAction(validatedData.email, validatedData.password);
 
       const token = response?.data?.data?.login?.token;
+      const userId = response?.data?.data?.login?.userId;
+
       if (token) {
         localStorage.setItem("access_token", token);
+        if (userId) {
+          localStorage.setItem("userId", userId);
+        }
         await redirectAfterLogin();
       } else {
         toast.error(response?.data?.errors[0].message);

diff --git a/src/components/form/TraineeApply.tsx b/src/components/form/TraineeApply.tsx
@@ -9,6 +9,7 @@ import { AppDispatch, RootState } from '../../redux/store';
 import useFormValidation from '../useFormValidation';
 import { useTheme } from '../../hooks/darkmode'; 
 import { loggedUserAction } from '../../redux/actions/getLoggedUser';
+import { toast } from "react-toastify";
 interface FormData {
   firstName: string;
   lastName: string;
@@ -121,10 +122,21 @@ const TraineeApplicationForm: React.FC = () => {
       try {
         const newTraineeId = await dispatch(createTrainee(formData));
         console.log('Trainee created successfully');
-        navigate(`trainee-success/${newTraineeId}`, { replace: true });
-      } catch (error) {
+        navigate(`myApplications/trainee-success/${newTraineeId}`, { replace: true });
+      } catch (error:any) {
         console.error('Error submitting form:', error);
-        setSubmitError('An error occurred while submitting the form. Please try again.');
+        console.log('Full error object:', JSON.stringify(error, null, 2));
+        console.log('Error response:', error.response);
+        console.log('Error message:', error.message);
+
+        let errorMessage = "An error occurred while creating the trainee.";
+        if (error.response?.data?.errors?.[0]?.message) {
+          errorMessage = error.response.data.errors[0].message;
+        } else if (error.message) {
+          errorMessage = error.message;
+        }
+
+        setSubmitError(errorMessage);
       } finally {
         setIsSubmitting(false);
       }
@@ -177,7 +189,6 @@ const TraineeApplicationForm: React.FC = () => {
             disabled={isSubmitting}
           />
         </form>
-        {submitError && <p className="text-red-500 mt-2">{submitError}</p>}
       </div>
     </div>
   );

diff --git a/src/components/form/TraineeAttributeForm.tsx b/src/components/form/TraineeAttributeForm.tsx
@@ -4,12 +4,14 @@ import { createTraineeAttribute } from '../../redux/actions/traineeAttributes';
 import TraineeFormPage1 from '../../components/TraineeFormPage1';
 import TraineeFormPage2 from '../../components/TraineeFormPage2';
 import { useTheme } from '../../hooks/darkmode'; 
+import { useNavigate } from 'react-router-dom'
 
 const TraineeAttributeForm = ({ traineeId }) => {
   const dispatch = useDispatch();
   const [page, setPage] = useState(1);
   const { theme } = useTheme(); 
   const isDarkMode = theme === false; 
+  const navigate = useNavigate();
 
   const [formData, setFormData] = useState({
     gender: '',
@@ -70,6 +72,7 @@ const TraineeAttributeForm = ({ traineeId }) => {
     };
     console.log('Attribute data being sent:', attributeData);
     dispatch(createTraineeAttribute(attributeData));
+    navigate('/applicant')
   };
 
   return (

diff --git a/src/components/sidebar/sidebarItems.tsx b/src/components/sidebar/sidebarItems.tsx
@@ -34,6 +34,11 @@ export const sidebarItems1 = [
     icon: <Icon icon="akar-icons:globe"></Icon>,
     title: "Applications",
   },
+  {
+    path: "Trainee-applicants",
+    icon: <Icon icon="ic:round-people"></Icon>,
+    title: "Trainees-Applicants",
+  },
   {
     path: "cohort",
     icon: <Icon icon="fa6-solid:graduation-cap"></Icon>,
@@ -44,7 +49,6 @@ export const sidebarItems1 = [
     icon: <Icon icon="game-icons:cycle"></Icon>,
     title: "Application Cycles",
   },
-
   {
     path: "grading",
     icon: <Icon icon="bxs:dashboard"></Icon>,
@@ -58,6 +62,11 @@ export const sidebarItems1 = [
 ];
 
 export const applicantSidebarItems = [
+  {
+    path: "/applicant",
+    icon: <Icon icon="fontisto:pie-chart-1"></Icon>,
+    title: "Dashboard",
+  },
   {
     path: "myApplications",
     icon: <Icon icon="material-symbols:wysiwyg-rounded"></Icon>,