Merge branch 'main' of https://github.com/tripsit/TripBot into hipper…

…ooni-branch

.env.example

@@ -1,21 +1,60 @@
+# Copy this file and rename it as .env in the same directory
+# Fill in the REQUIRED values
+
+# REQUIRED Discord Bot settings
+DISCORD_GUILD_ID = 960606557622657026 # Keep this as the dev server
+DISCORD_OWNER_ID = 1234 # Your discord ID
+DISCORD_CLIENT_ID = 1234 # In your Discord Developer Portal
+DISCORD_CLIENT_TOKEN = abc123 # In your Discord Developer Portal
+PRISMA_DB_URL = postgres://tripsit:SuperSecure123@tripbot_database:5432/tripsit
+POSTGRES_DB_URL = postgres://tripsit:SuperSecure123@tripbot_database:5432/tripsit
+
+# REQUIRED Database password
+# This shold be the same as the PRISMA_DB_URL and POSTGRS_DB_URL passwords
+POSTGRESQL_PASSWORD = SuperSecure123
+
+## Everything after this is OPTIONAL
+
+# Keep as development
 NODE_ENV = development
 
-DISCORD_CLIENT_ID = In your Discord Developer Portal
-DISCORD_CLIENT_TOKEN = In your Discord Developer Portal
-DISCORD_GUILD_ID = 960606557622657026
+# Feel free to change
+TIME_ZONE = "America/Chicago"
+TZ = "America/Chicago"
 
-MATRIX_ACCESS_TOKEN = <Optional>
+# Used for docker
+COMPOSE_PROJECT_NAME = 'tripbot'
+XID = 1000
+PUID = 1000
+PGID = 1000
 
-MOODLE_TOKEN = <Optional>
+# Domains
+DNS_DOMAIN = localhost
 
-POSTGRES_DB_URL_EXAMPLE = postgres://tripsit_api:P@ssw0rd@localhost:5432/tripsit
+# PG Admin
+PGADMIN_PASSWORD = SuperSecure123
 
+# Discord OAuth
 DISCORD_CLIENT_SECRET = <Optional>
 DISCORD_CLIENT_REDIRECT_URI = <Optional>
-GITHUB_TOKEN = <Optional>
-RAPID_TOKEN  <Optional>
-WOLFRAM_TOKEN = <Optional>
-IMGUR_ID = <Optional>
-IMGUR_SECRET = <Optional>
-YOUTUBE_TOKEN = <Optional>
-IMDB_TOKEN = <Optional>
+
+# Matrix bot 
+MATRIX_ACCESS_TOKEN = <Optional>
+
+# Telegram bot
+TELEGRAM_TOKEN = <Optional>
+
+# OpenAI
+OPENAI_API_ORG = <Optional>
+OPENAI_API_KEY = <Optional>
+
+# Other API Tokens
+MOODLE_TOKEN = <Optional> # For Moodle API
+GITHUB_TOKEN = <Optional> # For GitHub API
+RAPID_TOKEN  <Optional> # For RapidAPI
+WOLFRAM_TOKEN = <Optional> # For WolframAlpha API
+IMGUR_ID = <Optional> # For Imgur API
+IMGUR_SECRET = <Optional> # For Imgur API
+YOUTUBE_TOKEN = <Optional> # For YouTube API
+IMDB_TOKEN = <Optional> # For IMDB API
+```

docker-compose.yml

@@ -162,7 +162,6 @@ services:
       - traefik.http.routers.tripbot_api.tls.certresolver=letsencrypt
       - traefik.http.routers.tripbot_api.service=tripbot_api-svc
       - traefik.http.routers.tripbot_api.middlewares=default@file
-    command: npx tsc-watch --onSuccess "npx nodemon --config ./src/api/nodemon.json"
 
 networks:
   tripbot-net: