Merge branch 'master' into docker-compose

dreammall-earth · Feb 5, 2024 · f453673 · f453673
2 parents 6b83293 + 0591086
commit f453673
Show file tree

Hide file tree

Showing 143 changed files with 8,446 additions and 3,275 deletions.
diff --git a/.github/workflows/presenter.test.build.code.yml b/.github/workflows/presenter.test.build.code.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v3.3.0
 
       - name: Check for presenter file changes
-        uses: dorny/paths-filter@v2.11.1
+        uses: dorny/paths-filter@v3.0.0
         id: changes
         with:
           token: ${{ github.token }}

diff --git a/.github/workflows/presenter.test.build.docs.yml b/.github/workflows/presenter.test.build.docs.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v3.3.0
 
       - name: Check for presenter file changes
-        uses: dorny/paths-filter@v2.11.1
+        uses: dorny/paths-filter@v3.0.0
         id: changes
         with:
           token: ${{ github.token }}

diff --git a/.github/workflows/presenter.test.build.storybook.yml b/.github/workflows/presenter.test.build.storybook.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v3.3.0
 
       - name: Check for presenter file changes
-        uses: dorny/paths-filter@v2.11.1
+        uses: dorny/paths-filter@v3.0.0
         id: changes
         with:
           token: ${{ github.token }}

diff --git a/.github/workflows/presenter.test.lint.code.yml b/.github/workflows/presenter.test.lint.code.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v3.3.0
 
       - name: Check for presenter file changes
-        uses: dorny/paths-filter@v2.11.1
+        uses: dorny/paths-filter@v3.0.0
         id: changes
         with:
           token: ${{ github.token }}

diff --git a/.github/workflows/presenter.test.unit.code.yml b/.github/workflows/presenter.test.unit.code.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v3.3.0
 
       - name: Check for presenter file changes
