fix: resolving the merge conflicts with the development branch

Author: TaariqMansurie

.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
+  }
+}