Merge branch 'master' into 555-devops-maildev

.github/workflows/admin.test.build.code.yml

@@ -1,6 +1,6 @@
 name: "admin:test:build test code"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/admin.test.build.docker.yml

@@ -1,6 +1,6 @@
 name: "admin:test:build test docker"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/admin.test.build.docs.yml

@@ -1,6 +1,6 @@
 name: "admin:test:build test docs"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/admin.test.build.storybook.yml

@@ -1,6 +1,6 @@
 name: "admin:test:build test storybook"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/admin.test.lint.code.yml

@@ -1,6 +1,6 @@
 name: "admin:test:lint code with defined linters"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/admin.test.unit.code.yml

@@ -1,6 +1,6 @@
 name: "admin:test:unit test code with defined suites"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/backend.test.build.code.yml

@@ -1,6 +1,6 @@
 name: "backend:test:build test code"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/backend.test.build.docker.yml

@@ -1,6 +1,6 @@
 name: "backend:test:build test docker"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/backend.test.build.docs.yml

@@ -1,6 +1,6 @@
 name: "backend:test:build test docs"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/backend.test.lint.code.yml

@@ -1,6 +1,6 @@
 name: "backend:test:lint code with defined linters"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/backend.test.unit.code.yml

@@ -3,7 +3,7 @@ name: "backend:test:unit test code with defined suites"
 env:
   DATABASE_URL: mysql://root:@localhost:3306/dreammall.earth
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/e2e.run.tests.yml

@@ -1,6 +1,6 @@
 name: e2e:test:all test the application end to end
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   e2e-tests:
@@ -18,15 +18,27 @@ jobs:
       - name: E2E | Boot up test system
         run: |
           cd authentik/
+          rm -rf database
           ./database.unpack.sh
           docker compose up -d
+          cd ../
+          docker compose up -d database
+          cd backend
+          cp .env.dist .env
+          ln -s src/auth/public.pem public.pem
+          npm install
+          npm run db:reset
+          npm run build
+          npm run start &
           cd ../frontend
           cp .env.dist .env
-          docker compose -f docker-compose.test.yml up -d frontend
+          npm install
+          npm run prod &
           cd  ../presenter
           cp .env.dist .env
-          docker compose -f docker-compose.test.yml up -d presenter
-          sleep 4m
+          export PORT=3001
+          npm install
+          npm run prod &
 
       - name: Install cucumber-json-formatter
         run: |
@@ -56,5 +68,5 @@ jobs:
         if: ${{ failure() && steps.e2e-run.conclusion == 'failure' }}
         uses: actions/upload-artifact@v4
         with:
-          name: boilerplate-e2e-test-report-pr-${{ steps.pr-number.outputs.pr }}
+          name: dreammall-e2e-test-report-pr-${{ steps.pr-number.outputs.pr }}
           path: /home/runner/work/dreammall.earth/dreammall.earth/tests/cypress/reports/dreammall-e2e_html_report

.github/workflows/e2e.test.build.docs.yml

@@ -1,6 +1,6 @@
 name: e2e:test:build test docs
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   files-changed:

.github/workflows/e2e.test.lint.yml

@@ -1,6 +1,6 @@
 name: e2e:test:lint code with defined linters
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   files-changed:

.github/workflows/frontend.test.build.code.yml

@@ -1,6 +1,6 @@
 name: "frontend:test:build test code"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/frontend.test.build.docker.yml

@@ -1,6 +1,6 @@
 name: "frontend:test:build test docker"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/frontend.test.build.docs.yml

@@ -1,6 +1,6 @@
 name: "frontend:test:build test docs"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/frontend.test.build.storybook.yml

@@ -1,6 +1,6 @@
 name: "frontend:test:build test storybook"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/frontend.test.lint.code.yml

@@ -1,6 +1,6 @@
 name: "frontend:test:lint code with defined linters"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/frontend.test.unit.code.yml

@@ -1,6 +1,6 @@
 name: "frontend:test:unit test code with defined suites"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/presenter.test.build.code.yml

@@ -1,6 +1,6 @@
 name: "presenter:test:build test code"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/presenter.test.build.docker.yml

@@ -1,6 +1,6 @@
 name: "presenter:test:build test docker"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/presenter.test.build.docs.yml

@@ -1,6 +1,6 @@
 name: "presenter:test:build test docs"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/presenter.test.build.storybook.yml

@@ -1,6 +1,6 @@
 name: "presenter:test:build test storybook"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/presenter.test.lint.code.yml

@@ -1,6 +1,6 @@
 name: "presenter:test:lint code with defined linters"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/presenter.test.unit.code.yml

@@ -1,6 +1,6 @@
 name: "presenter:test:unit test code with defined suites"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

.github/workflows/test.code.yml

@@ -1,6 +1,6 @@
 name: "dreammall:test:code with defined tests & linters"
 
-on: push
+on: [push,pull_request_target]
 
 jobs:
   # only (but most important) job from this workflow required for pull requests

admin/Dockerfile

@@ -16,13 +16,13 @@ ENV PORT="3000"
 
 # Labels
 LABEL org.label-schema.build-date="${BUILD_DATE}"
-LABEL org.label-schema.name="it4c:frontend"
-LABEL org.label-schema.description="IT4C Frontend Boilerplate"
-LABEL org.label-schema.usage="https://github.com/IT4Change/boilerplate-frontend/blob/master/README.md"
-LABEL org.label-schema.url="https://github.com/IT4Change/boilerplate-frontend"
-LABEL org.label-schema.vcs-url="https://github.com/IT4Change/boilerplate-frontend/tree/master/"
+LABEL org.label-schema.name="dreammall:admin"
+LABEL org.label-schema.description="DreamMall Admin Interface"
+LABEL org.label-schema.usage="https://github.com/dreammall-earth/dreammall.earth/tree/master/admin/README.md"
+LABEL org.label-schema.url="https://github.com/dreammall-earth/dreammall.earth/tree/master/admin/README.md"
+LABEL org.label-schema.vcs-url="https://github.com/dreammall-earth/dreammall.earth/tree/master/admin/"
 LABEL org.label-schema.vcs-ref="${BUILD_COMMIT}"
-LABEL org.label-schema.vendor="IT4C"
+LABEL org.label-schema.vendor="DreamMall"
 LABEL org.label-schema.version="${BUILD_VERSION}"
 LABEL org.label-schema.schema-version="1.0"
 LABEL maintainer="info@it4c.dev"

admin/README.md

@@ -1,4 +1,4 @@
-# boilerplate-frontend
+# DreamMall Admin Interface
 
 [![nodejs][badge-nodejs-img]][badge-nodejs-href]
 [![npm][badge-npm-img]][badge-npm-href]
@@ -17,7 +17,7 @@
 [![vuepress][badge-vuepress-img]][badge-vuepress-href]
 [![chromatic][badge-chromatic-img]][badge-chromatic-href]
 
-The IT4C Boilerplate for frontends
+The DreamMall admin interface
 
 ![](src/assets/it4c-logo2-clean-bg_alpha-128x128.png)
 

admin/docker-compose.override.yml

@@ -1,5 +1,3 @@
-version: '3.4'
-
 services:
   #######################################################
   # FRONTEND ############################################

admin/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.4'
-
 services:
   #######################################################
   # FRONTEND ############################################