Merge branch 'main' into ADE-30-manual-steps

Author: jkestering-modus

.husky/pre-commit

@@ -1 +1,18 @@
-cd frontend && npm run lint
+#!/bin/sh
+project_root=$(pwd)
+cd $project_root
+sh ./lizard.sh
+
+# Only run frontend lint if the directory exists
+if [ -d "frontend" ]; then
+  cd frontend && npm run lint
+fi
+
+cd $project_root
+
+# Add backend linting
+if [ -d "backend" ]; then
+  cd backend && npm run lint
+fi
+
+exit 0

.husky/pre-push

@@ -1,4 +1,53 @@
 #!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
 
-cd frontend && npm run lint && npm run test:ci
+# Get the range of commits being pushed
+# For the remote branch that doesn't exist yet, use the empty tree object
+RANGE="$(git rev-parse --verify HEAD)"
+
+echo "Checking commit range: $RANGE"
+
+# Check if any frontend files were modified in the commits being pushed
+FRONTEND_CHANGES=$(git diff --name-only $RANGE | grep "^frontend/" || true)
+
+# Only run frontend tests if frontend files were modified
+if [ -n "$FRONTEND_CHANGES" ]; then
+  echo "Frontend changes detected. Running frontend tests..."
+
+  # Navigate to frontend directory
+  cd frontend || exit 1
+
+  . "$(dirname -- "$0")/_/husky.sh"
+
+  cd frontend && npm run lint && npm run test:ci
+
+  # Capture the exit code
+  TEST_EXIT_CODE=$?
+
+  # Return to the original directory
+  cd ..
+
+  # If tests failed, prevent the push
+  if [ $TEST_EXIT_CODE -ne 0 ]; then
+    echo "Frontend tests failed. Push aborted."
+    exit 1
+  fi
+
+  echo "Frontend tests passed."
+else
+  echo "No frontend changes detected. Skipping frontend tests."
+fi
+
+# Check if any backend files were modified in the commits being pushed
+BACKEND_CHANGES=$(git diff --name-only $RANGE | grep "^backend/" || true)
+
+if [ -n "$BACKEND_CHANGES" ]; then
+    echo "Backend changes detected. Running backend lint..."
+
+    . "$(dirname -- "$0")/_/husky.sh"
+    cd backend && npm run lint
+else
+  echo "No backend changes detected. Skipping backend tests."
+fi
+
+# Continue with the push
+exit 0

backend/package-lock.json

@@ -51,7 +51,7 @@
     "rxjs": "^7.8.1",
     "source-map-support": "^0.5.21",
     "web-vitals": "^2.1.4",
-    "aws-cdk-lib": "2.139.0",
+    "aws-cdk-lib": "2.184.1",
     "@nestjs/swagger": "^7.1.13",
     "swagger-ui-express": "^5.0.0",
     "passport": "^0.7.0",
@@ -73,7 +73,7 @@
     "@typescript-eslint/parser": "^7.9.0",
     "@vitest/coverage-c8": "^0.33.0",
     "aws-cdk": "2.139.0",
-    "aws-cdk-lib": "^2.139.0",
+    "aws-cdk-lib": "^2.184.1",
     "dotenv-cli": "^8.0.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.0.0",
@@ -91,6 +91,6 @@
     "vitest": "^0.33.0"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "2.139.0"
+    "aws-cdk-lib": "2.184.1"
   }
 }

backend/package.json

@@ -5,13 +5,13 @@ import { AuthError } from '../models/auth';
  */
 export const AUTH_ERROR_MESSAGES: Record<string, string> = {
   // Sign In errors
-  'UserNotFoundException': 'The email address or password you entered is incorrect.',
-  'NotAuthorizedException': 'The email address or password you entered is incorrect.',
+  'UserNotFoundException': 'Incorrect email or password.',
+  'NotAuthorizedException': 'Incorrect email or password.',
   'UserNotConfirmedException': 'Please check your email to verify your account.',
   'PasswordResetRequiredException': 'You need to reset your password. Please check your email.',
 
   // Sign Up errors
-  'UsernameExistsException': 'This email address is already associated with an account. Please sign in or reset your password.',
+  'UsernameExistsException': 'This email is already linked to an account. Please sign in or reset your password.',
   'InvalidPasswordException': 'Password does not meet the requirements. Please use a stronger password.',
   'InvalidParameterException': 'Please check your input and try again.',
 

frontend/src/common/utils/auth-errors.ts

@@ -70,7 +70,7 @@
     "numeric": "Must contain only numbers",
     "exact-length": "Must be exactly {{length}} characters",
     "passwords-match": "Passwords must match",
-    "email": "Please enter a valid email address",
+    "email": "Please provide a valid email address (e.g., [email protected]).",
     "required": "This field is required",
     "min-length": "Must be at least {{length}} characters",
     "max-length": "Must be at most {{length}} characters",

frontend/src/common/utils/i18n/resources/en/auth.json

@@ -4,7 +4,7 @@
     height: 100%;
     display: flex;
     flex-direction: column;
-    justify-content: center;
+    padding-top: 1rem;
   }
 
   .ls-signup-page__form {