Merge remote-tracking branch 'origin/main' into dev-moritz

Layout

.github/workflows/build-and-test.yml

@@ -1,20 +0,0 @@
-name: Build and Test
-
-on:
-  push:
-    branches: [ dev ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Build the application
-      uses: actions/checkout@v3
-    - uses: oven-sh/setup-bun@v1
-      with:
-        bun-version: "latest"
-    - run: bun install
-    - run: bun run build
-    - run: bun run test:unit
-    - run: bun run test:e2e

.github/workflows/dev-pipeline.yml

@@ -1,27 +1,26 @@
 name: Dev Pipeline
 
 on:
+  pull_request:
+    branches: [main]
   push:
-    branches: [ dev ]
+    branches: [main]
 
 jobs:
-  build:
+  deploy:
     runs-on: ubuntu-latest
-
     steps:
-    - name: Deploy dev changes.
-      uses: appleboy/ssh-action@master
-      with:
-        host: "212.227.155.91"
-        username: "root"
-        password: "!2Zc727cI1"
-        port: 22
-        script: |
-          cd ~/apps/online-energieausweis
-          git reset --hard HEAD
-          git clean -f -d
-          git pull origin main
-          git status
-          npm install -g bun
-          bun install
-          bash build.sh
+      - uses: actions/checkout@v2
+      - uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.DEV_HOST }}
+          username: ${{ secrets.DEV_USERNAME }}
+          password: ${{ secrets.DEV_PASSWORD }}
+          port: 22
+          script: |
+            cd ~/online-energieausweis
+            git reset --hard origin/main
+            git clean -f -d
+            git pull origin main
+            git status
+            make prod

.github/workflows/prod-pipeline.yml

@@ -1,27 +0,0 @@
-name: Production Deployment
-
-on:
-  release:
-    types: [ created ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Deploy to production.
-      uses: appleboy/ssh-action@master
-      with:
-        host: "212.227.155.91"
-        username: "root"
-        password: "!2Zc727cI1"
-        port: 22
-        script: |
-          cd ~/apps/online-energieausweis
-          git reset --hard HEAD
-          git clean -f -d
-          git pull origin main
-          git status
-          npm install -g bun
-          bun install
-          bash build.sh

.gitignore

@@ -1,25 +1,34 @@
-# build output
-dist/
-
-# generated types
-.astro/
-
-# dependencies
-node_modules/
-
-# logs
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-# lockfile
-pnpm-lock.yaml
-bun.lockb
-
-# environment variables
-.env
-.env.production
-
-# macOS-specific files
-.DS_Store
+# build output
+dist/
+
+# generated types
+.astro/
+
+# log files
+logs/
+
+# dependencies
+node_modules/
+
+# logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# lockfile
+pnpm-lock.yaml
+bun.lockb
+
+# environment variables
+.env
+.env.production
+
+# macOS-specific files
+.DS_Store
+
+public/fonts/
+
+*.Identifier
+
+src/lib/Berechnungen/BedarfsausweisWohnen/18599-Tabellenverfahren-Wohngebaeude-komplett-ocr.pdf

.vscode/settings.json

@@ -1,5 +1,17 @@
+
+
 {
 	"i18n-ally.localesPaths": [
 		"public/locales"
-	]
-}
+	],
+	"typescript.tsdk": "node_modules/typescript/lib",
+	"css.lint.unknownAtRules": "ignore",
+	"scss.lint.unknownAtRules": "ignore",
+	"less.lint.unknownAtRules": "ignore"
+
+	"workbench.colorCustomizations": {
+		"minimap.background": "#00000000",
+		"scrollbar.shadow": "#00000000"
+	},
+	
+}

Makefile