-        uses: dorny/paths-filter@v2.11.1
+        uses: dorny/paths-filter@v3.0.0
         id: changes
         with:
           token: ${{ github.token }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,54 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.1.0](https://github.com/dreammall-earth/dreammall.earth/compare/1.0.1...1.1.0)
+
+- refactor(presenter): rename products to produkte [`#214`](https://github.com/dreammall-earth/dreammall.earth/pull/214)
+- fix(presenter): proper social preview [`#212`](https://github.com/dreammall-earth/dreammall.earth/pull/212)
+- feat(presenter): vike per-page title [`#207`](https://github.com/dreammall-earth/dreammall.earth/pull/207)
+- feat(presenter): design pages [`#206`](https://github.com/dreammall-earth/dreammall.earth/pull/206)
+- feat(presenter): scss refactor [`#204`](https://github.com/dreammall-earth/dreammall.earth/pull/204)
+- refactor(presenter): make input fields and checkbox reusable components [`#180`](https://github.com/dreammall-earth/dreammall.earth/pull/180)
+- feat(presenter): automatic slider [`#205`](https://github.com/dreammall-earth/dreammall.earth/pull/205)
+- refactor(presenter): improve naming conventions and folder structures [`#197`](https://github.com/dreammall-earth/dreammall.earth/pull/197)
+- fix(backend): brevo response call fixes [`#203`](https://github.com/dreammall-earth/dreammall.earth/pull/203)
+- feat(presenter): double opt in [`#188`](https://github.com/dreammall-earth/dreammall.earth/pull/188)
+- chore(presenter): update boilerplate presenter 22.01.24 [`#198`](https://github.com/dreammall-earth/dreammall.earth/pull/198)
+- chore(frontend): update packages 20 01 2024 [`#61`](https://github.com/dreammall-earth/dreammall.earth/pull/61)
+- feat(presenter): improved social preview [`#186`](https://github.com/dreammall-earth/dreammall.earth/pull/186)
+- fix(presenter): design fixes [`#178`](https://github.com/dreammall-earth/dreammall.earth/pull/178)
+- feat(presenter): improve stories [`#179`](https://github.com/dreammall-earth/dreammall.earth/pull/179)
+- docs(other): include browserstack reference as required by that service [`#181`](https://github.com/dreammall-earth/dreammall.earth/pull/181)
+- feat(backend): double opt in [`#168`](https://github.com/dreammall-earth/dreammall.earth/pull/168)
+- chore(presenter): update presenter from boilerplate [`#176`](https://github.com/dreammall-earth/dreammall.earth/pull/176)
+- feat(presenter): increase coverage presenter [`#169`](https://github.com/dreammall-earth/dreammall.earth/pull/169)
+- docs(frontend): fix readme [`#55`](https://github.com/dreammall-earth/dreammall.earth/pull/55)
+- feat(frontend): stories [`#54`](https://github.com/dreammall-earth/dreammall.earth/pull/54)
+- chore(frontend): update packages 13 01 2024 [`#53`](https://github.com/dreammall-earth/dreammall.earth/pull/53)
+- feat(presenter): test response messages [`#167`](https://github.com/dreammall-earth/dreammall.earth/pull/167)
+- feat(backend): database for newsletter double opt in [`#166`](https://github.com/dreammall-earth/dreammall.earth/pull/166)
+- feat(presenter): snapshot testing [`#165`](https://github.com/dreammall-earth/dreammall.earth/pull/165)
+- feat(frontend): snapshot tests [`#47`](https://github.com/dreammall-earth/dreammall.earth/pull/47)
+- feat(frontend): test vike button [`#46`](https://github.com/dreammall-earth/dreammall.earth/pull/46)
+- feat(frontend): build server [`#45`](https://github.com/dreammall-earth/dreammall.earth/pull/45)
+- feat(frontend): utilize vike-navigate [`#44`](https://github.com/dreammall-earth/dreammall.earth/pull/44)
+- fix(presenter): fix unit tests [`#161`](https://github.com/dreammall-earth/dreammall.earth/pull/161)
+- chore(presenter): update packages [`#160`](https://github.com/dreammall-earth/dreammall.earth/pull/160)
+- chore(frontend): update packages [`#43`](https://github.com/dreammall-earth/dreammall.earth/pull/43)
+- refactor(presenter): utilize vike's client-side navigation [`#125`](https://github.com/dreammall-earth/dreammall.earth/pull/125)
+- chore(presenter): update boilerplate presenter [`#134`](https://github.com/dreammall-earth/dreammall.earth/pull/134)
+- fix(frontend): deleted unused debug handlers [`#35`](https://github.com/dreammall-earth/dreammall.earth/pull/35)
+- Bump actions/checkout from 3 to 4 [`#33`](https://github.com/dreammall-earth/dreammall.earth/pull/33)
+- chore(workflow): dependabot support [`#32`](https://github.com/dreammall-earth/dreammall.earth/pull/32)
+- chore(frontend): apply vike fix [`#31`](https://github.com/dreammall-earth/dreammall.earth/pull/31)
+- chore(frontend): package updates [`#30`](https://github.com/dreammall-earth/dreammall.earth/pull/30)
+- fix(frontend): optimization [`#29`](https://github.com/dreammall-earth/dreammall.earth/pull/29)
+
 #### [1.0.1](https://github.com/dreammall-earth/dreammall.earth/compare/1.0.0...1.0.1)
 
+> 22 December 2023
+
+- chore(release): 1.0.1 [`#133`](https://github.com/dreammall-earth/dreammall.earth/pull/133)
 - fix(presenter): fix invisible hamburger menu on Safari iOS [`#132`](https://github.com/dreammall-earth/dreammall.earth/pull/132)
 
 ### [1.0.0](https://github.com/dreammall-earth/dreammall.earth/compare/0.9.3...1.0.0)

diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "boilerplate-backend",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "The IT4C Boilerplate for backends",
   "main": "build/index.ts",
   "repository": {

diff --git a/backend/src/api/Brevo.spec.ts b/backend/src/api/Brevo.spec.ts
@@ -17,12 +17,12 @@ CONFIG.BREVO_NEWSLETTER_TEMPLATE_OPTIN = 3
 CONFIG.BREVO_NEWSLETTER_LIST = 3
 
 const mockSendTransacEmail = jest.fn().mockResolvedValue({
-  response: { statusCode: 200 },
+  response: { statusCode: 201 },
 })
 const mockSetApiKey = jest.fn()
 
 const mockCreateContact = jest.fn().mockResolvedValue({
-  response: { statusCode: 200 },
+  response: { statusCode: 201 },
 })
 
 const code = '1234567890abcdef'
@@ -81,7 +81,7 @@ describe('Brevo', () => {
           mockSendTransacEmail
             .mockResolvedValueOnce({
               response: {
-                statusCode: 200,
+                statusCode: 201,
               },
             })
             .mockRejectedValue({
@@ -122,7 +122,7 @@ describe('Brevo', () => {
         beforeAll(() => {
           mockSendTransacEmail.mockResolvedValue({
             response: {
-              statusCode: 200,
+              statusCode: 201,
             },
           })
         })
@@ -344,7 +344,7 @@ describe('Brevo', () => {
           jest.clearAllMocks()
           mockSendTransacEmail.mockResolvedValue({
             response: {
-              statusCode: 200,
+              statusCode: 201,
             },
           })
         })
@@ -373,7 +373,7 @@ describe('Brevo', () => {
           jest.clearAllMocks()
           mockSendTransacEmail.mockResolvedValue({
             response: {
-              statusCode: 200,
+              statusCode: 201,
             },
           })
         })
@@ -546,7 +546,7 @@ describe('Brevo', () => {
         beforeAll(() => {
           mockCreateContact.mockResolvedValue({
             response: {
-              statusCode: 200,
+              statusCode: 201,
             },
           })
         })

diff --git a/backend/src/api/Brevo.ts b/backend/src/api/Brevo.ts
@@ -153,7 +153,7 @@ export const subscribeToNewsletter = async (
 
   try {
     const brevoResult = await apiInstance.sendTransacEmail(smtpEmailToClient)
-    if (brevoResult.response.statusCode === 200) {
+    if (brevoResult.response.statusCode === 201 || brevoResult.response.statusCode === 202) {
       await prisma.newsletterPreOptIn.update({
         where: { id: params.id },
         data: { brevoSuccessMail: new Date() },
@@ -196,7 +196,7 @@ export const confirmNewsletter = async (code: string): Promise<boolean> => {
 
   try {
     const brevoResult = await apiInstance.createContact(contact)
-    if (brevoResult.response.statusCode === 200) {
+    if (brevoResult.response.statusCode === 201 || brevoResult.response.statusCode === 204) {
       const brevoSuccessDate = new Date()
       await prisma.newsletterPreOptIn.update({
         where: { id: optin.id },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dreammall.earth",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Dreammall.earth website & product page",
   "main": "build/index.js",
   "type": "module",

diff --git a/presenter/.env.dist b/presenter/.env.dist
@@ -2,5 +2,7 @@
 PUBLIC_ENV__ENDPOINTS__GRAPHQL_URI=http://localhost:4000/
 
 # META
-PUBLIC_ENV__META__DEFAULT_TITLE="DreamMall"
-PUBLIC_ENV__META__DEFAULT_DESCRIPTION="DreamMall Client"
+PUBLIC_ENV__META__BASE_URL="http://localhost:3000"
+PUBLIC_ENV__META__DEFAULT_AUTHOR="DreamMall Verlag GbR"
+PUBLIC_ENV__META__DEFAULT_DESCRIPTION="Deine Reichweite Erweitern Alle Möglichkeiten Miteinander Ausschöpfen Lebensqualität Leben"
+PUBLIC_ENV__META__DEFAULT_TITLE="DreamMall"
diff --git a/presenter/.stylelintrc.json b/presenter/.stylelintrc.json
@@ -1,7 +1,10 @@
 {
     "rules": {
         "selector-class-pattern": "^([a-z][a-z0-9]*)((--?|__)?[a-z0-9]+)*$",
-        "media-query-no-invalid": null
+        "media-query-no-invalid": null,
+        "at-rule-no-unknown": null,
+        "scss/at-rule-no-unknown": true,
+        "scss/load-no-partial-leading-underscore": null
     },
     "extends": [
         "stylelint-config-standard",

diff --git a/presenter/README.md b/presenter/README.md
@@ -138,11 +138,6 @@ Where `xxx` refers to the folder and product part you want to use the boilerplat
 
 This mechanic was taken from this [source](https://stackoverflow.com/questions/1683531/how-to-import-existing-git-repository-into-another/8396318#8396318)
 
-## TODO
-
-- [ ] tests
-- [ ] responsive design
-
 ## Known Problems
 
 - [ ] [Image flicker](https://github.com/vuetifyjs/vuetify/issues/18772)