Merge dev into prod

.github/dependabot.yml

@@ -5,7 +5,7 @@
 
 version: 2
 updates:
-  - package-ecosystem: "" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  - package-ecosystem: '' # See documentation for possible values
+    directory: '/' # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: 'weekly'

.github/workflows/enforce-branch-naming.yml → .github/workflows/branch-naming.yml

@@ -3,7 +3,7 @@ name: Enforce Branch Naming
 on:
   push:
     branches:
-      - "*"
+      - '*'
 
 jobs:
   check-branch-name:

.github/workflows/ci.yaml

@@ -4,42 +4,95 @@ on:
   push:
     branches:
       - development
+      - testing
       - staging
       - production
+      - 'story/*'
   pull_request:
     branches:
       - development
+      - testing
       - staging
       - production
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20]
 
     steps:
+      # Checkout the code
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
+      # Set up Node.js
       - name: Set up Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: ${{ matrix.node-version }}
 
+      # Cache dependencies
+      - name: Cache node modules
+        uses: actions/cache@v4
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-${{ matrix.node-version }}-
+
+      # Install dependencies
       - name: Install dependencies
-        run: npm install
+        run: npm ci
+
+      # # Lint the code
+      # - name: Run linting
+      #   run: npm run lint
 
-      # - name: Run tests
-      #   run: npm test
+      # # Run Prettier check
+      # - name: Run Prettier
+      #   run: npm run format
+
+      # # Run Jest tests with coverage
+      # - name: Run unit tests with coverage
+      #   run: npm run test
+
+      # # Run end-to-end Cypress tests
+      # - name: Run Cypress tests
+      #   run: npm run cypress:run
+
+      # Upload test coverage report as an artifact
+      - name: Upload coverage report
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-report
+          path: coverage/
 
   deploy:
     runs-on: ubuntu-latest
-    needs: build
+    needs: [build]
     if: github.ref == 'refs/heads/production'
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: npm ci
 
-      - name: Deploy to Production
-        run: |
-          # Add your deployment script here
+      # Build the project before deploying
+      - name: Build project
+        run: npm run build
+
+      # Deploy to Azure Static Web Apps
+      - name: Build And Deploy to Azure
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for GitHub integrations (i.e., PR comments)
+          action: 'upload'
+          app_location: '/' # App source code path
+          api_location: '' # Api source code path - optional
+          output_location: 'dist/' # Built app content directory - adjust to match your app’s dist folder

.github/workflows/commit-msg.yml

@@ -0,0 +1,25 @@
+name: Enforce Commit Message
+
+on:
+  push:
+    branches:
+      - '*'
+
+jobs:
+  check-commit-message:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Enforce commit message Jira issue ID
+        run: |
+          COMMITS=$(git rev-list --all)
+          for COMMIT in $COMMITS; do
+            MESSAGE=$(git log --format=%B -n 1 $COMMIT)
+            if [[ ! $MESSAGE =~ (Merge|NFG-[0-9]+) ]]; then
+              echo "Error: Commit message '$MESSAGE' does not contain a Jira issue ID (NFG-<issue-number>)."
+              exit 1
+            fi
+          done

.gitignore

@@ -40,3 +40,12 @@ testem.log
 # System files
 .DS_Store
 Thumbs.db
+package-lock.json
+docs*
+
+# Auto-generated files
+*.css.map
+*.css
+
+# Environments
+src/environment

.hintrc

@@ -0,0 +1,13 @@
+{
+  "extends": [
+    "development"
+  ],
+  "hints": {
+    "axe/forms": [
+      "default",
+      {
+        "label": "off"
+      }
+    ]
+  }
+}

.husky/pre-commit

@@ -1,11 +1,17 @@
 #!/bin/sh
-# This hook checks that branches are named according to the convention.
 
+# This hook checks that branches are named according to the updated convention.
 current_branch=$(git rev-parse --abbrev-ref HEAD)
