Merge pull request #110 from DatepollSystems/layout-v2

Layout v2

.github/workflows/preview.yml

@@ -0,0 +1,62 @@
+name: preview
+
+on: [pull_request]
+
+# This allows a subsequently queued workflow run to interrupt previous runs
+concurrency:
+  group: 'preview-${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  build-lava:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: dafnik/setup-node-pnpm@v3
+        with:
+          install-ignore-scripts: true
+
+      - name: Build
+        run: pnpm build:lava
+
+      - name: Upload lava build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: lava
+          path: dist
+
+  # Deploy job
+  deploy-lava-preview:
+    name: Deploy lava preview
+    needs: build-lava
+
+    permissions:
+      pull-requests: write
+      actions: read
+
+    # Deploy to the preview environment
+    environment:
+      name: preview-${{ github.event.number }}
+      url: ${{ steps.deploy-preview.outputs.url }}
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: lava
+          path: dist
+
+      - name: deploy preview
+        id: deploy-preview
+        uses: dafnik/ssp@v1
+        with:
+          host: preview.dafnik.me
+          username: ${{ secrets.PREVIEW_SSH_USER }}
+          key: ${{ secrets.PREVIEW_SSH_PRIVATE_KEY }}
+          port: ${{ secrets.PREVIEW_SSH_PORT }}
+          source: dist/*
+          target: /var/www/share/preview
+          strip_components: 3

compose-local-dev.yml

@@ -79,6 +79,12 @@ services:
       - RATE_LIMIT_ENABLED=true
       - RATE_LIMIT_DURATION_IN_SECONDS=120
       - RATE_LIMIT_TRIES=40
+      - STRIPE_ENABLED=false
+      - STRIPE_KEYS_SECRET=sk_test
+      - STRIPE_KEYS_PUBLISHABLE=pk_test
+      - STRIPE_WEBHOOK_SEED_ENABLED=false
+      - STRIPE_WEBHOOK_URL=https://not-existing.kellner.team/api/v1/public/webhooks/stripe
+      - STRIPE_WEBHOOK_SECRET=testabc
     networks:
       - kellner-backend
     # No healthcheck possible as the container is distroless and therefor has no bash nor other tools to make requests

package.json

@@ -12,6 +12,7 @@
     "build:stats": "rm -rf ./dist/WaiterRobot-Web/ && mkdir -p ./dist/WaiterRobot-Web && ng build --stats-json",
     "analyze": "npm run build:stats && source-map-explorer dist/WaiterRobot-Web/**/*.js",
     "tsc:check": "tsc",
+    "ci": "pnpm lint && pnpm format",
     "lint": "eslint '**/*.{js,ts,html,json,md}' --fix",
     "lint:check": "eslint '**/*.{js,ts,html,json,md}'",
     "format:check": "prettier --check .",
@@ -50,7 +51,7 @@
     "jspdf": "2.5.1",
     "ng2-pdfjs-viewer": "^17.0.3",
     "ngx-print": "^1.5.1",
-    "ngxtension": "3.0.1",
+    "ngxtension": "3.2.0",
     "rxjs": "7.8.1",
     "tslib": "2.6.2",
     "zone.js": "0.14.4"