acasini/n3wt-school
1
0
Fork 0
mirror of https://git.v0id.ovh/n3wt-innov/n3wt-school.git synced 2026-01-29 07:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: acasini:9481a0132d2e1f18da5fc632d924adde04d316d4
Branches Tags
acasini:main acasini:N3WTS-17-Formulaire_Dynamique acasini:develop acasini:A64_TestsAutomatiques acasini:A63_TestsUnitaires acasini:WIP_Docker_DocuSeal acasini:WIP_IMAP
acasini:0.0.2
..
compare: acasini:0.0.2
Branches Tags
acasini:N3WTS-17-Formulaire_Dynamique acasini:develop acasini:A64_TestsAutomatiques acasini:A63_TestsUnitaires acasini:main acasini:WIP_Docker_DocuSeal acasini:WIP_IMAP
acasini:0.0.2

2 Commits
9481a0132d ... 0.0.2

Author SHA1 Message Date
N3WT DE COMPET
616eaccd0e chore(release): 0.0.2 2025-06-01 13:28:30 +02:00
N3WT DE COMPET
b780e8b4ff fix: ajout des urls prod et demo 
# Message de commit (conventionnel) :
#  Construction automatique depuis une branche aux formats:
#  - <type>-<ticket-id>-ma_super_description
#  - <type>-ma_super_description
# <type>(<scope>): <description> [#<ticket-id>]
# ex : feat(frontend): ajout de la gestion des utilisateurs dans le dashboard [#1]
#
# Types:
# - feat: Nouvelle fonctionnalité
# - fix: Correction de bug
# - docs: Documentation
# - style: Changements esthétiques
# - refactor: Refactorisation
# - test: Ajout/modification de tests
# - chore: Tâches diverses (e.g., mise à jour des dépendances)
#
# Scope: Optionnel (ex. backend, frontend, api, ci )
#
# Ticket ID: Référence à un ticket ou une issue (ex. [#123])
 2025-06-01 13:28:28 +02:00
58 changed files with 245 additions and 436 deletions
Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,4 +2,3 @@
.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.3" __version__ = "0.0.2"

1
Back-End/requirements.txt
View File

@ -66,7 +66,6 @@ urllib3==2.2.3
vine==5.1.0 vine==5.1.0
wcwidth==0.2.13 wcwidth==0.2.13
webencodings==0.5.1 webencodings==0.5.1
watchfiles
xhtml2pdf==0.2.16 xhtml2pdf==0.2.16
channels==4.0.0 channels==4.0.0
channels-redis==4.1.0 channels-redis==4.1.0

68
Back-End/start.py
View File