@@ -0,0 +1,52 @@
+.PHONY: dev database online-energieausweis all prod bun-install-database # api bun-install-api
+
+online-energieausweis:
+	bun run dev --host
+
+dev: database online-energieausweis # api
+
+database:
+	$(MAKE) -C ../database dev
+
+bun-install-database:
+	cd ../database
+	bun link
+	bun install
+
+# bun-install-api: bun-install-database
+# 	cd ../api
+# 	bun install
+# 	bun link @ibcornelsen/database
+
+# api:
+# 	$(MAKE) -C ../api dev
+
+all:
+	mkdir -p ~/logs
+	bun run dev 2>&1 | tee ~/logs/`date '+%d-%m-%Y_%H:%M:%S'`.log
+
+prod: bun-install-database # bun-install-api
+	mkdir -p ~/logs
+	mkdir -p ~/persistent/online-energieausweis
+	
+# Wir müssen sichergehen, dass der Database Container läuft, sonst können wir ihn nicht linken.
+	@if [ ! $$(docker ps | grep database | wc -l) -gt 0 ]; then \
+		cd ../database; \
+		$(MAKE) prod; \
+		cd ../online-energieausweis; \
+	fi
+	
+# Auch die API sollte bereits laufen
+# @if [ $$(pm2 pid api) -eq "0" ]; then \
+# 	cd ../api; \
+# 	$(MAKE) prod; \
+# 	cd ../online-energieausweis; \
+# fi
+
+	- rm -f ~/online-energieausweis/.env;
+	- touch ~/online-energieausweis/.env;
+	- echo "PRIVATE_KEY=$(cat /etc/letsencrypt/live/ibcornelsen.de/privkey.pem | base64 | tr -d '\n')" >> ~/online-energieausweis/.env;
+	- echo "CERTIFICATE=$(cat /etc/letsencrypt/live/ibcornelsen.de/fullchain.pem | base64 | tr -d '\n')" >> ~/online-energieausweis/.env;
+
+	- pm2 delete online-energieausweis
+	pm2 start --name "online-energieausweis" --log ~/logs/`date '+%d-%m-%Y_%H:%M:%S'`.log --time  bun -- astro dev

astro.config.mjs

@@ -1,29 +1,45 @@
 import { defineConfig } from "astro/config";
 import svelte from "@astrojs/svelte";
 // import astroI18next from "astro-i18next";
-
 import tailwind from "@astrojs/tailwind";
-
-// https://astro.build/config
 import node from "@astrojs/node";
-
-// https://astro.build/config
 import mdx from "@astrojs/mdx";
+import dsv from "@rollup/plugin-dsv"
+import astroTypesafeAPI from "astro-typesafe-api"
 
-// https://astro.build/config
+import { fileURLToPath } from "url";
+
+// https://astro.build/config 
 export default defineConfig({
-  integrations: [/*astroI18next(),*/svelte(), tailwind(), mdx()],
+  integrations: [svelte(), tailwind(), mdx(), astroTypesafeAPI()],
   outDir: "./dist",
   output: "server",
-	vite: {
-		optimizeDeps: {
-			exclude: ["@ibcornelsen/api", "@ibcornelsen/database"]
-		}
-	},
+  vite: {
+    optimizeDeps: {
+      exclude: ["@ibcornelsen/api", "@ibcornelsen/database"]
+    },
+    resolve: {
+      alias: {
+        "#": fileURLToPath(new URL("./src", import.meta.url))
+      }
+    },
+		ssr: {
+			noExternal: ["@pdfme/generator", "@pdfme/common", "@pdfme/schemas"]
+		},
+    build: {
+      commonjsOptions: {
+        transformMixedEsModules: false
+      }
+    },
+		plugins: [dsv()]
+  },
   adapter: node({
     mode: "middleware"
   }),
-	server: {
-		port: 3000
-	}
+  server: {
+    port: 3000
+  },
+  devToolbar: {
+    enabled: false
+  }
 });

build.sh

@@ -9,50 +9,63 @@ DB_USER="main"
 DB_PASSWORD="hHMP8cd^N3SnzGRR"
 DB_PORT=5432
 
