resolve merge conflicts'

Author: humemah

.eslintrc.js

@@ -0,0 +1,71 @@
+module.exports = {
+  ignorePatterns: ['**/*.css'],
+  env: {
+    browser: true,
+    es6: true,
+    node: true,
+  },
+  settings: {
+    react: {
+      version: 'detect',
+    },
+    'import/resolver': {
+      node: {
+        paths: ['src'],
+        extensions: ['.js', '.jsx'],
+      },
+    },
+  },
+  extends: [
+    'airbnb',
+    'plugin:react/recommended', // Uses the recommended rules from @eslint-plugin-react
+    'plugin:react-hooks/recommended',
+    'plugin:react/jsx-runtime',
+    'plugin:import/recommended',
+    'prettier/react',
+    'plugin:prettier/recommended', // use prettier as a eslint rule
+  ],
+  globals: {
+    Atomics: 'readonly',
+    SharedArrayBuffer: 'readonly',
+  },
+  parser: 'babel-eslint',
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true,
+    },
+    ecmaVersion: 2018,
+    sourceType: 'module',
+  },
+  plugins: ['react', 'testing-library', 'prettier'],
+  rules: {
+    'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx'] }],
+    'no-underscore-dangle': 'off',
+    'react/prop-types': 'off',
+    'react-hooks/exhaustive-deps': 'off',
+    'react/jsx-key': 'off',
+    'react/jsx-uses-react': 'off',
+    'react/display-name': 'off',
+    'react/no-direct-mutation-state': 'off',
+    'react/no-unknown-property': 'off',
+    'react/destructuring-assignment': 'off',
+    'react/react-in-jsx-scope': 'off',
+    'import/no-duplicates': 'off',
+    'import/no-named-as-default': 'off',
+    'jsx-a11y/label-has-associated-control': 'off',
+    'jsx-a11y/no-static-element-interactions': 'off',
+    'jsx-a11y/click-events-have-key-events': 'off',
+    'jsx-a11y/control-has-associated-label': 'off',
+    'no-alert': 'error',
+    'no-console': 'error',
+    'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
+  },
+  overrides: [
+    {
+      files: ['**/*.test.js', '**/*.test.jsx'],
+      env: {
+        jest: true,
+      },
+    },
+  ],
+};

.eslintrc.json

@@ -0,0 +1,14 @@
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "patterns": [
+          "*.css",
+          "!*.module.css",
+          "!index.css"
+        ]
+      }
+    ]
+  }
+}

.github/workflows/deploy.yml

@@ -7,7 +7,7 @@ on:
 concurrency:
   group: Build and Deploy / ${{ github.ref_name == 'main' && 'Production' || 'Development' }}
   cancel-in-progress: true
-jobs:
+jobs:  
   # Build
   build:
     name: Build
@@ -62,4 +62,4 @@ jobs:
           domain: ${{ vars.SURGE_DOMAIN }}
           project: './build'
           login: ${{ secrets.SURGE_LOGIN }}
-          token: ${{ secrets.SURGE_TOKEN }}
+          token: ${{ secrets.SURGE_TOKEN }}

.github/workflows/pull_request_test.yml

@@ -5,6 +5,41 @@ on:
     branches:
       - development
 jobs:
+  # CSS Enforcement
+  css-check:
+    name: Enforce CSS Modules
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Check for disallowed .css files in changed files
+        run: |
+          # Get list of changed CSS files in this PR
+          changed_files=$(git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }}...HEAD | grep '\.css$' || true)
+          
+          if [ -z "$changed_files" ]; then
+            echo "No CSS files changed in this PR"
+            exit 0
+          fi
+          
+          echo "Changed CSS files:"
+          echo "$changed_files"
+          
+          # Check if any of the changed files are disallowed
+          disallowed=$(echo "$changed_files" | grep -vE '(\.module\.css$|index\.css$)' || true)
+          
+          if [ -n "$disallowed" ]; then
+            echo "❌ Disallowed CSS file detected! Only '.module.css' (or 'index.css') files are permitted."
+            echo "The following files violate the CSS Module policy:"
+            echo "$disallowed"
+            exit 1
+          else
+            echo "✅ CSS Module Enforcement Check passed - all changed CSS files are valid"
+          fi
+
   test:
     runs-on: ubuntu-latest
     steps:
