Merge branch 'master' into Max/Backend/Curriculum

backend/build.gradle.kts

@@ -41,3 +41,4 @@ tasks.register("run") {
 tasks.withType<Test> {
 	useJUnitPlatform()
 }
+

backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java

@@ -1,10 +1,7 @@
 package ovh.herisson.Clyde.EndPoints;
 
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
 import ovh.herisson.Clyde.Repositories.TokenRepository;
 import ovh.herisson.Clyde.Repositories.UserRepository;
 import ovh.herisson.Clyde.Services.*;
@@ -12,11 +9,10 @@ import ovh.herisson.Clyde.Tables.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Date;
 
 @RestController
-@CrossOrigin(origins = "http://localhost:5173")
+@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 
 public class MockController {
     private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
@@ -24,11 +20,8 @@ public class MockController {
     public final UserRepository userRepo;
     public final TokenRepository tokenRepo;
     public final TokenService tokenService;
-
     public final CursusCourseService cursusCourseService;
-
     public final CursusService cursusService;
-
     public final CourseService courseService;
     ArrayList<User> mockUsers;
 
@@ -58,7 +51,6 @@ public class MockController {
         User joe = new User("Mama","Joe","student@student.com","roundabout","DaWarudo",new Date(0), null,Role.Student,passwordEncoder.encode("student"));
         User meh = new User("Inspiration","lackOf","secretary@secretary.com","a Box","the street",new Date(0), null,Role.Teacher,passwordEncoder.encode("secretary"));
         User joke = new User("CthemBalls","Lemme","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
-
         mockUsers = new ArrayList<User>(Arrays.asList(herobrine,joe,meh,joke));
 
         userRepo.saveAll(mockUsers);
@@ -108,3 +100,4 @@ public class MockController {
         userRepo.deleteAll(mockUsers);
     }
 }
+

backend/src/main/java/ovh/herisson/Clyde/EndPoints/PingController.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 import ovh.herisson.Clyde.Responses.PingResponse;
 
 @RestController
-@CrossOrigin(origins = "http://localhost:5173")
+@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 public class PingController {
 
 	@GetMapping("/ping")

backend/src/main/java/ovh/herisson/Clyde/EndPoints/StorageController.java

@@ -1,16 +1,15 @@
 package ovh.herisson.Clyde.EndPoints;
 
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import ovh.herisson.Clyde.Services.StorageService;
-import org.springframework.core.io.Resource;
 import ovh.herisson.Clyde.Tables.FileType;
+import ovh.herisson.Clyde.Tables.StorageFile;
 
 @RestController
-@CrossOrigin(origins = "http://localhost:5173")
+@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 public class StorageController {
 
     private final StorageService storageServ;
@@ -21,12 +20,17 @@ public class StorageController {
 
 
     @PostMapping("/upload/{fileType}")
-    public ResponseEntity<String> handleFileUpload(@RequestParam("file") MultipartFile file, @PathVariable FileType fileType) {
+    public ResponseEntity<StorageFile> handleFileUpload(@RequestParam("file") MultipartFile file, @PathVariable FileType fileType) {
 
-        String path = storageServ.store(file,fileType);
+		StorageFile fileEntry = null;
+		try {
+			fileEntry = storageServ.store(file,fileType);
 			
-        if (path == null) return new ResponseEntity<>("issue with the file storage", HttpStatus.BAD_REQUEST);
+		} catch(Exception e){
+			e.printStackTrace();
+		}
 
-        return  new ResponseEntity<>(path, HttpStatus.OK);
+
+        return new ResponseEntity<>(fileEntry, HttpStatus.OK);
     }
 }

backend/src/main/java/ovh/herisson/Clyde/EndPoints/TokenController.java

@@ -9,7 +9,7 @@ import ovh.herisson.Clyde.Services.TokenService;
 import ovh.herisson.Clyde.Tables.Token;
 
 @RestController
-@CrossOrigin(origins = "http://localhost:5173")
+@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 public class TokenController {
 
     private final TokenService tokenServ;

backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java

@@ -2,17 +2,20 @@ package ovh.herisson.Clyde.EndPoints;
 
 
 import org.springframework.http.HttpStatus;
-
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.AuthenticatorService;
 import ovh.herisson.Clyde.Services.UserService;
+import ovh.herisson.Clyde.Tables.Role;
 import ovh.herisson.Clyde.Tables.User;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 
 @RestController
-@CrossOrigin(origins = "http://localhost:5173")
+@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 public class UserController {
 
     private final UserService userService;
@@ -23,23 +26,78 @@ public class UserController {
     }
 
     @GetMapping("/user")
-    public ResponseEntity<User> getUser(@RequestHeader("Cookie") String authorization){
+    public ResponseEntity<HashMap<String,Object>> getUser(@RequestHeader("Authorization") String authorization){
 
         if (authorization == null) return new UnauthorizedResponse<>(null);
         User user = authServ.getUserFromToken(authorization);
         if (user == null) return new UnauthorizedResponse<>(null);
-        return new ResponseEntity<>(user, HttpStatus.OK);
+
+        return new ResponseEntity<>(userWithoutPassword(user), HttpStatus.OK);
     }
 
-    @PostMapping("/user") //todo check role
+    @PostMapping("/user")
-    public ResponseEntity<String> postUser(@RequestBody User user){
+    public ResponseEntity<String> postUser(@RequestBody User user,@RequestHeader("Authorization") String authorization){
+
+        if (!isSecretaryOrAdmin(authorization))
+            return new UnauthorizedResponse<>(null);
+
         userService.save(user);
         return new ResponseEntity<>(String.format("Account created with ID:%s",user.getRegNo()),HttpStatus.CREATED);
     }
 
     @GetMapping("/users")
-    public Iterable<User> getAllUsers(){
+    public ResponseEntity<Iterable<HashMap<String,Object>>> getAllUsers(@RequestHeader("Authorization") String authorization){
-        return userService.getAll();
+
+        if (!isSecretaryOrAdmin(authorization))
+            return new UnauthorizedResponse<>(null);
+
+        Iterable<User> users = userService.getAll();
+        ArrayList<HashMap<String, Object>> withoutPassword = new ArrayList<>();
+
+        for (User u :users){
+            withoutPassword.add(userWithoutPassword(u));
+        }
+        return new ResponseEntity<>(withoutPassword, HttpStatus.OK);
+    }
+    @PatchMapping("/user")
+    public ResponseEntity<String> patchUser(@RequestBody Map<String,Object> updates, @RequestHeader("Authorization") String authorization) {
+
+        if (authorization == null) return new UnauthorizedResponse<>(null);
+
+        User poster = authServ.getUserFromToken(authorization);
+        if (poster == null) {return new UnauthorizedResponse<>("bad authorization");}
+
+        if (!userService.modifyData(poster, updates, poster))
+            return new UnauthorizedResponse<>("there was an issue with the updates requested");
+
+        return new ResponseEntity<>("data modified", HttpStatus.OK);
+    }
+        /** return user's data except password
+         * @param user the user to return
+         * @return all the user data without the password
+         */
+    private HashMap<String,Object> userWithoutPassword(User user){
+        HashMap<String,Object> toReturn = new HashMap<>();
+
+        toReturn.put("regNo",user.getRegNo());
+        toReturn.put("firstName",user.getFirstName());
+        toReturn.put("lastName",user.getLastName());
+        toReturn.put("birthDate",user.getBirthDate());
+        toReturn.put("country",user.getCountry());
+        toReturn.put("address",user.getAddress());
+        toReturn.put("role",user.getRole());
+
+        return toReturn;
+    }
+
+    private boolean isSecretaryOrAdmin(String authorization){
+        if (authorization ==null)
+            return false;
+
+        User poster = authServ.getUserFromToken(authorization);
+        if (poster == null) return false;
+
+        return poster.getRole() == Role.Secretary && poster.getRole() == Role.Admin;
     }
 }
 

backend/src/main/java/ovh/herisson/Clyde/Services/StorageService.java

@@ -1,13 +1,13 @@
 package ovh.herisson.Clyde.Services;
 
-import org.springframework.core.io.UrlResource;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import ovh.herisson.Clyde.Repositories.FileRepository;
-import ovh.herisson.Clyde.Tables.FileType;
+import ovh.herisson.Clyde.Tables.*;
-import ovh.herisson.Clyde.Tables.StorageFile;
+
+import java.io.File;
 import java.io.IOException;
-import org.springframework.core.io.Resource;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -24,10 +24,18 @@ public class StorageService {
 
     public StorageService(FileRepository filerepo){
         this.fileRepo = filerepo;
+
+		if(!Files.exists(rootLocation)){
+			try {
+				Files.createDirectories(rootLocation);
+			} catch(IOException e){
+				e.printStackTrace();
+			}
+		}
     }
 
 
-    public String store(MultipartFile file, FileType fileType) {
+    public StorageFile store(MultipartFile file, FileType fileType) {
 
         if (file.getOriginalFilename().isEmpty()){return null;}
 
@@ -49,8 +57,14 @@ public class StorageService {
         String url = this.rootLocation.resolve(Paths.get(Objects.requireNonNull(stringUuid)))
                 .normalize().toString();
 
-        fileRepo.save(new StorageFile(file.getName(),url, fileType));
+        return fileRepo.save(new StorageFile(file.getName(),url, fileType));
+    }
 
-        return url;
+    public void delete(StorageFile file) throws SecurityException {
+        File f = new File(file.getUrl());
+        f.delete();
+
+        //Delete l'entité
+        fileRepo.delete(file);
     }
 }

backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java

@@ -5,16 +5,10 @@ import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.UserRepository;
 import ovh.herisson.Clyde.Tables.Role;
 import ovh.herisson.Clyde.Tables.User;
-
+import java.util.*;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
 
 @Service
 public class UserService {
-
     private final UserRepository userRepo;
     private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
 
@@ -34,17 +28,79 @@ public class UserService {
         }
     }
 
+    /** modify the target data
+     * verify the permission of modifying from the poster
+     *
+     * @param poster the user wanting to modify target's data
+     * @param updates the changes to be made
+     * @param target the user to update
+     * @return if the changes were done or not
+     */
+    public boolean modifyData(User poster, Map<String ,Object> updates, User target){
+
+        if (poster.getRegNo().equals(target.getRegNo())){
+            for (Map.Entry<String, Object> entry : updates.entrySet()){
+
+                if ( entry.getKey().equals("regNo") || entry.getKey().equals("role")) {return false;}
+
+                switch (entry.getKey()){
+                    case "firstName":
+                        target.setFirstName((String) entry.getValue());
+                        break;
+                    case "lastName":
+                        target.setLastName((String) entry.getValue());
+                        break;
+                    case "email":
+                        target.setEmail((String) entry.getValue());
+                        break;
+                    case "address":
+                        target.setAddress((String) entry.getValue());
+                        break;
+                    case "country":
+                        target.setCountry((String) entry.getValue());
+                        break;
+                    case "birthDate":
+                        target.setBirthDate((Date) entry.getValue());
+                        break;
+                    case "profilePictureUrl":
+                        target.setProfilePictureUrl((String) entry.getValue());
+                        break;
+                    case "password":
+                        target.setPassword(passwordEncoder.encode((String) entry.getValue()));
+                        break;
+                }
+            }
+            userRepo.save(target);
+            return true;
+        }
+        // the secretary can change roles (for example if a student becomes a teacher)
+        else if (poster.getRole() == Role.Secretary)
+        {
+            for (Map.Entry<String, Object> entry : updates.entrySet()){
+
+                if ( !entry.getKey().equals("role")) {return false;}
+
+                if (entry.getValue() == Role.Admin){return false;}
+
+                target.setRole((Role) entry.getValue());
+                userRepo.save(target);
+                return true;
+            }
+        }
+        return false;
+    }
+
 
     public boolean checkPassword(User user, String tryingPassword){
         return passwordEncoder.matches(tryingPassword,  user.getPassword());
     }
 
     public void save(User  user){
+        user.setPassword(passwordEncoder.encode(user.getPassword()));
         userRepo.save(user);
     }
 
     public Iterable<User> getAll(){
         return userRepo.findAll();
     }
-
 }

backend/src/main/java/ovh/herisson/Clyde/Tables/ReinscriptionRequest.java

@@ -19,7 +19,7 @@ public class ReinscriptionRequest {
 
     //Permet de différencier les demandes de changement et une réinscription dans le même cursus
     //Pour la réinscription on va le mettre a 0
-    private boolean type;
+    private boolean type = false;
 
     public ReinscriptionRequest(){}
 
@@ -30,6 +30,12 @@ public class ReinscriptionRequest {
         this.type = type;
     }
 
+    public ReinscriptionRequest(User user, Cursus newCursus, RequestState state){
+        this.user = user;
+        this.newCursus = newCursus;
+        this.state = state;
+    }
+
     public int getId() {
         return id;
     }

backend/src/main/java/ovh/herisson/Clyde/Tables/StorageFile.java

@@ -1,9 +1,6 @@
 package ovh.herisson.Clyde.Tables;
 
-import jakarta.persistence.Entity;
+import jakarta.persistence.*;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
 
 
 @Entity
@@ -19,7 +16,6 @@ public class StorageFile {
 
     private FileType fileType;
 
-
     public StorageFile(String name, String url, FileType fileType){
         this.name = name;
         this.url = url;
@@ -60,4 +56,5 @@ public class StorageFile {
     public void setFileType(FileType fileType) {
         this.fileType = fileType;
     }
+
 }

backend/src/main/java/ovh/herisson/Clyde/Tables/User.java

@@ -8,12 +8,11 @@ import java.util.Date;
 //et l'attribut tokenApi doit encore être ajouté vu qu'il faut en discuter
 
 @Entity
-//Je rajoute un s au nom de la table pour éviter les conflits avec les mots réservés
 @Table(name = "Users")
 public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private int regNo;
+    private Long regNo;
     private String lastName;
     private String firstName;
     @Column(unique = true)
@@ -38,9 +37,34 @@ public class User {
         this.password = password;
     }
 
+
+    /** Constructor for the first registration request from a student (can't specify a Role)
+     *
+     * @param lastName
+     * @param firstName
+     * @param email
+     * @param address
+     * @param country
+     * @param birthDate
+     * @param profilePictureUrl
+     * @param password
+     */
+    public User(String lastName, String firstName, String email, String address,
+                String country, Date birthDate, String profilePictureUrl, String password)
+    {
+        this.lastName = lastName;
+        this.firstName = firstName;
+        this.email = email;
+        this.address = address;
+        this.country = country;
+        this.birthDate = birthDate;
+        this.profilePictureUrl = profilePictureUrl;
+        this.password = password;
+        this.role = Role.Student;
+    }
     public User() {}
 
-    public int getRegNo(){
+    public Long getRegNo(){
         return this.regNo;
     }
     public String getLastName() {

frontend/public/i18n/EN.txt

@@ -1,11 +1,9 @@
-# English translations (some examples to remove)
-
 login.guest.signin=Sign in
 login.guest.register=Register
 login.guest.alregister=Already Registered
 login.guest.welcome=WELCOME TO THE UNIVERSITY
 login.guest.email=E-MAIL 
-login.guest.firstname= FIRSTNAME
+login.guest.firstname=FIRSTNAME
 login.guest.surname=SURNAME
 login.guest.country=COUNTRY
 login.guest.address=ADDRESS
@@ -15,6 +13,8 @@ login.guest.lastpage=Last Page
 login.guest.submit=Submit
 login.guest.birthday=BIRTHDAY
 login.guest.confirm=CONFIRM
+login.cPassword=Confirm Password
+login.password=Password
 app.home=Home
 app.login=Login
 app.notifications=Notifications
@@ -23,8 +23,28 @@ app.messages=Messages
 app.forum=Forum
 app.schedules=Schedules
 app.inscription.requests=Inscription Requests
+app.manage.courses=Manage Courses
+app.language=Language
+app.manage.profile=Manage profile
 request.moreInfos=More Infos
 request.accept=Accept
 request.refuse=Refuse
-#=====================================================
+courses.createCourse=Create course
-
+courses.deleteCourse=Delete course
+courses.modify=Modify
+courses.toDelete=Course to Delete
+courses.confirm=Confirm
+courses.back=Back
+profile.modify.data=Modify personnal data
+profile.reRegister=Re-register
+profile.unRegister=Unregister
+profile.course.list=Courses list
+profile.address=Address
+profile.picture=Profile picture
+name=Name
+teacher=Teacher
+student=Student
+secretary=Secretary
+curriculum=curriculum
+credits=Credits
+faculty=Faculty

frontend/public/i18n/FR.txt

@@ -1,20 +1,20 @@
-# Traductions françaises (Quelques examples a enlever)
-
 login.guest.signin=SE CONNECTER
 login.guest.register=S'enregistrer
 login.guest.alregister=Déjà Enregistré
 login.guest.welcome=BIENVENUE A L'UNIVERSITE
 login.guest.email=E-MAIL 
-login.guest.firstname= PRENOM
+login.guest.firstname=PRENOM
-login.guest.surname= NOM
+login.guest.surname=NOM
-login.guest.country= PAYS
+login.guest.country=PAYS
 login.guest.address=ADRESSE
-login.guest.password= MOT DE PASSE
+login.guest.password=MOT DE PASSE
 login.guest.nextpage=Prochaine Page
 login.guest.lastpage=Derniere Page
 login.guest.submit=Envoyer
 login.guest.birthday=DATE DE NAISSANCE
 login.guest.confirm=CONFIRMER
+login.cPassword=Confirmer mot de passe
+login.password=Mot de passe
 app.home=Home
 app.login=Se connecter
 app.notifications=Notifications
@@ -23,7 +23,28 @@ app.messages=Messages
 app.forum=Forum
 app.schedules=Horaires
 app.inscription.requests=Demandes d'Inscription
+app.manage.courses=Gérer les cours
+app.language=Langue
+app.manage.profile=Gérer le profil
 request.moreInfos=Plus d'Infos
 request.accept=Accepter
 request.refuse=Refuser
-#=====================================================
+courses.createCourse=Créer un cours
+courses.deleteCourse=Supprimer un cours
+courses.modify=Modifier
+courses.toDelete=Cours à supprimer
+courses.confirm=Confirmer
+courses.back=Retour
+profile.modify.data=Modifier données personnelles
+profile.reRegister=Réinsciption
+profile.unRegister=Désinscription
+profile.course.list=Liste des cours
+profile.address=Adresse
+profile.picture=Photo de profil
+name=Nom
+teacher=Enseignant
+student=Etudiant
+secretary=Secrétaire
+curriculum=Cursus
+credits=Credits
+faculty=Faculté

frontend/src/App.vue

@@ -8,11 +8,13 @@
   import LoginPage from './Apps/Login.vue'
   import Inscription from "./Apps/Inscription.vue"
   import Profil from "./Apps/Profil.vue"
+  import Courses from "./Apps/ManageCourses.vue" 
 
   const apps = {
   	'/login': LoginPage,
 	'/inscription': Inscription,
-  '/profil': Profil
+  '/profil': Profil,
+  '/manage-courses' : Courses,
   }
   const currentPath = ref(window.location.hash)
 
@@ -39,7 +41,7 @@
       <ul class="horizontal">
         <li title=home>
             <a class="icon" href="#home">
-                <img @click="draw" src="./assets/Clyde.png" style="width: 40px; height: auto; margin-top:4px">
+                <img class="clyde" src="./assets/Clyde.png" style="width: 40px; height: auto; margin-top:4px">
             </a></li>
         <li title=home>
             <a class="icon" href="#home">
@@ -57,7 +59,7 @@
             <a class="icon" >
                 <div  class="fa-solid fa-gear"  style="margin-top: 7px; margin-bottom: 3px;"></div>
                 <div v-if="active" class="dropdown">
-                  <div class="dropdown-content">Langage</div>
+                  <div class="dropdown-content">{{i18n("app.language")}}</div>
                   <ul style="list-style-type:none;">
                     <li style=" margin-bottom:10px;margin-right:20px;float:left; font-size:10px; color:black;">
                       <button @:click="setLang('en');" href="#home">EN</button>
@@ -67,7 +69,7 @@
                   </ul>
                   <div style='align-items:center;'>
                   <a style="cursor:pointer;font-size:20px;" href="#/profil" class="dropdown-content">
-                    Manage Profile
+                    {{i18n("app.manage.profile")}}
                   </a>
                   </div>
 
@@ -97,8 +99,12 @@
             <div class="fa-solid fa-envelope" style="font-size: 40px;" ></div>
             <div class="text">{{i18n("app.forum")}}</div></a></li>
         <li><a href="#/inscription">
-            <div class="fa-solid fa-users" style="font-size: 40px;"></div>
+            <div class="fa-solid fa-users" style="align-self:center;font-size: 40px;"></div>
-            <div class="text">{{i18n("app.inscription.requests")}}</div></a></li>
+            <div class="text" style="top:0;">{{i18n("app.inscription.requests")}}</div></a></li>
+
+        <li><a href="#/manage-courses">
+            <div class="fa-solid fa-book" style="align-self:center;font-size: 40px;overflow:none;"></div>
+            <div class="text">{{i18n("app.manage.courses")}}</div></a></li>
     </ul>
 
     </div>
@@ -246,7 +252,6 @@
 	  }
 
 	  .text {
-		position: absolute;
 		right: 0%;
 		width: 0%;
 		opacity: 0;
@@ -258,9 +263,13 @@
 
 	  ul.vertical:hover .text {
 		opacity: 1;
-		width: 70%;
+		width: 60%;
 		transition-duration: .3s;
-		padding-left: 5px;
+		padding-left: 15px;
+	  }
+
+	  .clyde:hover{
+		  content: url("./assets/angry_clyde.png")
 	  }
     
 </style>

frontend/src/Apps/Inscription.vue

@@ -1,32 +1,10 @@
 <script setup>
   import Req from "./Request.vue"
-  const requests_example = [ {
+  import { getRegisters } from '@/rest/ServiceInscription.js'
-  id:0,
+
-  type:"Inscription",
+  const requests_example = getRegisters();
-  lastName:"DoefenschmirtzLEMAGNIFIQUE",
-  firstName:"Jhon",
-  address: "Radiator Springs",
-  country: "USA",
-  birthdate:"2004-02-02",
-  email:"JohnDoe@gmail.com",
-  cursus:"IT",
-  degree:"BAC1",
-  },
-  {
-  id:1,
-  type:"ReInscription",
-  lastName:"Doe",
-  firstName:"Jane",
-  address: "Radiator Springs",
-  country: "USA",
-  birthdate:"2004-03-03",
-  email:"JaneDoe@gmail.com",
-  cursus:"Psychology",
-  degree:"BAC1",
-}]
 </script>
 
 <template>
-  <Req v-for="item of requests_example" v-bind="item">
+  <Req v-for="item of requests_example"/>
-      </Req>
 </template>

frontend/src/Apps/Login.vue

@@ -1,28 +1,25 @@
 <script setup>
-  import { login , register} from '@/rest/Users.js'
   import { ref } from 'vue'
   import i18n from '@/i18n.js'
+  import { login , register } from '@/rest/Users.js'
+  import { uploadProfilePicture } from '@/rest/uploads.js'
+
   const loginPage= ref(true)
   const page = ref(0)
 
-  const emailID=ref("")
-  const passwordIN=ref("")
-
-
   const submitValue= ref(i18n("login.guest.submit"))
   const surname=ref("")
   const firstname=ref("")
-  const passwordOUT=ref("")
+  const password=ref("")
   const passwordConfirm=ref("")
   const birthday=ref("")
-  const emailOUT=ref("")
+  const email=ref("")
   const address=ref("")
   const country=ref("")
   const cursus=ref("")
-  const loginInfos = [{_emailID:emailID},{_passwordIN:passwordIN}]
-  const registerInfos= [{_surname:surname},{_firstname:firstname},{_birthday:birthday},{_passwordOUT:passwordOUT},
-  {_passwordConfirm:passwordConfirm},{_emailOUT:emailOUT},{_address:address},{_country:country},{_cursus:cursus}]
  
+  const imageSaved = ref(false)
+  const ppData = ref(false)
 </script>
 
 
@@ -30,17 +27,17 @@
       <div class='loginBox'>
 
         <div v-if="loginPage">
-          <form @submit.prevent="login(emailID, passwordIN)"class="form">
+          <form @submit.prevent="login(email, password)"class="form">
             <h1 style="color:rgb(239,60,168); font-family: sans-serif;">
               {{i18n("login.guest.signin")}}
             </h1>
             <div class="inputBox">
               <p>ID / {{i18n("login.guest.email")}}</p> 
-              <input type="text" v-model="emailID">
+              <input type="text" v-model="email">
             </div>
             <div class="inputBox">
               <p>{{i18n("login.guest.password")}}</p>
-              <input type="password" v-model="passwordIN">
+              <input type="password" v-model="password">
             </div>
             <div class="register">
               <a @click="loginPage=!loginPage">{{i18n("login.guest.register")}}</a>
@@ -52,7 +49,7 @@
         </div>
 
         <div v-else>
-          <form @submit.prevent="register(surname,firstname,emailOUT)" class="form">
+          <form @submit.prevent="register(firstname, surname, birthday, password, mail, address, country, cursus)" class="form">
             <h1 style="color:rgb(239,60,168); font-family: sans-serif; text-align:center;">
               {{i18n("login.guest.welcome")}}
             </h1>
@@ -71,11 +68,12 @@
               </div>
               <div class="inputBox">
                  <p>{{i18n("login.guest.password")}}</p>
-                 <input type="password" v-model="passwordOUT">
+                 <input type="password" v-model="password">
               </div>
               <div class="inputBox">
                 <p>{{i18n("login.guest.confirm")}} {{i18n("login.guest.password")}}</p>
                  <input type="password" v-model="passwordConfirm">
+				 <!-- TODO: Verify password is same as passwordConfirm -->
               </div>
               
               <div class="switchpage">
@@ -89,7 +87,7 @@
             <div v-else>
               <div class="inputBox">
                 <p>{{i18n("login.guest.email")}}</p>
-                <input type="mail" v-model="emailOUT">
+                <input type="mail" v-model="email">
               </div>
               <div class="inputBox">
                 <p>{{i18n("login.guest.address")}}</p>
@@ -99,8 +97,12 @@
                 <p>{{i18n("login.guest.country")}}</p>
                 <input type="text" v-model="country">
               </div>
+              <form novalidate enctype="multipart/form-data" class="inputBox">
+              	<p>ProfilePicture</p> 
+				<input type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*">
+              </form>
               <div class="inputBox">
-                <p>CURSUS</p> 
+                <p>{{i18n("curriculum").toUpperCase()}}</p> 
                   <select v-model="cursus">
                     <option value="Chemistry">Chemistry</option>
                     <option value="Psycho">Psychology</option>
@@ -165,7 +167,6 @@
 .inputBox input,button,select {
   
   width:100%;
-  background:rgb(255, 0 255);
   border: none;
   margin-right: 50px;
   padding-left: 10px;

frontend/src/Apps/ManageCourses.vue

@@ -0,0 +1,279 @@
+<script setup>
+  import i18n from "@/i18n.js"
+  import {ref} from 'vue'
+const cursus=[
+  {
+  "id": 12,
+  "name": "Math pour l'info",
+  "credits": 11,
+  "faculty": "science",
+  "teacher": 42,
+  "Assistants": []},
+  {
+  "id": 42,
+  "name": "Operating Systems",
+  "credits": 8,
+  "faculty": "science",
+  "teacher": 62,
+  "Assistants": []},
+  {
+  "id": 52,
+  "name": "Fonctionnement des ordinateurs",
+  "credits": 11,
+  "faculty": "science",
+  "teacher": 59,
+  "Assistants": []},
+
+  ]
+
+  const profList=[42,45,62,84,59]
+
+  const createMod = ref(false)
+  const deleteMod = ref(false)
+
+  const editElementID = ref(""); 
+
+  function editItem(id){
+    editElementID = id;
+  }
+
+  //Juste pour montrer le Create Mode
+  const pattern = {
+
+  "id": 0,
+  "name": null,
+  "credits": null,
+  "faculty": null,
+  "teacher": null,
+  "Assistants": []}
+
+
+  let toAdd = Object.assign({}, pattern);
+
+  function addToCourse (){
+  if (cursus.length>0){
+    toAdd.id=(cursus[cursus.length-1].id)-1;}
+    else{
+    toAdd.id=0;
+    }
+    let isnull= false;
+    for(const [key, value] of Object.entries(toAdd)){
+      if(value === null){
+        isnull=true;
+      }
+    }
+      if (!isnull){
+      cursus.push(toAdd);
+      }
+      toAdd= Object.assign({},pattern);
+    } 
+  
+
+  //Juste pour montrer le Delete Mode
+  let toRemove;
+
+  function removeCourse() {
+  console.log("ok");
+  console.log(toRemove);
+  let rem=-1;
+  for(const [key, value] of Object.entries(cursus)){
+    console.log(key);
+    console.log(value)
+    if(value.name === toRemove){
+         rem = key;
+        break;
+      }
+    }
+    console.log(rem)
+  if (rem > -1){
+    cursus.splice(rem, 1);}
+  console.log(cursus);
+  }
+
+</script>
+<template>
+  <div class="body">
+    <div v-if="!deleteMod && !createMod" class="listTitle buttonGrid">
+      <button class="create" @click="createMod = true">
+        {{i18n("courses.createCourse")}}
+      </button>
+      <button class="delete" @click="deleteMod=true" >
+        {{i18n("courses.deleteCourse")}}
+      </button>
+    </div>
+    <div v-if="createMod">
+      <form class="listElement">
+        <div style="margin-bottom:20px;">
+         {{i18n("name")}} : 
+        <input v-model="toAdd.name">
+        </div>
+        <div style="margin-bottom:20px;">
+          {{i18n("teacher")}} : 
+         <select style="max-width:200px;" class="teacher" v-model="toAdd.teacher">
+          <option v-for="item in profList">{{item}}</option>
+        </select>
+        </div>
+        <div style="margin-bottom:20px;">
+          {{i18n("credits")}} : 
+        <input v-model="toAdd.credits">
+        </div>
+        <div style="margin-bottom:20px;">
+          {{i18n("faculty")}} : 
+        <input v-model="toAdd.faculty">
+        </div>
+      <button class="create" @click="createMod=!createMod; addToCourse();"> {{i18n("courses.confirm")}} </button>
+      <button style="float:right;" @click="createMod=!createMod">{{i18n("courses.back")}}</button>
+      </form>
+    </div>
+    <div v-if="deleteMod">
+      <form class="listElement">
+        <div style="margin-bottom:20px;">
+          {{i18n("courses.toDelete")}} :
+         <select style="max-width:200px;" class="teacher" v-model="toRemove">
+          <option v-for="item in cursus">{{item.name}}</option>
+          
+        </select>
+        </div>
+        <div style="margin-bottom:20px;">
+          {{i18n("login.password")}}: 
+        <input >
+        </div>
+        <div style="margin-bottom:20px;">
+          {{i18n("login.cPassword")}} : 
+        <input>
+        </div>
+        <button class="delete" @click="deleteMod=!deleteMod;removeCourse();"> {{i18n("courses.deleteCourse")}} </button>
+        <button style="float:right;" @click="deleteMod=!deleteMod"> {{i18n("courses.back")}}</button>
+      </form>
+    </div>
+
+    <div v-if="!createMod && !deleteMod" v-for="item in cursus" :key="item.name">
+      <div style ="padding:15px 15px 15px 15px;">
+      <button  v-if="editElementID !== item.name"  @click="editElementID = item.name">
+        {{i18n("courses.modify")}}
+      </button>
+      <button v-else @click="editElementID= ''"> {{i18n("courses.confirm")}} </button>
+      </div>
+      <div  class="listElement" > 
+      <div class="containerElement" v-if="editElementID !== item.name" >
+
+        <div class="name"> {{item.name}} </div>
+        <div class="teacher">{{item.teacher}}</div> 
+        <div class="credits">{{i18n("credits")}}:{{item.credits}}</div>  
+      </div>
+      <div class="containerElement"v-else>
+        <input style="max-width:200px;" class="name" v-model="item.name">
+        <select style="max-width:200px;" class="teacher" v-model="item.teacher">
+          <option v-for="item in profList">{{item}}</option>
+        </select>
+        <input style="max-width:100px;"class="credits" v-model="item.credits">  
+      </div>
+    </div>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.body {
+    width:100%;
+    margin-bottom:10px;
+  }
+ .containerElement{ 
+   justify-content:center;
+    display:grid;
+    grid-template-columns:350px 350px 200px;
+    grid-template-areas:
+    "name teacher credits"; 
+    column-gap:10px;
+    
+  }
+  
+  .name {
+    grid-area:name;
+    align-self:center;
+  }
+
+  .teacher{
+    grid-area:teacher;
+    align-self:center;
+  }
+
+  .credits{
+    grid-area:credits;
+    align-self:center;
+  }
+
+.listElement{
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+  margin-bottom:10px;
+}
+
+.modify{
+  font-size:25px;
+  padding:10px 10px 10px 10px;
+  background-color: rgb(239,60,168);
+  cursor: pointer;
+  border:none;
+  border-radius:15px;
+}
+
+  input, select{
+  padding:10px 10px 10px 10px; 
+  font-size:25px;
+  cursor: pointer;
+  border:none;
+  border-radius:15px;
+  }
+  button{
+    font-size:15px;
+     height:50px;
+     width:100px;
+    border:none;
+    border-radius:20px;
+
+  }
+
+  .buttonGrid{
+    display:grid;
+    grid-template-columns: auto auto;
+    column-gap:50px;
+    grid-template-areas:
+      "create delete";
+  }
+
+  .create{
+    grid-area:create;
+    
+    background-color:rgb(0,200,0);
+
+  }
+
+  .delete{
+    grid-area:delete;
+    background-color:rgb(200,0,0);
+  }
+
+  .listTitle{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width:400px;
+    margin-left:auto;
+    margin-right:auto;
+    border:2px solid black;
+    font-size:25px;
+    color:white;
+    padding:20px;
+    background-color:rgb(50,50,50);
+    border-radius:20px;margin-bottom:10px;
+
+    button:hover{
+      opacity:0.8;
+    }
+}
+</style>

frontend/src/Apps/Profil.vue

@@ -1,6 +1,7 @@
 <script setup>
   import {reactive, ref} from 'vue'
   import {getUser} from '../rest/Users.js'
+  import i18n from "@/i18n.js"
  /* 
   const user = getUser(); 
 */
@@ -84,23 +85,23 @@ const toModify = Object.assign({}, user);
             E-mail: {{user.email}}      
           </div>
           <div v-if="user.role==='student'">
-            {{user.option}} {{user.role.toUpperCase()}} 
+            {{user.option}} {{i18n(user.role).toUpperCase()}} 
           </div>
           <div v-else>
-            Faculty: {{user.faculty}} 
+            {{i18n("faculty")}}: {{user.faculty}} 
-            Role: {{user.role}}
+            Role:  {{i18n(user.role).toUpperCase()}} 
           </div>
           <div>
-            <button @click="modif=!modif"> Modifier données personnelles </button>
+            <button @click="modif=!modif"> {{i18n("profile.modify.data")}} </button>
           </div>
           <div v-if="(user.role==='student')">
-            <button>Réinscription</button>
+            <button>{{i18n("profile.reRegister")}}</button>
-            <button style="float:right;background-color:rgb(150,0,0);">Désinscription</button>
+            <button style="float:right;background-color:rgb(150,0,0);">{{i18n("profile.unRegister")}}</button>
           </div>
         </div>
         <div v-else class="infosContainer">
           <div>
-            Profil Picture
+            {{i18n("profile.picture")}}:
             <input type="file">
           </div>
           <div>
@@ -108,19 +109,19 @@ const toModify = Object.assign({}, user);
             <input type="mail" v-model="toModify.email" />
           </div>
           <div>
-            Address:
+            {{i18n("profile.address")}}:
             <input type="text" v-model="toModify.address">
           </div>
           <div>
-            Password
+            {{i18n("login.password")}}:
             <input type="password" v-model="toModify.password">
           </div>
           <div>
-            Confirm Password
+            {{i18n("login.cPassword")}}:
             <input type="password" id="confirm">
           </div>
           <div>
-            <button @click=" modif=!modif">Confirm</button>
+            <button @click=" modif=!modif">{{i18n("courses.confirm")}}</button>
           </div>
         </div>
       </div>
@@ -128,7 +129,7 @@ const toModify = Object.assign({}, user);
 
         <div v-if="(user.role==='student')">
           <div class="listTitle">
-           Liste des cours
+            {{i18n("profile.course.list")}}
           </div>
         <div  class="listElement "
           v-for="item in user.cursus">
@@ -145,7 +146,7 @@ const toModify = Object.assign({}, user);
     
       <div v-if="(user.role==='teacher')">
           <div class="listTitle">
-           Liste des cours
+            {{i18n("profile.course.list")}}
           </div>
           <div class="listElement " v-for="item in user.coursesOwned">
           {{item.name}}       

frontend/src/rest/ServiceInscription.js

@@ -15,16 +15,22 @@ export async function createRegister(){
 
 /**
  * list all register request in a list of Objects
- */
+ * Shall return a list of
-export async function getRegisters(){
+ * - id
-	return restGet("/requests/register")
+ * - type
-}
+ * - lastName
-
+ * - firstName
-/**
+ * - address
- * Get info on a particular registering request
+ * - country
+ * - birthdate
+ * - email
+ * - cursus
+ * - degree
  */
 export async function getRegisters(id){
-	return restGet("/request/register/" + id);
+	if(id != null)
+		return restGet("/request/register/" + id);
+	return restGet("/request/register")
 }
 
 /**

frontend/src/rest/Users.js

@@ -4,8 +4,57 @@ export async function login(user, pass, exp){
 	return restPost("/login", {identifier: user, password: pass, expirationDate: exp});
 }
 
-export async function register(user, pass, mail){
+/**
-	return restPost("/user", {name: user, password: pass, mail: mail});
+ * Register a user (tokenless)
+ * 
+ * @param firstname
+ * @param lastname
+ * @param birthdate
+ * @param password
+ * @param mail
+ * @param address
+ * @param country
+ * @param cursus
+ * @param imageId	id of the image in database returned when uploaded
+ */
+export async function register(firstname, lastname, birthDate, password, email, address, country, cursus, imageId){
+	return restPost("/register", {
+		firstname: firstname,
+		lastname: lastname,
+		birthDate: birthDate,
+		password: password,
+		email: email,
+		address: address,
+		country: country,
+		cursus: cursus
+	});
+}
+
+/**
+ * Register a user (by secretary)
+ * 
+ * @param firstname
+ * @param lastname
+ * @param birthdate
+ * @param password
+ * @param mail
+ * @param address
+ * @param country
+ * @param imageId	id of the image in database returned when uploaded
+ *
+ * PS: the password is not is not required as it is generated by the backend and sent to the user
+ * by mail. it's up to the user to change it if he cares about security
+ */
+export async function createUser(firstname, lastname, birthDate, email, address, country, role, imageId){
+	return restPost("/user", {
+		firstname: firstname,
+		lastname: lastname,
+		birthDate: birthDate,
+		password: password,
+		email: email,
+		address: address,
+		country: country,
+	});
 }
 
 /**

frontend/src/rest/restConsumer.js

@@ -11,6 +11,11 @@ export async function restPost(endPoint, data) {
 	return await _rest(endPoint, {method: "POST", credentials: 'include', body: JSON.stringify(data)});
 }
 
+export async function restPostFile(endPoint, file){
+	let headers = new Headers();
+	return await _rest(endPoint, {method: "POST", credentials: 'include', body: file, headers: headers });
+}
+
 export async function restDelete(endPoint, data) {
 	return await _rest(endPoint, {method: "DELETE", credentials: 'include', body: JSON.stringify(data)});
 }
@@ -35,13 +40,14 @@ async function _rest(endPoint, config){
 		'Authorization': session_token,
 		'Content-Type': 'application/json',
 	});
-	config['headers'] = headers;
+	config['headers'] = config['headers'] == null ? headers : config['headers'];
 	return toast.promise(fetch(restURL + endPoint, config),
 		{
 			pending: config['pending'] != null ? config['pending'] : 'pending',
 			error: config['error'] != null ? config['error'] : 'Network Failure...',
 			success: config['success'] != null ? config['success'] : {render(res){
-				return res.ok ? "Success" : "error";
+				console.log(res);
+				return res.data.ok ? "Success" : "error";
 			}},
 		})
 		.then( e => e.json()).catch( e => e );

frontend/src/rest/uploads.js

@@ -0,0 +1,11 @@
+import { restPostFile } from '@/rest/restConsumer.js'
+
+
+/**
+ * Upload a file to the server and return the url of this image
+ */
+export async function uploadProfilePicture(file){
+	const formData = new FormData();
+	formData.append("file", file[0]);
+	return restPostFile("/upload/ProfilePicture", formData)
+}