diff --git a/Front-End/messages/en/sidebar.json b/Front-End/messages/en/sidebar.json
index 7c93cf5..ce09e55 100644
--- a/Front-End/messages/en/sidebar.json
+++ b/Front-End/messages/en/sidebar.json
@@ -1,6 +1,6 @@
{
"dashboard": "Dashboard",
- "students": "Students",
+ "subscriptions": "Subscriptions",
"structure": "Structure",
"planning": "Schedule",
"grades": "Grades",
diff --git a/Front-End/messages/en/students.json b/Front-End/messages/en/subscriptions.json
similarity index 100%
rename from Front-End/messages/en/students.json
rename to Front-End/messages/en/subscriptions.json
diff --git a/Front-End/messages/fr/sidebar.json b/Front-End/messages/fr/sidebar.json
index 79610e7..3982d5f 100644
--- a/Front-End/messages/fr/sidebar.json
+++ b/Front-End/messages/fr/sidebar.json
@@ -1,6 +1,6 @@
{
"dashboard": "Tableau de bord",
- "students": "Élèves",
+ "subscriptions": "Inscriptions",
"structure": "Structure",
"planning": "Emploi du temps",
"grades": "Notes",
diff --git a/Front-End/messages/fr/students.json b/Front-End/messages/fr/subscriptions.json
similarity index 100%
rename from Front-End/messages/fr/students.json
rename to Front-End/messages/fr/subscriptions.json
diff --git a/Front-End/src/app/[locale]/admin/layout.js b/Front-End/src/app/[locale]/admin/layout.js
index 10ec2db..ba0ec67 100644
--- a/Front-End/src/app/[locale]/admin/layout.js
+++ b/Front-End/src/app/[locale]/admin/layout.js
@@ -17,7 +17,7 @@ import DropdownMenu from '@/components/DropdownMenu';
import Logo from '@/components/Logo';
import {
FR_ADMIN_HOME_URL,
- FR_ADMIN_STUDENT_URL,
+ FR_ADMIN_SUBSCRIPTIONS_URL,
FR_ADMIN_STRUCTURE_URL,
FR_ADMIN_GRADES_URL,
FR_ADMIN_PLANNING_URL,
@@ -33,7 +33,7 @@ export default function Layout({
const sidebarItems = {
"admin": { "id": "admin", "name": t('dashboard'), "url": FR_ADMIN_HOME_URL, "icon": Home },
- "students": { "id": "students", "name": t('students'), "url": FR_ADMIN_STUDENT_URL, "icon": Users },
+ "subscriptions": { "id": "subscriptions", "name": t('subscriptions'), "url": FR_ADMIN_SUBSCRIPTIONS_URL, "icon": Users },
"structure": { "id": "structure", "name": t('structure'), "url": FR_ADMIN_STRUCTURE_URL, "icon": Building },
"grades": { "id": "grades", "name": t('grades'), "url": FR_ADMIN_GRADES_URL, "icon": FileText },
"planning": { "id": "planning", "name": t('planning'), "url": FR_ADMIN_PLANNING_URL, "icon": Calendar },
diff --git a/Front-End/src/app/[locale]/admin/students/editInscription/page.js b/Front-End/src/app/[locale]/admin/subscriptions/editInscription/page.js
similarity index 95%
rename from Front-End/src/app/[locale]/admin/students/editInscription/page.js
rename to Front-End/src/app/[locale]/admin/subscriptions/editInscription/page.js
index c6ea300..1149b3b 100644
--- a/Front-End/src/app/[locale]/admin/students/editInscription/page.js
+++ b/Front-End/src/app/[locale]/admin/subscriptions/editInscription/page.js
@@ -2,7 +2,7 @@
import React, { useState, useEffect } from 'react';
import { useSearchParams } from 'next/navigation';
import InscriptionFormShared from '@/components/Inscription/InscriptionFormShared';
-import { FR_ADMIN_STUDENT_URL,
+import { FR_ADMIN_SUBSCRIPTIONS_URL,
BK_GESTIONINSCRIPTION_ELEVE_URL,
BK_GESTIONINSCRIPTION_FICHEINSCRIPTION_URL } from '@/utils/Url';
import useCsrfToken from '@/hooks/useCsrfToken';
@@ -72,7 +72,7 @@ export default function Page() {
const result = await response.json();
console.log('Success:', result);
// Redirection après succès
- window.location.href = FR_ADMIN_STUDENT_URL;
+ window.location.href = FR_ADMIN_SUBSCRIPTIONS_URL;
} catch (error) {
console.error('Error:', error);
alert('Une erreur est survenue lors de la mise à jour des données');
@@ -84,7 +84,7 @@ export default function Page() {
initialData={initialData}
csrfToken={csrfToken}
onSubmit={handleSubmit}
- cancelUrl={FR_ADMIN_STUDENT_URL}
+ cancelUrl={FR_ADMIN_SUBSCRIPTIONS_URL}
isLoading={isLoading}
/>
);
diff --git a/Front-End/src/app/[locale]/admin/students/page.js b/Front-End/src/app/[locale]/admin/subscriptions/page.js
similarity index 98%
rename from Front-End/src/app/[locale]/admin/students/page.js
rename to Front-End/src/app/[locale]/admin/subscriptions/page.js
index fc2bb8b..0e3e3ff 100644
--- a/Front-End/src/app/[locale]/admin/students/page.js
+++ b/Front-End/src/app/[locale]/admin/subscriptions/page.js
@@ -20,7 +20,7 @@ import AffectationClasseForm from '@/components/AffectationClasseForm'
import { BK_GESTIONINSCRIPTION_FICHESINSCRIPTION_URL,
BK_GESTIONINSCRIPTION_SEND_URL,
- FR_ADMIN_STUDENT_EDIT_SUBSCRIBE,
+ FR_ADMIN_SUBSCRIPTIONS_EDIT_URL,
BK_GESTIONINSCRIPTION_ARCHIVE_URL,
BK_GESTIONINSCRIPTION_CLASSES_URL,
BK_GESTIONINSCRIPTION_FICHEINSCRIPTION_URL,
@@ -33,7 +33,7 @@ import useCsrfToken from '@/hooks/useCsrfToken';
const useFakeData = process.env.NEXT_PUBLIC_USE_FAKE_DATA === 'true';
export default function Page({ params: { locale } }) {
- const t = useTranslations('students');
+ const t = useTranslations('subscriptions');
const [ficheInscriptions, setFicheInscriptions] = useState([]);
const [fichesInscriptionsDataEnCours, setFichesInscriptionsDataEnCours] = useState([]);
const [fichesInscriptionsDataInscrits, setFichesInscriptionsDataInscrits] = useState([]);
@@ -440,7 +440,7 @@ const columns = [
Modifier
>
),
- onClick: () => window.location.href = `${FR_ADMIN_STUDENT_EDIT_SUBSCRIBE}?idEleve=${row.eleve.id}&id=1`,
+ onClick: () => window.location.href = `${FR_ADMIN_SUBSCRIPTIONS_EDIT_URL}?idEleve=${row.eleve.id}&id=1`,
}] : []),
...(row.etat === 2 ? [{
label: (
@@ -448,7 +448,7 @@ const columns = [
Modifier
>
),
- onClick: () => window.location.href = `${FR_ADMIN_STUDENT_EDIT_SUBSCRIBE}?idEleve=${row.eleve.id}&id=1`,
+ onClick: () => window.location.href = `${FR_ADMIN_SUBSCRIPTIONS_EDIT_URL}?idEleve=${row.eleve.id}&id=1`,
}] : []),
...(row.etat === 3 ? [{
label: (
diff --git a/Front-End/src/app/[locale]/users/login/page.js b/Front-End/src/app/[locale]/users/login/page.js
index fc8de16..0352e9b 100644
--- a/Front-End/src/app/[locale]/users/login/page.js
+++ b/Front-End/src/app/[locale]/users/login/page.js
@@ -8,7 +8,7 @@ import InputTextIcon from '@/components/InputTextIcon';
import Loader from '@/components/Loader'; // Importez le composant Loader
import Button from '@/components/Button'; // Importez le composant Button
import { User, KeySquare } from 'lucide-react'; // Importez directement les icônes nécessaires
-import { BK_LOGIN_URL, FR_ADMIN_STUDENT_EDIT_SUBSCRIBE, FR_ADMIN_STUDENT_URL, FR_PARENTS_HOME_URL, FR_USERS_NEW_PASSWORD_URL, FR_USERS_SUBSCRIBE_URL } from '@/utils/Url';
+import { BK_LOGIN_URL, FR_ADMIN_SUBSCRIPTIONS_EDIT_URL, FR_ADMIN_SUBSCRIPTIONS_URL, FR_PARENTS_HOME_URL, FR_USERS_NEW_PASSWORD_URL, FR_USERS_SUBSCRIBE_URL } from '@/utils/Url';
import useLocalStorage from '@/hooks/useLocalStorage';
import useCsrfToken from '@/hooks/useCsrfToken';
const useFakeData = process.env.NEXT_PUBLIC_USE_FAKE_DATA === 'true';
@@ -44,7 +44,7 @@ export default function Page() {
setErrorMessage("")
if(isOK(data)){
localStorage.setItem('userId', data.profil); // Stocker l'identifiant de l'utilisateur
- router.push(`${FR_ADMIN_STUDENT_EDIT_SUBSCRIBE}?id=${data.profil}`);
+ router.push(`${FR_ADMIN_SUBSCRIPTIONS_EDIT_URL}?id=${data.profil}`);
} else {
if(data.errorFields){
setUserFieldError(data.errorFields.email)
@@ -86,7 +86,7 @@ export default function Page() {
router.push(`${FR_PARENTS_HOME_URL}`);
} else if (data.droit == 2) {
// Vue ADMIN
- router.push(`${FR_ADMIN_STUDENT_URL}`);
+ router.push(`${FR_ADMIN_SUBSCRIPTIONS_URL}`);
} else {
// Cas anormal
}
diff --git a/Front-End/src/app/lib/actions.js b/Front-End/src/app/lib/actions.js
index 078c1ba..5ee83b0 100644
--- a/Front-End/src/app/lib/actions.js
+++ b/Front-End/src/app/lib/actions.js
@@ -3,7 +3,7 @@ import {
BK_LOGIN_URL,
FR_USERS_LOGIN_URL ,
FR_ADMIN_HOME_URL,
- FR_ADMIN_STUDENT_URL,
+ FR_ADMIN_SUBSCRIPTIONS_URL,
FR_ADMIN_CLASSES_URL,
FR_ADMIN_GRADES_URL,
FR_ADMIN_PLANNING_URL,
diff --git a/Front-End/src/utils/Url.js b/Front-End/src/utils/Url.js
index 2773af3..c7109c4 100644
--- a/Front-End/src/utils/Url.js
+++ b/Front-End/src/utils/Url.js
@@ -43,9 +43,9 @@ export const FR_USERS_NEW_PASSWORD_URL = `/users/password/new`
//ADMIN
export const FR_ADMIN_HOME_URL = `/admin`
-// ADMIN/STUDENTS URL
-export const FR_ADMIN_STUDENT_URL = `/admin/students`
-export const FR_ADMIN_STUDENT_EDIT_SUBSCRIBE = `/admin/students/editInscription`
+// ADMIN/SUBSCRIPTIONS URL
+export const FR_ADMIN_SUBSCRIPTIONS_URL = `/admin/subscriptions`
+export const FR_ADMIN_SUBSCRIPTIONS_EDIT_URL = `/admin/subscriptions/editInscription`
//ADMIN/CLASSES URL
export const FR_ADMIN_CLASSES_URL = `/admin/classes`