From b2d0be014c5bbfe14b892fbc108b6450ffb940eb Mon Sep 17 00:00:00 2001
From: Wawilski <Karpinskiwal@gmail.com>
Date: Sun, 17 Mar 2024 15:59:12 +0100
Subject: [PATCH] UserList and Student List part1

---
 .../Clyde/EndPoints/UserController.java       |  6 +-
 frontend/public/i18n/EN.txt                   | 10 +--
 frontend/public/i18n/FR.txt                   | 10 +--
 frontend/src/Apps/StudentsList.vue            | 63 ++-----------------
 frontend/src/Apps/UsersList.vue               |  5 +-
 frontend/src/rest/Users.js                    |  4 +-
 6 files changed, 22 insertions(+), 76 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
index 9461ba4..c43b195 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
@@ -48,9 +48,9 @@ public class UserController {
     }
 
     @GetMapping("/users")
-    public ResponseEntity<Iterable<HashMap<String,Object>>> getAllUsers(@RequestHeader("Authorization") String authorization){
-
-        if (authServ.isNotSecretaryOrAdmin(authorization))
+    public ResponseEntity<Iterable<HashMap<String,Object>>> getAllUsers(@RequestHeader("authorization") String authorization){
+        System.out.println(authorization);
+        if (authServ.IsNotIn(new Role[]{Role.Admin,Role.Secretary},authorization))
             return new UnauthorizedResponse<>(null);
 
         Iterable<User> users = userService.getAll();
diff --git a/frontend/public/i18n/EN.txt b/frontend/public/i18n/EN.txt
index f3bfa22..283a781 100644
--- a/frontend/public/i18n/EN.txt
+++ b/frontend/public/i18n/EN.txt
@@ -45,9 +45,9 @@ profile.address=Address
 profile.picture=Profile picture
 profile.change.curriculum=Change curriculum
 name=Name
-teacher=Teacher
-student=Student
-secretary=Secretary
-curriculum=curriculum
-credits=Credits
+Teacher=Teacher
+Student=Student
+Secretary=Secretary
+Curriculum=curriculum
+Credits=Credits
 faculty=Faculty
diff --git a/frontend/public/i18n/FR.txt b/frontend/public/i18n/FR.txt
index f86b26c..15fa856 100644
--- a/frontend/public/i18n/FR.txt
+++ b/frontend/public/i18n/FR.txt
@@ -45,9 +45,9 @@ profile.address=Adresse
 profile.picture=Photo de profil
 profile.change.curriculum=Changer cursus
 name=Nom
-teacher=Enseignant
-student=Etudiant
-secretary=Secrétaire
-curriculum=Cursus
-credits=Credits
+Teacher=Enseignant
+Student=Etudiant
+Secretary=Secrétaire
+Curriculum=Cursus
+Credits=Credits
 faculty=Faculté
diff --git a/frontend/src/Apps/StudentsList.vue b/frontend/src/Apps/StudentsList.vue
index 93fee03..89dae0b 100644
--- a/frontend/src/Apps/StudentsList.vue
+++ b/frontend/src/Apps/StudentsList.vue
@@ -1,72 +1,17 @@
 <script setup>
   import i18n from "@/i18n.js"
   import { reactive  } from 'vue'
+  import { getStudents } from '../rest/Users.js'
 
-const users =[{
-  status: "Inscrit",
-  profilPicture:"/Clyde.png",
-  lastName:"Ghost",
-  firstName:"Clyde",
-  role:"student",
-  address: "Radiator Springs",
-  email:"ClydeGhost@gmail.com",
-  cursus:[
-  {
-  "id": 12,
-  "name": "Math pour l'info",
-  "credits": 11,
-  "faculty": "science",
-  "teacher": 42,
-  "Assistants": []},
-  {
-  "id": 42,
-  "name": "Fonctionnement des ordinateurs",
-  "credits": 11,
-  "faculty": "science",
-  "teacher": 42,
-  "Assistants": []},
-
-  ],
-  option:"IT",
-  degree:"BAC1",
-  password:"CeciEstUnMotDePasse123",},
-  {
-  status: "En attente",
-  profilPicture:"/Clyde.png",
-  lastName:"Ghost",
-  firstName:"Clyde",
-  role:"student",
-  address: "Radiator Springs",
-  email:"ClydeGhost@gmail.com",
-  cursus:[
-  {
-  "id": 12,
-  "name": "Math pour l'info",
-  "credits": 11,
-  "faculty": "science",
-  "teacher": 42,
-  "Assistants": []},
-  {
-  "id": 42,
-  "name": "Fonctionnement des ordinateurs",
-  "credits": 11,
-  "faculty": "science",
-  "teacher": 42,
-  "Assistants": []},
-
-  ],
-  option:"IT",
-  degree:"BAC1",
-  password:"CeciEstUnMotDePasse123",
-  }]
-
+  const users = await getStudents();
+  console.log(users)
 </script> 
 <template>
   <div v-for="item in users">
     <div class="bodu">
       <div class="container">
         <div class="status"><a style="margin-left:30px">{{item.status}}</a></div>
-        <div class="option"><a>{{item.option}}</a></div>
+        <div class="option"><a>{{item.role}}</a></div>
         <div class="surname"><a>{{item.lastName}}</a></div>
         <div class="firstname"><a>{{item.firstName}}</a></div>
         <div class="infos"><button style="background-color:rgb(105,05,105);" >{{i18n("request.moreInfos")}}   </button></div>
diff --git a/frontend/src/Apps/UsersList.vue b/frontend/src/Apps/UsersList.vue
index 46e93b7..73f68b2 100644
--- a/frontend/src/Apps/UsersList.vue
+++ b/frontend/src/Apps/UsersList.vue
@@ -5,13 +5,14 @@
   import { getAllUsers } from '../rest/Users.js'
 
   const users = await getAllUsers();
-
+  
+  console.log(users);
 </script> 
 <template>
   <div v-for="item in users">
     <div class="bodu">
       <div class="container">
-        <div class="role"><a style="margin-left:30px">{{i18n(item.role).toUpperCase()}}</a></div>
+        <div class="role"><a style="margin-left:30px">{{i18n(item.role)}}</a></div>
         <div class="surname"><a>{{item.lastName}}</a></div>
         <div class="firstname"><a>{{item.firstName}}</a></div>
         <div class="infos"><button style="background-color:rgb(105,05,105);" >{{i18n("request.moreInfos")}}   </button></div>
diff --git a/frontend/src/rest/Users.js b/frontend/src/rest/Users.js
index 83c1937..0636ccd 100644
--- a/frontend/src/rest/Users.js
+++ b/frontend/src/rest/Users.js
@@ -112,12 +112,12 @@ export async function getAllUsers(){
  * - role
  */
 export async function getTeachers(){
-	return restGet("/users/teacher")
+	return restGet("/teachers")
 }
 
 
 export async function getStudents(){
-  return restGet("/users/student")
+  return restGet("/students")
 }
 /**
  * Get informations about yourself