-git_pull_force() {
-	git reset --hard HEAD
-	git clean -f -d
-	git pull origin main
-}
+# Wir gehen davon aus, dass die Änderungen bereits von GitHub gepullt wurden
+# Dieses Skript ist nur dafür gedacht, von GitHub bei einer Automation
+# ausgeführt zu werden. Außerdem würde es nicht wirklich Sinn ergeben, wenn das
+# Build Skript sich die Änderungen am build Skript holen würde...
+# Wir müssen alle lokalen Pakete verlinken
 
-# Zuerst müssen wir neue Änderungen von GitHub pullen.
-cd ~/apps/$APP_NAME
-git_pull_force;
+# --------------------------------- Database --------------------------------- #
 
-# Dann bauen wir das Docker Image unserer Application
-cd ~/apps/$APP_NAME
-docker stop $APP_NAME
-docker rm $APP_NAME
-docker build -t $APP_NAME .
+cd ../database
+bun link
+bun install
 
-# SECTION: Startup jobs zu crontab hinzufügen.
-# Erstmal den cronfile leeren.
-crontab -r;
+# ------------------------------------ API ----------------------------------- #
 
-# Alle builds schlagen fehl wenn die Datenbank nicht da ist, also muss der Container zuerst gebaut werden.
-(crontab -l ; echo "@reboot sudo ~/database/build.sh &") | crontab -;
-(crontab -l ; echo "@reboot sudo ~/apps/online-energieausweis/build.sh &") | crontab -;
-(crontab -l ; echo "@reboot sudo ~/apps/layout-tool/build.sh &") | crontab -;
+cd ../api
+bun install
+bun link @ibcornelsen/database
 
-# Wir legen ein persistent directory an
-PERSISTENT_DIR="${HOME}/persistent/online-energieausweis";
+# ------------------------------------ APP ----------------------------------- #
+
+cd ../$APP_NAME
+bun install
+bun link @ibcornelsen/database
+
+# Jeder unserer Applikationen hat ein Verzeichnis in dem alle Dateien dauerhaft,
+# Versionsunabhängig gespeichert werden. Dieses legen wir hier an, falls es noch
+# nicht existiert.
+PERSISTENT_DIR="${HOME}/persistent/${APP_NAME}";
 mkdir -p $PERSISTENT_DIR;
 
-# Wir legen einen .env file für unsere letsencrypt keys an.
-rm -f ~/apps/$APP_NAME/.env;
-touch ~/apps/$APP_NAME/.env;
-echo "PRIVATE_KEY=$(cat /etc/letsencrypt/live/ibcornelsen.de/privkey.pem | base64 | tr -d '\n')" >> ~/apps/$APP_NAME/.env;
-echo "CERTIFICATE=$(cat /etc/letsencrypt/live/ibcornelsen.de/fullchain.pem | base64 | tr -d '\n')" >> ~/apps/$APP_NAME/.env;
+# TODO: Wir legen hier die .env Datei an, die die SSL Zertifikate enthält.
+rm -f ~/$APP_NAME/.env;
+touch ~/$APP_NAME/.env;
+echo "PRIVATE_KEY=$(cat /etc/letsencrypt/live/ibcornelsen.de/privkey.pem | base64 | tr -d '\n')" >> ~/$APP_NAME/.env;
+echo "CERTIFICATE=$(cat /etc/letsencrypt/live/ibcornelsen.de/fullchain.pem | base64 | tr -d '\n')" >> ~/$APP_NAME/.env;
 
-# Und starten unsere App wieder.
-docker run -d --name $APP_NAME --link $DB_CONTAINER_NAME \
-	-v "${PERSISTENT_DIR}:/persistent" \
-	-p "${APP_PORT}:80" \
-	-e DB_CONNECTION=postgresql://${DB_USER}:${DB_PASSWORD}@${DB_CONTAINER_NAME}:${DB_PORT}/${DB_NAME} \
-	-e DB_PORT=${DB_PORT} \
-	--env-file ~/apps/${APP_NAME}/.env \
-	$APP_NAME;
+# Wir müssen sichergehen, dass der Database Container läuft, sonst können wir ihn nicht linken.
+if [ ! $((docker ps | grep $DB_CONTAINER_NAME) | wc -l) -gt 0 ]; then
+	cd ../database;
+	bash build.sh;
+	cd ../$APP_NAME;
+fi
 
