diff --git a/api/.gitignore b/api/.gitignore index d3f46a1..3f4260f 100644 --- a/api/.gitignore +++ b/api/.gitignore @@ -1,164 +1,3 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ -cover/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -.pybuilder/ -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -# For a library or package, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# .python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# poetry -# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. -# This is especially recommended for binary packages to ensure reproducibility, and is more -# commonly ignored for libraries. -# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control -#poetry.lock - -# pdm -# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. -#pdm.lock -# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it -# in version control. -# https://pdm.fming.dev/#use-with-ide -.pdm.toml - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ -lib64/ -lib64 -bin/ -lib/ -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -# pytype static type analyzer -.pytype/ - -# Cython debug symbols -cython_debug/ - -# PyCharm -# JetBrains specific template is maintained in a separate JetBrains.gitignore that can -# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore -# and can be added to the global gitignore or merged into this file. For a more nuclear -# option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ - +# Created by venv; see https://docs.python.org/3/library/venv.html +*.sql +db.* diff --git a/api/Dockerfile b/api/Dockerfile new file mode 100644 index 0000000..abced25 --- /dev/null +++ b/api/Dockerfile @@ -0,0 +1,10 @@ +FROM python:latest + +WORKDIR /app + +COPY . /app + +COPY requirements.txt requirements.txt +RUN pip3 install -r requirements.txt + +CMD [ "python3", "-m" , "flask", "run", "--host=0.0.0.0"] diff --git a/api/serv.py b/api/app.py similarity index 100% rename from api/serv.py rename to api/app.py diff --git a/api/pyvenv.cfg b/api/pyvenv.cfg index c9efe48..9de90cb 100644 --- a/api/pyvenv.cfg +++ b/api/pyvenv.cfg @@ -1,5 +1,5 @@ -home = /usr/lib/python-exec/python3.12 +home = /usr/lib/python-exec/python3.13 include-system-site-packages = false -version = 3.12.7 -executable = /usr/bin/python3.12 -command = /usr/lib/python-exec/python3.12/python -m venv /ssd/src/helloasso/api +version = 3.13.9 +executable = /usr/bin/python3.13 +command = /usr/lib/python-exec/python3.13/python -m venv --upgrade /ssd/src/helloasso/api diff --git a/api/requirements.txt b/api/requirements.txt index a1ab5bc..cd5a476 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -1,12 +1,12 @@ blinker==1.9.0 -click==8.1.7 -Flask==3.1.0 -Flask-Cors==5.0.0 +click==8.3.1 +Flask==3.1.2 +flask-cors==6.0.1 flask-sock==0.7.0 -h11==0.14.0 +h11==0.16.0 itsdangerous==2.2.0 -Jinja2==3.1.4 -MarkupSafe==3.0.2 +Jinja2==3.1.6 +MarkupSafe==3.0.3 simple-websocket==1.1.0 -Werkzeug==3.1.3 -wsproto==1.2.0 +Werkzeug==3.1.4 +wsproto==1.3.2 diff --git a/frontend/Dockerfile b/frontend/Dockerfile new file mode 100644 index 0000000..e96f17f --- /dev/null +++ b/frontend/Dockerfile @@ -0,0 +1,19 @@ +FROM node:latest as build + +WORKDIR /app + +COPY package*.json ./ + +RUN npm install + +RUN npm install -g @angular/cli + +COPY . . + +RUN ng build --configuration=production + +FROM nginx:latest +COPY ./nginx.conf /etc/nginx/conf.d/default.conf +COPY --from=build app/dist/helloasso/browser/ /usr/share/nginx/html + +EXPOSE 80 diff --git a/frontend/nginx.conf b/frontend/nginx.conf new file mode 100644 index 0000000..cf7ab9c --- /dev/null +++ b/frontend/nginx.conf @@ -0,0 +1,10 @@ +server { + listen 0.0.0.0:80; + listen [::]:80; + + root /usr/share/nginx/html; + + location / { + try_files $uri $uri/ /index.html =404; + } +}