resolved conflicts (#60)

* Add Not Found Page * Add Sign In Profile Picture Ft-send-bulky-email (#61) * new * added a send email model * email * email Co-authored-by: UmuhireJessie <[email protected]> TO be removed fix: run the app ft-superadmin-roles&permissions(superadmin can view members) feat(ft-user-register): user should be able to create account superAdmin register user fix(routes): Add routes directory add login page and add name field on user registration by superadmin create program bg: Added Loader ft(): programs page role & permission implementation of delete role and permissions ft():delete program implementation of delete role and permissions feature:Application form using Google Form implementation of delete role and permissions ft(): edit program new changes ft():Applicant Dashboard add grading system form feat(admin list applications):view applications ft admin view applications admin update status of candidate application Feature github actions (#119) * fix: remove placeholder property * Have github actions setup with necessary jobs * Have code climate errors removed * Corrected codeclimate issues * --ammend * --ammend --------- Co-authored-by: ceelogre <[email protected]> Co-authored-by: Ndahimana Bonheur <[email protected]> * fix: remove placeholder property * #103 Navigation fixed --------- Co-authored-by: ceelogre <[email protected]> Co-authored-by: Ndahimana Bonheur <[email protected]> Fix number can't be shared (#130) Co-authored-by: Mugisha <[email protected]> * fix: remove placeholder property * fix duplicate links --------- Co-authored-by: ceelogre <[email protected]> Ft minimize dashboard menu #110 (#140) * fix: remove placeholder property * ft minimize dashboard menu * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard scrollbar * fix minimize dashboard scrollbar * fix minimize dashboard scrollbar * Fix layout spacing between sidebar and main content in AdminLayout * new * Fix layout spacing between sidebar and main content in AdminLayout * fix layout --------- Co-authored-by: ceelogre <[email protected]> Co-authored-by: Prince-Kid <[email protected]> Co-authored-by: Mucyo Prince <[email protected]> Co-authored-by: Aime-Patrick <[email protected]> * fix: remove placeholder property * The built-in superadmin account cannot create a program --------- Co-authored-by: ceelogre <[email protected]> Ft shareable job post (#139) * fix: remove placeholder property * Ft():shareable job post page * Feature: Adding shareable job post buttons * Feature: Adding shareable job post buttons * Feature: Adding shareable job post buttons * fix codeclimate issue * add gmail and fix telegram link * add gmail sharing * fix url sharing * fix url * fix url * fix codeclimate * applicant share application --------- Co-authored-by: ceelogre <[email protected]> Co-authored-by: dean-daryl <[email protected]> Co-authored-by: Bahati <[email protected]> Co-authored-by: uwituzeb <[email protected]> Ft add favicon (#124) * fix: remove placeholder property * add favicon svg * added favicon * removed unneccessary added port number * resolved conflicts * resolved conflicts * resolved conflicts * add favicon svg * resolved conflicts * removed unneccessary added port number * resolved conflicts * resolved conflicts * added favicon * removed unneccessary added port number * resolved conflicts * resolved conflicts * resolved conflicts * added favicon * removed unneccessary added port number * resolved conflicts * resolved conflicts * resolved conflicts * resolved conflicts * resolved conflicts * resolved conflicts * resolved conflicts --------- Co-authored-by: ceelogre <[email protected]> Fix tel (#123) * fix: remove placeholder property * fix code & tell issue * rebasing * fix code issue --------- Co-authored-by: ceelogre <[email protected]> Fix/update trainee info (#137) * add validations and work on edit * ensure birthdate is correctly set in formData * ensure all formData are populated correctly * fix codeclimate issue * update traineUpdate * update traineUpdate * update traineUpdate * update traineUpdate * update traineUpdate * update traineUpdate * fix traineUpdate * add loader * add sidebar link for trainee applicants * add redirection after updating * feature: improve trainee details page * handling missing application info, also adding download functionality * fixing error related to download and refactoring * Update TrainneeDetails.tsx * handling issues related to deployment * Fix number can't be shared (#130) Co-authored-by: Mugisha <[email protected]> * #102 sidebar links review (#128) * fix: remove placeholder property * fix duplicate links --------- Co-authored-by: ceelogre <[email protected]> * Ft minimize dashboard menu #110 (#140) * fix: remove placeholder property * ft minimize dashboard menu * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard scrollbar * fix minimize dashboard scrollbar * fix minimize dashboard scrollbar * Fix layout spacing between sidebar and main content in AdminLayout * new * Fix layout spacing between sidebar and main content in AdminLayout * fix layout --------- Co-authored-by: ceelogre <[email protected]> Co-authored-by: Prince-Kid <[email protected]> Co-authored-by: Mucyo Prince <[email protected]> Co-authored-by: Aime-Patrick <[email protected]> * #118 fx: builtinSuperAdminCreateProgram (#126) * fix: remove placeholder property * The built-in superadmin account cannot create a program --------- Co-authored-by: ceelogre <[email protected]> * feature: improve trainee details page * handling missing application info, also adding download functionality * Update TrainneeDetails.tsx * adding way to send email and other adjustments * refining and fixing some issues * Update webpack.config.js * customizing way of sending email * refactoring code to fix issue related to code climate * fixing issue for deployment * fixing issues related to refactoring --------- Co-authored-by: MUGISHA Emmanuel <[email protected]> Co-authored-by: Mugisha <[email protected]> Co-authored-by: ISHIMWE Jean Baptiste <[email protected]> Co-authored-by: ceelogre <[email protected]> Co-authored-by: ManziPatrick <[email protected]> Co-authored-by: Prince-Kid <[email protected]> Co-authored-by: Mucyo Prince <[email protected]> Co-authored-by: Aime-Patrick <[email protected]> Co-authored-by: Niyonshuti Jean De Dieu <[email protected]> fixes #168 auth and admin login (#169) * feature: improve trainee details page (#172) * handling missing application info, also adding download functionality * fixing error related to download and refactoring * Update TrainneeDetails.tsx * handling issues related to deployment * Fix number can't be shared (#130) * #102 sidebar links review (#128) * fix: remove placeholder property * fix duplicate links --------- * Ft minimize dashboard menu #110 (#140) * fix: remove placeholder property * ft minimize dashboard menu * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard scrollbar * fix minimize dashboard scrollbar * fix minimize dashboard scrollbar * Fix layout spacing between sidebar and main content in AdminLayout * new * Fix layout spacing between sidebar and main content in AdminLayout * fix layout --------- * #118 fx: builtinSuperAdminCreateProgram (#126) * fix: remove placeholder property * The built-in superadmin account cannot create a program --------- * feature: improve trainee details page * handling missing application info, also adding download functionality * Update TrainneeDetails.tsx * adding way to send email and other adjustments * refining and fixing some issues * Update webpack.config.js * customizing way of sending email * refactoring code to fix issue related to code climate * fixing issue for deployment * fixing issues related to refactoring --------- Co-authored-by: MUREKEZI Ismael <[email protected]> Co-authored-by: MUGISHA Emmanuel <[email protected]> Co-authored-by: Mugisha <[email protected]> Co-authored-by: ISHIMWE Jean Baptiste <[email protected]> Co-authored-by: ceelogre <[email protected]> Co-authored-by: ManziPatrick <[email protected]> Co-authored-by: Prince-Kid <[email protected]> Co-authored-by: Mucyo Prince <[email protected]> Co-authored-by: Aime-Patrick <[email protected]> Ft search job post (#187) * ft(Add search): Add entry search * Will add user seach Job Functionalities --squashed commits * single page to view and search Jobs * will make jobs and search be on same page * updating functionality * Real time searching --------- Co-authored-by: Jmukakalisa <[email protected]> 154 crud application form (#167) * Will add create application feature * Will add update application form feature * Will add view application form feature * Will add dark mode card * Will add create application feature * Will add update application form feature * Will add view application form feature * Will add dark mode card Add Verify Email (#179) Co-authored-by: vegetason <[email protected]> ft(Add search): Add entry search (#136) Co-authored-by: Jmukakalisa <[email protected]> Forget password #147 (#178) * fogetpassword * ft-forget password * reset and forget password * reset and forget password * reset and forget password * reset and forget password * reset password * reset update background * reset update background * reset update background * reset password * reset password * reset password * reset password * yarn.lock * Ft search job post (#187) * ft(Add search): Add entry search * Will add user seach Job Functionalities --squashed commits * single page to view and search Jobs * will make jobs and search be on same page * updating functionality * Real time searching --------- Co-authored-by: Jmukakalisa <[email protected]> * 154 crud application form (#167) * Will add create application feature * Will add update application form feature * Will add view application form feature * Will add dark mode card * Will add create application feature * Will add update application form feature * Will add view application form feature * Will add dark mode card * Add Verify Email (#179) Co-authored-by: vegetason <[email protected]> * resolve comflit * resolve comflit * resolve comflit * resolve comflit --------- Co-authored-by: Aime Brues <[email protected]> Co-authored-by: Jmukakalisa <[email protected]> Co-authored-by: MUGISHA Joseph <[email protected]> Co-authored-by: Irakoze Paulin <[email protected]> Co-authored-by: vegetason <[email protected]> Ft edit, publish and unpublish jobs (#189) * fix: remove placeholder property * fix code & tell issue * will add ft for editing jobs --------- Co-authored-by: ceelogre <[email protected]> Fix fault alerts (#182) * correct error messages * work on resolving fault alerts remove a bug (#190) Co-authored-by: vegetason <[email protected]> Admin dashboard (#181) General search and filtration admin (#184) * general-search-admin * Will add results tab general search updates resolved conflicts admin general search updates fixing code climate issues * resolving conflicts --------- Co-authored-by: MUGISHA Joseph <[email protected]> * add applicant dashboard page * add dashboard cards * integrate with backend * fetch all data from their respective queries * remove console logs * update cohort types and query * fix routes * fix code climate * add graph * fix chart * delete yarn * fix graph and login * fix * trigger * revert --------- Co-authored-by: uwituzeb <[email protected]> Fix job Search (#199) Co-authored-by: vegetason <[email protected]> * feature: improve trainee details page (#172) * handling missing application info, also adding download functionality * fixing error related to download and refactoring * Update TrainneeDetails.tsx * handling issues related to deployment * Fix number can't be shared (#130) * #102 sidebar links review (#128) * fix: remove placeholder property * fix duplicate links --------- * Ft minimize dashboard menu #110 (#140) * fix: remove placeholder property * ft minimize dashboard menu * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard by icon and categorize into section * fix minimize dashboard scrollbar * fix minimize dashboard scrollbar * fix minimize dashboard scrollbar * Fix layout spacing between sidebar and main content in AdminLayout * new * Fix layout spacing between sidebar and main content in AdminLayout * fix layout --------- * #118 fx: builtinSuperAdminCreateProgram (#126) * fix: remove placeholder property * The built-in superadmin account cannot create a program --------- * feature: improve trainee details page * handling missing application info, also adding download functionality * Update TrainneeDetails.tsx * adding way to send email and other adjustments * refining and fixing some issues * Update webpack.config.js * customizing way of sending email * refactoring code to fix issue related to code climate * fixing issue for deployment * fixing issues related to refactoring --------- Co-authored-by: MUREKEZI Ismael <[email protected]> Co-authored-by: MUGISHA Emmanuel <[email protected]> Co-authored-by: Mugisha <[email protected]> Co-authored-by: ISHIMWE Jean Baptiste <[email protected]> Co-authored-by: ceelogre <[email protected]> Co-authored-by: ManziPatrick <[email protected]> Co-authored-by: Prince-Kid <[email protected]> Co-authored-by: Mucyo Prince <[email protected]> Co-authored-by: Aime-Patrick <[email protected]> revert changes from develop (#205) fix:dev conflict issues (#207) added preferences page
atlp-rwanda · Oct 22, 2024 · 0951b10 · 0951b10
1 parent 281ad12
commit 0951b10
Show file tree

Hide file tree

Showing 238 changed files with 37,577 additions and 18,236 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,9 +1,8 @@
-version: 2
 jobs: 
   build: 
     working_directory: ~/repo
     docker:
-      - image: circleci/node:12.13.0
+      - image: circleci/node:14
     steps:
       - checkout
       # Download and cache dependencies
@@ -25,7 +24,7 @@ jobs:
           command: npm test
       - run:
           name: Generate coverage report
-          command: npm run build
+          command: npm run build -f
       - store_artifacts: # Save tests results as artifacts
           path: test-results.xml
           prefix: tests

diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -23,7 +23,7 @@ checks:
   method-lines:
     enabled: true
     config:
-      threshold: 45
+      threshold: 90
   nested-control-flow:
     enabled: true
     config:
@@ -33,18 +33,19 @@ checks:
     config:
       threshold: 4
   similar-code:
-    enabled: true
+    enabled: false
     config:
       threshold: #language-specific defaults. overrides affect all languages.
   identical-code:
-    enabled: true
+    enabled: false
     config:
       threshold: #language-specific defaults. overrides affect all languages.
 plugins:
  rubocop:
   enabled: true
  eslint:
-  enabled: true
+  enabled: false
+  channel: eslint-8
 exclude_patterns:
 - "config/"
 - "db/"

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -5,16 +5,24 @@ module.exports = {
   },
   extends: [
     'plugin:react/recommended',
-    'standard-with-typescript'
+    'standard-with-typescript',
+    'eslint:all',
+    'plugin:react/all'
   ],
   overrides: [
   ],
+  parser: "@typescript-eslint/parser",
   parserOptions: {
+    ecmaFeatures: {
+      jsx: true
+    },
+    project: './tsconfig.json',
     ecmaVersion: 'latest',
     sourceType: 'module'
   },
   plugins: [
-    'react'
+    'react',
+    '@typescript-eslint'
   ],
   rules: {
   }

diff --git a/.github/workflows/dev-pulse-ci.yml b/.github/workflows/dev-pulse-ci.yml
@@ -0,0 +1,28 @@
+name: Devpulse CI
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  test-and-build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Use Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: '18'
+
+    - name: Install dependencies
+      run: npm install --legacy-peer-deps
+
+    - name: Run tests
+      run: npm test
+
+    - name: Build
+      run: npm run build
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,6 @@ coverage
 .vscode
 dist
 buildcoverage
-package-lock.json
+package-lock.json
+.DS_Store
+build/
diff --git a/index.html b/index.html
@@ -1,14 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="icon" href="assets/favicon.ico" type="image/x-icon">
     <title>Devpulse</title>
     <script src="https://npmcdn.com/axios/dist/axios.min.js"></script>
     <script src="https://accounts.google.com/gsi/client" async defer></script>
-</head>
-<body>
+  </head>
+  <body>
     <div id="app" class="body-b"></div>
-</body>
-</html>
+  </body>
+</html>
diff --git a/jest.config.js b/jest.config.js
@@ -7,7 +7,7 @@ module.exports = {
   },
   moduleNameMapper: {
     "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$":
-      "<rootDir>/test/jest/__mocks__/fileMock.ts",
+      "<rootDir>/__mocks__/fileMock.ts",
     "\\.(css|less|scss)$": "<rootDir>/__mocks__/styleMock.ts",
   },
 };
diff --git a/package.json b/package.json
@@ -4,10 +4,11 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "start": "echo \"Error: no test specified\" && exit 1",
+    "start": "webpack server",
     "dev": "webpack server",
-    "test": "react-scripts test --watchAll=false",
-    "build": "webpack build"
+    "test": "jest --watchAll=false",
+    "build": "webpack build",
+    "lint": "eslint src --ext ts,tsx"
   },
   "repository": {
     "type": "git",
@@ -25,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",
@@ -35,9 +36,11 @@
     "@types/react-dom": "^18.0.6",
     "@types/react-table": "^7.7.12",
     "@types/redux-state-sync": "^3.1.5",
+    "@types/uglify-js": "^3.17.5",
     "@typescript-eslint/eslint-plugin": "^5.47.0",
     "autoprefixer": "^10.4.7",
     "babel-loader": "^8.2.5",
+    "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^6.7.1",
     "dotenv": "^16.0.3",
     "eslint": "^8.30.0",
@@ -47,10 +50,10 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-react": "^7.31.11",
     "file-loader": "^6.2.0",
-    "html-webpack-plugin": "^5.5.0",
+    "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",
@@ -66,52 +69,79 @@
     "webpack-dev-server": "^4.11.1"
   },
   "dependencies": {
+    "@apollo/client": "^3.8.1",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
+    "@fortawesome/fontawesome-svg-core": "^6.4.2",
+    "@fortawesome/free-regular-svg-icons": "^6.4.2",
+    "@fortawesome/free-solid-svg-icons": "^6.2.0",
+    "@fortawesome/react-fontawesome": "^0.2.0",
     "@heroicons/react": "^1.0.6",
-    "@hookform/resolvers": "^0.1.0",
+    "@hookform/resolvers": "^3.3.0",
+    "@mui/icons-material": "^6.1.1",
     "@mui/material": "^5.10.11",
     "@mui/x-date-pickers": "^5.0.6",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.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",
+    "antd": "^5.21.2",
     "axios": "^1.1.2",
     "bootstrap": "^5.2.2",
     "browser": "^0.2.6",
     "date-fns": "^2.29.3",
+    "dayjs": "^1.11.6",
     "dotenv": "^16.0.3",
+    "express": "^4.21.0",
     "flowbite": "^1.5.3",
+    "flowbite-react": "^0.6.4",
+    "formik": "^2.4.3",
+    "googleapis": "^126.0.1",
+    "graphql": "^16.6.0",
     "graphql-request": "^5.1.0",
+    "html2canvas": "^1.4.1",
     "icons": "^1.0.0",
     "jest": "^29.1.2",
     "jest-environment-jsdom": "^29.1.2",
+    "joi": "^17.10.2",
     "jquery": "^3.6.1",
+    "jspdf": "^2.5.2",
     "jwt-decode": "^3.1.2",
     "mini-css-extract-plugin": "^2.6.1",
     "moment": "^2.29.4",
-    "next-link": "^2.0.0",
+    "next-preload-headers": "^3.0.4",
     "patch-package": "^6.4.7",
+    "path": "^0.12.7",
     "popper.js": "^1.16.1",
     "react-datepicker": "^4.8.0",
-    "react-hook-form": "^7.37.0",
+    "react-hook-form": "^7.45.4",
+    "react-hot-toast": "^2.4.1",
     "react-i18next": "^11.18.6",
     "react-icons": "^4.6.0",
+    "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-select": "^5.5.6",
+    "react-scripts": "^3.0.1",
+    "react-select": "^5.7.4",
     "react-table": "^7.8.0",
     "react-toastify": "^9.0.8",
+    "recharts": "^2.12.7",
+    "redux": "^4.2.0",
     "redux-devtools-extension": "^2.13.9",
     "redux-state-sync": "^3.1.4",
     "redux-thunk": "^2.4.1",
     "stream": "^0.0.2",
     "stream-http": "^3.2.0",
     "ts-jest": "^29.0.3",
-    "with-click-outside": "^1.0.1"
+    "with-click-outside": "^1.0.1",
+    "yup": "^1.2.0",
+    "zod": "^3.22.2"
   },
   "browserslist": {
     "production": [

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -2,19 +2,13 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1, shrink-to-fit=no"
-    />
     <meta name="theme-color" content="#000000" />
-
+    <link rel="icon" href="favicon.ico" type="image/x-icon">
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
 
     <title>React App</title>
   </head>
   <body>
     <div id="root"></div>
-
   </body>
 </html>
diff --git a/src/.DS_Store b/src/.DS_Store