-# Crontab Updaten
-cd ~/$APP_NAME
-crontab .crontab
+# Auch die API sollte bereits laufen
+if [ $(pm2 pid api) -eq "0" ]; then
+	cd ../api;
+	make prod;
+	cd ../$APP_NAME;
+fi
+
+# Jetzt wo wir alle Vorbereitungen getroffen haben, starten wir das Docker Image und linken es mit der Datenbank.
+# docker run -d --name $APP_NAME --link $DB_CONTAINER_NAME \
+# 	-v "${PERSISTENT_DIR}:/persistent" \
+# 	-v "./node_modules/@ibcornelsen/database:/${APP_NAME}/node_modules/@ibcornelsen/database" \
+# 	-v "./node_modules/@ibcornelsen/api:/${APP_NAME}/node_modules/@ibcornelsen/api" \
+# 	-v "./node_modules/@ibcornelsen/ui:/${APP_NAME}/node_modules/@ibcornelsen/ui" \
+# 	-p "${APP_PORT}:3000" \
+# 	$APP_NAME;
+
+make prod

cypress.config.ts

@@ -1,17 +1,42 @@
 import { defineConfig } from "cypress";
+import dsv from "@rollup/plugin-dsv"
+
+import { fileURLToPath } from "url";
+import vitePreprocessor from "cypress-vite";
 
 export default defineConfig({
   e2e: {
     baseUrl: "http://localhost:3000",
-    supportFile: false,
 		viewportHeight: 900,
 		viewportWidth: 1660,
+		supportFile: false,
+		specPattern: "./src/cypress/e2e/**/*.{ts,js}",
+		setupNodeEvents(on, config) {
+				on("file:preprocessor", vitePreprocessor({
+					optimizeDeps: {
+						exclude: ["@ibcornelsen/database"]
+					},
+					resolve: {
+						alias: {
+							"#": fileURLToPath(new URL("./src", import.meta.url)),
+							"#components": fileURLToPath(new URL("./src/components", import.meta.url)),
+							"#lib": fileURLToPath(new URL("./src/lib", import.meta.url))
+						}
+					},
+					base: fileURLToPath(new URL("./src", import.meta.url)),
+					build: {
+						commonjsOptions: {
+							transformMixedEsModules: false
+						}
+					},
+					plugins: [dsv()]
+				}))
+		},
   },
-
   component: {
     devServer: {
       framework: "svelte",
-      bundler: "vite",
+      bundler: "vite"
     },
-  },
+  }
 });

docker-compose.yml

@@ -13,14 +13,14 @@ services:
       - ./:/online-energieausweis
       - ./node_modules/@ibcornelsen/ui:/online-energieausweis/node_modules/@ibcornelsen/ui
       - ./node_modules/@ibcornelsen/database:/online-energieausweis/node_modules/@ibcornelsen/database
-      - ./node_modules/@ibcornelsen/api:/online-energieausweis/node_modules/@ibcornelsen/api
+      # - ./node_modules/@ibcornelsen/api:/online-energieausweis/node_modules/@ibcornelsen/api
       - ./node_modules/radix-svelte-icons:/online-energieausweis/node_modules/radix-svelte-icons
       - ../api/persistent:/persistent
   ibcornelsen-api:
     extends:
       file: ../api/docker-compose.yml
       service: ibcornelsen-api
-  ibcornelsen-database:
+  database:
     extends:
       file: ../database/docker-compose.yml
-      service: ibcornelsen-database
+      service: database

install.sh

