Flask now serves the frontend
continuous-integration/drone the build failed Details

pull/20/head
Jef Roosens 2021-05-18 22:06:37 +02:00
parent f5b443d271
commit 0d693847b1
Signed by: Jef Roosens
GPG Key ID: 955C0660072F691F
3 changed files with 22 additions and 14 deletions

View File

@ -47,7 +47,7 @@ COPY --chown=runner:runner setup.cfg setup.py ./
COPY \
--from=fbuilder \
--chown=runner:runner \
/usr/src/app/web/dist ./dist
/usr/src/app/web/dist ./web/dist
ENTRYPOINT ["python"]
CMD ["app"]

View File

@ -8,8 +8,16 @@ MIN_COV := 0
WEB_DIR := web
# By default, just create the venv when needed
# =====GENERAL=====
## By default, create the venv
all: venv
.PHONY: all
## Remove any temporary files
clean:
@ rm -rf '$(VENV)' '$(WEB_DIR)'/node_modules
.PHONY: clean
# =====BACKEND=====
@ -44,13 +52,6 @@ test: venv
.PHONY: test
## Cleaning
### Remove the venv
clean:
@ rm -rf '$(VENV)' '$(WEB_DIR)'/node_modules
.PHONY: clean
## Starting the server
### Run the Quart server
run: venv
@ -82,6 +83,7 @@ fformat: node_modules
## Testing
ftest: node_modules
@ yarn --cwd '$(WEB_DIR)' test
.PHONY: ftest
## Building
fbuild: node_modules
@ -94,3 +96,9 @@ fbuild: node_modules
dbuild:
@ DOCKER_BUILDKIT=1 docker build -t chewingbever/jos:dev .
.PHONY: image
## Run image
drun: dbuild
@ docker run --rm -it -p 5000:5000 chewingbever/jos:dev
.PHONY: drun

View File

@ -1,13 +1,13 @@
"""Main entrypoint for the program."""
from quart import Quart
app = Quart("jos")
app = Quart("jos", static_folder="web/dist", static_url_path="/")
@app.route("/")
async def hello():
"""Placeholder route."""
return "hello"
@app.route('/', methods=['GET'], defaults={'path': ''})
@app.route('/<path:path>', methods=['GET'])
async def frontend(path):
return await app.send_static_file("index.html")
app.run(host="0.0.0.0")