Merge branch 'development' into Jay_Modify_Badge_Amount

Author: anirudhsk2107

.babelrc

@@ -1,3 +1,7 @@
 {
-  "presets": ["react-app"]
+  "presets": ["react-app"],
+  "plugins": [
+    "@babel/plugin-proposal-optional-chaining",
+    "@babel/plugin-proposal-nullish-coalescing-operator"
+  ]
 }

.circleci/config.yml

@@ -1,40 +1,26 @@
-*.png
-*.svg
-*.test.js
-*.test.jsx
-src/actions/**
-src/App.css
-src/config.json
+# =======================================================================
+# ⚠️ DO NOT ADD NEW ENTRIES ⚠️
+# Only the files and folders listed below are allowed to be ignored.
+# This .gitignore is locked down to maintain consistency across the team.
+# To propose changes, please open a discussion or PR with justification.
+# =======================================================================
 
-src/index.js
-src/reducers/**
-src/styles.js
-src/utils/**
-src/__tests__/**
+# Ignore build folders
+/node_modules/
+/public/
+/build/
 
+# Ignore test files inside /src/components
+src/components/BMDashboard/_tests_/BMDashboard.test.jsx
+src/components/Reports/PeopleReport/components/PeopleTasksPieChart.test.jsx
 
-
-src/components/App.jsx
-src/components/AutoReload/**
+# Ignore folders in /src
 src/components/Badge/**
-src/components/common/**
-src/components/Header/**
-src/components/BMDashboard/BMHeader/**
-src/components/MonthlyEffort/**
-
-src/components/PermissionsManagement/**
-# src/components/PopUpBar/**
-src/components/ProfileLinks/**
+src/components/Dashboard/**
 src/components/Projects/**
-src/components/Reports/**
-src/components/SetupProfile/**
-src/components/SummaryBar/**
 src/components/SummaryManagement/**
-src/components/TaskEditSuggestions/**
 src/components/TeamMemberTasks/**
-src/components/Teams/**
-src/components/TeamLocations/**
-src/components/Timelog/**
-src/components/UpdatePassword/**
+src/components/Teams/TeamMembersPopup.jsx
 src/components/UserManagement/**
 src/components/UserProfile/**
+src/components/Announcements/index.jsx

.eslintignore

@@ -48,9 +48,13 @@ module.exports = {
     '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',
     'no-alert': 'error',
     'no-console': 'error',
     'import/no-extraneous-dependencies': ['error', { devDependencies: true }],

.eslintrc.js

@@ -0,0 +1,24 @@
+{
+  "extends": [
+    "airbnb",
+    "prettier"
+  ],
+  "plugins": [
+    "prettier"
+  ],
+  "rules": {
+    "prettier/prettier": "error",
+    "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }]
+  },
+  "env": {
+    "browser": true,
+    "es2021": true
+  },
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "ecmaVersion": 12,
+    "sourceType": "module"
+  }
+}

.eslintrc.json

@@ -1,2 +1,2 @@
-* text=auto eol=lf
-*.png binary
+# * text=auto eol=lf
+# *.png binary

.gitattributes

@@ -21,6 +21,7 @@ To test this backend PR you need to checkout the #XXX frontend PR.
 4. log as admin user
 5. go to dashboard→ Tasks→ task→…
 6. verify function “A” (feel free to include screenshot here)
+7. verify this new feature works in [dark mode](https://docs.google.com/document/d/11OXJfBBedK6vV-XvqWR8A9lOH0BsfnaHx01h1NZZXfI)
 
 ## Screenshots or videos of changes:
 

.github/pull_request_template.md

@@ -0,0 +1,39 @@
+name: Close PRs from Forks
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
+
+jobs:
+  check-fork:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Check if PR is from a fork
+        id: check
+        run: |
+          echo "PR head repo: ${{ github.event.pull_request.head.repo.full_name }}"
+          echo "Base repo: ${{ github.event.repository.full_name }}"
+          if [[ "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.event.repository.full_name }}" ]]; then
+            echo "PR is from a fork"
+            echo "is_fork=true" >> $GITHUB_ENV
+          else
+            echo "PR is not from a fork"
+            echo "is_fork=false" >> $GITHUB_ENV
+          fi
+
+      - name: Close PR and add comment
+        if: env.is_fork == 'true'
+        run: |
+          PR_NUMBER=${{ github.event.pull_request.number }}
+          GH_REPO=${{ github.repository }}
+          echo "Closing PR #$PR_NUMBER in repository $GH_REPO"
+          gh pr close \
+            "$PR_NUMBER" \
+            --repo "${{ github.repository }}" \
+            --comment "This PR has been closed because PRs from forks are not allowed. Please create a branch directly off the origin repository and resubmit your PR."
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/close-fork-pr.yml

@@ -0,0 +1,65 @@
+name: Build and Deploy
+on:
+  push:
+    branches:
+      - main
+      - development
+concurrency:
+  group: Build and Deploy / ${{ github.ref_name == 'main' && 'Production' || 'Development' }}
+  cancel-in-progress: true
+jobs:
+  # Build
+  build:
+    name: Build
+    strategy:
+      matrix:
+        environment: ${{ github.ref_name == 'main' && fromJson('["Production", "Beta"]') || fromJson('["Development"]') }}
+    environment: ${{ matrix.environment }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 14
+          cache: 'npm'
+      - name: Install Dependencies
+        run: npm ci
+      # We don't run tests here since we assume it's already done during PR process.
+      # - name: Update Browser List
+      #   run: npx browserslist@latest --update-db
+      - name: Build React App
+        run: npm run build && cp build/index.html build/200.html 
+        env:
+          NODE_ENV: ${{ github.ref_name == 'main' && 'production' || 'development' }}
+          REACT_APP_APIENDPOINT: ${{ vars.REACT_APP_API_ENDPOINT }}
+          GENERATE_SOURCEMAP: ${{ github.ref_name != 'main' }}
+      - name: Upload Build Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.environment }} Build
+          path: ./build
+  # Deployment
+  deployment-surge:
+    name: Deploy to Surge
+    needs: build
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        environment: ${{ github.ref_name == 'main' && fromJson('["Production", "Beta"]') || fromJson('["Development"]') }}
+    environment: ${{ matrix.environment }}
+    if: ${{ success() }}
+    steps:
+      - name: Download Build Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ matrix.environment }} Build
+          path: ./build
+      - name: Deploy to Surge
+        uses: dswistowski/surge-sh-action@v1
+        with:
+          domain: ${{ vars.SURGE_DOMAIN }}
+          project: './build'
+          login: ${{ secrets.SURGE_LOGIN }}
+          token: ${{ secrets.SURGE_TOKEN }}