acasini/n3wt-school
1
0
Fork 0
mirror of https://git.v0id.ovh/n3wt-innov/n3wt-school.git synced 2026-01-28 15:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
N3WT DE COMPET
2025-06-01 14:45:38 +02:00
parent a17078709b 67cea2f1c6
commit ec2c1daebc
8 changed files with 51 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,4 +1,5 @@
.venv/ .venv/
.env .env
node_modules/ node_modules/
hardcoded-strings-report.md hardcoded-strings-report.md
backend.env

2
.husky/prepare-commit-msg
View File

@ -1 +1 @@
node scripts/prepare-commit-msg.js "$1" "$2" #node scripts/prepare-commit-msg.js "$1" "$2"

2
Back-End/Subscriptions/templates/emails/subscribeDirector.html
View File

@ -37,7 +37,7 @@
<body> <body>
<div class="container"> <div class="container">
<div class="header"> <div class="header">
<img src="{{URL_DJANGO}}static/img/logo_min.svg" alt="Logo N3wt School" class="logo" /> <img src="{{URL_DJANGO}}/static/img/logo_min.svg" alt="Logo N3wt School" class="logo" />
<h1>Confirmation de souscription</h1> <h1>Confirmation de souscription</h1>
</div> </div>
<div class="content"> <div class="content">

2
Back-End/__version__.py
View File

@ -1 +1 @@
__version__ = "0.0.2" __version__ = "0.0.3"

2
Front-End/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "n3wt-school-front-end", "name": "n3wt-school-front-end",
"version": "0.0.2", "version": "0.0.3",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",

22
conf/backend.env.default Normal file
View File

@ -0,0 +1,22 @@
TZ="Europe/Paris"
TEST_MODE=true
CSRF_COOKIE_SECURE=true
CSRF_COOKIE_DOMAIN=".localhost"
CORS_ALLOWED_ORIGINS=http://localhost:3000,http://127.0.0.1:3000,http://localhost:8080,http://127.0.0.1:8080
CSRF_TRUSTED_ORIGINS=http://localhost:3000,http://127.0.0.1:3000,http://localhost:8080,http://127.0.0.1:8080
BASE_URL=http://localhost:3000
DEBUG=false
EMAIL_HOST="smtp.hostinger.com"
EMAIL_PORT="587"
EMAIL_HOST_USER=""
EMAIL_HOST_PASSWORD=''
EMAIL_USE_TLS=true
EMAIL_USE_SSL=false
DB_NAME="school"
DB_USER="postgres"
DB_PASSWORD="postgres"
DB_HOST="database"
DB_PORT="5432"
URL_DJANGO="http://localhost:8080"
SECRET_KEY="<SIGNINGKEY>"

22
docker-compose.prod.yml
View File

@ -1,15 +1,19 @@
services: services:
redis: redis:
image: 'redis:latest' image: "redis:latest"
volumes:
- redis-data:/data
expose: expose:
- 6379 - 6379
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
database: database:
image: 'postgres:latest' image: "postgres:latest"
expose: expose:
- 5432 - 5432
volumes:
- postgres-data:/var/lib/postgresql/data
environment: environment:
POSTGRES_USER: postgres POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres POSTGRES_PASSWORD: postgres
@ -20,17 +24,13 @@ services:
image: git.v0id.ovh/n3wt-innov/n3wt-school/backend:latest image: git.v0id.ovh/n3wt-innov/n3wt-school/backend:latest
ports: ports:
- 8080:8080 - 8080:8080
environment: env_file: "./conf/backend.env"
- TZ=Europe/Paris
- TEST_MODE=True
links: links:
- "database:database" - "database:database"
- "redis:redis" - "redis:redis"
depends_on: depends_on:
- redis - redis
- database - database
volumes:
- ./conf/application.json:/Back-End/Subscriptions/Configuration/application.json
command: python start.py command: python start.py
frontend: frontend:
@ -40,6 +40,8 @@ services:
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- NODE_ENV=production - NODE_ENV=production
- NEXT_PUBLIC_API_URL=http://toto:8080 volumes:
depends_on: - ./conf/env:/app/.env
- backend volumes:
postgres-data:
redis-data:

92
docker-compose.yml
View File

@ -1,55 +1,24 @@
services: services:
redis: redis:
image: "redis:latest" image: "redis:latest"
ports: volumes:
- 6379:6379 - redis-data:/data
expose:
- 6379
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
database: database:
image: "postgres:latest" image: "postgres:latest"
ports: expose:
- 5432:5432 - 5432
volumes:
- postgres-data:/var/lib/postgresql/data
environment: environment:
POSTGRES_USER: postgres POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres POSTGRES_PASSWORD: postgres
POSTGRES_DB: school POSTGRES_DB: school
TZ: Europe/Paris TZ: Europe/Paris
# docuseal_db:
# image: postgres:latest
# environment:
# POSTGRES_USER: postgres
# POSTGRES_PASSWORD: postgres
# DOCUSEAL_DB_HOST: docuseal_db
# POSTGRES_DB: docuseal
# ports:
# - 5433:5432 # port différent si besoin d'accès direct depuis l'hôte
# docuseal:
# image: docuseal/docuseal:latest
# container_name: docuseal_app
# depends_on:
# - docuseal_db
# ports:
# - "3001:3000"
# environment:
# DATABASE_URL: postgresql://postgres:postgres@docuseal_db:5432/docuseal
# volumes:
# - ./docuseal:/data/docuseal
# caddy:
# image: caddy:2
# container_name: caddy
# restart: unless-stopped
# ports:
# - "4000:4443"
# volumes:
# - ./Caddyfile:/etc/caddy/Caddyfile
# - caddy_data:/data
# - caddy_config:/config
# depends_on:
# - docuseal
backend: backend:
build: build:
@ -58,54 +27,15 @@ services:
- 8080:8080 - 8080:8080
volumes: volumes:
- ./Back-End:/Back-End - ./Back-End:/Back-End
environment: env_file: "./conf/backend.env"
- TZ=Europe/Paris
- TEST_MODE=True
- CORS_ALLOWED_ORIGINS=http://localhost:3000,http://127.0.0.1:3000,http://localhost:8080,http://127.0.0.1:8080
- CSRF_TRUSTED_ORIGINS=http://localhost:3000,http://127.0.0.1:3000,http://localhost:8080,http://127.0.0.1:8080
- BASE_URL=http://localhost:3000
links: links:
- "database:database" - "database:database"
- "redis:redis" - "redis:redis"
depends_on: depends_on:
- redis - redis
- database - database
#- docuseal
command: python start.py command: python start.py
# init_docuseal_users:
# build:
# context: .
# dockerfile: Dockerfile
# depends_on:
# - docuseal
# environment:
# DOCUSEAL_DB_HOST: docuseal_db
# POSTGRES_USER: postgres
# POSTGRES_PASSWORD: postgres
# USER_FIRST_NAME: n3wt
# USER_LAST_NAME: school
# USER_COMPANY: n3wt.innov
# USER_EMAIL: n3wt.school@gmail.com
# USER_PASSWORD: n3wt1234
# volumes:
# - ./initDocusealUsers.sh:/docker-entrypoint-initdb.d/initDocusealUsers.sh
# frontend:
# build:
# context: ./Front-End
# args:
# - BUILD_MODE=development
# ports:
# - 3000:3000
# volumes:
# - ./Front-End:/app
# env_file:
# - .env
# environment:
# - TZ=Europe/Paris
# depends_on:
# - backend
volumes: volumes:
caddy_data: postgres-data:
caddy_config: redis-data: