update master

.eslintrc.json

@@ -22,6 +22,6 @@
     //"@typescript-eslint/no-unused-vars": "warn"
     "jest/no-conditional-expect": "off"    
   },
-  "ignorePatterns": ["dist", "jest.config.js"]
+  "ignorePatterns": ["dist", "jest.config.js", "httpdocs"]
 
 }

.github/workflows/eslint.yml

@@ -15,8 +15,7 @@ jobs:
         with:
           node-version: 16
       - run: npm ci # or yarn install
-      - uses: sibiraj-s/action-eslint@v3
-        with:
-          eslint-args: '--ignore-path=.gitignore --quiet'
-          extensions: 'js,jsx,ts,tsx'
-          annotations: true
+      - name: Lint server-side code
+        run: npx eslint src/ --fix
+      - name: Lint client-side code
+        run: npx eslint httpdocs/js/ --fix

.github/workflows/main.yml

@@ -0,0 +1,48 @@
+name: Tests
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "dev", "main" ]
+  pull_request:
+    branches: [ "dev", "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      NODE_ENV: ${{ vars.NODE_ENV }}
+      LOCALHOST: ${{ vars.LOCALHOST }}
+      LOCALHOSTV6: ${{ vars.LOCALHOSTV6 }}
+      KEYA: ${{ secrets.KEYA }}
+      KEYB: ${{ secrets.KEYB }}
+      USER_TEST: ${{ secrets.USER_TEST }}
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: '20'
+        cache: 'npm'
+    - run: echo "NODE_ENV = $NODE_ENV"
+    - run: npm ci
+    - run: npm run build --if-present
+    - name: Start server
+      run: |
+        sudo NODE_ENV=$NODE_ENV LOCALHOST=$LOCALHOST LOCALHOSTV6=$LOCALHOSTV6 KEYA=$KEYA KEYB=$KEYB USER_TEST=$USER_TEST npm start &
+        sleep 15 # Give server some time to start
+    - name: Check if server is running
+      run: |
+        curl --fail http://localhost:80 || exit 1
+    - name: Run app tests
+      run: npm run test:app
+    - name: Run login tests
+      run: npm run test:login
+    - name: Run unit tests
+      run: npm run test:unit
+    - name: Run integration tests
+      run: npm run test:integration
+
+
+

.gitignore

@@ -1,3 +1,5 @@
+data/
+
 # Logs
 logs
 *.log

.vscode/launch.json

@@ -1,21 +1,15 @@
 {
-	// Use IntelliSense to learn about possible attributes.
-	// Hover to view descriptions of existing attributes.
-	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"type": "node",
-			"request": "launch",
-			"name": "Debug server.ts",
-			"skipFiles": [
-				"<node_internals>/**"
-			],
-			"program": "${workspaceFolder}\\src\\app.ts",
-			"preLaunchTask": "tsc: build - tsconfig.json",
-			"outFiles": [
-				"${workspaceFolder}/dist/**/*.js"
-			]
-		}
-	]
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Debug TypeScript",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}\\src\\app.ts",
+            "preLaunchTask": "build"
+        }
+    ]
 }

.vscode/tasks.json

@@ -0,0 +1,18 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "type": "shell",
+            "command": "npx tsc -p tsconfig.json",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": "$tsc"
+        }
+    ]
+}