Skip to content

Commit c9a2928

Browse files
authored
Merge pull request #1 from NoahStapp/add-frontend
Add React frontend + fix docker
2 parents 248c9f4 + fc635ae commit c9a2928

File tree

148 files changed

+4101
-11773
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+4101
-11773
lines changed

.DS_Store

-6 KB
Binary file not shown.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ testing-project
33
.mypy_cache
44
# poetry.lock
55
dev-link/
6+
7+
.DS_Store

cookiecutter.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@
4646

4747
"_copy_without_render": [
4848
"frontend/**/*.html",
49-
"frontend/**/*.vue",
50-
"frontend/.nuxt/*",
49+
"frontend/**/*.tsx",
50+
"frontend/**/*.ico",
51+
"frontend/.next/*",
5152
"frontend/node_modules/*",
5253
"backend/app/app/email-templates/**"
5354
]

{{cookiecutter.project_slug}}/.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ docker-stack.yml
44
*.txt
55
.env
66
*.code-workspace
7-
.s3cfg
7+
.s3cfg
8+
9+
.DS_Store
Binary file not shown.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
__pycache__
22
app.egg-info
3+
4+
.DS_Store

{{cookiecutter.project_slug}}/docker-compose.override.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,10 @@ services:
7171

7272
frontend:
7373
ports:
74-
- "24678:24678"
75-
volumes:
76-
# https://stackoverflow.com/a/32785014
77-
- ./frontend:/frontend
78-
- node_modules:/frontend/node_modules
74+
- "3000:3000"
7975
build:
8076
context: ./frontend
81-
target: run-dev
77+
target: runner
8278
labels:
8379
- traefik.enable=true
8480
- traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set}

{{cookiecutter.project_slug}}/docker-compose.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,9 @@ services:
170170
image: "${DOCKER_IMAGE_FRONTEND?Variable not set}:${TAG-latest}"
171171
env_file:
172172
- .env
173-
- ./frontend/.env
174-
environment:
175-
- NUXT_HOST=0.0.0.0
176-
- NUXT_PORT=80
177-
- NITRO_HOST=0.0.0.0
178-
- NITRO_PORT=80
173+
- ./frontend/.env.local
179174
build:
180175
context: ./frontend
181-
args:
182-
NUXT_VERSION: ${NUXT_VERSION:-^3.5}
183176
deploy:
184177
labels:
185178
- traefik.enable=true

{{cookiecutter.project_slug}}/frontend/.dockerignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

{{cookiecutter.project_slug}}/frontend/.editorconfig

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)