@@ -0,0 +1,15 @@
+git clone https://github.com/IBCornelsen/online-energieausweis
+git clone https://github.com/IBCornelsen/database
+git clone https://github.com/IBCornelsen/api
+
+cd ./database
+bun link
+bun install
+
+cd ../api
+bun link
+bun install
+
+cd ../online-energieausweis
+bun link
+bun install

notes/ausweis-erstellung.md

@@ -0,0 +1,19 @@
+# Ausweis Erstellung
+
+Wenn ein neuer Nutzer auf unsere Seite kommt und einen Ausweis erstellen möchte muss er sich nicht unbedingt sofort registrieren. Um den Kunden ein reibungsloses Erlebnis zu bieten versuchen wir den Nutzer automatisch anzulegen, allerdings kann es sein, dass der Ausweis nicht weiter bearbeitet wird. In diesem Fall müssen wir den Ausweis nach einer Zeit wieder löschen, damit er nicht für immer in unserer Datenbank bleibt.
+
+```tefcha
+Nutzer Kommt auf unsere Seite
+
+if Nutzer ist eingeloggt
+	Ausweis wird erstellt und Nutzer zugewiesen
+else
+	Ausweis erstellen
+	-> Schritt 2
+	if Nutzer registriert sich
+		Ausweis wird verknüpft
+	else
+		Ausweis nach einer Woche gelöscht
+	
+usw...
+```

package.json

