Merge branch 'dev' into prod

backend/routes/default/frontend.data.js

@@ -51,7 +51,6 @@ export const confirmUser = async (username) => {
         EMail Varchar(100) NOT NULL,
         Telefonnummer Varchar(100) NOT NULL,
         Lose INT NOT NULL,
-        Schokolade BOOLEAN NOT NULL,
         Firmenname Varchar(100),
         Vorname_Geschaeftlich Varchar(100),
         Nachname_Geschaeftlich Varchar(100),
@@ -94,7 +93,7 @@ export const newEntry = async (formData, username, prizeDraw) => {
   const tableName = confirmation.tableName;
 
   const [result] = await pool.query(
-    `INSERT INTO ?? (Verlosung, Vorname, Nachname, EMail, Telefonnummer, Lose, Schokolade, Firmenname, Vorname_Geschaeftlich, Nachname_Geschaeftlich, EMail_Geschaeftlich, Telefonnummer_Geschaeftlich, Strasse_Hausnr, Plz_Ort, Zahlungsmethode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+    `INSERT INTO ?? (Verlosung, Vorname, Nachname, EMail, Telefonnummer, Lose, Firmenname, Vorname_Geschaeftlich, Nachname_Geschaeftlich, EMail_Geschaeftlich, Telefonnummer_Geschaeftlich, Strasse_Hausnr, Plz_Ort, Zahlungsmethode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
     [
       tableName,
       prizeDraw,
@@ -103,7 +102,6 @@ export const newEntry = async (formData, username, prizeDraw) => {
       formData.email,
       formData.phoneNumber,
       formData.tickets,
-      formData.chocolates,
       formData.companyName,
       formData.cmpFirstName,
       formData.cpmLastName,

docker-compose.yml

@@ -1,16 +1,19 @@
 services:
-  #  frontend:
-  #    container_name: ca-lose-frontend
-  #    build: ./frontend
-  #    ports:
-  #      - "8002:80"
-  #    restart: unless-stopped
+  frontend:
+    container_name: ca-lose-frontend
+    hostname: lose-verkaufen
+    build: ./frontend
+    depends_on:
+      - backend
+    networks:
+      ca-lose-internal:
+        ipv4_address: 172.25.0.2
+    restart: unless-stopped
 
   backend:
     container_name: ca-lose-backend
+    hostname: backend
     build: ./backend
-    ports:
-      - "8004:8004"
     environment:
       NODE_ENV: production
       DB_HOST: ca-lose-mysql
@@ -19,21 +22,78 @@ services:
       DB_NAME: ca_lose
     depends_on:
       - database
+    networks:
+      ca-lose-internal:
+        ipv4_address: 172.25.0.3
     restart: unless-stopped
 
   database:
     container_name: ca-lose-mysql
+    hostname: database
     image: mysql:8.0
     restart: unless-stopped
-    ports:
-      - "3311:3306"
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
       MYSQL_DATABASE: ca_lose
       TZ: Europe/Berlin
     volumes:
-      - ./.docker/volumes/ca-lose_mysql:/var/lib/mysql
+      - ../docker/volumes/ca-lose_mysql:/var/lib/mysql
       - ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro
+    networks:
+      ca-lose-internal:
+        ipv4_address: 172.25.0.4
 
+  # DNS Server for hostname resolution within the Docker network
+  dnsmasq:
+    container_name: ca-lose-dns
+    image: andyshinn/dnsmasq:latest
+    restart: unless-stopped
+    cap_add:
+      - NET_ADMIN
+    command: >
+      --no-daemon
+      --log-queries
+      --address=/lose-verkaufen/172.25.0.2
+      --address=/frontend/172.25.0.2
+      --address=/backend/172.25.0.3
+      --address=/database/172.25.0.4
+      --address=/wireguard/172.25.0.6
+    networks:
+      ca-lose-internal:
+        ipv4_address: 172.25.0.5
+
+  # WireGuard VPN server for secure remote access to the Docker network
+  wireguard:
+    build: ./wg-easy-ca-lose
+    container_name: ca-lose-wireguard
+    cap_add:
+      - NET_ADMIN
+      - SYS_MODULE
+    environment:
+      WG_HOST: dus3.the1s.de
+      INSECURE: "true"
+      HOST: "172.25.0.6"
+      PORT: "80"
     volumes:
-  ca-lose_mysql:
+      - ../docker/volumes/ca-lose-wireguard-v15:/etc/wireguard
+      - /lib/modules:/lib/modules:ro
+    ports:
+      - "51830:51830/udp"
+    #      - "51831:51821/tcp" Public Web-UI Port
+    sysctls:
+      - net.ipv4.ip_forward=1
+      - net.ipv4.conf.all.src_valid_mark=1
+    restart: unless-stopped
+    depends_on:
+      - dnsmasq
+    networks:
+      ca-lose-internal:
+        ipv4_address: 172.25.0.6
+
+networks:
+  ca-lose-internal:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 172.25.0.0/24
+          gateway: 172.25.0.1

frontend/src/config/interfaces.config.ts

@@ -46,7 +46,6 @@ export const createFormSchema = (
     email: z.email(t("email-error")),
     phoneNumber: z.string(t("phone-error")).refine(validator.isMobilePhone),
     tickets: z.number(t("ticket-error")).min(1),
-    chocolates: z.boolean(t("chocolates-error")),
     companyName: invoice
       ? z.string().min(1, t("name-error"))
       : z.string().optional(),

frontend/src/pages/MainForm.tsx

@@ -72,8 +72,7 @@ export const MainForm = () => {
       lastName: "",
       email: "",
       phoneNumber: "",
-      tickets: 0,
-      chocolates: false,
+      tickets: 1,
       companyName: "",
       cmpFirstName: "",
       cpmLastName: "",
@@ -317,7 +316,7 @@ export const MainForm = () => {
               )}
             </Field>
 
-            {/* Tickets + Invoice + Chocolate toggle */}
+            {/* Tickets + Invoice toggle */}
             <div className="grid grid-cols-2 gap-3 items-end">
               <FormControl required>
                 <FormLabel>{t("tickets")}</FormLabel>
@@ -331,14 +330,12 @@ export const MainForm = () => {
                       <>
                         <Input
                           type="number"
-                          value={
-                            field.state.value === 0 ? "" : field.state.value
-                          }
+                          value={field.state.value ?? ""}
                           onBlur={field.handleBlur}
-                          onChange={(e) => {
-                            const val = e.target.value;
-                            field.handleChange(val === "" ? 0 : Number(val));
-                          }}
+                          onChange={(e) =>
+                            field.handleChange(Number(e.target.value))
+                          }
+                          slotProps={{ input: { min: 1 } }}
                           variant="soft"
                           sx={{ borderRadius: "10px" }}
                         />
@@ -352,7 +349,7 @@ export const MainForm = () => {
                   }}
                 </Field>
               </FormControl>
-              <div className="flex flex-col gap-2 pb-2">
+              <div className="flex items-center pb-2">
                 <Checkbox
                   checked={invoice}
                   onChange={(e) => {
@@ -371,16 +368,6 @@ export const MainForm = () => {
                   label={t("invoice")}
                   variant="outlined"
                 />
-                <Field name="chocolates">
-                  {(field) => (
-                    <Checkbox
-                      checked={!!field.state.value}
-                      onChange={(e) => field.handleChange(e.target.checked)}
-                      label={t("chocolates")}
-                      variant="outlined"
-                    />
-                  )}
-                </Field>
               </div>
             </div>
 

frontend/src/utils/i18n/locales/de/de.json

@@ -35,7 +35,5 @@
     "name-error": "Sie müssen einen Namen eingeben!",
     "email-error": "Sie müssen eine gültige E-Mail Adresse eingeben!",
     "phone-error": "Sie müssen eine gültige Telefonnummer eingeben!",
-    "footer-headline": "Dieses System wurde vollständig konzipiert und entwickelt von Theis Gaedigk. - Portfolio: ",
-    "chocolates": "Schokoladen",
-    "chocolates-error": "Dieses Feld kann nur wahr oder falsch sein."
+    "footer-headline": "Dieses System wurde vollständig konzipiert und entwickelt von Theis Gaedigk. - Portfolio: "
 }

frontend/src/utils/i18n/locales/en/en.json

@@ -36,7 +36,5 @@
     "name-error": "You have to enter a name!",
     "email-error": "You have to enter a valid E-Mail adress!",
     "phone-error": "You have to enter a vaild phone number!",
-    "footer-headline": "This system was fully designed and developed by Theis Gaedigk. - Portfolio: ",
-    "chocolates": "Chocolates",
-    "chocolates-error": "This field can only be true or false."
+    "footer-headline": "This system was fully designed and developed by Theis Gaedigk. - Portfolio: "
 }