From 2bbb7b1ffbc3bcd6017898ea16316b4d3eb5b450 Mon Sep 17 00:00:00 2001 From: PxlLoewe <72106766+PxlLoewe@users.noreply.github.com> Date: Wed, 11 Jun 2025 20:25:25 -0700 Subject: [PATCH] remove environments from git --- .env.example | 82 ++++++++++++++++ .env.prod | 74 +++++++-------- .gitignore | 4 +- .../(app)/admin/station/_components/Form.tsx | 93 ++++--------------- docker-compose.mini.yml | 27 ------ 5 files changed, 137 insertions(+), 143 deletions(-) create mode 100644 .env.example delete mode 100644 docker-compose.mini.yml diff --git a/.env.example b/.env.example new file mode 100644 index 00000000..52aaa1f2 --- /dev/null +++ b/.env.example @@ -0,0 +1,82 @@ +# ─────────────────────────────────────────────── +# 🔐 Authentifizierung & Cookies +# ─────────────────────────────────────────────── +AUTH_DISPATCH_SECRET= +AUTH_HUB_SECRET= + +AUTH_DISPATCH_COOKIE_PREFIX= +AUTH_HUB_COOKIE_PREFIX= + +AUTH_DISPATCH_URL= +AUTH_HUB_URL= +NEXT_PUBLIC_DISPATCH_SERVICE_ID= + + +# ─────────────────────────────────────────────── +# 🌐 Öffentliche URLs +# ─────────────────────────────────────────────── +NEXT_PUBLIC_HUB_URL= +NEXT_PUBLIC_HUB_SERVER_URL= +NEXT_PUBLIC_DISPATCH_URL= +NEXT_PUBLIC_DISPATCH_SERVER_URL= +DISCORD_SERVER_URL= + + +NEXT_PUBLIC_ESRI_ACCESS_TOKEN= +NEXT_PUBLIC_OPENAIP_ACCESS= + +# ─────────────────────────────────────────────── +# 🗄️ Datenbank +# ─────────────────────────────────────────────── +DATABASE_URL= + +# ─────────────────────────────────────────────── +# 📡 LiveKit Konfiguration +# ─────────────────────────────────────────────── +NEXT_PUBLIC_LIVEKIT_URL= +LIVEKIT_API_KEY= +LIVEKIT_API_SECRET= + +# ─────────────────────────────────────────────── +# 🚦 Dispatch Server (Backend) +# ─────────────────────────────────────────────── +DISPATCH_SERVER_PORT= +DISPATCH_APP_TOKEN= + +REDIS_HOST= +REDIS_PORT= + +# ─────────────────────────────────────────────── +# 🧠 HUB Server (Backend) +# ─────────────────────────────────────────────── +HUB_SERVER_PORT= + +DISCORD_SERVER_PORT= +# ─────────────────────────────────────────────── +# 📚 Moodle +# ─────────────────────────────────────────────── +MOODLE_URL= +MOODLE_API_TOKEN= +MOODLE_USER_PASSWORD= +NEXT_PUBLIC_MOODLE_URL= + + +# ─────────────────────────────────────────────── +# 📧 E-Mail Einstellungen (nur HUB Server) +# ─────────────────────────────────────────────── +MAIL_SERVER= +MAIL_PORT= +MAIL_USER= +MAIL_PASSWORD= + +# ─────────────────────────────────────────────── +# 🕹️ Discord OAuth (optional) +# ─────────────────────────────────────────────── + +DISCORD_GUILD_ID= + +DISCORD_OAUTH_CLIENT_ID= +DISCORD_OAUTH_SECRET= +DISCORD_BOT_TOKEN= +DISCORD_REDIRECT_URL= +NEXT_PUBLIC_DISCORD_URL= \ No newline at end of file diff --git a/.env.prod b/.env.prod index 185f86ae..52aaa1f2 100644 --- a/.env.prod +++ b/.env.prod @@ -1,82 +1,82 @@ # ─────────────────────────────────────────────── # 🔐 Authentifizierung & Cookies # ─────────────────────────────────────────────── -AUTH_DISPATCH_SECRET=dispatch -AUTH_HUB_SECRET=var +AUTH_DISPATCH_SECRET= +AUTH_HUB_SECRET= -AUTH_DISPATCH_COOKIE_PREFIX=DISPATCH -AUTH_HUB_COOKIE_PREFIX=HUB +AUTH_DISPATCH_COOKIE_PREFIX= +AUTH_HUB_COOKIE_PREFIX= -AUTH_DISPATCH_URL=https://dispatch.premiumag.de -AUTH_HUB_URL=https://hub.premiumag.de -NEXT_PUBLIC_DISPATCH_SERVICE_ID=1 +AUTH_DISPATCH_URL= +AUTH_HUB_URL= +NEXT_PUBLIC_DISPATCH_SERVICE_ID= # ─────────────────────────────────────────────── # 🌐 Öffentliche URLs # ─────────────────────────────────────────────── -NEXT_PUBLIC_HUB_URL=https://hub.premiumag.de -NEXT_PUBLIC_HUB_SERVER_URL=https://api.hub.premiumag.de -NEXT_PUBLIC_DISPATCH_URL=https://dispatch.premiumag.de -NEXT_PUBLIC_DISPATCH_SERVER_URL=https://api.dispatch.premiumag.de -DISCORD_SERVER_URL=http://discord-server:3000 +NEXT_PUBLIC_HUB_URL= +NEXT_PUBLIC_HUB_SERVER_URL= +NEXT_PUBLIC_DISPATCH_URL= +NEXT_PUBLIC_DISPATCH_SERVER_URL= +DISCORD_SERVER_URL= NEXT_PUBLIC_ESRI_ACCESS_TOKEN= -NEXT_PUBLIC_OPENAIP_ACCESS=6e85069940543ef02f8615b737059d98 +NEXT_PUBLIC_OPENAIP_ACCESS= # ─────────────────────────────────────────────── # 🗄️ Datenbank # ─────────────────────────────────────────────── -DATABASE_URL=postgresql://persistant-data:persistant-data-pw@postgres:5432/var +DATABASE_URL= # ─────────────────────────────────────────────── # 📡 LiveKit Konfiguration # ─────────────────────────────────────────────── -NEXT_PUBLIC_LIVEKIT_URL=wss://livekit.premiumag.de -LIVEKIT_API_KEY=APIAnsGdtdYp2Ho -LIVEKIT_API_SECRET=tdPjVsYUx8ddC7K9NvdmVAeLRF9GeADD6Fedm1x63fWC +NEXT_PUBLIC_LIVEKIT_URL= +LIVEKIT_API_KEY= +LIVEKIT_API_SECRET= # ─────────────────────────────────────────────── # 🚦 Dispatch Server (Backend) # ─────────────────────────────────────────────── -DISPATCH_SERVER_PORT=3000 -DISPATCH_APP_TOKEN=dispatch +DISPATCH_SERVER_PORT= +DISPATCH_APP_TOKEN= -REDIS_HOST=redis -REDIS_PORT=6379 +REDIS_HOST= +REDIS_PORT= # ─────────────────────────────────────────────── # 🧠 HUB Server (Backend) # ─────────────────────────────────────────────── -HUB_SERVER_PORT=3000 +HUB_SERVER_PORT= -DISCORD_SERVER_PORT=3000 +DISCORD_SERVER_PORT= # ─────────────────────────────────────────────── # 📚 Moodle # ─────────────────────────────────────────────── -MOODLE_URL=https://02.premiumag.de:8081 -MOODLE_API_TOKEN=ac346f0324647b68488d13fd52a9bbe8 -MOODLE_USER_PASSWORD=var-api-user-P1 -NEXT_PUBLIC_MOODLE_URL=https://02.premiumag.de:8081 +MOODLE_URL= +MOODLE_API_TOKEN= +MOODLE_USER_PASSWORD= +NEXT_PUBLIC_MOODLE_URL= # ─────────────────────────────────────────────── # 📧 E-Mail Einstellungen (nur HUB Server) # ─────────────────────────────────────────────── -MAIL_SERVER=asmtp.mail.hostpoint.ch -MAIL_PORT=465 -MAIL_USER=noreply@virtualairrescue.com -MAIL_PASSWORD=b7316PB8aDPCC%-& +MAIL_SERVER= +MAIL_PORT= +MAIL_USER= +MAIL_PASSWORD= # ─────────────────────────────────────────────── # 🕹️ Discord OAuth (optional) # ─────────────────────────────────────────────── -DISCORD_GUILD_ID=1077269395019141140 +DISCORD_GUILD_ID= -DISCORD_OAUTH_CLIENT_ID=930384053344034846 -DISCORD_OAUTH_SECRET=96aSvmIePqFTbGc54mad0QsZfDnYwhl1 -DISCORD_BOT_TOKEN=OTMwMzg0MDUzMzQ0MDM0ODQ2.G7zIy-._hE3dTbtUv6sd7nIP2PUn3d8s-2MFk0x3nYMg8 -DISCORD_REDIRECT_URL=https://hub.premiumag.de/api/discord-redirect -NEXT_PUBLIC_DISCORD_URL=https://discord.com/oauth2/authorize?client_id=930384053344034846&response_type=code&redirect_uri=https%3A%2F%2Fhub.premiumag.de%2Fapi%2Fdiscord-redirect&scope=identify+guilds+email \ No newline at end of file +DISCORD_OAUTH_CLIENT_ID= +DISCORD_OAUTH_SECRET= +DISCORD_BOT_TOKEN= +DISCORD_REDIRECT_URL= +NEXT_PUBLIC_DISCORD_URL= \ No newline at end of file diff --git a/.gitignore b/.gitignore index d4c20c85..c47bc39c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,9 +18,7 @@ mkcert # Local env files .env .env.local -.env.development.local -.env.test.local -.env.production.local +.env.prod # Testing coverage diff --git a/apps/hub/app/(app)/admin/station/_components/Form.tsx b/apps/hub/app/(app)/admin/station/_components/Form.tsx index 0cf23c93..c8d33908 100644 --- a/apps/hub/app/(app)/admin/station/_components/Form.tsx +++ b/apps/hub/app/(app)/admin/station/_components/Form.tsx @@ -34,30 +34,15 @@ export const StationForm = ({ station }: { station?: Station }) => {

Allgemeines

- + - - + + { /> - + - - Ausgerüstet mit: - + Ausgerüstet mit:
@@ -179,14 +135,8 @@ export const StationForm = ({ station }: { station?: Station }) => { step="any" /> @@ -195,12 +145,7 @@ export const StationForm = ({ station }: { station?: Station }) => {

Hubschrauber

- + {
- {station && ( diff --git a/docker-compose.mini.yml b/docker-compose.mini.yml deleted file mode 100644 index eb00514d..00000000 --- a/docker-compose.mini.yml +++ /dev/null @@ -1,27 +0,0 @@ -services: - redis: - container_name: redis - image: redis/redis-stack:latest - ports: - - "6379:6379" - volumes: - - "redis_data:/data" - # Für den Zugriff auf den Host - livekit-server: - image: livekit/livekit-server - container_name: livekit_server - restart: unless-stopped - ports: - - "7880:7880" - - "7881:7881" - - "7882:7882/udp" - volumes: - - "./livekit.yaml:/livekit.yaml" - command: - - "--config" - - "/livekit.yaml" - - "--node-ip=127.0.0.1" - -volumes: - redis_data: - driver: local