@@ -5,82 +5,90 @@
   "type": "module",
   "scripts": {
     "dev": "bun astro dev",
-    "build": "bun --bun astro build",
-    "preview": "bun --bun astro preview",
+    "build": "bun astro build",
+    "preview": "bun astro preview",
     "astro": "astro",
     "test:e2e": "cypress run",
     "test:unit": "bun test",
     "format": "prettier --write .",
-    "build:production": "astro build && bun --bun server.js",
+    "build:production": "astro build && bun --bun server.ts",
     "i18n:generate": "bunx astro-i18next generate",
-    "prisma:studio": "bunx prisma studio --schema=./node_modules/@ibcornelsen/database/prisma/schema.prisma"
+    "prisma:studio": "bunx prisma studio --schema=./node_modules/@ibcornelsen/database/prisma/schema.prisma",
+    "openapi:generate": "bun astro-typesafe-api generate"
   },
   "private": true,
   "dependencies": {
-    "@astrojs/mdx": "^0.18.4",
-    "@astrojs/node": "^5.1.4",
+    "@astrojs/mdx": "^3.1.9",
+    "@astrojs/node": "^8.3.4",
     "@astrojs/svelte": "^2.2.0",
     "@astrojs/tailwind": "^3.1.3",
-    "@ibcornelsen/api": "link:@ibcornelsen/api",
     "@ibcornelsen/database": "link:@ibcornelsen/database",
     "@ibcornelsen/ui": "^0.0.2",
-    "@mollie/api-client": "^3.7.0",
-    "@pdfme/common": "^3.2.3",
-    "@pdfme/generator": "^3.2.3",
-    "@pdfme/ui": "^3.2.3",
-    "@trpc/client": "^10.45.0",
-    "@trpc/server": "^10.45.0",
-    "astro": "^2.5.1",
-    "astro-i18next": "1.0.0-beta.21",
-    "astro-spa": "^1.3.9",
+    "@mollie/api-client": "^4.1.0",
+    "@pdfme/common": "^5.2.16",
+    "@pdfme/generator": "^5.2.16",
+    "@pdfme/ui": "^5.2.16",
+    "@trpc/client": "^10.45.2",
+    "@trpc/server": "^10.45.2",
+    "astro": "^4.16.17",
+    "astro-typesafe-api": "^0.2.1",
     "body-scroll-lock": "^4.0.0-beta.0",
     "buffer": "^6.0.3",
-    "bun": "^1.0.2",
-    "cookiejs": "^2.1.2",
+    "bun": "^1.1.45",
     "csvtojson": "^2.0.10",
-    "esbuild": "^0.18.17",
-    "express": "^4.18.2",
-    "flag-icons": "^6.9.2",
-    "fontkit": "^2.0.2",
-    "i18next": "^23.4.1",
-    "i18next-fs-backend": "^2.1.5",
-    "i18next-http-backend": "^2.2.1",
-    "jimp": "^0.22.8",
+    "express": "^4.21.2",
+    "flag-icons": "^6.15.0",
+    "fontkit": "^2.0.4",
+    "is-base64": "^1.1.0",
     "js-cookie": "^3.0.5",
-    "jwt-simple": "^0.5.6",
-    "katex": "^0.16.7",
-    "knex": "^2.4.2",
-    "moment": "^2.29.4",
-    "pg": "^8.11.0",
+    "js-interpolate": "^1.3.2",
+    "jsonwebtoken": "^9.0.2",
+    "jwt-decode": "^4.0.0",
+    "moment": "^2.30.1",
+    "moment-timezone": "^0.5.46",
+    "nodemailer": "^6.10.0",
+    "pdf-lib": "^1.17.1",
+    "postcss-nested": "^7.0.2",
     "radix-svelte-icons": "^1.0.0",
-    "sass": "^1.62.1",
-    "svelte": "^3.59.1",
+    "sass": "^1.83.4",
+    "svelte": "^3.59.2",
     "svelte-dialogs": "^1.2.2",
-    "svelte-preprocess": "^5.0.3",
-    "svelte-ripple-action": "^1.0.5",
-    "svelte-tabs": "^1.1.0",
-    "tailwindcss": "^3.3.2",
+    "svelte-preprocess": "^5.1.4",
+    "svelte-ripple-action": "^1.0.6",
+    "tailwindcss": "^3.4.17",
     "trpc-openapi": "^1.2.0",
-    "uuid": "^9.0.0",
-    "vite-tsconfig-paths": "^4.2.0",
-    "zod": "^3.22.4"
+    "uuid": "^9.0.1",
+    "zod": "^3.24.1"
   },
   "devDependencies": {
-    "@faker-js/faker": "^8.3.1",
-    "@tailwindcss/typography": "^0.5.10",
+    "@faker-js/faker": "^8.4.1",
+    "@rollup/plugin-dsv": "^3.0.5",
+    "@tailwindcss/typography": "^0.5.16",
     "@types/body-scroll-lock": "^3.1.2",
-    "@types/fontkit": "^2.0.6",
+    "@types/express": "^5.0.0",
+    "@types/fontkit": "^2.0.7",
+    "@types/is-base64": "^1.1.3",
     "@types/js-cookie": "^3.0.6",
-    "@types/uuid": "^9.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.6",
-    "@typescript-eslint/parser": "^5.59.6",
-    "bun-types": "^1.0.22",
-    "cypress": "^13.6.2",
+    "@types/jsonwebtoken": "^9.0.7",
+    "@types/nodemailer": "^6.4.17",
+    "@types/uuid": "^9.0.8",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
+    "autoprefixer": "^10.4.20",
+    "bun-types": "^1.1.45",
+    "cypress": "^13.17.0",
     "cypress-file-upload": "^5.0.8",
-    "daisyui": "^4.6.0",
+    "cypress-vite": "^1.6.0",
+    "daisyui": "^4.12.23",
     "eslint": "~8.15.0",
     "eslint-config-prettier": "8.1.0",
+    "postcss": "^8.5.1",
+    "postcss-import": "^16.1.0",
+    "postcss-nesting": "^13.0.1",
     "prettier": "^2.8.8",
     "typescript": "^4.9.5"
+  },
+  "overrides": {
+    "zod": "^3.24.1"
   }
 }

postcss.config.cjs

@@ -0,0 +1,8 @@
+module.exports = {
+  plugins: {
+    'postcss-import': {},
+    'tailwindcss/nesting': {},
+    tailwindcss: {},
+    autoprefixer: {},
+  }
+}