diff --git a/.dockerignore b/.dockerignore index 4118205..66ff579 100644 --- a/.dockerignore +++ b/.dockerignore @@ -25,10 +25,10 @@ venv_old/ *.sqlite3 # Django media & static -streetup/media/ -streetup/private_media/ -streetup/static/ -streetup/django.log +loko/media/ +loko/private_media/ +loko/static/ +loko/django.log *.log # VS Code / Editor config diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 995dd4e..577de22 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,4 +1,4 @@ -name: Build and Deploy StreetUp +name: Build and Deploy Loko on: workflow_dispatch: @@ -13,7 +13,7 @@ on: - production env: - REGISTRY: ghcr.io + REGISTRY: registry.valogeo.be IMAGE_NAME: ${{ github.repository }} jobs: @@ -80,11 +80,11 @@ jobs: if [[ "$ENV_CHOICE" == "production" ]]; then echo "env=production" >> $GITHUB_OUTPUT echo "host=${{ secrets.SSH_HOST_PROD }}" >> $GITHUB_OUTPUT - echo "path=/home/kdeterme/streetup-prod" >> $GITHUB_OUTPUT + echo "path=/home/kdeterme/loko-prod" >> $GITHUB_OUTPUT else echo "env=test" >> $GITHUB_OUTPUT echo "host=${{ secrets.SSH_HOST_TEST }}" >> $GITHUB_OUTPUT - echo "path=/home/kdeterme/streetup-test" >> $GITHUB_OUTPUT + echo "path=/home/kdeterme/loko-test" >> $GITHUB_OUTPUT fi - name: Deploy to Server via SSH diff --git a/.gitignore b/.gitignore index f33cdc2..72f0f9e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,8 @@ node_modules/ *.log *.md !README.md -!streetup/common/help_docs/ -!streetup/common/help_docs/**/*.md +!loko/common/help_docs/ +!loko/common/help_docs/**/*.md media/ private_media/ @@ -25,18 +25,18 @@ __pycache__/ *$py.class -streetup/.env +loko/.env scripts/ carl_export/ carl_export.* -streetup/static/ +loko/static/ deploy.sh generated_passwords.txt -streetup/generated_passwords.txt +loko/generated_passwords.txt scratch/ Caddyfile Caddyfile.prod diff --git a/Dockerfile b/Dockerfile index 63dc4ef..56e63fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # Création de l'environnement conda avec les packages cartographiques et poppler # gdal, geos, proj et poppler sont installés depuis conda-forge -RUN mamba create -n streetup-env -y -c conda-forge \ +RUN mamba create -n loko-env -y -c conda-forge \ python=3.12 \ gdal \ geos \ @@ -35,13 +35,13 @@ RUN mamba create -n streetup-env -y -c conda-forge \ && mamba clean -afy # Activation par défaut de l'environnement Conda dans le conteneur -ENV PATH=/opt/conda/envs/streetup-env/bin:$PATH -ENV CONDA_DEFAULT_ENV=streetup-env +ENV PATH=/opt/conda/envs/loko-env/bin:$PATH +ENV CONDA_DEFAULT_ENV=loko-env # Configuration explicite des variables GIS pour GeoDjango -ENV GDAL_LIBRARY_PATH=/opt/conda/envs/streetup-env/lib/libgdal.so -ENV GEOS_LIBRARY_PATH=/opt/conda/envs/streetup-env/lib/libgeos_c.so -ENV PROJ_DATA=/opt/conda/envs/streetup-env/share/proj +ENV GDAL_LIBRARY_PATH=/opt/conda/envs/loko-env/lib/libgdal.so +ENV GEOS_LIBRARY_PATH=/opt/conda/envs/loko-env/lib/libgeos_c.so +ENV PROJ_DATA=/opt/conda/envs/loko-env/share/proj # Argument de build pour activer l'installation des librairies IA (ultralytics, OpenCV...) # Passer INSTALL_AI_LIBS=true dans le docker-compose pour les inclure @@ -55,50 +55,50 @@ RUN pip install --no-cache-dir -r requirements/base.txt && \ fi # 1. Copie des répertoires volumineux et statiques (très bonne mise en cache) -COPY streetup/scripts/ /app/scripts/ -COPY streetup/common/ /app/common/ -COPY streetup/home/ /app/home/ +COPY loko/scripts/ /app/scripts/ +COPY loko/common/ /app/common/ +COPY loko/home/ /app/home/ # 2. Copie des modules de l'application qui changent rarement -COPY streetup/locale/ /app/locale/ -COPY streetup/templates/ /app/templates/ -COPY streetup/analytics/ /app/analytics/ -COPY streetup/api/ /app/api/ -COPY streetup/authorizations/ /app/authorizations/ -COPY streetup/contracts/ /app/contracts/ -COPY streetup/documents/ /app/documents/ -COPY streetup/maps/ /app/maps/ -COPY streetup/notifications/ /app/notifications/ -COPY streetup/projects/ /app/projects/ -COPY streetup/reporting/ /app/reporting/ -COPY streetup/bim/ /app/bim/ -COPY streetup/sign/ /app/sign/ -COPY streetup/stock/ /app/stock/ +COPY loko/locale/ /app/locale/ +COPY loko/templates/ /app/templates/ +COPY loko/analytics/ /app/analytics/ +COPY loko/api/ /app/api/ +COPY loko/authorizations/ /app/authorizations/ +COPY loko/contracts/ /app/contracts/ +COPY loko/documents/ /app/documents/ +COPY loko/maps/ /app/maps/ +COPY loko/notifications/ /app/notifications/ +COPY loko/projects/ /app/projects/ +COPY loko/reporting/ /app/reporting/ +COPY loko/bim/ /app/bim/ +COPY loko/sign/ /app/sign/ +COPY loko/stock/ /app/stock/ # 3. Copie des modules actifs ou modifiés fréquemment -COPY streetup/streetup/ /app/streetup/ -COPY streetup/mobile/ /app/mobile/ -COPY streetup/observations/ /app/observations/ -COPY streetup/controls/ /app/controls/ -COPY streetup/interventions/ /app/interventions/ -COPY streetup/assets/ /app/assets/ -COPY streetup/panoramax/ /app/panoramax/ +COPY loko/loko/ /app/loko/ +COPY loko/mobile/ /app/mobile/ +COPY loko/observations/ /app/observations/ +COPY loko/controls/ /app/controls/ +COPY loko/interventions/ /app/interventions/ +COPY loko/assets/ /app/assets/ +COPY loko/panoramax/ /app/panoramax/ # 4. Copie des fichiers de code de road_detection (sans réimporter les modèles de détection) -COPY streetup/road_detection/__init__.py /app/road_detection/ -COPY streetup/road_detection/admin.py /app/road_detection/ -COPY streetup/road_detection/apps.py /app/road_detection/ -COPY streetup/road_detection/detection.py /app/road_detection/ -COPY streetup/road_detection/forms.py /app/road_detection/ -COPY streetup/road_detection/models.py /app/road_detection/ -COPY streetup/road_detection/urls.py /app/road_detection/ -COPY streetup/road_detection/views.py /app/road_detection/ -COPY streetup/road_detection/migrations/ /app/road_detection/migrations/ -COPY streetup/road_detection/templates/ /app/road_detection/templates/ +COPY loko/road_detection/__init__.py /app/road_detection/ +COPY loko/road_detection/admin.py /app/road_detection/ +COPY loko/road_detection/apps.py /app/road_detection/ +COPY loko/road_detection/detection.py /app/road_detection/ +COPY loko/road_detection/forms.py /app/road_detection/ +COPY loko/road_detection/models.py /app/road_detection/ +COPY loko/road_detection/urls.py /app/road_detection/ +COPY loko/road_detection/views.py /app/road_detection/ +COPY loko/road_detection/migrations/ /app/road_detection/migrations/ +COPY loko/road_detection/templates/ /app/road_detection/templates/ # 5. Copie des fichiers Python et de configuration restants à la racine -COPY streetup/*.py /app/ -COPY streetup/generated_passwords.txt* /app/ +COPY loko/*.py /app/ +COPY loko/generated_passwords.txt* /app/ # Exposer le port par défaut EXPOSE 8000 diff --git a/README.md b/README.md index 8f99735..885ddb5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# StreetUp — Asset Management pour l'espace public +# Loko — Asset Management pour l'espace public -**StreetUp** est une application web complète de gestion des actifs de l'espace public. Elle permet aux administrations publiques, gestionnaires d'infrastructures et prestataires de maintenance de cartographier, de suivre et de maintenir l'ensemble des équipements et infrastructures présents sur l'espace public. +**Loko** est une application web complète de gestion des actifs de l'espace public. Elle permet aux administrations publiques, gestionnaires d'infrastructures et prestataires de maintenance de cartographier, de suivre et de maintenir l'ensemble des équipements et infrastructures présents sur l'espace public. Le projet est publié sous licence libre **EUPL (European Union Public Licence)**. @@ -17,7 +17,7 @@ Le projet est propulsé par **Django** et s'appuie sur une base de données **Po ## 🚦 Thématiques Gérées -StreetUp permet de modéliser et de localiser précisément les équipements liés à plusieurs domaines de la voirie : +Loko permet de modéliser et de localiser précisément les équipements liés à plusieurs domaines de la voirie : * **Bâtiments** : Bâtiments publics, gestion des salles, etc. * **Espaces extérieurs** : Plaines de jeux, terrains de sport extérieurs, etc. diff --git a/doc/DOCUMENTATION.html b/doc/DOCUMENTATION.html index 7bfcd86..8c399e1 100644 --- a/doc/DOCUMENTATION.html +++ b/doc/DOCUMENTATION.html @@ -3,7 +3,7 @@ - Documentation StreetUp + Documentation Loko