Legger til submissions

Author: joachimhs

Dockerfile.dev

@@ -3,4 +3,4 @@ WORKDIR /app
 COPY package*.json ./
 RUN npm ci
 EXPOSE 5175
-CMD ["npm", "run", "dev", "--", "--host", "0.0.0.0", "--port", "5175"]
+CMD ["sh", "-c", "npx drizzle-kit migrate && npm run dev -- --host 0.0.0.0 --port 5175"]

docker-compose.prod.yml

@@ -14,15 +14,27 @@ services:
       timeout: 5s
       retries: 5
 
+  nginx:
+    image: nginx:alpine
+    restart: unless-stopped
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
+      - ${SSL_CERT_DIR:-./ssl}:/etc/nginx/ssl:ro
+    depends_on:
+      - app
+
   app:
     image: ghcr.io/javabin/javabinkids:${JZ_KIDS_VERSION:-latest}
     restart: unless-stopped
-    ports:
-      - "${APP_PORT:-3000}:3000"
+    expose:
+      - "3000"
     environment:
       DATABASE_URL: postgres://${DB_USER:-javabin}:${DB_PASSWORD}@db:5432/${DB_NAME:-javabinkids}
-      RESEND_API_KEY: ${RESEND_API_KEY}
-      BASE_URL: ${BASE_URL}
+      SENDGRID_API_KEY: ${SENDGRID_API_KEY}
+      BASE_URL: ${BASE_URL:-https://jzkids.skaperiet.no}
       NODE_ENV: production
     depends_on:
       db:

docker-compose.yml

@@ -28,7 +28,7 @@ services:
       - /app/node_modules
     environment:
       DATABASE_URL: postgres://javabin:javabin@db:5432/javabinkids
-      RESEND_API_KEY: ${RESEND_API_KEY:-re_your_api_key}
+      SENDGRID_API_KEY: ${SENDGRID_API_KEY:-SG.your_api_key}
       ADMIN_USERNAME: ${ADMIN_USERNAME:-admin}
       ADMIN_PASSWORD: ${ADMIN_PASSWORD:-changeme}
       BASE_URL: http://localhost:5175

drizzle/migrations/0005_add_submissions.sql

@@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS "submissions" (
+	"submissionId" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"arrangementId" uuid NOT NULL,
+	"status" text DEFAULT 'submitted' NOT NULL,
+	"title" text NOT NULL,
+	"description" text NOT NULL,
+	"equipmentRequirements" text,
+	"ageMin" integer NOT NULL,
+	"ageMax" integer NOT NULL,
+	"maxParticipants" integer NOT NULL,
+	"speakerName" text NOT NULL,
+	"speakerEmail" text NOT NULL,
+	"speakerBio" text NOT NULL,
+	"editToken" uuid DEFAULT gen_random_uuid() NOT NULL,
+	"createdAt" timestamp DEFAULT now() NOT NULL,
+	"updatedAt" timestamp DEFAULT now() NOT NULL
+);
+
+ALTER TABLE "submissions" ADD CONSTRAINT "submissions_arrangementId_events_arrangementId_fk" FOREIGN KEY ("arrangementId") REFERENCES "events"("arrangementId") ON DELETE restrict ON UPDATE no action;
+
+ALTER TABLE "events" ADD COLUMN "openForSubmissions" boolean DEFAULT false NOT NULL;
+ALTER TABLE "events" ADD COLUMN "submissionDeadline" timestamp;

drizzle/migrations/meta/0005_snapshot.json

@@ -0,0 +1,15 @@
+{
+  "id": "0005_add_submissions",
+  "prevId": "0004_add_images_and_consent",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {},
+  "enums": {},
+  "schemas": {},
+  "sequences": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  }
+}

drizzle/migrations/meta/_journal.json

@@ -36,6 +36,13 @@
       "when": 1773900060000,
       "tag": "0004_add_images_and_consent",
       "breakpoints": true
+    },
+    {
+      "idx": 5,
+      "version": "7",
+      "when": 1774258800000,
+      "tag": "0005_add_submissions",
+      "breakpoints": true
     }
   ]
 }

nginx.conf

@@ -0,0 +1,24 @@
+server {
+    listen 80;
+    server_name jzkids.skaperiet.no;
+    return 301 https://$server_name$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name jzkids.skaperiet.no;
+
+    ssl_certificate /etc/nginx/ssl/STAR_skaperiet_no_chain.crt;
+    ssl_certificate_key /etc/nginx/ssl/skaperiet_no.key;
+
+    client_max_body_size 20M;
+
+    location / {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        proxy_pass http://app:3000;
+    }
+}