@ -1,6 +1,5 @@
import subprocess import subprocess
import os import os
from watchfiles import run_process
def run_command(command): def run_command(command):
process = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) process = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@ -12,7 +11,6 @@ def run_command(command):
return process.returncode return process.returncode
test_mode = os.getenv('test_mode', 'false').lower() == 'true' test_mode = os.getenv('test_mode', 'false').lower() == 'true'
watch_mode = os.getenv('DJANGO_WATCH', 'false').lower() == 'true'
commands = [ commands = [
["python", "manage.py", "collectstatic", "--noinput"], ["python", "manage.py", "collectstatic", "--noinput"],
@ -34,55 +32,23 @@ test_commands = [
["python", "manage.py", "init_mock_datas"] ["python", "manage.py", "init_mock_datas"]
] ]
def run_daphne(): for command in commands:
try: if run_command(command) != 0:
result = subprocess.run([ exit(1)
"daphne", "-b", "0.0.0.0", "-p", "8080", "N3wtSchool.asgi:application"
])
return result.returncode
except KeyboardInterrupt:
print("Arrêt de Daphne (KeyboardInterrupt)")
return 0
if __name__ == "__main__": #if test_mode:
for command in commands: # for test_command in test_commands:
if run_command(command) != 0: # if run_command(test_command) != 0:
exit(1) # exit(1)
#if test_mode: # Lancer les processus en parallèle
# for test_command in test_commands:
# if run_command(test_command) != 0:
# exit(1)
if watch_mode: processes = [
celery_worker = subprocess.Popen(["celery", "-A", "N3wtSchool", "worker", "--loglevel=info"]) subprocess.Popen(["daphne", "-b", "0.0.0.0", "-p", "8080", "N3wtSchool.asgi:application"]),
celery_beat = subprocess.Popen(["celery", "-A", "N3wtSchool", "beat", "--loglevel=info", "--scheduler", "django_celery_beat.schedulers:DatabaseScheduler"]) subprocess.Popen(["celery", "-A", "N3wtSchool", "worker", "--loglevel=info"]),
try: subprocess.Popen(["celery", "-A", "N3wtSchool", "beat", "--loglevel=info", "--scheduler", "django_celery_beat.schedulers:DatabaseScheduler"])
run_process( ]
'.',
target=run_daphne # Attendre la fin des processus
) for process in processes:
except KeyboardInterrupt: process.wait()
print("Arrêt demandé (KeyboardInterrupt)")
finally:
celery_worker.terminate()
celery_beat.terminate()
celery_worker.wait()
celery_beat.wait()
else:
processes = [
subprocess.Popen([
"daphne", "-b", "0.0.0.0", "-p", "8080", "N3wtSchool.asgi:application"
]),
subprocess.Popen(["celery", "-A", "N3wtSchool", "worker", "--loglevel=info"]),
subprocess.Popen(["celery", "-A", "N3wtSchool", "beat", "--loglevel=info", "--scheduler", "django_celery_beat.schedulers:DatabaseScheduler"])
]
try:
for process in processes:
process.wait()
except KeyboardInterrupt:
print("Arrêt demandé (KeyboardInterrupt)")
for process in processes:
process.terminate()
for process in processes:
process.wait()

9
CHANGELOG.md
View File

@ -2,13 +2,6 @@
Toutes les modifications notables apportées à ce projet seront documentées dans ce fichier. Toutes les modifications notables apportées à ce projet seront documentées dans ce fichier.
### [0.0.3](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/compare/0.0.2...0.0.3) (2025-06-01)
### Corrections de bugs
* Ajout d'un '/' en fin d'URL ([67cea2f](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/67cea2f1c6edae8eed5e024c79b1e19d08788d4c))
### 0.0.2 (2025-06-01) ### 0.0.2 (2025-06-01)
@ -168,7 +161,7 @@ Toutes les modifications notables apportées à ce projet seront documentées da
* ajout de credential include dans get CSRF ([c161fa7](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/c161fa7e7568437ba501a565ad53192b9cb3b6f3)) * ajout de credential include dans get CSRF ([c161fa7](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/c161fa7e7568437ba501a565ad53192b9cb3b6f3))
* Ajout de l'établissement dans la requête KPI récupérant les ([ada2a44](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/ada2a44c3ec9ba45462bd7e78984dfa38008e231)) * Ajout de l'établissement dans la requête KPI récupérant les ([ada2a44](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/ada2a44c3ec9ba45462bd7e78984dfa38008e231))
* Ajout des niveaux scolaires dans le back [[#27](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/27)] ([05542df](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/05542dfc40649fd194ee551f0298f1535753f219)) * Ajout des niveaux scolaires dans le back [[#27](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/27)] ([05542df](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/05542dfc40649fd194ee551f0298f1535753f219))
* ajout des urls prod et demo ([043d93d](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/043d93dcc476e5eb3962fdbe0f6a81b937122647)) * ajout des urls prod et demo ([b780e8b](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/b780e8b4ff4b5e6bbbccf1c77a56136c0c4affcb)), closes [#1](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/1) [#123](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/123)
* Ajout du % ou € en mode édition de réduction ([f2628bb](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/f2628bb45a14da42d014e42b1521820ffeedfb33)) * Ajout du % ou € en mode édition de réduction ([f2628bb](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/f2628bb45a14da42d014e42b1521820ffeedfb33))
* Ajout du controle sur le format des dates ([e538ac3](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/e538ac3d56294d4e647a38d730168ea567c76f04)) * Ajout du controle sur le format des dates ([e538ac3](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/e538ac3d56294d4e647a38d730168ea567c76f04))
* Ajout du mode Visu ([e1c6073](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/e1c607308c12cf75695e9d4593dc27ebe74e6a4f)) * Ajout du mode Visu ([e1c6073](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/e1c607308c12cf75695e9d4593dc27ebe74e6a4f))

26
Front-End/package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "n3wt-school-front-end", "name": "n3wt-school-front-end",
"version": "0.0.3", "version": "0.0.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "n3wt-school-front-end", "name": "n3wt-school-front-end",
"version": "0.0.3", "version": "0.0.1",
"dependencies": { "dependencies": {
"@docuseal/react": "^1.0.56", "@docuseal/react": "^1.0.56",
"@radix-ui/react-dialog": "^1.1.2", "@radix-ui/react-dialog": "^1.1.2",
@ -29,7 +29,6 @@
"react-dnd": "^16.0.1", "react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1", "react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18", "react-dom": "^18",
"react-hook-form": "^7.62.0",
"react-international-phone": "^4.5.0", "react-international-phone": "^4.5.0",
"react-quill": "^2.0.0", "react-quill": "^2.0.0",
"react-tooltip": "^5.28.0" "react-tooltip": "^5.28.0"
@ -8835,21 +8834,6 @@
"react": "^18.3.1" "react": "^18.3.1"
} }
}, },
"node_modules/react-hook-form": {
"version": "7.62.0",
"resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.62.0.tgz",
"integrity": "sha512-7KWFejc98xqG/F4bAxpL41NB3o1nnvQO1RWZT3TqRZYL8RryQETGfEdVnJN2fy1crCiBLLjkRBVK05j24FxJGA==",
"engines": {
"node": ">=18.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/react-hook-form"
},
"peerDependencies": {
"react": "^16.8.0 || ^17 || ^18 || ^19"
}
},
"node_modules/react-international-phone": { "node_modules/react-international-phone": {
"version": "4.5.0", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/react-international-phone/-/react-international-phone-4.5.0.tgz", "resolved": "https://registry.npmjs.org/react-international-phone/-/react-international-phone-4.5.0.tgz",
@ -17176,12 +17160,6 @@
"scheduler": "^0.23.2" "scheduler": "^0.23.2"
} }
}, },
"react-hook-form": {
"version": "7.62.0",
"resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.62.0.tgz",
"integrity": "sha512-7KWFejc98xqG/F4bAxpL41NB3o1nnvQO1RWZT3TqRZYL8RryQETGfEdVnJN2fy1crCiBLLjkRBVK05j24FxJGA==",
"requires": {}
},
"react-international-phone": { "react-international-phone": {
"version": "4.5.0", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/react-international-phone/-/react-international-phone-4.5.0.tgz", "resolved": "https://registry.npmjs.org/react-international-phone/-/react-international-phone-4.5.0.tgz",

9
Front-End/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "n3wt-school-front-end", "name": "n3wt-school-front-end",
"version": "0.0.3", "version": "0.0.2",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",
@ -35,20 +35,19 @@
"react-dnd": "^16.0.1", "react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1", "react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18", "react-dom": "^18",
"react-hook-form": "^7.62.0",
"react-international-phone": "^4.5.0", "react-international-phone": "^4.5.0",
"react-quill": "^2.0.0", "react-quill": "^2.0.0",
"react-tooltip": "^5.28.0" "react-tooltip": "^5.28.0"
}, },
"devDependencies": { "devDependencies": {
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0", "@testing-library/react": "^13.4.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/user-event": "^14.4.3", "@testing-library/user-event": "^14.4.3",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"autoprefixer": "^10.4.20", "autoprefixer": "^10.4.20",
"eslint": "^8", "eslint": "^8",
"eslint-config-next": "14.2.11", "eslint-config-next": "14.2.11",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"postcss": "^8.4.47", "postcss": "^8.4.47",
"tailwindcss": "^3.4.14" "tailwindcss": "^3.4.14"
} }

6
Front-End/src/app/[locale]/admin/grades/page.js
View File

