Merge dev into 320

README.md

@@ -20,11 +20,11 @@ npm install
 
 ## Setup
 ### Environment file
+#### Backend
 1. Copy the example environment file `.env.example` in the backend directory and rename it to `.env`.
 1. Replace the OPENAI_API_KEY value in the `.env` file with your [OpenAI API key](https://platform.openai.com/account/api-keys).
 1. Replace the SESSION_SECRET value with a [random UUID](https://www.uuidgenerator.net/).
 
-
 | env var                         | default | description |
 | ------------------------------- | ------- | ----------- |
 | OPENAI_API_KEY                  | YOUR_API_KEY | API key used to authenticate the user when using the OpenAI API. |
@@ -35,6 +35,13 @@ npm install
 | EMAIL_WHITELIST                 | [email protected],[email protected],@scottlogic.com | List of emails that the chat bot can 'send' emails to when the EMAIL_WHITELIST defence is active. |
 | SESSION_SECRET                  | YOUR_SESSION_SECRET | A secret string used to set up the backend user session. |
 
+#### Frontend
+1. Copy the example environment file `.env.example` in the frontend directory and rename it to `.env`.
+
+| env var                         | default | description |
+| ------------------------------- | ------- | ----------- |
+| VITE_BACKEND_URL                | http://localhost:3001/ | The base URL to access the backend. |
+
 ## Development
 ### Linting and formatting
 

backend/src/router.ts

@@ -283,7 +283,7 @@ router.post("/openai/chat", async (req: OpenAiChatRequest, res) => {
       // enable next level when user wins current level
       if (chatResponse.wonLevel) {
         console.log("Win conditon met for level: ", currentLevel);
-        numLevelsCompleted = currentLevel + 1;
+        numLevelsCompleted = Math.max(numLevelsCompleted, currentLevel + 1);
         req.session.numLevelsCompleted = numLevelsCompleted;
         chatResponse.numLevelsCompleted = numLevelsCompleted;
       }

frontend/.env.example

@@ -0,0 +1 @@
+VITE_BACKEND_URL=http://localhost:3001/

frontend/.eslintrc.cjs

@@ -7,14 +7,15 @@ module.exports = {
     "plugin:@typescript-eslint/stylistic-type-checked",
     "plugin:@typescript-eslint/strict-type-checked",
     "plugin:react-hooks/recommended",
+    "plugin:jsx-a11y/recommended",
   ],
   ignorePatterns: ["dist", ".eslintrc.cjs"],
   parser: "@typescript-eslint/parser",
   parserOptions: {
     project: true,
     tsconfigRootDir: __dirname,
   },
-  plugins: ["react-refresh"],
+  plugins: ["react-refresh", "jsx-a11y"],
   rules: {
     "@typescript-eslint/init-declarations": "error",