-branch_regex="^(chapter|story|bug|epic)/NFG-[0-9]+-.+$"
+branch_regex="^(development|staging|testing|production|(^(chapter|story|bug|feature)/NFG-[0-9]+-.+$)$)"
 
-if ! echo "$current_branch" | grep -Eq "$branch_regex"; then
-  echo "Error: Branch name '$current_branch' does not follow the naming convention."
-  echo "Please rename your branch to follow the convention: (chapter|story|bug|epic)/NFG-123-description."
-  exit 1
+if ! echo "$current_branch" | grep -qE "$branch_regex"; then
+    echo "Error: Branch name '$current_branch' does not follow the naming convention."
+    echo "Please rename your branch to follow the convention: "
+    echo " - For environment branches: (development|staging|testing|production)"
+    echo " - For feature branches: (chapter|story|bug|feature)/NFG-<issue-number>-description."
+    exit 1
 fi
+
+# Format staged files using Prettier
+npx prettier $(git diff --cached --name-only --diff-filter=ACMR | sed 's| |\\ |g') --write --ignore-unknown
+git update-index --again

.husky/pre-push

@@ -5,23 +5,26 @@ protected_branches='development|testing|staging|production'
 
 current_branch=$(git rev-parse --abbrev-ref HEAD)
 
+# Prevent direct push to protected branches
 if echo "$current_branch" | grep -Eq "$protected_branches"; then
   echo "Error: Direct push to $current_branch is not allowed."
   echo "Please use pull requests for changes to this branch."
   exit 1
 fi
 
-# Do not allow push if missing Jira issue ID in commit message.
+# Allow commit messages that are merge commits to bypass Jira issue ID check
 while read local_ref local_sha remote_ref remote_sha; do
-  if [ "$local_sha" = "0000000000000000000000000000000000000000" ]; then
-    # Branch is being deleted, ignore
-    continue
-  fi
-
   COMMITS=$(git rev-list $remote_sha..$local_sha)
   for COMMIT in $COMMITS; do
     MESSAGE=$(git log --format=%B -n 1 $COMMIT)
-    if [[ ! $MESSAGE =~ NFG-[0-9]+ ]]; then
+
+    # Skip the check for merge commits
+    if [[ $MESSAGE =~ ^Merge ]]; then
+      continue
+    fi
+
+    # Enforce Jira issue ID in other commit messages
+    if [[ ! $MESSAGE =~ (Merge|NFG-[0-9]+) ]]; then
       echo "Error: Commit message '$MESSAGE' does not contain a Jira issue ID (NFG-<issue-number>)."
       exit 1
     fi

README.md

@@ -1,4 +1,4 @@
-# Nufacturing App
+# Nufacturing ERP / CRM App
 
 ## Overview
 
@@ -68,7 +68,7 @@ The Nufacturing App employs a comprehensive multi-environment setup to facilitat
 
 ### Testing Environment
 
-- **Purpose:** Runs a full suite of automated tests to catch bugs before code reaches staging or production.
+- **Purpose:** Runs a full suite of manual User Acceptance Tests to catch bugs before code reaches staging or production.
 - **Setup:**
   - Testing MongoDB
   - Testing API
@@ -238,4 +238,4 @@ Use tags for marking significant releases or milestones. For example, `v1.0.0`.
 
 By maintaining these five environments, Gallimore Software ensures a robust, reliable, and efficient development and deployment process for the Nufacturing app. This approach leads to higher quality software and improved user satisfaction, aligning with our goals of delivering innovative and customer-centric solutions.
 
-[def]: ./docs/workflow.png
+[def]: ./docs/WORKFLOW.png

angular.json

@@ -32,6 +32,12 @@
           },
           "configurations": {
             "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environment/environment.ts",
+                  "with": "src/environment/environment.prod.ts"
+                }
+              ],
               "budgets": [
                 {
                   "type": "initial",