From a0c38a8d590d15464aa801814254a63cda05b755 Mon Sep 17 00:00:00 2001 From: Wawilski Date: Fri, 15 Mar 2024 15:12:01 +0100 Subject: [PATCH 01/20] adding list of user PROTO --- frontend/public/i18n/EN.txt | 2 + frontend/public/i18n/FR.txt | 2 + frontend/src/App.vue | 15 ++- frontend/src/Apps/Login.vue | 2 +- frontend/src/Apps/Profil.vue | 13 ++- frontend/src/Apps/StudentsList.vue | 160 +++++++++++++++++++++++++++++ frontend/src/Apps/UsersList.vue | 157 ++++++++++++++++++++++++++++ 7 files changed, 343 insertions(+), 8 deletions(-) create mode 100644 frontend/src/Apps/StudentsList.vue create mode 100644 frontend/src/Apps/UsersList.vue diff --git a/frontend/public/i18n/EN.txt b/frontend/public/i18n/EN.txt index 90a001d..a8ed237 100644 --- a/frontend/public/i18n/EN.txt +++ b/frontend/public/i18n/EN.txt @@ -26,6 +26,8 @@ app.inscription.requests=Inscription Requests app.manage.courses=Manage Courses app.language=Language app.manage.profile=Manage profile +app.studentList=Students List +app.users=Users request.moreInfos=More Infos request.accept=Accept request.refuse=Refuse diff --git a/frontend/public/i18n/FR.txt b/frontend/public/i18n/FR.txt index c2f7689..d0ee8cf 100644 --- a/frontend/public/i18n/FR.txt +++ b/frontend/public/i18n/FR.txt @@ -26,6 +26,8 @@ app.inscription.requests=Demandes d'Inscription app.manage.courses=Gérer les cours app.language=Langue app.manage.profile=Gérer le profil +app.studentList=Liste des étudiants +app.users=Utilisateurs request.moreInfos=Plus d'Infos request.accept=Accepter request.refuse=Refuser diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 7b944de..7729b5b 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -9,12 +9,16 @@ import Inscription from "./Apps/Inscription.vue" import Profil from "./Apps/Profil.vue" import Courses from "./Apps/ManageCourses.vue" + import Students from "./Apps/StudentsList.vue" + import Users from "./Apps/UsersList.vue" const apps = { - '/login': LoginPage, + '/login': LoginPage, '/inscription': Inscription, '/profil': Profil, '/manage-courses' : Courses, + '/students' : Students, + '/users' : Users, } const currentPath = ref(window.location.hash) @@ -105,8 +109,13 @@
  • {{i18n("app.manage.courses")}}
  • - - +
  • +
    +
    {{i18n("app.studentList")}}
  • +
  • +
    +
    {{i18n("app.users")}}
  • +
    diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue index b7b3242..fbc0dfe 100644 --- a/frontend/src/Apps/Login.vue +++ b/frontend/src/Apps/Login.vue @@ -104,7 +104,7 @@
    -

    ProfilePicture

    +

    {{i18n("profile.picture").toUpperCase()}}

    diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue index 8068690..9c1c962 100644 --- a/frontend/src/Apps/Profil.vue +++ b/frontend/src/Apps/Profil.vue @@ -1,12 +1,13 @@ @@ -74,7 +78,8 @@ const toModify = Object.assign({}, user);
    - + +
    @@ -102,7 +107,7 @@ const toModify = Object.assign({}, user);
    {{i18n("profile.picture")}}: - +
    E-mail: diff --git a/frontend/src/Apps/StudentsList.vue b/frontend/src/Apps/StudentsList.vue new file mode 100644 index 0000000..539996f --- /dev/null +++ b/frontend/src/Apps/StudentsList.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/frontend/src/Apps/UsersList.vue b/frontend/src/Apps/UsersList.vue new file mode 100644 index 0000000..f8c5920 --- /dev/null +++ b/frontend/src/Apps/UsersList.vue @@ -0,0 +1,157 @@ + + + + + + From b047c4de351f03905b0f29edd8c0a9b77b65e7a3 Mon Sep 17 00:00:00 2001 From: Wawilski Date: Fri, 15 Mar 2024 20:23:33 +0100 Subject: [PATCH 02/20] Listing users and students --- frontend/{src/assets => public}/Clyde.png | Bin frontend/public/i18n/EN.txt | 1 + frontend/public/i18n/FR.txt | 1 + frontend/src/App.vue | 4 +- frontend/src/Apps/Profil.vue | 7 +- frontend/src/Apps/Request.vue | 2 +- frontend/src/Apps/StudentsList.vue | 30 +++---- frontend/src/Apps/UsersList.vue | 100 +++------------------- 8 files changed, 38 insertions(+), 107 deletions(-) rename frontend/{src/assets => public}/Clyde.png (100%) diff --git a/frontend/src/assets/Clyde.png b/frontend/public/Clyde.png similarity index 100% rename from frontend/src/assets/Clyde.png rename to frontend/public/Clyde.png diff --git a/frontend/public/i18n/EN.txt b/frontend/public/i18n/EN.txt index a8ed237..f3bfa22 100644 --- a/frontend/public/i18n/EN.txt +++ b/frontend/public/i18n/EN.txt @@ -43,6 +43,7 @@ profile.unRegister=Unregister profile.course.list=Courses list profile.address=Address profile.picture=Profile picture +profile.change.curriculum=Change curriculum name=Name teacher=Teacher student=Student diff --git a/frontend/public/i18n/FR.txt b/frontend/public/i18n/FR.txt index d0ee8cf..f86b26c 100644 --- a/frontend/public/i18n/FR.txt +++ b/frontend/public/i18n/FR.txt @@ -43,6 +43,7 @@ profile.unRegister=Désinscription profile.course.list=Liste des cours profile.address=Adresse profile.picture=Photo de profil +profile.change.curriculum=Changer cursus name=Nom teacher=Enseignant student=Etudiant diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 7729b5b..51ca585 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -45,7 +45,7 @@
    +
    + +
    diff --git a/frontend/src/Apps/StudentsList.vue b/frontend/src/Apps/StudentsList.vue index 539996f..36b7b9b 100644 --- a/frontend/src/Apps/StudentsList.vue +++ b/frontend/src/Apps/StudentsList.vue @@ -3,8 +3,8 @@ import { reactive } from 'vue' const users =[{ - state: "Inscrit", - profilPicture:"../assets/clyde.png", + status: "Inscrit", + profilPicture:"/Clyde.png", lastName:"Ghost", firstName:"Clyde", role:"student", @@ -31,8 +31,8 @@ const users =[{ degree:"BAC1", password:"CeciEstUnMotDePasse123",}, { - state: "En attente", - profilPicture:"../assets/clyde.png", + status: "En attente", + profilPicture:"/Clyde.png", lastName:"Ghost", firstName:"Clyde", role:"student", @@ -67,14 +67,12 @@ console.log(users[0])
    - - + +
    -
    -
    -
    +
    @@ -83,11 +81,11 @@ console.log(users[0]) .container{ color:white; height:100px; - font-size:20px; + font-size:30px; display:grid; - grid-template-columns:[firstCol-start]100px[firstCol-end secondCol-start]150px[secondCol-end thirdCol-start]200px[thirdCol-end fourthCol-start]150px[fourthCol-end]150px[fifthCol-end]150px[sixthCol-end]150px[endCol]; + grid-template-columns:250px 250px 250px 250px 150px; grid-template-areas: - "id type surname firstname infos accept refuse"; + "status option surname firstname infos"; column-gap:10px; } @@ -97,8 +95,8 @@ console.log(users[0]) align-self:center; } - .accept{ - grid-area:accept; + .option{ + grid-area:option; align-self:center; } @@ -117,8 +115,8 @@ console.log(users[0]) align-self:center; } - .type{ - grid-area:type; + .status{ + grid-area:status; align-self:center; } diff --git a/frontend/src/Apps/UsersList.vue b/frontend/src/Apps/UsersList.vue index f8c5920..949f3a4 100644 --- a/frontend/src/Apps/UsersList.vue +++ b/frontend/src/Apps/UsersList.vue @@ -2,72 +2,15 @@