Merge branch 'dev' into feature-32-jsdoc-rules

.dockerignore

@@ -2,3 +2,4 @@
 /data
 /node_modules
 /server/node_modules
+/server/.env

.github/workflows/ci.yml

@@ -31,12 +31,11 @@ jobs:
         run: npm run format:check
       - name: Run ESLint
         run: npm run lint --workspaces
-      - name: Initialize database, generate Prisma client
-        run: cd server; npx prisma migrate reset --force
+      - name: Initialize database, set up .env, generate Prisma client
+        run: cd server; cp example.env .env; npm run test:db:reset
         env:
           DATABASE_URL: postgresql://postgres@db/app
       - name: Run Tests
-        if: ${{ false }}
         run: npm test
         env:
           DATABASE_URL: postgresql://postgres@db/app

client/package.json

@@ -6,6 +6,8 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
+    "format": "prettier --write --ignore-unknown .",
+    "format:check": "prettier --check --ignore-unknown .",
     "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview",
     "storybook": "storybook dev -p 6006",
@@ -39,6 +41,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.5",
     "eslint-plugin-storybook": "^0.8.0",
+    "prettier": "^3.2.4",
     "prop-types": "^15.8.1",
     "storybook": "^7.6.17",
     "storybook-dark-mode": "^3.0.3",

docker-compose.yml

@@ -19,11 +19,15 @@ services:
     command: bash -l -c "npm install && npm start"
     environment:
       - DATABASE_URL=postgresql://postgres@db/app
+      - SMTP_HOST=mail
+      - SMTP_PORT=1025
+      - SMTP_USER=
+      - SMTP_PASS=
     ports:
-      - 5000:5000 #vite
-      - 5100:5100 #fastify
-      - 5555:5555 #prismaORM
-      - 6006:6006 #storybook
+      - 5000:5000 # vite
+      - 5100:5100 # fastify
+      - 5555:5555 # prisma
+      - 6006:6006 # storybook
     depends_on:
       - db
       - mail