@ -1,6 +1,6 @@
'use client'; 'use client';
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import SelectChoice from '@/components/Form/SelectChoice'; import SelectChoice from '@/components/SelectChoice';
import AcademicResults from '@/components/Grades/AcademicResults'; import AcademicResults from '@/components/Grades/AcademicResults';
import Attendance from '@/components/Grades/Attendance'; import Attendance from '@/components/Grades/Attendance';
import Remarks from '@/components/Grades/Remarks'; import Remarks from '@/components/Grades/Remarks';
@ -9,7 +9,7 @@ import Homeworks from '@/components/Grades/Homeworks';
import SpecificEvaluations from '@/components/Grades/SpecificEvaluations'; import SpecificEvaluations from '@/components/Grades/SpecificEvaluations';
import Orientation from '@/components/Grades/Orientation'; import Orientation from '@/components/Grades/Orientation';
import GradesStatsCircle from '@/components/Grades/GradesStatsCircle'; import GradesStatsCircle from '@/components/Grades/GradesStatsCircle';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
import logger from '@/utils/logger'; import logger from '@/utils/logger';
import { import {
FE_ADMIN_GRADES_STUDENT_COMPETENCIES_URL, FE_ADMIN_GRADES_STUDENT_COMPETENCIES_URL,
@ -29,7 +29,7 @@ import { useClasses } from '@/context/ClassesContext';
import { Award, FileText } from 'lucide-react'; import { Award, FileText } from 'lucide-react';
import SectionHeader from '@/components/SectionHeader'; import SectionHeader from '@/components/SectionHeader';
import GradesDomainBarChart from '@/components/Grades/GradesDomainBarChart'; import GradesDomainBarChart from '@/components/Grades/GradesDomainBarChart';
import InputText from '@/components/Form/InputText'; import InputText from '@/components/InputText';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { useCsrfToken } from '@/context/CsrfContext'; import { useCsrfToken } from '@/context/CsrfContext';

2
Front-End/src/app/[locale]/admin/grades/studentCompetencies/page.js
View File

@ -2,7 +2,7 @@
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { useSearchParams, useRouter } from 'next/navigation'; import { useSearchParams, useRouter } from 'next/navigation';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
import GradeView from '@/components/Grades/GradeView'; import GradeView from '@/components/Grades/GradeView';
import { import {
fetchStudentCompetencies, fetchStudentCompetencies,

4
Front-End/src/app/[locale]/admin/settings/page.js
View File

@ -2,8 +2,8 @@
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import Tab from '@/components/Tab'; import Tab from '@/components/Tab';
import TabContent from '@/components/TabContent'; import TabContent from '@/components/TabContent';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
import InputText from '@/components/Form/InputText'; import InputText from '@/components/InputText';
import CheckBox from '@/components/CheckBox'; // Import du composant CheckBox import CheckBox from '@/components/CheckBox'; // Import du composant CheckBox
import logger from '@/utils/logger'; import logger from '@/utils/logger';
import { import {

4
Front-End/src/app/[locale]/admin/structure/SchoolClassManagement/page.js
View File

@ -8,8 +8,8 @@ import { fetchClasse } from '@/app/actions/schoolAction';
import { useSearchParams } from 'next/navigation'; import { useSearchParams } from 'next/navigation';
import logger from '@/utils/logger'; import logger from '@/utils/logger';
import { useClasses } from '@/context/ClassesContext'; import { useClasses } from '@/context/ClassesContext';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
import SelectChoice from '@/components/Form/SelectChoice'; import SelectChoice from '@/components/SelectChoice';
import CheckBox from '@/components/CheckBox'; import CheckBox from '@/components/CheckBox';
import { import {
fetchAbsences, fetchAbsences,

12
Front-End/src/app/[locale]/admin/subscriptions/createSubscription/page.js
View File

@ -2,17 +2,17 @@
import React, { useState, useRef, useEffect } from 'react'; import React, { useState, useRef, useEffect } from 'react';
import { User, Mail } from 'lucide-react'; import { User, Mail } from 'lucide-react';
import InputTextIcon from '@/components/Form/InputTextIcon'; import InputTextIcon from '@/components/InputTextIcon';
import ToggleSwitch from '@/components/Form/ToggleSwitch'; import ToggleSwitch from '@/components/ToggleSwitch';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
import Table from '@/components/Table'; import Table from '@/components/Table';
import FeesSection from '@/components/Structure/Tarification/FeesSection'; import FeesSection from '@/components/Structure/Tarification/FeesSection';
import DiscountsSection from '@/components/Structure/Tarification/DiscountsSection'; import DiscountsSection from '@/components/Structure/Tarification/DiscountsSection';
import SectionTitle from '@/components/SectionTitle'; import SectionTitle from '@/components/SectionTitle';
import InputPhone from '@/components/Form/InputPhone'; import InputPhone from '@/components/InputPhone';
import CheckBox from '@/components/CheckBox'; import CheckBox from '@/components/CheckBox';
import RadioList from '@/components/Form/RadioList'; import RadioList from '@/components/RadioList';
import SelectChoice from '@/components/Form/SelectChoice'; import SelectChoice from '@/components/SelectChoice';
import Loader from '@/components/Loader'; import Loader from '@/components/Loader';
import { getCurrentSchoolYear, getNextSchoolYear } from '@/utils/Date'; import { getCurrentSchoolYear, getNextSchoolYear } from '@/utils/Date';
import logger from '@/utils/logger'; import logger from '@/utils/logger';

11
Front-End/src/app/[locale]/admin/subscriptions/page.js
View File

@ -40,8 +40,8 @@ import {
import DjangoCSRFToken from '@/components/DjangoCSRFToken'; import DjangoCSRFToken from '@/components/DjangoCSRFToken';
import { useCsrfToken } from '@/context/CsrfContext'; import { useCsrfToken } from '@/context/CsrfContext';
import logger from '@/utils/logger'; import logger from '@/utils/logger';
import { PhoneLabel } from '@/components/Form/PhoneLabel'; import { PhoneLabel } from '@/components/PhoneLabel';
import FileUpload from '@/components/Form/FileUpload'; import FileUpload from '@/components/FileUpload';
import FilesModal from '@/components/Inscription/FilesModal'; import FilesModal from '@/components/Inscription/FilesModal';
import { getCurrentSchoolYear, getNextSchoolYear } from '@/utils/Date'; import { getCurrentSchoolYear, getNextSchoolYear } from '@/utils/Date';
@ -250,12 +250,7 @@ export default function Page({ params: { locale } }) {
}, 500); // Debounce la recherche }, 500); // Debounce la recherche
return () => clearTimeout(timeoutId); return () => clearTimeout(timeoutId);
} }
}, [ }, [searchTerm, selectedEstablishmentId, currentSchoolYearPage, itemsPerPage]);
searchTerm,
selectedEstablishmentId,
currentSchoolYearPage,
itemsPerPage,
]);
/** /**
* UseEffect to update page count of tab * UseEffect to update page count of tab

4
Front-End/src/app/[locale]/page.js
View File

@ -1,9 +1,8 @@
'use client'; 'use client';
import { useTranslations } from 'next-intl'; import { useTranslations } from 'next-intl';
import React from 'react'; import React from 'react';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
import Logo from '@/components/Logo'; // Import du composant Logo import Logo from '@/components/Logo'; // Import du composant Logo
import FormRenderer from '@/components/Form/FormRenderer';
export default function Home() { export default function Home() {
const t = useTranslations('homePage'); const t = useTranslations('homePage');
@ -14,7 +13,6 @@ export default function Home() {
<h1 className="text-4xl font-bold mb-4">{t('welcomeParents')}</h1> <h1 className="text-4xl font-bold mb-4">{t('welcomeParents')}</h1>
<p className="text-lg mb-8">{t('pleaseLogin')}</p> <p className="text-lg mb-8">{t('pleaseLogin')}</p>
<Button text={t('loginButton')} primary href="/users/login" /> <Button text={t('loginButton')} primary href="/users/login" />
<FormRenderer />
</div> </div>
); );
} }

2
Front-End/src/app/[locale]/parents/page.js
View File

@ -11,7 +11,7 @@ import {
CalendarDays, CalendarDays,
} from 'lucide-react'; } from 'lucide-react';
import StatusLabel from '@/components/StatusLabel'; import StatusLabel from '@/components/StatusLabel';
import FileUpload from '@/components/Form/FileUpload'; import FileUpload from '@/components/FileUpload';
import { FE_PARENTS_EDIT_SUBSCRIPTION_URL } from '@/utils/Url'; import { FE_PARENTS_EDIT_SUBSCRIPTION_URL } from '@/utils/Url';
import { import {
fetchChildren, fetchChildren,

4
Front-End/src/app/[locale]/parents/settings/page.js
View File

@ -1,7 +1,7 @@
'use client'; 'use client';
import React, { useState } from 'react'; import React, { useState } from 'react';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
import InputText from '@/components/Form/InputText'; import InputText from '@/components/InputText';
import logger from '@/utils/logger'; import logger from '@/utils/logger';
import { useNotification } from '@/context/NotificationContext'; import { useNotification } from '@/context/NotificationContext';

16
Front-End/src/app/[locale]/users/login/page.js
View File

@ -3,9 +3,9 @@ import React, { useState } from 'react';
import DjangoCSRFToken from '@/components/DjangoCSRFToken'; import DjangoCSRFToken from '@/components/DjangoCSRFToken';
import Logo from '@/components/Logo'; import Logo from '@/components/Logo';
import { useRouter } from 'next/navigation'; import { useRouter } from 'next/navigation';
import InputTextIcon from '@/components/Form/InputTextIcon'; import InputTextIcon from '@/components/InputTextIcon';
import Loader from '@/components/Loader'; // Importez le composant Loader import Loader from '@/components/Loader'; // Importez le composant Loader
import Button from '@/components/Form/Button'; // Importez le composant Button import Button from '@/components/Button'; // Importez le composant Button
import { User, KeySquare } from 'lucide-react'; // Importez directement les icônes nécessaires import { User, KeySquare } from 'lucide-react'; // Importez directement les icônes nécessaires
import { FE_USERS_NEW_PASSWORD_URL, getRedirectUrlFromRole } from '@/utils/Url'; import { FE_USERS_NEW_PASSWORD_URL, getRedirectUrlFromRole } from '@/utils/Url';
import { login } from '@/app/actions/authAction'; import { login } from '@/app/actions/authAction';
@ -35,7 +35,11 @@ export default function Page() {
logger.debug('Sign In Result', result); logger.debug('Sign In Result', result);
if (result.error) { if (result.error) {
showNotification(result.error, 'error', 'Erreur'); showNotification(
result.error,
'error',
'Erreur'
);
setIsLoading(false); setIsLoading(false);
} else { } else {
// On initialise le contexte establishement avec la session // On initialise le contexte establishement avec la session
@ -46,7 +50,11 @@ export default function Page() {
if (url) { if (url) {
router.push(url); router.push(url);
} else { } else {
showNotification('Type de rôle non géré', 'error', 'Erreur'); showNotification(
'Type de rôle non géré',
'error',
'Erreur'
);
} }
}); });
setIsLoading(false); setIsLoading(false);

22
Front-End/src/app/[locale]/users/password/new/page.js
View File

@ -3,9 +3,9 @@
import React, { useState } from 'react'; import React, { useState } from 'react';
import DjangoCSRFToken from '@/components/DjangoCSRFToken'; import DjangoCSRFToken from '@/components/DjangoCSRFToken';
import Logo from '@/components/Logo'; import Logo from '@/components/Logo';
import InputTextIcon from '@/components/Form/InputTextIcon'; import InputTextIcon from '@/components/InputTextIcon';
import Loader from '@/components/Loader'; import Loader from '@/components/Loader';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
import { User } from 'lucide-react'; import { User } from 'lucide-react';
import { FE_USERS_LOGIN_URL } from '@/utils/Url'; import { FE_USERS_LOGIN_URL } from '@/utils/Url';
import { useCsrfToken } from '@/context/CsrfContext'; import { useCsrfToken } from '@/context/CsrfContext';
@ -25,13 +25,25 @@ export default function Page() {
.then((data) => { .then((data) => {
logger.debug('Success:', data); logger.debug('Success:', data);
if (data.message !== '') { if (data.message !== '') {
showNotification(data.message, 'success', 'Succès'); showNotification(
data.message,
'success',
'Succès'
);
router.push(`${FE_USERS_LOGIN_URL}`); router.push(`${FE_USERS_LOGIN_URL}`);
} else { } else {
if (data.errorMessage) { if (data.errorMessage) {
showNotification(data.errorMessage, 'error', 'Erreur'); showNotification(
data.errorMessage,
'error',
'Erreur'
);
} else if (data.errorFields) { } else if (data.errorFields) {
showNotification(data.errorFields.email, 'error', 'Erreur'); showNotification(
data.errorFields.email,
'error',
'Erreur'
);
} }
} }
setIsLoading(false); setIsLoading(false);

17
Front-End/src/app/[locale]/users/password/reset/page.js
View File

@ -5,9 +5,9 @@ import React, { useState, useEffect } from 'react';
import DjangoCSRFToken from '@/components/DjangoCSRFToken'; import DjangoCSRFToken from '@/components/DjangoCSRFToken';
import Logo from '@/components/Logo'; import Logo from '@/components/Logo';
import { useSearchParams, useRouter } from 'next/navigation'; import { useSearchParams, useRouter } from 'next/navigation';
import InputTextIcon from '@/components/Form/InputTextIcon'; import InputTextIcon from '@/components/InputTextIcon';
import Loader from '@/components/Loader'; import Loader from '@/components/Loader';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
import { FE_USERS_LOGIN_URL } from '@/utils/Url'; import { FE_USERS_LOGIN_URL } from '@/utils/Url';
import { KeySquare } from 'lucide-react'; import { KeySquare } from 'lucide-react';
import { useCsrfToken } from '@/context/CsrfContext'; import { useCsrfToken } from '@/context/CsrfContext';
@ -33,12 +33,21 @@ export default function Page() {
resetPassword(uuid, data, csrfToken) resetPassword(uuid, data, csrfToken)
.then((data) => { .then((data) => {
if (data.message !== '') { if (data.message !== '') {
logger.debug('Success:', data); logger.debug('Success:', data);
showNotification(data.message, 'success', 'Succès'); showNotification(
data.message,
'success',
'Succès'
);
router.push(`${FE_USERS_LOGIN_URL}`); router.push(`${FE_USERS_LOGIN_URL}`);
} else { } else {
if (data.errorMessage) { if (data.errorMessage) {
showNotification(data.errorMessage, 'error', 'Erreur'); showNotification(
data.errorMessage,
'error',
'Erreur'
);
} else if (data.errorFields) { } else if (data.errorFields) {
showNotification( showNotification(
data.errorFields.password1 || data.errorFields.password2, data.errorFields.password1 || data.errorFields.password2,

20
Front-End/src/app/[locale]/users/subscribe/page.js
View File

@ -4,9 +4,9 @@ import React, { useState, useEffect } from 'react';
import DjangoCSRFToken from '@/components/DjangoCSRFToken'; import DjangoCSRFToken from '@/components/DjangoCSRFToken';
import Logo from '@/components/Logo'; import Logo from '@/components/Logo';
import { useSearchParams, useRouter } from 'next/navigation'; import { useSearchParams, useRouter } from 'next/navigation';
import InputTextIcon from '@/components/Form/InputTextIcon'; import InputTextIcon from '@/components/InputTextIcon';
import Loader from '@/components/Loader'; import Loader from '@/components/Loader';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
import { User, KeySquare } from 'lucide-react'; import { User, KeySquare } from 'lucide-react';
import { FE_USERS_LOGIN_URL } from '@/utils/Url'; import { FE_USERS_LOGIN_URL } from '@/utils/Url';
import { useCsrfToken } from '@/context/CsrfContext'; import { useCsrfToken } from '@/context/CsrfContext';
@ -36,16 +36,22 @@ export default function Page() {
.then((data) => { .then((data) => {
logger.debug('Success:', data); logger.debug('Success:', data);
if (data.message !== '') { if (data.message !== '') {
showNotification(data.message, 'success', 'Succès'); showNotification(
data.message,
'success',
'Succès'
);
router.push(`${FE_USERS_LOGIN_URL}`); router.push(`${FE_USERS_LOGIN_URL}`);
} else { } else {
if (data.errorMessage) { if (data.errorMessage) {
showNotification(data.errorMessage, 'error', 'Erreur'); showNotification(
data.errorMessage,
'error',
'Erreur'
);
} else if (data.errorFields) { } else if (data.errorFields) {
showNotification( showNotification(
data.errorFields.email || data.errorFields.email || data.errorFields.password1 || data.errorFields.password2,
data.errorFields.password1 ||
data.errorFields.password2,
'error', 'error',
'Erreur' 'Erreur'
); );

6
Front-End/src/components/Admin/EmailSender.js
View File

@ -9,10 +9,10 @@ import { useEstablishment } from '@/context/EstablishmentContext';
import AlertMessage from '@/components/AlertMessage'; import AlertMessage from '@/components/AlertMessage';
import RecipientInput from '@/components/RecipientInput'; import RecipientInput from '@/components/RecipientInput';
import { useRouter } from 'next/navigation'; // Ajoute cette ligne import { useRouter } from 'next/navigation'; // Ajoute cette ligne
import WisiwigTextArea from '@/components/Form/WisiwigTextArea'; import WisiwigTextArea from '@/components/WisiwigTextArea';
import logger from '@/utils/logger'; import logger from '@/utils/logger';
import InputText from '@/components/Form/InputText'; import InputText from '@/components/InputText';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
export default function EmailSender({ csrfToken }) { export default function EmailSender({ csrfToken }) {
const [recipients, setRecipients] = useState([]); const [recipients, setRecipients] = useState([]);

0
Front-End/src/components/Form/Button.js → Front-End/src/components/Button.js
View File

0
Front-End/src/components/Form/DraggableFileUpload.js → Front-End/src/components/DraggableFileUpload.js
View File

0
Front-End/src/components/Form/FileUpload.js → Front-End/src/components/FileUpload.js
View File

194
Front-End/src/components/Form/FormRenderer.js
View File

@ -1,194 +0,0 @@
import logger from '@/utils/logger';
import { useForm, Controller } from 'react-hook-form';
import SelectChoice from './SelectChoice';
import InputTextIcon from './InputTextIcon';
import * as LucideIcons from 'lucide-react';
import Button from './Button';
import DjangoCSRFToken from '../DjangoCSRFToken';
import WisiwigTextArea from './WisiwigTextArea';
/*
* Récupère une icône Lucide par son nom.
*/
export function getIcon(name) {
if (Object.keys(LucideIcons).includes(name)) {
const Icon = LucideIcons[name];
return Icon ?? null;
} else {
return null;
}
}
const formConfigTest = {
id: 0,
title: 'Mon formulaire dynamique',
submitLabel: 'Envoyer',
fields: [
{ id: 'name', label: 'Nom', type: 'text', required: true },
{ id: 'email', label: 'Email', type: 'email' },
{
id: 'email2',
label: 'Email',
type: 'text',
icon: 'Mail',
},
{
id: 'role',
label: 'Rôle',
type: 'select',
options: ['Admin', 'Utilisateur', 'Invité'],
required: true,
},
{
type: 'paragraph',
text: "Bonjour, Bienvenue dans ce formulaire d'inscription haha",
},
{
id: 'birthdate',
label: 'Date de naissance',
type: 'date',
icon: 'Calendar',
},
{
id: 'textarea',
label: 'toto',
type: 'textarea',
},
],
};
export default function FormRenderer({
formConfig = formConfigTest,
csrfToken,
}) {
const {
handleSubmit,
control,
formState: { errors },
reset,
} = useForm();
const onSubmit = (data) => {
logger.debug('=== DÉBUT onSubmit ===');
logger.debug('Réponses :', data);
const formattedData = {
//TODO: idDossierInscriptions: 123,
formId: formConfig.id,
responses: { ...data },
};
//TODO: ENVOYER LES DONNÉES AU BACKEND
alert('Données reçues : ' + JSON.stringify(formattedData, null, 2));
reset(); // Réinitialiser le formulaire après soumission
logger.debug('=== FIN onSubmit ===');
};
const onError = (errors) => {
logger.error('=== ERREURS DE VALIDATION ===');
logger.error('Erreurs :', errors);
alert('Erreurs de validation : ' + JSON.stringify(errors, null, 2));
};
return (
<form
onSubmit={handleSubmit(onSubmit, onError)}
className="max-w-md mx-auto"
>
{csrfToken ? <DjangoCSRFToken csrfToken={csrfToken} /> : null}
<h2 className="text-2xl font-bold text-center mb-4">
{formConfig.title}
</h2>
{formConfig.fields.map((field) => (
<div key={field.id} className="flex flex-col mt-4">
{field.type === 'paragraph' && <p>{field.text}</p>}
{(field.type === 'text' ||
field.type === 'email' ||
field.type === 'date') && (
<Controller
name={field.id}
control={control}
rules={{ required: field.required }}
render={({ field: { onChange, value, name } }) => (
<InputTextIcon
label={field.label}
required={field.required}
IconItem={field.icon ? getIcon(field.icon) : null}
type={field.type}
name={name}
value={value || ''}
onChange={onChange}
errorMsg={
errors[field.id]
? field.required
? `${field.label} est requis`
: 'Champ invalide'
: ''
}
/>
)}
/>
)}
{field.type === 'select' && (
<Controller
name={field.id}
control={control}
rules={{ required: field.required }}
render={({ field: { onChange, value, name } }) => (
<SelectChoice
label={field.label}
required={field.required}
name={name}
selected={value || ''}
callback={onChange}
choices={field.options.map((e) => ({ label: e, value: e }))}
placeHolder={`Sélectionner ${field.label.toLowerCase()}`}
errorMsg={
errors[field.id]
? field.required
? `${field.label} est requis`
: 'Champ invalide'
: ''
}
/>
)}
/>
)}
{field.type === 'textarea' && (
<Controller
name={field.id}
control={control}
rules={{ required: field.required }}
render={({ field: { onChange, value } }) => (
<WisiwigTextArea
label={field.label}
placeholder={field.placeholder}
value={value || ''}
onChange={onChange}
required={field.required}
errorMsg={
errors[field.id]
? field.required
? `${field.label} est requis`
: 'Champ invalide'
: ''
}
/>
)}
/>
)}
</div>
))}
<div className="form-group-submit mt-4">
<Button
type="submit"
primary
text={formConfig.submitLabel ? formConfig.submitLabel : 'Envoyer'}
className="mb-1 px-4 py-2 rounded-md shadow bg-emerald-500 text-white hover:bg-emerald-600 w-full"
/>
</div>
</form>
);
}

4
Front-End/src/components/Grades/Attendance.js
View File

@ -1,7 +1,7 @@
import React, { useState } from 'react'; import React, { useState } from 'react';
import { Trash2 } from 'lucide-react'; import { Trash2 } from 'lucide-react';
import ToggleSwitch from '@/components/Form/ToggleSwitch'; import ToggleSwitch from '@/components/ToggleSwitch';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
import Popup from '@/components/Popup'; import Popup from '@/components/Popup';
import { useNotification } from '@/context/NotificationContext'; import { useNotification } from '@/context/NotificationContext';

2
Front-End/src/components/Grades/GradeView.js
View File

@ -1,6 +1,6 @@
import React, { useState, useMemo, useEffect } from 'react'; import React, { useState, useMemo, useEffect } from 'react';
import { BookOpen, CheckCircle, AlertCircle, Clock } from 'lucide-react'; import { BookOpen, CheckCircle, AlertCircle, Clock } from 'lucide-react';
import RadioList from '@/components/Form/RadioList'; import RadioList from '@/components/RadioList';
const LEVELS = [ const LEVELS = [
{ value: 0, label: 'Non évalué' }, { value: 0, label: 'Non évalué' },

0
Front-End/src/components/Form/InputPhone.js → Front-End/src/components/InputPhone.js
View File

0
Front-End/src/components/Form/InputText.js → Front-End/src/components/InputText.js
View File

10
Front-End/src/components/Form/InputTextIcon.js → Front-End/src/components/InputTextIcon.js
View File

@ -1,5 +1,3 @@
import React from 'react';
export default function InputTextIcon({ export default function InputTextIcon({
name, name,
type, type,
@ -33,11 +31,9 @@ export default function InputTextIcon({
!enable ? 'bg-gray-100 cursor-not-allowed' : '' !enable ? 'bg-gray-100 cursor-not-allowed' : ''
}`} }`}
> >
{IconItem ? ( <span className="inline-flex min-h-9 items-center px-3 rounded-l-md bg-gray-50 text-gray-500 text-sm">
<span className="inline-flex min-h-9 items-center px-3 rounded-l-md bg-gray-50 text-gray-500 text-sm"> {IconItem && <IconItem />}
<IconItem /> </span>
</span>
) : null}
<input <input
type={type} type={type}
id={name} id={name}

0
Front-End/src/components/Form/InputTextWithColorIcon.js → Front-End/src/components/InputTextWithColorIcon.js
View File

2
Front-End/src/components/Inscription/FilesToUpload.js
View File

@ -1,6 +1,6 @@
import React, { useState } from 'react'; import React, { useState } from 'react';
import Table from '@/components/Table'; import Table from '@/components/Table';
import FileUpload from '@/components/Form/FileUpload'; import FileUpload from '@/components/FileUpload';
import { Upload, Eye, Trash2, FileText } from 'lucide-react'; import { Upload, Eye, Trash2, FileText } from 'lucide-react';
import { BASE_URL } from '@/utils/Url'; import { BASE_URL } from '@/utils/Url';
import Popup from '@/components/Popup'; import Popup from '@/components/Popup';

6
Front-End/src/components/Inscription/InscriptionFormShared.js
View File

@ -1,6 +1,6 @@
// Import des dépendances nécessaires // Import des dépendances nécessaires
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
import DjangoCSRFToken from '@/components/DjangoCSRFToken'; import DjangoCSRFToken from '@/components/DjangoCSRFToken';
import { import {
fetchSchoolFileTemplatesFromRegistrationFiles, fetchSchoolFileTemplatesFromRegistrationFiles,
@ -220,7 +220,9 @@ export default function InscriptionFormShared({
.then((data) => { .then((data) => {
setProfiles(data); setProfiles(data);
}) })
.catch((error) => logger.error('Error fetching profiles : ', error)); .catch((error) =>
logger.error('Error fetching profiles : ', error)
);
if (selectedEstablishmentId) { if (selectedEstablishmentId) {
// Fetch data for registration payment modes // Fetch data for registration payment modes

4
Front-End/src/components/Inscription/PaymentMethodSelector.js
View File

@ -1,6 +1,6 @@
import React, { useEffect } from 'react'; import React, { useEffect } from 'react';
import SelectChoice from '@/components/Form/SelectChoice'; import SelectChoice from '@/components/SelectChoice';
import RadioList from '@/components/Form/RadioList'; import RadioList from '@/components/RadioList';
import logger from '@/utils/logger'; import logger from '@/utils/logger';
export default function PaymentMethodSelector({ export default function PaymentMethodSelector({

4
Front-End/src/components/Inscription/ResponsableInputFields.js
View File

@ -1,5 +1,5 @@
import InputText from '@/components/Form/InputText'; import InputText from '@/components/InputText';
import InputPhone from '@/components/Form/InputPhone'; import InputPhone from '@/components/InputPhone';
import React, { useEffect } from 'react'; import React, { useEffect } from 'react';
import { useTranslations } from 'next-intl'; import { useTranslations } from 'next-intl';
import { Trash2, Plus, Users } from 'lucide-react'; import { Trash2, Plus, Users } from 'lucide-react';

2
Front-End/src/components/Inscription/SiblingInputFields.js
View File

@ -1,4 +1,4 @@
import InputText from '@/components/Form/InputText'; import InputText from '@/components/InputText';
import React, { useEffect } from 'react'; import React, { useEffect } from 'react';
import { Trash2, Plus, Users } from 'lucide-react'; import { Trash2, Plus, Users } from 'lucide-react';
import SectionHeader from '@/components/SectionHeader'; import SectionHeader from '@/components/SectionHeader';

13
Front-End/src/components/Inscription/StudentInfoForm.js
View File

@ -1,12 +1,12 @@
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import InputText from '@/components/Form/InputText'; import InputText from '@/components/InputText';
import SelectChoice from '@/components/Form/SelectChoice'; import SelectChoice from '@/components/SelectChoice';
import Loader from '@/components/Loader'; import Loader from '@/components/Loader';
import { fetchRegisterForm } from '@/app/actions/subscriptionAction'; import { fetchRegisterForm } from '@/app/actions/subscriptionAction';
import logger from '@/utils/logger'; import logger from '@/utils/logger';
import SectionHeader from '@/components/SectionHeader'; import SectionHeader from '@/components/SectionHeader';
import { User } from 'lucide-react'; import { User } from 'lucide-react';
import FileUpload from '@/components/Form/FileUpload'; import FileUpload from '@/components/FileUpload';
import { BASE_URL } from '@/utils/Url'; import { BASE_URL } from '@/utils/Url';
import { levels, genders } from '@/utils/constants'; import { levels, genders } from '@/utils/constants';
@ -112,10 +112,13 @@ export default function StudentInfoForm({
(field === 'birth_place' && (field === 'birth_place' &&
(!formData.birth_place || formData.birth_place.trim() === '')) || (!formData.birth_place || formData.birth_place.trim() === '')) ||
(field === 'birth_postal_code' && (field === 'birth_postal_code' &&
(!formData.birth_postal_code || (
!formData.birth_postal_code ||
String(formData.birth_postal_code).trim() === '' || String(formData.birth_postal_code).trim() === '' ||
isNaN(Number(formData.birth_postal_code)) || isNaN(Number(formData.birth_postal_code)) ||
!Number.isInteger(Number(formData.birth_postal_code)))) || !Number.isInteger(Number(formData.birth_postal_code))
)
) ||
(field === 'address' && (field === 'address' &&
(!formData.address || formData.address.trim() === '')) || (!formData.address || formData.address.trim() === '')) ||
(field === 'attending_physician' && (field === 'attending_physician' &&

6
Front-End/src/components/Inscription/ValidateSubscription.js
View File

@ -1,7 +1,7 @@
'use client'; 'use client';
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import ToggleSwitch from '@/components/Form/ToggleSwitch'; import ToggleSwitch from '@/components/ToggleSwitch';
import SelectChoice from '@/components/Form/SelectChoice'; import SelectChoice from '@/components/SelectChoice';
import { BASE_URL } from '@/utils/Url'; import { BASE_URL } from '@/utils/Url';
import { import {
fetchSchoolFileTemplatesFromRegistrationFiles, fetchSchoolFileTemplatesFromRegistrationFiles,
@ -10,7 +10,7 @@ import {
import logger from '@/utils/logger'; import logger from '@/utils/logger';
import { School, CheckCircle, Hourglass, FileText } from 'lucide-react'; import { School, CheckCircle, Hourglass, FileText } from 'lucide-react';
import SectionHeader from '@/components/SectionHeader'; import SectionHeader from '@/components/SectionHeader';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
export default function ValidateSubscription({ export default function ValidateSubscription({
studentId, studentId,

0
Front-End/src/components/Form/MultiSelect.js → Front-End/src/components/MultiSelect.js
View File

0
Front-End/src/components/Form/PhoneLabel.js → Front-End/src/components/PhoneLabel.js
View File

0
Front-End/src/components/Form/RadioList.js → Front-End/src/components/RadioList.js
View File

0
Front-End/src/components/Form/SelectChoice.js → Front-End/src/components/SelectChoice.js
View File

4
Front-End/src/components/Structure/Competencies/CompetenciesList.js
View File

@ -2,9 +2,9 @@ import React, { useState, useRef, useCallback } from 'react';
import TreeView from '@/components/Structure/Competencies/TreeView'; import TreeView from '@/components/Structure/Competencies/TreeView';
import SectionHeader from '@/components/SectionHeader'; import SectionHeader from '@/components/SectionHeader';
import { Award, CheckCircle } from 'lucide-react'; import { Award, CheckCircle } from 'lucide-react';
import SelectChoice from '@/components/Form/SelectChoice'; import SelectChoice from '@/components/SelectChoice';
import CheckBox from '@/components/CheckBox'; import CheckBox from '@/components/CheckBox';
import Button from '@/components/Form/Button'; import Button from '@/components/Button';
import { useEstablishment } from '@/context/EstablishmentContext'; import { useEstablishment } from '@/context/EstablishmentContext';
import { import {
fetchEstablishmentCompetencies, fetchEstablishmentCompetencies,

6
Front-End/src/components/Structure/Configuration/ClassesSection.js
View File

@ -2,10 +2,10 @@ import { Trash2, Edit3, ZoomIn, Users, Check, X, Hand } from 'lucide-react';
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import Table from '@/components/Table'; import Table from '@/components/Table';
import Popup from '@/components/Popup'; import Popup from '@/components/Popup';
import InputText from '@/components/Form/InputText'; import InputText from '@/components/InputText';
import SelectChoice from '@/components/Form/SelectChoice'; import SelectChoice from '@/components/SelectChoice';
import TeacherItem from '@/components/Structure/Configuration/TeacherItem'; import TeacherItem from '@/components/Structure/Configuration/TeacherItem';
import MultiSelect from '@/components/Form/MultiSelect'; import MultiSelect from '@/components/MultiSelect';
import LevelLabel from '@/components/CustomLabels/LevelLabel'; import LevelLabel from '@/components/CustomLabels/LevelLabel';
import { DndProvider, useDrop } from 'react-dnd'; import { DndProvider, useDrop } from 'react-dnd';
import { HTML5Backend } from 'react-dnd-html5-backend'; import { HTML5Backend } from 'react-dnd-html5-backend';

2
Front-End/src/components/Structure/Configuration/SpecialitiesSection.js
View File

@ -2,7 +2,7 @@ import { Trash2, Edit3, Check, X, BookOpen } from 'lucide-react';
import { useState } from 'react'; import { useState } from 'react';
import Table from '@/components/Table'; import Table from '@/components/Table';
import Popup from '@/components/Popup'; import Popup from '@/components/Popup';
import InputTextWithColorIcon from '@/components/Form/InputTextWithColorIcon'; import InputTextWithColorIcon from '@/components/InputTextWithColorIcon';
import { DndProvider } from 'react-dnd'; import { DndProvider } from 'react-dnd';
import { HTML5Backend } from 'react-dnd-html5-backend'; import { HTML5Backend } from 'react-dnd-html5-backend';
import SpecialityItem from '@/components/Structure/Configuration/SpecialityItem'; import SpecialityItem from '@/components/Structure/Configuration/SpecialityItem';

4
Front-End/src/components/Structure/Configuration/TeachersSection.js
View File

@ -2,11 +2,11 @@ import React, { useState, useEffect } from 'react';
import { Edit3, Trash2, GraduationCap, Check, X, Hand } from 'lucide-react'; import { Edit3, Trash2, GraduationCap, Check, X, Hand } from 'lucide-react';
import Table from '@/components/Table'; import Table from '@/components/Table';
import Popup from '@/components/Popup'; import Popup from '@/components/Popup';
import ToggleSwitch from '@/components/Form/ToggleSwitch'; import ToggleSwitch from '@/components/ToggleSwitch';
import { useCsrfToken } from '@/context/CsrfContext'; import { useCsrfToken } from '@/context/CsrfContext';
import { DndProvider, useDrag, useDrop } from 'react-dnd'; import { DndProvider, useDrag, useDrop } from 'react-dnd';
import { HTML5Backend } from 'react-dnd-html5-backend'; import { HTML5Backend } from 'react-dnd-html5-backend';
import InputText from '@/components/Form/InputText'; import InputText from '@/components/InputText';
import SpecialityItem from '@/components/Structure/Configuration/SpecialityItem'; import SpecialityItem from '@/components/Structure/Configuration/SpecialityItem';
import TeacherItem from './TeacherItem'; import TeacherItem from './TeacherItem';
import logger from '@/utils/logger'; import logger from '@/utils/logger';

10
Front-End/src/components/Structure/Files/FileUploadDocuSeal.js
View File

@ -7,7 +7,7 @@ import {
} from '@/app/actions/registerFileGroupAction'; } from '@/app/actions/registerFileGroupAction';
import { DocusealBuilder } from '@docuseal/react'; import { DocusealBuilder } from '@docuseal/react';
import logger from '@/utils/logger'; import logger from '@/utils/logger';
import MultiSelect from '@/components/Form/MultiSelect'; // Import du composant MultiSelect import MultiSelect from '@/components/MultiSelect'; // Import du composant MultiSelect
import { useCsrfToken } from '@/context/CsrfContext'; import { useCsrfToken } from '@/context/CsrfContext';
import { useEstablishment } from '@/context/EstablishmentContext'; import { useEstablishment } from '@/context/EstablishmentContext';
import Popup from '@/components/Popup'; import Popup from '@/components/Popup';
@ -121,13 +121,7 @@ export default function FileUploadDocuSeal({
guardianDetails.forEach((guardian, index) => { guardianDetails.forEach((guardian, index) => {
logger.debug('creation du clone avec required : ', is_required); logger.debug('creation du clone avec required : ', is_required);
cloneTemplate( cloneTemplate(templateMaster?.id, guardian.email, is_required, selectedEstablishmentId, apiDocuseal)
templateMaster?.id,
guardian.email,
is_required,
selectedEstablishmentId,
apiDocuseal
)
.then((clonedDocument) => { .then((clonedDocument) => {
// Sauvegarde des schoolFileTemplates clonés dans la base de données // Sauvegarde des schoolFileTemplates clonés dans la base de données
const data = { const data = {

6
Front-End/src/components/Structure/Files/ParentFilesSection.js
View File

@ -1,14 +1,14 @@
import React, { useState } from 'react'; import React, { useState } from 'react';
import { Plus, Edit3, Trash2, Check, X, FileText } from 'lucide-react'; import { Plus, Edit3, Trash2, Check, X, FileText } from 'lucide-react';
import Table from '@/components/Table'; import Table from '@/components/Table';
import InputText from '@/components/Form/InputText'; import InputText from '@/components/InputText';
import MultiSelect from '@/components/Form/MultiSelect'; import MultiSelect from '@/components/MultiSelect';
import Popup from '@/components/Popup'; import Popup from '@/components/Popup';
import logger from '@/utils/logger'; import logger from '@/utils/logger';
import { createRegistrationParentFileTemplate } from '@/app/actions/registerFileGroupAction'; import { createRegistrationParentFileTemplate } from '@/app/actions/registerFileGroupAction';
import { useCsrfToken } from '@/context/CsrfContext'; import { useCsrfToken } from '@/context/CsrfContext';
import SectionHeader from '@/components/SectionHeader'; import SectionHeader from '@/components/SectionHeader';
import ToggleSwitch from '@/components/Form/ToggleSwitch'; import ToggleSwitch from '@/components/ToggleSwitch';
import { useNotification } from '@/context/NotificationContext'; import { useNotification } from '@/context/NotificationContext';
import AlertMessage from '@/components/AlertMessage'; import AlertMessage from '@/components/AlertMessage';

2
Front-End/src/components/Structure/Tarification/DiscountsSection.js
View File

@ -3,7 +3,7 @@ import { Trash2, Edit3, Check, X, Percent, EuroIcon, Tag } from 'lucide-react';
import Table from '@/components/Table'; import Table from '@/components/Table';
import Popup from '@/components/Popup'; import Popup from '@/components/Popup';
import CheckBox from '@/components/CheckBox'; import CheckBox from '@/components/CheckBox';
import InputText from '@/components/Form/InputText'; import InputText from '@/components/InputText';
import logger from '@/utils/logger'; import logger from '@/utils/logger';
import SectionHeader from '@/components/SectionHeader'; import SectionHeader from '@/components/SectionHeader';
import { useEstablishment } from '@/context/EstablishmentContext'; import { useEstablishment } from '@/context/EstablishmentContext';

2
Front-End/src/components/Structure/Tarification/FeesSection.js
View File

@ -3,7 +3,7 @@ import { Trash2, Edit3, Check, X, EyeOff, Eye, CreditCard } from 'lucide-react';
import Table from '@/components/Table'; import Table from '@/components/Table';
import Popup from '@/components/Popup'; import Popup from '@/components/Popup';
import CheckBox from '@/components/CheckBox'; import CheckBox from '@/components/CheckBox';
import InputText from '@/components/Form/InputText'; import InputText from '@/components/InputText';
import logger from '@/utils/logger'; import logger from '@/utils/logger';
import SectionHeader from '@/components/SectionHeader'; import SectionHeader from '@/components/SectionHeader';
import { useEstablishment } from '@/context/EstablishmentContext'; import { useEstablishment } from '@/context/EstablishmentContext';

0
Front-End/src/components/Form/ToggleSwitch.js → Front-End/src/components/ToggleSwitch.js
View File

4
Front-End/src/components/Form/WisiwigTextArea.js → Front-End/src/components/WisiwigTextArea.js
View File

@ -4,10 +4,10 @@ import 'react-quill/dist/quill.snow.css';
const ReactQuill = dynamic(() => import('react-quill'), { ssr: false }); const ReactQuill = dynamic(() => import('react-quill'), { ssr: false });
export default function WisiwigTextArea({ export default function WisiwigTextArea({
label = 'Zone de Texte', label = 'Mail',
value, value,
onChange, onChange,
placeholder = 'Ecrivez votre texte ici...', placeholder = 'Ecrivez votre mail ici...',
className = 'h-64', className = 'h-64',
required = false, required = false,
errorMsg, errorMsg,

22
conf/backend.env.default
View File

@ -1,22 +0,0 @@
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,19 +1,15 @@
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
@ -24,13 +20,17 @@ 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
env_file: "./conf/backend.env" environment:
- 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,8 +40,6 @@ services:
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- NODE_ENV=production - NODE_ENV=production
volumes: - NEXT_PUBLIC_API_URL=http://toto:8080
- ./conf/env:/app/.env depends_on:
volumes: - backend
postgres-data:
redis-data:

92
docker-compose.yml
View File

@ -1,24 +1,55 @@
services: services:
redis: redis:
image: "redis:latest" image: "redis:latest"
volumes: ports:
- redis-data:/data - 6379:6379
expose:
- 6379
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
database: database:
image: "postgres:latest" image: "postgres:latest"
expose: ports:
- 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:
@ -27,15 +58,54 @@ services:
- 8080:8080 - 8080:8080
volumes: volumes:
- ./Back-End:/Back-End - ./Back-End:/Back-End
env_file: "./conf/backend.env" environment:
- 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:
postgres-data: caddy_data:
redis-data: caddy_config:

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "n3wt-school", "name": "n3wt-school",
"version": "0.0.3", "version": "0.0.2",
"scripts": { "scripts": {
"prepare": "husky", "prepare": "husky",
"release": "standard-version", "release": "standard-version",