Merge branch 'development' into nanguan-fix-report-lint

.circleci/config.yml

@@ -14,7 +14,7 @@ jobs:
           command: 'sudo npm install'
       - run:
           name: Run react build
-          command: 'sudo REACT_APP_APIENDPOINT=$APIENDPOINT_PROD REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD REACT_APP_SENTRY_URL=$SENTRY_URL_PROD SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS=$NODE_OPTIONS npm run build && sudo mv build/index.html build/200.html'
+          command: 'sudo REACT_APP_APIENDPOINT=$APIENDPOINT_PROD REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD REACT_APP_SENTRY_URL=$SENTRY_URL_PROD SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS="$NODE_OPTIONS --max_old_space_size=4096" npm run build --prod && sudo mv build/index.html build/200.html'
       - run:
           name: Export error log if 'Build the React client' failed
           command: |
@@ -35,6 +35,9 @@ jobs:
       - run:
           name: Deploy app
           command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_PROD --project ./build
+      - run:
+          name: Deploy app
+          command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_PROD1 --project ./build
       - save_cache:
           key: v1-prod-dependencies-{{ checksum "package-lock.json" }}
           paths:
@@ -59,7 +62,7 @@ jobs:
           command: npm install
       - run:
           name: Build the React client
-          command: export REACT_APP_APIENDPOINT=$APIENDPOINT_DEV REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD REACT_APP_SENTRY_URL=$SENTRY_URL_DEV SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS=$NODE_OPTIONS && npm run build
+          command: export REACT_APP_APIENDPOINT=$APIENDPOINT_DEV REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD REACT_APP_SENTRY_URL=$SENTRY_URL_DEV SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS="$NODE_OPTIONS --max_old_space_size=4096" && npm run build --prod
       - run:
           name: Export error log if 'Build the React client' failed
           command: |
@@ -80,6 +83,9 @@ jobs:
       - run:
           name: Deploy compiled app to surge.sh on $SURGE_DOMAIN_DEV
           command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_DEV --project ./build
+      - run:
+          name: Deploy compiled app to surge.sh on $SURGE_DOMAIN_DEV1
+          command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_DEV1 --project ./build
       - save_cache:
           key: v1.1-dependencies-{{ checksum "package-lock.json" }}
           paths:
@@ -100,7 +106,7 @@ jobs:
           command: npm install
       - run:
           name: Build the React client
-          command: export REACT_APP_APIENDPOINT=$APIENDPOINT_BETA REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS=$NODE_OPTIONS && npm run build
+          command: export REACT_APP_APIENDPOINT=$APIENDPOINT_BETA REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS="$NODE_OPTIONS --max_old_space_size=4096" && npm run build --prod
       - run:
           name: Export error log if 'Build the React client' failed
           command: |
@@ -120,10 +126,7 @@ jobs:
           command: cp build/index.html build/200.html
       - run:
           name: Deploy compiled app to surge.sh on $SURGE_DOMAIN_BETA
-          command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_BETA --project ./build
-      - run:
-          name: Deploy compiled app to surge.sh on highestgood.com
-          command: ./node_modules/.bin/surge --domain highestgood.com --project ./build
+          command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_BETA --project ./build 
       - save_cache:
           key: v1-beta-dependencies-{{ checksum "package-lock.json" }}
           paths:

.eslintignore

@@ -9,7 +9,6 @@ src/config.json
 src/index.js
 src/reducers/**
 src/styles.js
-src/utils/**
 src/__tests__/**
 
 /public/
@@ -19,17 +18,13 @@ src/components/App.jsx
 src/components/AutoReload/**
 src/components/Badge/**
 src/components/common/**
-src/components/Header/**
-src/components/ProfileLinks/**
 src/components/Projects/**
 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/UserManagement/**
 src/components/UserProfile/**
 src/components/Announcements/**

.eslintrc.json

@@ -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"
+  }
+}

.github/workflows/lint.yml

@@ -0,0 +1,25 @@
+# File: .github/workflows/lint.yml
+name: Lint React App
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '14'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Run linter
+        run: npm run lint

.github/workflows/test.yml

@@ -0,0 +1,31 @@
+name: Test React App
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '14'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Run tests
+        run: npm test
+
+      - name: Upload test results
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results
+          path: test-results # Adjust the path to your test results if necessary

.prettierignore

@@ -12,27 +12,21 @@ src/routes.js
 src/setupTests.js
 src/store.js
 src/styles.js
-src/utils/**
 src/__tests__/**
 
 
 src/components/App.jsx
 src/components/AutoReload/**
-src/components/Header/**
 src/components/Inventory/**
 src/components/Memberships/**
-src/components/NewProfileLink/**
-src/components/ProfileLinks/**
 src/components/Projects/**
 src/components/Reports/**
 src/components/SetupProfile/**
-src/components/SummaryBar/**
 src/components/SummaryManagement/**
 src/components/TaskEditSuggestions/**
 src/components/TeamLocations/**
 src/components/TeamMemberTasks/**
 src/components/Teams/**
-src/components/Timelog/**
 src/components/UserManagement/**
 src/components/UserProfile/**
 src/components/Announcements/**

jest.config.js

@@ -14,11 +14,12 @@ module.exports = {
   // An array of file extensions your modules use
   moduleFileExtensions: ['js', 'json', 'jsx'],
 
-  // Bundle mapper for d3 import
+  // Bundle mapper for d3 import and other custom mocks
   moduleNameMapper: {
     d3: '<rootDir>/node_modules/d3/dist/d3.min.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
   },
 
   // The paths to modules that run some code to configure or set up the testing environment before each test
@@ -38,6 +39,8 @@ module.exports = {
 
   // 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)'],
+
+  // Include snapshot serializers
   snapshotSerializers: ['enzyme-to-json/serializer'],
 
   // Indicates whether each individual test should be reported during the run