tonitch/Clyde
1
0
Fork 0
forked from PGL/Clyde
Code Pull Requests Activity

UserList and Student List part1

Browse Source
This commit is contained in:
Wawilski 2024-03-17 15:59:12 +01:00
parent 210fda0401
commit b2d0be014c
6 changed files with 22 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
View File

@ -48,9 +48,9 @@ public class UserController {
} }
@GetMapping("/users") @GetMapping("/users")
public ResponseEntity<Iterable<HashMap<String,Object>>> getAllUsers(@RequestHeader("Authorization") String authorization){ public ResponseEntity<Iterable<HashMap<String,Object>>> getAllUsers(@RequestHeader("authorization") String authorization){
System.out.println(authorization);
if (authServ.isNotSecretaryOrAdmin(authorization)) if (authServ.IsNotIn(new Role[]{Role.Admin,Role.Secretary},authorization))
return new UnauthorizedResponse<>(null); return new UnauthorizedResponse<>(null);
Iterable<User> users = userService.getAll(); Iterable<User> users = userService.getAll();

10
frontend/public/i18n/EN.txt
View File

@ -45,9 +45,9 @@ profile.address=Address
profile.picture=Profile picture profile.picture=Profile picture
profile.change.curriculum=Change curriculum profile.change.curriculum=Change curriculum
name=Name name=Name
teacher=Teacher Teacher=Teacher
student=Student Student=Student
secretary=Secretary Secretary=Secretary
curriculum=curriculum Curriculum=curriculum
credits=Credits Credits=Credits
faculty=Faculty faculty=Faculty

10
frontend/public/i18n/FR.txt
View File

@ -45,9 +45,9 @@ profile.address=Adresse
profile.picture=Photo de profil profile.picture=Photo de profil
profile.change.curriculum=Changer cursus profile.change.curriculum=Changer cursus
name=Nom name=Nom
teacher=Enseignant Teacher=Enseignant
student=Etudiant Student=Etudiant
secretary=Secrétaire Secretary=Secrétaire
curriculum=Cursus Curriculum=Cursus
credits=Credits Credits=Credits
faculty=Faculté faculty=Faculté

63
frontend/src/Apps/StudentsList.vue
View File

@ -1,72 +1,17 @@
<script setup> <script setup>
import i18n from "@/i18n.js" import i18n from "@/i18n.js"
import { reactive } from 'vue' import { reactive } from 'vue'
import { getStudents } from '../rest/Users.js'
const users =[{ const users = await getStudents();
status: "Inscrit", console.log(users)
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",
}]
</script> </script>
<template> <template>
<div v-for="item in users"> <div v-for="item in users">
<div class="bodu"> <div class="bodu">
<div class="container"> <div class="container">
<div class="status"><a style="margin-left:30px">{{item.status}}</a></div> <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="surname"><a>{{item.lastName}}</a></div>
<div class="firstname"><a>{{item.firstName}}</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> <div class="infos"><button style="background-color:rgb(105,05,105);" >{{i18n("request.moreInfos")}} </button></div>

3
frontend/src/Apps/UsersList.vue
View File

@ -6,12 +6,13 @@
const users = await getAllUsers(); const users = await getAllUsers();
console.log(users);
</script> </script>
<template> <template>
<div v-for="item in users"> <div v-for="item in users">
<div class="bodu"> <div class="bodu">
<div class="container"> <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="surname"><a>{{item.lastName}}</a></div>
<div class="firstname"><a>{{item.firstName}}</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> <div class="infos"><button style="background-color:rgb(105,05,105);" >{{i18n("request.moreInfos")}} </button></div>

4
frontend/src/rest/Users.js
View File

@ -112,12 +112,12 @@ export async function getAllUsers(){
* - role * - role
*/ */
export async function getTeachers(){ export async function getTeachers(){
return restGet("/users/teacher") return restGet("/teachers")
} }
export async function getStudents(){ export async function getStudents(){
return restGet("/users/student") return restGet("/students")
} }
/** /**
* Get informations about yourself * Get informations about yourself