Merge branch 'master' into 126-refactor-ensure-proper-internal-and-ex…

…ternal-links-via-linting

.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 }}

.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 }}

.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 }}

.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 }}

.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 }}

.github/workflows/release.yml

@@ -39,7 +39,7 @@ jobs:
       ##########################################################################
       # TODO: this will error on duplicate
       #- name: package-version-to-git-tag
-      #  uses: pkgdeps/git-tag-action@v2
+      #  uses: pkgdeps/git-tag-action@v3
       #  with:
       #    github_token: ${{ secrets.GITHUB_TOKEN }}
       #    github_repo: ${{ github.repository }}
@@ -50,7 +50,7 @@ jobs:
       # Push build tag to GitHub ###############################################
       ##########################################################################
       - name: package-version-to-git-tag + build number
-        uses: pkgdeps/git-tag-action@v2
+        uses: pkgdeps/git-tag-action@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_repo: ${{ github.repository }}

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)

README.md

@@ -41,6 +41,10 @@ The following commands are available:
 Generate a new version using `npm version --git-tag-version=false patch|minor|major`.
 Then run `npm run release` to propagate the new version and generate the changelog
 
+## External Tools
+
+This project is tested with Browserstack.
+
 ## License
 
 [Apache 2.0](./LICENSE)

backend/.env.dist

@@ -3,5 +3,6 @@ BREVO_ADMIN_NAME=""
 BREVO_ADMIN_EMAIL=""
 BREVO_CONTACT_TEMPLATE_ADMIN="1"
 BREVO_CONTACT_TEMPLATE_USER="2"
+BREVO_NEWSLETTER_TEMPLATE_OPTIN="3"
 BREVO_NEWSLETTER_LIST="3"
 DATABASE_URL="mysql://root:@localhost:3306/dreammall.earth"

backend/jest.config.json

@@ -1,13 +1,15 @@
 {
   "verbose": true,
   "preset": "ts-jest",
+  "modulePathIgnorePatterns": ["<rootDir>/build/"],
   "collectCoverage": true,
-  "collectCoverageFrom": ["src/**/*.ts", "!**/node_modules/**", "!src/index.ts", "!build/**"],
+  "collectCoverageFrom": ["src/**/*.ts", "!src/index.ts", "!src/prisma.ts", "!**/node_modules/**", "!build/**"],
   "coverageThreshold": {
     "global": {
-      "lines": 100,
       "statements": 100,
-      "functions": 100
+      "branches": 100,
+      "functions": 100,
+      "lines": 100
     }
   },
   "setupFiles": ["./test/testSetup.ts"],

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": {
@@ -42,6 +42,7 @@
     "dotenv": "^16.3.1",
     "graphql": "^16.8.1",
     "graphql-scalars": "^1.22.4",
+    "prisma-extension-soft-delete": "^1.0.0",
     "reflect-metadata": "^0.1.13",
     "tsconfig-paths": "^4.2.0",
     "type-graphql": "^2.0.0-beta.3"

backend/prisma/migrations/20240110125636_newsletter_double_opt_in/migration.sql

@@ -0,0 +1,27 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `brevoSuccess` on the `NewsletterSubscription` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE `NewsletterSubscription` DROP COLUMN `brevoSuccess`,
+    ADD COLUMN `deletedAt` DATETIME(3) NULL,
+    MODIFY `email` VARCHAR(254) NOT NULL;
+
+-- CreateTable
+CREATE TABLE `NewsletterPreOptIn` (
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `firstName` VARCHAR(50) NOT NULL,
+    `lastName` VARCHAR(50) NOT NULL,
+    `email` VARCHAR(254) NOT NULL,
+    `code` VARCHAR(16) NOT NULL,
+    `validTill` DATETIME(3) NULL,
+    `createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+    `deletedAt` DATETIME(3) NULL,
+    `brevoSuccessMail` DATETIME(3) NULL,
+    `brevoSuccessList` DATETIME(3) NULL,
+
+    UNIQUE INDEX `NewsletterPreOptIn_code_key`(`code`),
+    PRIMARY KEY (`id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

backend/prisma/schema.prisma

@@ -8,20 +8,33 @@ datasource db {
 }
 
 model ContactForm {
-  id            Int      @id @default(autoincrement())
-  firstName     String   @db.VarChar(50)
-  lastName      String   @db.VarChar(50)
-  email         String   @db.VarChar(100)
-  content       String   @db.VarChar(255)
-  createdAt     DateTime @default(now())
-  brevoSuccess  DateTime?
+  id                Int      @id @default(autoincrement())
+  firstName         String   @db.VarChar(50)
+  lastName          String   @db.VarChar(50)
+  email             String   @db.VarChar(100)
+  content           String   @db.VarChar(255)
+  createdAt         DateTime @default(now())
+  brevoSuccess      DateTime?
 }
 
 model NewsletterSubscription {
-  id            Int      @id @default(autoincrement())
-  firstName     String   @db.VarChar(50)
-  lastName      String   @db.VarChar(50)
-  email         String   @db.VarChar(100)
-  createdAt     DateTime @default(now())
-  brevoSuccess  DateTime?
+  id                Int      @id @default(autoincrement())
+  firstName         String   @db.VarChar(50)
+  lastName          String   @db.VarChar(50)
+  email             String   @db.VarChar(254)
+  createdAt         DateTime @default(now())
+  deletedAt         DateTime?
 }
+
+model NewsletterPreOptIn {
+  id                Int      @id @default(autoincrement())
+  firstName         String   @db.VarChar(50)
+  lastName          String   @db.VarChar(50)
+  email             String   @db.VarChar(254)
+  code              String   @db.VarChar(16) @unique
+  validTill         DateTime?
+  createdAt         DateTime @default(now())
+  deletedAt         DateTime?
+  brevoSuccessMail  DateTime?
+  brevoSuccessList  DateTime?
+}