@@ -20,4 +55,4 @@ jobs:
     - name: Run Unit Tests for Changed Files Only
       run: yarn run test:changed
     - name: Run Lint
-      run: yarn run lint
+      run: yarn run lint

.husky/pre-commit

@@ -3,12 +3,25 @@
 
 echo ""
 echo "🛡️  Husky pre-commit hook triggered"
+
+# Block plain .css files (except .module.css and index.css)
+for file in $(git diff --cached --name-only --diff-filter=ACM | grep '\.css$'); do
+  case "$file" in
+    *index.css) ;;            # allow index.css
+    *.module.css) ;;          # allow module.css
+    *)
+      echo "❌  $file is not allowed. Use .module.css instead."
+      exit 1
+      ;;
+  esac
+done
+
 echo "🛠️  Attempting to auto-fix lint issues (if possible)..."
 echo "🔍 Running ESLint via lint-staged on staged files:"
-git diff --cached --name-only --diff-filter=ACM | grep -E '\.(js|jsx|ts|tsx)$' || echo "No JS/TS files staged."
+git diff --cached --name-only --diff-filter=ACM | grep -E '\.(js|jsx|ts|tsx|css)$' || echo "No JS/TS/CSS files staged."
 
 # Run lint-staged only if relevant files are staged
-if git diff --cached --name-only | grep -qE '\.(js|jsx|ts|tsx)$'; then
+if git diff --cached --name-only | grep -qE '\.(js|jsx|ts|tsx|css)$'; then
   npx lint-staged
   lint_exit_code=$?
 
@@ -20,5 +33,5 @@ if git diff --cached --name-only | grep -qE '\.(js|jsx|ts|tsx)$'; then
     exit $lint_exit_code
   fi
 else
-  echo "ℹ️  No JS/TS files to lint. Skipping lint-staged."
+  echo "ℹ️  No JS/TS/CSS files to lint. Skipping lint-staged."
 fi

.stylelintrc

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "no-duplicate-selectors": true
+  }
+}

dummy.js

@@ -0,0 +1 @@
+// trigger reopen

eslint.config.js

@@ -29,16 +29,9 @@ module.exports = [
       'public/**',
       'build/**',
       // Ignore test files inside /src/components
-      'src/components/BMDashboard/_tests_/BMDashboard.test.jsx',
       'src/components/Reports/PeopleReport/components/PeopleTasksPieChart.test.jsx',
       // Ignore entire component folders
       'src/components/Badge/**',
-      'src/components/Projects/**',
-      'src/components/SummaryManagement/**',
-      'src/components/TeamMemberTasks/**',
-      'src/components/Teams/TeamMembersPopup.jsx',
-      'src/components/UserProfile/**',
-      'src/components/Announcements/index.jsx',
     ],
   },
 

jest.config.js

@@ -16,7 +16,7 @@ module.exports = {
 
   // Bundle mapper for d3 import and other custom mocks
   moduleNameMapper: {
-    d3: '<rootDir>/node_modules/d3/dist/d3.min.js',
+    '^d3$': '<rootDir>/src/__mocks__/d3.js',
     'react-leaflet': '<rootDir>/src/_tests_/__mocks__/react-leaflet.js',
     'marker-cluster-group': '<rootDir>/src/_tests_/__mocks__/react-leaflet-cluster.js',
     '\\.(css|less|scss|sass)$': 'identity-obj-proxy', // <-- Added to mock CSS/SCSS files
@@ -38,7 +38,12 @@ module.exports = {
   testURL: 'http://localhost',
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
-  transformIgnorePatterns: ['/node_modules/(?!d3|d3-array|internmap|delaunator|robust-predicates)'],
+  transformIgnorePatterns: [
+    '/node_modules/(?!d3|d3-[^/]+|internmap|delaunator|robust-predicates)/',
+  ],
+  transform: {
+    '^.+\\.[jt]sx?$': 'babel-jest',
+  },
 
   // Indicates whether each individual test should be reported during the run
   verbose: false,