Skip to content

Commit

Permalink
Merge branch 'apitwo'
Browse files Browse the repository at this point in the history
  • Loading branch information
eatenpancreas committed Feb 21, 2024
2 parents 9a252a1 + ec53d3e commit 3b22116
Show file tree
Hide file tree
Showing 141 changed files with 9,414 additions and 8,435 deletions.
6 changes: 6 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
target
node_modules
.idea
.svelte-kit
build
.env
17 changes: 12 additions & 5 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
# MAKE SURE TO ALSO USE compose.example.yml TO SET UP DOCKER AND USE THE RIGHT PASSWORD

# set these postgres credentials
DATABASE_URL="postgresql://USERNAME:PASS@HOST:PORT/DATABASE?schema=public"
# PROD: postgresql://postgres:PASS@host.docker.internal:5432/traps?schema=public
DATABASE_URL="postgresql://USERNAME:PASS@localhost:5432/traps?schema=public"
# set this to a random string
JWT_SECRET=secret

# Email authentication for users- this example uses Brevo. This is optional
# PROD: 0.0.0.0
API_ADDRESS=127.0.0.1
API_PORT=8080
SKIP_AUTH=false

# Email authentication for users- this example uses Brevo. CURRENTLY NOT IMPLEMENTED
EMAIL_AUTH_ENABLED=false
EMAIL_HOST=smtp-relay.brevo.com
EMAIL_PORT=587
Expand All @@ -18,5 +24,6 @@ VITE_PROJECT_BASE_TAGS="cool, api"
VITE_PROJECT_AUTHOR="author"

# This will be used to generate the email verification link
# Important: Change this, otherwise email auth will not work
VITE_PROJECT_URL="http://localhost:5173"
# PROD: change localhost to 0.0.0.0
VITE_PROJECT_URL="http://localhost:5173"
VITE_API_URL="http://localhost:8080"
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ node_modules
!.env.example
vite.config.js.timestamp-*
vite.config.ts.timestamp-*

api/target/
api/Cargo.lock

target/
compose.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3b22116

Please sign in to comment.