Little corrections

.gitea/workflows/backend.yaml

@@ -17,16 +17,15 @@ jobs:
         distribution: 'temurin'
     - uses: gradle/gradle-build-action@v3
     - name: building
-      run: ./gradlew backend:build -x test
+      run: ./gradlew backend:build
-  # Test-backend:
+  Test-backend:
-  #   runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-  #   steps:
+    steps:
-  #   - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
-  #   - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v3
-  #     with:
+      with:
-  #       java-version: '21'
+        java-version: '21'
-  #       distribution: 'temurin'
+        distribution: 'temurin'
-  #   - run: curl -fsSL https://get.docker.com | sh
+    - uses: gradle/gradle-build-action@v3
-  #   - uses: gradle/gradle-build-action@v3
+    - name: building
-  #   - name: testing
+      run: ./gradlew backend:test 
-  #     run: ./gradlew backend:test 

.gitea/workflows/deploy.yaml

@@ -45,7 +45,7 @@ jobs:
         distribution: 'temurin'
     - uses: gradle/gradle-build-action@v3
     - name: building
-      run: ./gradlew backend:build -x test
+      run: ./gradlew backend:build
     - name: pushing to the server
       run: |
         echo "${{ secrets.SSH_KEY }}" > key

backend/.gitignore

@@ -35,5 +35,3 @@ out/
 
 ### VS Code ###
 .vscode/
-
-/cdn

backend/Dockerfile

@@ -1,6 +1,5 @@
 FROM eclipse-temurin:21-jdk-alpine
 VOLUME /tmp
-VOLUME /cdn
 ENV SPRING_PROFILES_ACTIVE=prod
 COPY build/libs/backend-0.0.1-SNAPSHOT.jar /app.jar
 ENTRYPOINT ["java", "-jar", "/app.jar"]

backend/build.gradle.kts

@@ -25,17 +25,14 @@ dependencies {
 	implementation("com.kohlschutter.junixsocket:junixsocket-core:2.9.0")
 	// implementation("org.springframework.session:spring-session-jdbc")
 	developmentOnly("org.springframework.boot:spring-boot-devtools")
-	// developmentOnly("org.springframework.boot:spring-boot-docker-compose")
+	developmentOnly("org.springframework.boot:spring-boot-docker-compose")
 	runtimeOnly("org.postgresql:postgresql")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 	testImplementation("org.springframework.boot:spring-boot-testcontainers")
 	testImplementation("org.testcontainers:junit-jupiter")
 	testImplementation("org.testcontainers:postgresql")
-	testImplementation("io.rest-assured:rest-assured")
-	testImplementation("org.hamcrest:hamcrest")
 }
 
-
 tasks.register("run") {
 	dependsOn(tasks.bootRun)
 }
@@ -44,4 +41,3 @@ tasks.register("run") {
 tasks.withType<Test> {
 	useJUnitPlatform()
 }
-

backend/compose.yaml

@@ -6,4 +6,4 @@ services:
       - 'POSTGRES_USER=devel'
       - 'POSTGRES_PASSWORD=devel'
     ports:
-      - '5442:5432'
+      - '5432:5432'

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

@@ -1,75 +0,0 @@
-package ovh.herisson.Clyde.EndPoints;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RestController;
-import ovh.herisson.Clyde.Services.AuthenticatorService;
-import ovh.herisson.Clyde.Tables.Applications;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.ArrayList;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class ApplicationsController {
-
-    AuthenticatorService authServ;
-
-    public ApplicationsController(AuthenticatorService authServ){
-    this.authServ = authServ;
-    }
-
-
-    /** return a list of authorized applications.
-     *  depends on the token
-     */
-    @GetMapping("/apps")
-    public ResponseEntity<Iterable<Applications>> getAuthorizedApps(@RequestHeader("Authorization") String token){
-        return new ResponseEntity<>(getAuthorizedApplications(token), HttpStatus.OK);
-    }
-
-    @GetMapping("/apps/{identifier}")
-    public ResponseEntity<Boolean> getAppAuthorization(@PathVariable Applications identifier, @RequestHeader("Authorization") String token){
-
-        if (getAuthorizedApplications(token).contains(identifier)){
-            return new ResponseEntity<>(true, HttpStatus.OK);
-        }
-        return new ResponseEntity<>(false, HttpStatus.OK);
-    }
-
-    public ArrayList<Applications> getAuthorizedApplications(String token){
-        ArrayList<Applications> authorizedApps = new ArrayList<>();
-
-        //if unAuthed
-        authorizedApps.add(Applications.Login);
-
-		User user = authServ.getUserFromToken(token);
-		if(user == null)
-            return authorizedApps;
-        // if authed
-        authorizedApps.add(Applications.Profile);
-
-        if (!authServ.isNotIn(new Role[]{Role.Teacher,Role.Student,Role.Admin},token)) {
-            authorizedApps.add(Applications.Msg);
-            authorizedApps.add(Applications.Forum);
-            authorizedApps.add(Applications.Rdv);
-        }
-
-        //if Teacher or Secretary or Admin add ManageCourses App
-        if (!authServ.isNotIn(new Role[]{Role.Teacher,Role.Secretary,Role.Admin},token))
-            authorizedApps.add(Applications.ManageCourses);
-
-        if (!authServ.isNotIn(new Role[]{Role.InscriptionService,Role.Admin},token)){
-            authorizedApps.add(Applications.Inscription);
-            authorizedApps.add(Applications.StudentsList);}
-
-        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){ 
-          authorizedApps.add(Applications.UsersList);}
-        return authorizedApps;
-    }
-}

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

@@ -1,138 +0,0 @@
-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.CourseService;
-import ovh.herisson.Clyde.Services.ProtectionService;
-import ovh.herisson.Clyde.Services.TeacherCourseService;
-import ovh.herisson.Clyde.Tables.Course;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.User;
-import java.util.HashMap;
-import java.util.Map;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class CourseController {
-
-    private final CourseService courseServ;
-
-    private final TeacherCourseService teacherCourseServ;
-
-    private final AuthenticatorService authServ;
-
-    public CourseController(CourseService courseServ, TeacherCourseService teacherCourseServ, AuthenticatorService authServ) {
-        this.courseServ = courseServ;
-        this.teacherCourseServ = teacherCourseServ;
-        this.authServ = authServ;
-    }
-
-    @GetMapping("/course/{id}")
-    public ResponseEntity<HashMap<String,Object>> getCourse(@RequestHeader("Authorization") String token, @PathVariable long id){
-        if (authServ.getUserFromToken(token) == null)
-            return new UnauthorizedResponse<>(null);
-
-        Course foundCourse = courseServ.findById(id);
-
-        if (foundCourse == null)
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        return new ResponseEntity<>(ProtectionService.courseWithoutPassword(foundCourse), HttpStatus.OK);
-    }
-
-    @GetMapping("/courses")
-    public ResponseEntity<Iterable<HashMap<String,Object>>> getAllCourses(@RequestHeader("Authorization") String token){
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token))
-            return new UnauthorizedResponse<>(null);
-
-        return new ResponseEntity<>(ProtectionService.coursesWithoutPasswords(courseServ.findAll()),HttpStatus.OK);
-    }
-
-    @GetMapping("/courses/owned")
-    public ResponseEntity<Iterable<HashMap<String ,Object>>> getOwnedCourses(@RequestHeader("Authorization") String token){
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Teacher},token))
-            return new UnauthorizedResponse<>(null);
-
-        return new ResponseEntity<>(ProtectionService.coursesWithoutPasswords(courseServ.findOwnedCourses(authServ.getUserFromToken(token))),HttpStatus.OK);
-    }
-
-    @GetMapping("/course/{id}/assistants")
-    public ResponseEntity<Iterable<HashMap<String,Object>>> getCourseAssistants(@RequestHeader("Authorization")String token, @PathVariable long id){
-        if (authServ.getUserFromToken(token) == null)
-            return new UnauthorizedResponse<>(null);
-
-        Iterable<User> assistants = teacherCourseServ.findCourseAssistants(courseServ.findById(id));
-
-        return new ResponseEntity<>(ProtectionService.usersWithoutPasswords(assistants),HttpStatus.OK);
-    }
-
-
-    @PostMapping("/course")
-    public ResponseEntity<Map<String ,Object>> postCourse(@RequestHeader("Authorization") String token,
-                                             @RequestBody Course course)
-    {
-        System.out.println(course);
-        System.out.println(token);
-        if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token))
-            return new UnauthorizedResponse<>(null);
-
-        Course createdCourse = courseServ.save(course);
-        if (createdCourse == null)
-            return new ResponseEntity<>(null,HttpStatus.BAD_REQUEST);
-
-        return new ResponseEntity<>(ProtectionService.courseWithoutPassword(createdCourse), HttpStatus.CREATED);
-    }
-
-
-    @PatchMapping("/course/{id}")
-    public ResponseEntity<Course> patchCourse(@RequestHeader("Authorization") String token,
-                                              @RequestBody Map<String,Object> updates,
-                                              @PathVariable long id)
-    {
-
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Teacher,Role.Secretary}, token))
-            return new UnauthorizedResponse<>(null);
-
-
-
-        if (!courseServ.modifyData(id, updates, authServ.getUserFromToken(token).getRole()))
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PostMapping("/course/{id}")
-    public ResponseEntity<String> postTeachers(@RequestHeader("Authorization") String token,
-                                               @RequestBody Iterable<Long> teacherIds,
-                                               @PathVariable Long id)
-    {
-
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary}, token))
-            return new UnauthorizedResponse<>(null);
-
-
-        if (!teacherCourseServ.saveAll(teacherIds,courseServ.findById(id)))
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-
-    @DeleteMapping("course/{id}")
-    public ResponseEntity<String> deleteUser(@RequestHeader("Authorization") String token, @PathVariable Long id){
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary}, token))
-            return new UnauthorizedResponse<>(null);
-
-        Course toDelete = courseServ.findById(id);
-
-        if (toDelete == null)
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-
-        courseServ.delete(courseServ.findById(id));
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

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

@@ -1,97 +0,0 @@
-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.*;
-import ovh.herisson.Clyde.Tables.Curriculum;
-import ovh.herisson.Clyde.Tables.Role;
-
-import java.util.Map;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class CurriculumController {
-
-
-    private final CurriculumService curriculumServ;
-    private final AuthenticatorService authServ;
-
-    private final UserCurriculumService userCurriculumServ;
-    private final CurriculumCourseService curriculumCourseServ;
-
-    public CurriculumController(CurriculumService curriculumServ, AuthenticatorService authServ, UserCurriculumService userCurriculumServ, CurriculumCourseService curriculumCourseServ){
-        this.curriculumServ = curriculumServ;
-        this.authServ = authServ;
-        this.userCurriculumServ = userCurriculumServ;
-        this.curriculumCourseServ = curriculumCourseServ;
-    }
-
-    @GetMapping("/curriculum/{id}")
-    public ResponseEntity<Map<String,Object>> findById(@PathVariable long id){
-        Curriculum foundCurriculum = curriculumServ.findById(id);
-
-        if (foundCurriculum == null)
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        return new ResponseEntity<>(curriculumCourseServ.getDepthCurriculum(foundCurriculum), HttpStatus.OK);
-    }
-
-    @GetMapping("/curriculum")
-    public ResponseEntity<Map<String ,Object>> findSelfCurriculum(@RequestHeader("Authorization") String token){
-        if (authServ.getUserFromToken(token) == null)
-            return new UnauthorizedResponse<>(null);
-
-        Curriculum curriculum = userCurriculumServ.findByUser(authServ.getUserFromToken(token));
-
-        if (curriculum == null)
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        return new ResponseEntity<>(curriculumCourseServ.getDepthCurriculum(curriculum),HttpStatus.OK);
-    }
-
-    @GetMapping("/curriculums")
-    public ResponseEntity<Iterable<Map<String, Object>>> findAllIndDepth(){
-        return new ResponseEntity<>(curriculumCourseServ.getAllDepthCurriculum(),HttpStatus.OK);
-    }
-
-    @PostMapping("/curriculum")
-    public ResponseEntity<Curriculum> postCurriculum(@RequestHeader("Authorization") String token,@RequestBody Curriculum curriculum){
-
-        if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token))
-            return new UnauthorizedResponse<>(null);
-
-        return new ResponseEntity<>(curriculumServ.save(curriculum),HttpStatus.CREATED);
-    }
-
-    @PostMapping("/curriculum/{id}")
-    public ResponseEntity<String> postCoursesToCurriculum(@RequestHeader("Authorization") String token,
-                                                          @RequestBody Iterable<Long> coursesIds,
-                                                          @PathVariable long id)
-    {
-
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token))
-            return new UnauthorizedResponse<>(null);
-
-        if (!curriculumCourseServ.saveAll(coursesIds, curriculumServ.findById(id)))
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @DeleteMapping("/curriculum/{id}")
-    public ResponseEntity<String > deleteCurriculum(@RequestHeader("Authorization") String token, @PathVariable Long id){
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary}, token))
-            return new UnauthorizedResponse<>(null);
-
-        Curriculum toDelete = curriculumServ.findById(id);
-
-        if (toDelete == null)
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        curriculumServ.delete(toDelete);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

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

@@ -1,82 +0,0 @@
-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.InscriptionService;
-import ovh.herisson.Clyde.Services.ProtectionService;
-import ovh.herisson.Clyde.Tables.InscriptionRequest;
-import ovh.herisson.Clyde.Tables.RequestState;
-import ovh.herisson.Clyde.Tables.Role;
-import java.util.Map;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class InscriptionController {
-
-
-    private final InscriptionService inscriptionServ;
-    private final AuthenticatorService authServ;
-
-    public InscriptionController(InscriptionService inscriptionServ, AuthenticatorService authServ){
-        this.inscriptionServ = inscriptionServ;
-        this.authServ = authServ;
-    }
-
-
-    @GetMapping("/requests/register")
-    public ResponseEntity<Iterable<Map<String,Object>>> getAllRequests(@RequestHeader("Authorization") String token){
-
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.InscriptionService},token))
-            return new UnauthorizedResponse<>(null);
-
-        Iterable<InscriptionRequest> inscriptionRequests = inscriptionServ.getAll();
-
-        return new ResponseEntity<>(ProtectionService.requestsWithoutPasswords(inscriptionRequests), HttpStatus.OK);
-    }
-
-
-    @GetMapping("/request/register/{id}")
-    public ResponseEntity<Map<String,Object>> getById(@RequestHeader("Authorization") String token, @PathVariable long id){
-
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.InscriptionService},token))
-            return new UnauthorizedResponse<>(null);
-
-        InscriptionRequest foundInscriptionRequest = inscriptionServ.getById(id);
-
-        if (foundInscriptionRequest == null)
-            return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
-
-        return new ResponseEntity<>(ProtectionService.requestWithoutPassword(foundInscriptionRequest), HttpStatus.OK);
-    }
-
-    @PatchMapping("/request/register/{id}")
-    public ResponseEntity<InscriptionRequest> changeRequestState(@PathVariable long id,
-                                                                 @RequestHeader("Authorization") String token,
-                                                                 @RequestBody RequestState state)
-    {
-        if (authServ.isNotIn(new Role[]{Role.InscriptionService,Role.Admin},token))
-            return new UnauthorizedResponse<>(null);
-
-        if (!inscriptionServ.modifyState(id, state))
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-    @DeleteMapping("/request/register/{id}")
-    public ResponseEntity<String > deleteRequest(@RequestHeader("Authorization") String token, @PathVariable Long id){
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.InscriptionService}, token))
-            return new UnauthorizedResponse<>(null);
-
-        InscriptionRequest toDelete = inscriptionServ.getById(id);
-
-        if (toDelete == null)
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        inscriptionServ.delete(toDelete);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-}

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

@@ -1,16 +1,12 @@
 package ovh.herisson.Clyde.EndPoints;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.http.HttpHeaders;
-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.ProtectionService;
+
-import ovh.herisson.Clyde.Tables.InscriptionRequest;
 import java.util.Date;
-import java.util.Map;
 
 @RestController
 @CrossOrigin(originPatterns = "*", allowCredentials = "true")
@@ -32,7 +28,6 @@ public class LoginController {
     public LoginController(AuthenticatorService authServ){
         this.authServ = authServ;
     }
-
     @PostMapping(value = "/login")
     public ResponseEntity<String> login(@RequestBody RequestLogin requestLogin){
 
@@ -45,12 +40,6 @@ public class LoginController {
         responseHeaders.set("Set-Cookie",String.format("session_token=%s",sessionToken));
         return ResponseEntity.ok().headers(responseHeaders).build();
     }
-
-    @PostMapping("/register")
-    public ResponseEntity<Map<String,Object>> register(@RequestBody InscriptionRequest inscriptionRequest){
-
-        InscriptionRequest returnedInscriptionRequest = authServ.register(inscriptionRequest);
-
-        return new ResponseEntity<>(ProtectionService.requestWithoutPassword(returnedInscriptionRequest), HttpStatus.CREATED);
-    }
 }
+
+

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

@@ -1,17 +1,24 @@
 package ovh.herisson.Clyde.EndPoints;
 
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.CrossOrigin;
+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.*;
+import ovh.herisson.Clyde.Services.TokenService;
-import ovh.herisson.Clyde.Tables.*;
+import ovh.herisson.Clyde.Tables.Role;
+import ovh.herisson.Clyde.Tables.Token;
+import ovh.herisson.Clyde.Tables.User;
+
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Date;
 
 @RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
+@CrossOrigin(origins = "http://localhost:5173")
 
 public class MockController {
     private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
@@ -19,22 +26,13 @@ public class MockController {
     public final UserRepository userRepo;
     public final TokenRepository tokenRepo;
     public final TokenService tokenService;
-    public final CurriculumCourseService CurriculumCourseService;
-    public final CurriculumService curriculumService;
-    public final CourseService courseService;
-
-    public final InscriptionService inscriptionService;
     ArrayList<User> mockUsers;
 
 
-    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService){
+    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService){
         this.tokenRepo = tokenRepo;
         this.userRepo = userRepo;
         this.tokenService = tokenService;
-        this.CurriculumCourseService = CurriculumCourseService;
-        this.curriculumService = curriculumService;
-        this.courseService = courseService;
-        this.inscriptionService = inscriptionService;
     }
 
     /** Saves an example of each user type by :
@@ -46,56 +44,21 @@ public class MockController {
     @PostMapping("/mock")
     public void postMock(){
 
-        // user part
+        User herobrine = new User("brine","hero","admin@admin.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Admin,passwordEncoder.encode("admin"));
+        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));
-        User herobrine = new User("brine","hero","admin@admin.com","behind","ShadowsLand",new Date(0), null,Role.Admin,passwordEncoder.encode("admin"));
-        User joe = new User("Mama","Joe","student@student.com","roundabout","England",new Date(0), null,Role.Student,passwordEncoder.encode("student"));
-        User meh = new User("Polo","Marco","secretary@secretary.com","a Box","Monaco",new Date(0), null,Role.Secretary,passwordEncoder.encode("secretary"));
-        User joke = new User("Gaillard","Corentin","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
-        User jojo = new User("Bridoux","Justin","teacher2@teacher2.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
-        User lena = new User("Louille","Lena","inscriptionService@InscriptionService.com","no","yes",new Date(0), null,Role.InscriptionService,passwordEncoder.encode("inscriptionService"));
-        mockUsers = new ArrayList<>(Arrays.asList(herobrine,joe,meh,joke,lena,jojo));
 
         userRepo.saveAll(mockUsers);
+    }
 
-        // Course / Curriculum part
+    @DeleteMapping("/mock")
-
+    public void deleteMock(){
-        Curriculum infoBab1 = new Curriculum(1,"info");
+        for (User user:mockUsers){
-        Curriculum chemistryBab1 = new Curriculum(1,"chemistry");
+            tokenRepo.deleteAll(tokenRepo.getByUser(user));
-        Curriculum psychologyBab1 = new Curriculum(1,"psychology");
+        }
-
+        userRepo.deleteAll(mockUsers);
-        curriculumService.save(infoBab1);
-        curriculumService.save(chemistryBab1);
-        curriculumService.save(psychologyBab1);
-
-
-        Course progra1 = new Course(5,"Programmation et algorithmique 1",joke);
-        Course chemistry1 = new Course(12, "Thermochimie",joke);
-        Course psycho1 = new Course(21, "Neuroreaction of isolated brain cells",joke);
-        Course commun = new Course(2, "cours commun",joke);
-
-        courseService.save(progra1);
-        courseService.save(chemistry1);
-        courseService.save(psycho1);
-        courseService.save(commun);
-
-
-        CurriculumCourseService.save(new CurriculumCourse(infoBab1,progra1));
-        CurriculumCourseService.save(new CurriculumCourse(infoBab1,commun));
-
-        CurriculumCourseService.save(new CurriculumCourse(psychologyBab1,psycho1));
-        CurriculumCourseService.save(new CurriculumCourse(psychologyBab1,commun));
-
-
-        CurriculumCourseService.save(new CurriculumCourse(chemistryBab1,commun));
-        CurriculumCourseService.save(new CurriculumCourse(chemistryBab1,chemistry1));
-
-
-        InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 1,RequestState.Pending,"yes.png","password");
-
-        inscriptionService.save(inscriptionRequest);
-        
     }
 }
-

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(originPatterns = "*", allowCredentials = "true")
+@CrossOrigin(origins = "http://localhost:5173")
 public class PingController {
 
 	@GetMapping("/ping")

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

@@ -1,16 +1,18 @@
 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(originPatterns = "*", allowCredentials = "true")
+@CrossOrigin(origins = "http://localhost:5173")
 public class StorageController {
+
     private final StorageService storageServ;
 
     public StorageController(StorageService storageServ){
@@ -19,18 +21,12 @@ public class StorageController {
 
 
     @PostMapping("/upload/{fileType}")
-    public ResponseEntity<StorageFile> handleFileUpload(@RequestParam("file") MultipartFile file, @PathVariable FileType fileType) {
+    public ResponseEntity<String> handleFileUpload(@RequestParam("file") MultipartFile file, @PathVariable FileType fileType) {
 
-		StorageFile fileEntry;
+        String path = storageServ.store(file,fileType);
-		try {
-			fileEntry = storageServ.store(file,fileType);
 
-		} catch(Exception e){
+        if (path == null) return new ResponseEntity<>("issue with the file storage", HttpStatus.BAD_REQUEST);
-            e.printStackTrace();
-            return new ResponseEntity<>(null,HttpStatus.BAD_REQUEST);
-		}
 
-
+        return  new ResponseEntity<>(path, HttpStatus.OK);
-        return new ResponseEntity<>(fileEntry, HttpStatus.OK);
     }
 }

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

@@ -1,37 +1,26 @@
 package ovh.herisson.Clyde.EndPoints;
 
-import org.springframework.http.HttpStatus;
+
-import org.springframework.http.ResponseEntity;
+
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
-import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
-import ovh.herisson.Clyde.Services.AuthenticatorService;
 import ovh.herisson.Clyde.Services.TokenService;
-import ovh.herisson.Clyde.Tables.Role;
 import ovh.herisson.Clyde.Tables.Token;
 
 @RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
+@CrossOrigin(origins = "http://localhost:5173")
 public class TokenController {
 
     private final TokenService tokenServ;
 
-    private final AuthenticatorService authServ;
+    public TokenController(TokenService tokenServ){
-
-    public TokenController(TokenService tokenServ, AuthenticatorService authServ){
         this.tokenServ = tokenServ;
-        this.authServ = authServ;
     }
 
 
     @GetMapping("/tokens")
-    public ResponseEntity<Iterable<Token>> getTokens(@RequestHeader("Authorization")String token){
+    public Iterable<Token> getTokens(){
-
+        return tokenServ.getAllTokens();
-        if (authServ.isNotIn(new Role[]{Role.Admin},token))
-            return new UnauthorizedResponse<>(null);
-
-        return new ResponseEntity<>(tokenServ.getAllTokens(), HttpStatus.OK);
     }
 }

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

@@ -1,22 +1,18 @@
 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.ProtectionService;
 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(originPatterns = "*", allowCredentials = "true")
+@CrossOrigin(origins = "http://localhost:5173")
 public class UserController {
 
     private final UserService userService;
@@ -26,114 +22,26 @@ public class UserController {
         this.authServ = authServ;
     }
 
-    /** returns information about the connected user
-     *
-     * @param token the session token of the user
-     * @return the user information except his password
-     */
     @GetMapping("/user")
-    public ResponseEntity<HashMap<String,Object>> getUser(@RequestHeader("Authorization") String token){
+    public ResponseEntity<User> getUser(@RequestHeader("Cookie") String authorization){
 
-        User user = authServ.getUserFromToken(token);
+        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<>(ProtectionService.userWithoutPassword(user), HttpStatus.OK);
     }
 
-
+    @PostMapping("/user") //todo check role
-    @GetMapping("/user/{id}")
+    public ResponseEntity<String> postUser(@RequestBody User user){
-    public ResponseEntity<HashMap<String ,Object>> getUserById(@RequestHeader("Authorization") String token, @PathVariable Long id){
+        userService.save(user);
-
+        return new ResponseEntity<>(String.format("Account created with ID:%s",user.getRegNo()),HttpStatus.CREATED);
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService},token))
-            return new UnauthorizedResponse<>(null);
-
-        return new ResponseEntity<>(ProtectionService.userWithoutPassword(userService.getUserById(id)), HttpStatus.OK);
-    }
-
-    @PostMapping("/user")
-    public ResponseEntity<Map<String ,Object>> postUser(@RequestBody User user,@RequestHeader("Authorization") String token){
-
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.InscriptionService,Role.Secretary},token))
-            return new UnauthorizedResponse<>(null);
-
-        return new ResponseEntity<>(ProtectionService.userWithoutPassword(userService.save(user)),HttpStatus.CREATED);
     }
 
     @GetMapping("/users")
-    public ResponseEntity<Iterable<HashMap<String,Object>>> getAllUsers(@RequestHeader("Authorization") String token){
+    public Iterable<User> getAllUsers(){
-
+        return userService.getAll();
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token))
-          return new UnauthorizedResponse<>(null);
-
-        Role posterRole = authServ.getUserFromToken(token).getRole();
-
-        Iterable<User> users = new ArrayList<>();
-
-        if (posterRole == Role.Admin)
-            users = userService.getAll();
-
-        else if (posterRole == Role.Secretary)
-            users = userService.getAllExceptAdmins();
-
-        return new ResponseEntity<>(ProtectionService.usersWithoutPasswords(users), HttpStatus.OK);
-    }
-
-    /** changes the specified user's information
-     *
-     * @param updates the changes to be made
-     * @param token the session token of the user posting the change
-     * @param id the id of the user to change
-     * @return a string clarifying the issue (if there is any)
-     */
-    @PatchMapping("/user/{id}")
-    public ResponseEntity<String> patchUser(@RequestHeader("Authorization") String token,
-                                            @RequestBody Map<String,Object> updates,
-                                            @PathVariable Long id) {
-
-        if (token == null) return new UnauthorizedResponse<>(null);
-
-        User poster = authServ.getUserFromToken(token);
-        if (poster == null) {return new UnauthorizedResponse<>("bad token");}
-
-        if (!userService.modifyData(id, updates, poster))
-            return new UnauthorizedResponse<>("there was an issue with the updates requested");
-
-        return new ResponseEntity<>(null, HttpStatus.OK);
-    }
-
-    @GetMapping("/teachers")
-    public ResponseEntity<Iterable<HashMap<String,Object>>> getAllTeachers(@RequestHeader("Authorization") String token){
-        if (authServ.getUserFromToken(token) == null)
-            return new UnauthorizedResponse<>(null);
-
-        Iterable<User> teachers = userService.getAllTeachers();
-
-        return new ResponseEntity<>(ProtectionService.usersWithoutPasswords(teachers), HttpStatus.OK);
     }
 
 
-    @GetMapping("/students")
-    public ResponseEntity<Iterable<HashMap<String,Object>>> getAllStudent(@RequestHeader("Authorization") String token){
-        if (authServ.getUserFromToken(token) == null)
-            return new UnauthorizedResponse<>(null);
-
-        Iterable<User> students = userService.getAllStudents();
-
-        return new ResponseEntity<>(ProtectionService.usersWithoutPasswords(students), HttpStatus.OK);
-    }
-
-
-    @DeleteMapping("/user/{id}")
-    public ResponseEntity<String> deleteStudent(@RequestHeader("Authorization") String token, @PathVariable Long id){
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token) && !id.equals(authServ.getUserFromToken(token).getRegNo()))
-            return new UnauthorizedResponse<>(null);
-
-        User toDelete = userService.getUserById(id);
-
-        if (toDelete == null)
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        userService.delete(toDelete);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
 }
+

backend/src/main/java/ovh/herisson/Clyde/JdbcConfig.java

@@ -17,7 +17,7 @@ public class JdbcConfig {
 	public DataSource psqlSource(){
 		DriverManagerDataSource source = new DriverManagerDataSource();
 		source.setDriverClassName("org.postgresql.Driver");
-		source.setUrl("jdbc:postgresql://localhost:5442/clyde");
+		source.setUrl("jdbc:postgresql://localhost:5432/clyde");
 		source.setUsername("devel");
 		source.setPassword("devel");
 

backend/src/main/java/ovh/herisson/Clyde/Repositories/CourseRepository.java

@@ -1,15 +0,0 @@
-package ovh.herisson.Clyde.Repositories;
-
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Course;
-import ovh.herisson.Clyde.Tables.User;
-
-public interface CourseRepository extends CrudRepository<Course,Long> {
-    Course findById(long id);
-
-
-    @Query("select c from Course c where c.owner = ?1")
-    Iterable<Course> findAllOwnedCoures(User teacher);
-
-}

backend/src/main/java/ovh/herisson/Clyde/Repositories/CurriculumCourseRepository.java

@@ -1,17 +0,0 @@
-package ovh.herisson.Clyde.Repositories;
-
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Course;
-import ovh.herisson.Clyde.Tables.Curriculum;
-import ovh.herisson.Clyde.Tables.CurriculumCourse;
-
-public interface CurriculumCourseRepository extends CrudRepository<CurriculumCourse,Long> {
-
-    @Query("select distinct cc.course from CurriculumCourse cc where cc.curriculum = ?1")
-    Iterable<Course> findCoursesByCurriculum(Curriculum curriculum);
-
-
-    @Query("select distinct cc.curriculum from  CurriculumCourse cc")
-    Iterable<Curriculum> findDistinctCurriculums();
-}

backend/src/main/java/ovh/herisson/Clyde/Repositories/CurriculumRepository.java

@@ -1,8 +0,0 @@
-package ovh.herisson.Clyde.Repositories;
-
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Curriculum;
-
-public interface CurriculumRepository extends CrudRepository<Curriculum,Long> {
-    Curriculum findById(long id);
-}

backend/src/main/java/ovh/herisson/Clyde/Repositories/FileRepository.java

@@ -1,14 +1,9 @@
 package ovh.herisson.Clyde.Repositories;
 
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
 import ovh.herisson.Clyde.Tables.StorageFile;
 
-import java.util.ArrayList;
-
 
 public interface FileRepository extends CrudRepository<StorageFile,Long> {
-    public StorageFile getStorageFileByName(String name);
-
 }

backend/src/main/java/ovh/herisson/Clyde/Repositories/InscriptionRepository.java

@@ -1,10 +0,0 @@
-package ovh.herisson.Clyde.Repositories;
-
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.InscriptionRequest;
-
-
-public interface InscriptionRepository extends CrudRepository<InscriptionRequest,Long> {
-
-    InscriptionRequest findById(long aLong);
-}

backend/src/main/java/ovh/herisson/Clyde/Repositories/TeacherCourseRepository.java

@@ -1,14 +0,0 @@
-package ovh.herisson.Clyde.Repositories;
-
-
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Course;
-import ovh.herisson.Clyde.Tables.TeacherCourse;
-import ovh.herisson.Clyde.Tables.User;
-
-public interface TeacherCourseRepository extends CrudRepository<TeacherCourse, Long> {
-
-    @Query("select tc.user from TeacherCourse tc where tc.course = ?1")
-    Iterable<User> findAllAssistantOfCourse(Course course);
-}

backend/src/main/java/ovh/herisson/Clyde/Repositories/TokenRepository.java

@@ -10,5 +10,7 @@ public interface TokenRepository extends CrudRepository<Token,Long> {
 
     Token getByToken(String token);
 
+    Iterable<Token> getByUser(User user);
+
     ArrayList <Token> getByUserOrderByExpirationDate(User user);
 }

backend/src/main/java/ovh/herisson/Clyde/Repositories/UserCurriculumRepository.java

@@ -1,13 +0,0 @@
-package ovh.herisson.Clyde.Repositories;
-
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Curriculum;
-import ovh.herisson.Clyde.Tables.User;
-import ovh.herisson.Clyde.Tables.UserCurriculum;
-
-public interface UserCurriculumRepository extends CrudRepository<UserCurriculum, Long> {
-
-    @Query("select uc.curriculum from UserCurriculum uc where uc.user = ?1")
-    Curriculum findByUser(User student);
-}

backend/src/main/java/ovh/herisson/Clyde/Repositories/UserRepository.java

@@ -4,20 +4,15 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import ovh.herisson.Clyde.Tables.User;
 
+import java.util.List;
+
 public interface UserRepository extends CrudRepository<User, Long> {
 
     User findById(long id);
 
     User findByEmail(String email);
 
-
+    /**
-
+    @Query(value = "select a.* from Users a ",nativeQuery = true)
-    @Query("select u from User u where u.role = ovh.herisson.Clyde.Tables.Role.Teacher")
+    Iterable<User> findAllUsers();**/
-    Iterable<User> findAllTeachers();
-
-    @Query("select u from User u where u.role = ovh.herisson.Clyde.Tables.Role.Student")
-    Iterable<User> findAllStudents();
-
-    @Query("select u from User u where u.role <> ovh.herisson.Clyde.Tables.Role.Admin")
-    Iterable<User> findAllExceptAdmins();
 }

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

@@ -1,7 +1,9 @@
 package ovh.herisson.Clyde.Services;
 
 import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Tables.*;
+import ovh.herisson.Clyde.Tables.Token;
+import ovh.herisson.Clyde.Tables.User;
+
 import java.util.Date;
 
 @Service
@@ -9,12 +11,10 @@ public class AuthenticatorService {
 
     private final TokenService tokenService;
     private final UserService userService;
-    private final InscriptionService inscriptionService;
 
-    public AuthenticatorService(TokenService tokenService, UserService userService, InscriptionService inscriptionService){
+    public AuthenticatorService(TokenService tokenService, UserService userService){
         this.tokenService = tokenService;
         this.userService = userService;
-        this.inscriptionService = inscriptionService;
     }
 
     public User getUserFromToken(String token){
@@ -30,24 +30,4 @@ public class AuthenticatorService {
         tokenService.saveToken(new Token(user, token,expirationDate));
         return token;
     }
-
-    public InscriptionRequest register(InscriptionRequest inscriptionRequest) {
-        inscriptionRequest.setState(RequestState.Pending);
-        return inscriptionService.save(inscriptionRequest);
-    }
-
-    public boolean isNotIn(Role[] roles, String token){
-        if (token == null)
-            return true;
-
-        User poster = getUserFromToken(token);
-        if (poster == null) return true;
-
-        for (Role r:roles){
-            if (poster.getRole() == r)
-                return false;
-        }
-        return true;
-    }
 }
-

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

@@ -1,83 +0,0 @@
-package ovh.herisson.Clyde.Services;
-
-import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Repositories.CourseRepository;
-import ovh.herisson.Clyde.Tables.Course;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.User;
-import java.util.Map;
-
-@Service
-public class CourseService {
-
-    private final CourseRepository courseRepo;
-
-    public CourseService(CourseRepository courseRepo) {
-        this.courseRepo = courseRepo;
-    }
-
-    public Course save(Course course){
-        if (course.getOwner().getRole() != Role.Teacher)
-            return null;
-        return courseRepo.save(course);
-    }
-
-    public Course findById(long id){
-        return courseRepo.findById(id);
-    }
-
-
-    public Iterable<Course> findAll() {
-        return courseRepo.findAll();
-    }
-
-
-    public Iterable<Course> findOwnedCourses(User userFromToken) {
-        return courseRepo.findAllOwnedCoures(userFromToken);
-    }
-
-
-
-    public boolean modifyData(long id, Map<String, Object> updates, Role role) {
-        Course target = courseRepo.findById(id);
-
-        if (target == null)
-            return false;
-
-        if (role == Role.Teacher){
-            for (Map.Entry<String, Object> entry : updates.entrySet()){
-                if (entry.getKey().equals("title")){
-                    target.setTitle((String) entry.getValue());
-                    courseRepo.save(target);
-                    return true;
-                }
-            }
-        }
-
-        if (role != Role.Secretary)
-            return false;
-
-        for (Map.Entry<String ,Object> entry: updates.entrySet()){
-            switch (entry.getKey()){
-                case "title":
-                    target.setTitle((String) entry.getValue());
-                    break;
-                case "credits":
-                    target.setCredits((Integer) entry.getValue());
-                    break;
-                case "owner":
-                    if (((User) entry.getValue() ).getRole() != Role.Teacher)
-                        break;
-
-                    target.setOwner((User) entry.getValue());
-                    break;
-            }
-        }
-        courseRepo.save(target);
-        return true;
-    }
-
-    public void delete(Course course) {
-        courseRepo.delete(course);
-    }
-}

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

@@ -1,93 +0,0 @@
-package ovh.herisson.Clyde.Services;
-
-import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Repositories.CourseRepository;
-import ovh.herisson.Clyde.Repositories.CurriculumCourseRepository;
-import ovh.herisson.Clyde.Repositories.CurriculumRepository;
-import ovh.herisson.Clyde.Tables.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-@Service
-public class CurriculumCourseService {
-
-    private final CurriculumCourseRepository curriculumCourseRepo;
-
-    private final CourseRepository courseRepo;
-
-    private final CurriculumRepository curriculumRepo;
-
-    public CurriculumCourseService(CurriculumCourseRepository curriculumCourseRepository, CourseRepository courseRepo, CurriculumRepository curriculumRepo) {
-        this.curriculumCourseRepo = curriculumCourseRepository;
-        this.courseRepo = courseRepo;
-        this.curriculumRepo = curriculumRepo;
-    }
-
-    public void save(CurriculumCourse curriculumCourse){
-        curriculumCourseRepo.save(curriculumCourse);
-    }
-
-
-    public Map<String, Object> getDepthCurriculum(Curriculum curriculum){
-
-        if (curriculum == null)
-            return null;
-
-        HashMap<String ,Object> toReturn = new HashMap<>();
-        ArrayList<Map<String ,Object>> courses = new ArrayList<>();
-        Iterable<Course> foundCourses = curriculumCourseRepo.findCoursesByCurriculum(curriculum);
-
-        for (Course c: foundCourses){
-            courses.add(ProtectionService.courseWithoutPassword(c));
-        }
-        toReturn.put("courses",courses);
-        toReturn.put("curriculumId", curriculum.getCurriculumId());
-        toReturn.put("year", curriculum.getYear());
-        toReturn.put("option", curriculum.getOption());
-
-
-        return  toReturn;
-    }
-
-    public Iterable<Map<String, Object>> getAllDepthCurriculum(){
-
-        ArrayList<Map<String,Object>> toReturn = new ArrayList<>();
-
-        for (Curriculum curriculum : curriculumRepo.findAll()){
-            toReturn.add(getDepthCurriculum(curriculum));
-        }
-
-
-        return toReturn;
-    }
-
-    /** tries to add all courses to the curriculum
-     *
-     * @param coursesIds the ids of the courses to be added
-     * @param curriculum the curriculum to add the courses to
-     * @return if the changes were made
-     */
-    public boolean saveAll(Iterable<Long> coursesIds, Curriculum curriculum) {
-
-        if (curriculum == null || coursesIds == null)
-            return false;
-
-        ArrayList<Course> toAdd = new ArrayList<>();
-        for (Long courseId : coursesIds){
-
-            Course course = courseRepo.findById((long) courseId);
-            if (course == null)
-                return false;
-
-            if (!toAdd.contains(course))
-                toAdd.add(course);
-        }
-
-        for (Course course : toAdd){
-            curriculumCourseRepo.save(new CurriculumCourse(curriculum,course));
-        }
-        return true;
-    }
-}

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

@@ -1,25 +0,0 @@
-package ovh.herisson.Clyde.Services;
-
-import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Repositories.CurriculumRepository;
-import ovh.herisson.Clyde.Tables.Curriculum;
-
-@Service
-public class CurriculumService {
-
-    private final CurriculumRepository curriculumRepo;
-
-    public CurriculumService(CurriculumRepository curriculumRepo){
-        this.curriculumRepo = curriculumRepo;
-    }
-    public Curriculum save(Curriculum curriculum){
-        return curriculumRepo.save(curriculum);
-    }
-    public Curriculum findById(long id){
-        return curriculumRepo.findById(id);
-    }
-
-    public void delete(Curriculum curriculum) {
-        curriculumRepo.delete(curriculum);
-    }
-}

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

@@ -1,94 +0,0 @@
-package ovh.herisson.Clyde.Services;
-
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Repositories.CurriculumRepository;
-import ovh.herisson.Clyde.Repositories.InscriptionRepository;
-import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
-import ovh.herisson.Clyde.Repositories.UserRepository;
-import ovh.herisson.Clyde.Tables.InscriptionRequest;
-import ovh.herisson.Clyde.Tables.RequestState;
-import ovh.herisson.Clyde.Tables.User;
-import ovh.herisson.Clyde.Tables.UserCurriculum;
-
-@Service
-public class InscriptionService {
-
-    private final InscriptionRepository inscriptionRepo;
-
-    private final UserRepository userRepo;
-
-    private final UserCurriculumRepository userCurriculumRepo;
-
-    private final CurriculumRepository curriculumRepo;
-
-    private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-
-
-    public InscriptionService(InscriptionRepository inscriptionRepo, UserRepository userRepo, UserCurriculumRepository userCurriculumRepo, CurriculumRepository curriculumRepo){
-        this.inscriptionRepo = inscriptionRepo;
-        this.userRepo = userRepo;
-        this.userCurriculumRepo = userCurriculumRepo;
-        this.curriculumRepo = curriculumRepo;
-    }
-
-    public InscriptionRequest save(InscriptionRequest inscriptionRequest){
-        inscriptionRequest.setPassword(passwordEncoder.encode(inscriptionRequest.getPassword()));
-        return inscriptionRepo.save(inscriptionRequest);
-    }
-
-    public InscriptionRequest getById(long id){
-        return inscriptionRepo.findById(id);
-    }
-
-    public Iterable<InscriptionRequest> getAll(){
-        return inscriptionRepo.findAll();
-    }
-
-    public boolean modifyState(long id, RequestState requestState) {
-        InscriptionRequest inscrRequest = getById(id);
-
-        if (inscrRequest == null)
-            return false;
-
-        // if th state is the same we don't send an email
-        if (requestState == inscrRequest.getState())
-            return false;
-
-        /** todo send an email to tell the poster of the inscrRequest (inscrRequest.getEmail())
-         *  to notify them that the state of their request changed
-         *  FooEmailFormat toSend = (String.format("Your request state changed from %s to %s"),
-         *                                              inscrRequest.getState(), requestState)
-         * FooEmailSender.send(toSend, inscrRequest.getEmail())
-         */
-
-
-        //saves the user from the request if accepted
-        if (requestState == RequestState.Accepted)
-        {
-            if (curriculumRepo.findById(inscrRequest.getCurriculumId()) == null)
-                return false;
-
-            User userFromRequest = new User(
-                    inscrRequest.getLastName(),
-                    inscrRequest.getFirstName(),
-                    inscrRequest.getEmail(),
-                    inscrRequest.getAddress(),
-                    inscrRequest.getCountry(),
-                    inscrRequest.getBirthDate(),
-                    inscrRequest.getProfilePicture(),
-                    inscrRequest.getPassword()
-            );
-
-            userRepo.save(userFromRequest);
-            userCurriculumRepo.save(new UserCurriculum(userFromRequest, curriculumRepo.findById(inscrRequest.getCurriculumId())));
-        }
-        inscrRequest.setState(requestState);
-        save(inscrRequest);
-        return true;
-    }
-
-    public void delete(InscriptionRequest toDelete) {
-        inscriptionRepo.delete(toDelete);
-    }
-}

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

@@ -1,105 +0,0 @@
-package ovh.herisson.Clyde.Services;
-
-import ovh.herisson.Clyde.Tables.Course;
-import ovh.herisson.Clyde.Tables.InscriptionRequest;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-public class ProtectionService {
-
-    /** return user's data except password
-     * @param user the user to return
-     * @return all the user data without the password
-     */
-    public static HashMap<String,Object> userWithoutPassword(User user){
-
-        if (user ==null)
-            return null;
-
-        HashMap<String,Object> toReturn = new HashMap<>();
-
-        toReturn.put("regNo",user.getRegNo());
-        toReturn.put("lastName",user.getLastName());
-        toReturn.put("firstName",user.getFirstName());
-        toReturn.put("email", user.getEmail());
-        toReturn.put("address",user.getAddress());
-        toReturn.put("birthDate",user.getBirthDate());
-        toReturn.put("country",user.getCountry());
-        toReturn.put("profilePictureUrl",user.getProfilePictureUrl());
-        toReturn.put("role",user.getRole());
-        return toReturn;
-    }
-
-    public static Iterable<HashMap<String ,Object>>usersWithoutPasswords(Iterable<User> users){
-        ArrayList<HashMap<String,Object>> toReturn = new ArrayList<>();
-
-        for (User u : users){
-            toReturn.add(userWithoutPassword(u));
-        }
-
-        return toReturn;
-    }
-
-
-
-    public static HashMap<String,Object> courseWithoutPassword(Course course){
-        if (course == null)
-            return null;
-
-        HashMap<String ,Object> toReturn = new HashMap<>();
-
-        toReturn.put("courseId",course.getCourseID());
-        toReturn.put("credits",course.getCredits());
-        toReturn.put("title", course.getTitle());
-        toReturn.put("owner", userWithoutPassword(course.getOwner()));
-        return toReturn;
-    }
-
-    public static Iterable<HashMap<String ,Object>> coursesWithoutPasswords(Iterable<Course> courses){
-        ArrayList<HashMap<String,Object>> toReturn = new ArrayList<>();
-
-        for (Course course: courses){
-            toReturn.add(ProtectionService.courseWithoutPassword(course));
-        }
-
-        return toReturn;
-
-    }
-
-
-    public static Map<String, Object> requestWithoutPassword(InscriptionRequest inscriptionRequest) {
-
-        if (inscriptionRequest == null)
-            return null;
-
-        Map<String, Object> toReturn = new HashMap<>();
-
-        toReturn.put("id", inscriptionRequest.getId());
-        toReturn.put("lastName", inscriptionRequest.getLastName());
-        toReturn.put("firstName", inscriptionRequest.getFirstName());
-        toReturn.put("address", inscriptionRequest.getAddress());
-        toReturn.put("email",inscriptionRequest.getEmail());
-        toReturn.put("birthDate", inscriptionRequest.getBirthDate());
-        toReturn.put("country", inscriptionRequest.getCountry());
-        toReturn.put("curriculum", inscriptionRequest.getCurriculumId());
-        toReturn.put("state", inscriptionRequest.getState());
-        toReturn.put("profilePictureUrl", inscriptionRequest.getProfilePicture());
-
-        return toReturn;
-    }
-
-    public static Iterable<Map<String ,Object>> requestsWithoutPasswords(Iterable<InscriptionRequest> inscriptionRequests){
-
-        ArrayList<Map<String,Object>> toReturn = new ArrayList<>();
-
-        for (InscriptionRequest i:inscriptionRequests){
-            toReturn.add(requestWithoutPassword(i));
-        }
-        return toReturn;
-    }
-
-}
-

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

@@ -1,11 +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.*;
+import ovh.herisson.Clyde.Tables.FileType;
-import java.io.File;
+import ovh.herisson.Clyde.Tables.StorageFile;
 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;
@@ -15,26 +17,17 @@ import java.util.UUID;
 
 @Service
 public class StorageService {
+
+
     private final Path rootLocation = Paths.get("cdn/");
     private final FileRepository fileRepo;
 
     public StorageService(FileRepository filerepo){
         this.fileRepo = filerepo;
-
-		if(!Files.exists(rootLocation)){
-			try {
-				Files.createDirectories(rootLocation);
-			} catch(IOException e){
-				e.printStackTrace();
-			}
-		}
     }
 
 
-    public StorageFile store(MultipartFile file, FileType fileType) {
+    public String store(MultipartFile file, FileType fileType) {
-
-        if (file == null || file.getOriginalFilename() == null)
-            return null;
 
         if (file.getOriginalFilename().isEmpty()){return null;}
 
@@ -56,14 +49,8 @@ public class StorageService {
         String url = this.rootLocation.resolve(Paths.get(Objects.requireNonNull(stringUuid)))
                 .normalize().toString();
 
-        return fileRepo.save(new StorageFile(file.getOriginalFilename(),url, fileType));
+        fileRepo.save(new StorageFile(file.getName(),url, fileType));
-    }
 
-    public void delete(StorageFile file) throws SecurityException {
+        return url;
-        File f = new File(file.getUrl());
-        f.delete();
-
-        //Delete l'entité
-        fileRepo.delete(file);
     }
 }

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

@@ -1,53 +0,0 @@
-package ovh.herisson.Clyde.Services;
-
-import org.springframework.stereotype.Controller;
-import ovh.herisson.Clyde.Repositories.TeacherCourseRepository;
-import ovh.herisson.Clyde.Repositories.UserRepository;
-import ovh.herisson.Clyde.Tables.Course;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.TeacherCourse;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.ArrayList;
-
-@Controller
-public class TeacherCourseService {
-    private final TeacherCourseRepository teacherCourseRepo;
-
-    private final UserRepository userRepo;
-
-    public TeacherCourseService(TeacherCourseRepository teacherCourseRepo, UserRepository userRepo) {
-        this.teacherCourseRepo = teacherCourseRepo;
-        this.userRepo = userRepo;
-    }
-
-    public Iterable<User> findCourseAssistants(Course course) {
-        if (course == null)
-            return null;
-        return teacherCourseRepo.findAllAssistantOfCourse(course);
-    }
-
-
-    public boolean saveAll(Iterable<Long> teacherIds, Course course){
-
-        if (course == null  || teacherIds == null)
-            return false;
-
-        ArrayList<User> toAdd = new ArrayList<>();
-        for (Long teacherId : teacherIds){
-            User teacher = userRepo.findById((long) teacherId);
-            if ( teacher== null){
-                return false;
-            }
-            if (!toAdd.contains(teacher) && teacher.getRole() == Role.Teacher)
-            {
-                toAdd.add(teacher);
-            }
-        }
-        for (User teacher: toAdd){
-            teacherCourseRepo.save(new TeacherCourse(teacher,course));
-        }
-        return true;
-    }
-
-}

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

@@ -5,15 +5,16 @@ import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.TokenRepository;
 import ovh.herisson.Clyde.Tables.Token;
 import ovh.herisson.Clyde.Tables.User;
+
 import java.io.UnsupportedEncodingException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.Calendar;
+import java.util.Date;
 
 @Service
 public class TokenService {
-    private final TokenRepository tokenRepo;
+    TokenRepository tokenRepo;
 
     public TokenService(TokenRepository tokenRepo){
         this.tokenRepo = tokenRepo;
@@ -29,10 +30,13 @@ public class TokenService {
         new SecureRandom().nextBytes(bytes);
         for (int i = 0; i < bytes.length; i++) {
             bytes[i] = (byte) (((bytes[i]+256)%256  %95+ 32));
+            while ((char)bytes[i] == ';'){
+                bytes[i] = new SecureRandom().generateSeed(1)[0];
+            }
         }
         // will never end up in the catch because of the way that SecureRandom.nextBytes is implemented
         try {
-            return new String(Base64.getEncoder().encode(bytes),"ISO_8859_1");
+            return new String(bytes,"ISO_8859_1");
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException(e);
         }
@@ -40,19 +44,16 @@ public class TokenService {
 
     public User getUserFromToken(String token) {
         Token tokenRep = tokenRepo.getByToken(token);
-        if (tokenRep == null)
+        if (tokenRep == null) return null;
-            return null;
-
         return tokenRep.getUser();
     }
 
     public void saveToken(Token token){
         //Si l'utilisateur a déja 5 token delete celui qui devait expirer le plus vite
         ArrayList<Token> tokenList = tokenRepo.getByUserOrderByExpirationDate(token.getUser());
-
         while(tokenList.size() >= 5){
-            tokenRepo.delete(tokenList.getFirst());
+            tokenRepo.delete(tokenList.get(0));
-            tokenList.remove(tokenList.getFirst());
+            tokenList.remove(tokenList.get(0));
         }
         tokenRepo.save(token);
     }
@@ -70,5 +71,5 @@ public class TokenService {
                 tokenRepo.delete(t);
             }
         }
-    }
+    };
 }

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

@@ -1,20 +0,0 @@
-package ovh.herisson.Clyde.Services;
-
-import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
-import ovh.herisson.Clyde.Tables.Curriculum;
-import ovh.herisson.Clyde.Tables.User;
-
-@Service
-public class UserCurriculumService {
-
-    private final UserCurriculumRepository userCurriculumRepository;
-
-    public UserCurriculumService(UserCurriculumRepository userCurriculumRepository) {
-        this.userCurriculumRepository = userCurriculumRepository;
-    }
-
-    public Curriculum findByUser(User student){
-        return userCurriculumRepository.findByUser(student);
-    }
-}

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

@@ -5,10 +5,16 @@ 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();
 
@@ -17,15 +23,8 @@ public class UserService {
     }
 
 
-    /** return the user identified by th identifier
-     *
-     * @param identifier can be an email or the RegNo
-     * @return the identified user
-     */
     public User getUser(String identifier){
-        if (identifier == null)
+        if (identifier == null) return null;
-            return null;
-
         try {
             int id = Integer.parseInt(identifier);
             return userRepo.findById(id);
@@ -35,100 +34,17 @@ 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 targetId the id of the user to update
-     * @return if the changes were done or not
-     */
-    public boolean modifyData(long targetId, Map<String ,Object> updates, User poster){
-
-        User target = userRepo.findById(targetId);
-        if (target == null)
-            return false;
-
-        if (poster.getRegNo().equals(target.getRegNo())){
-            for (Map.Entry<String, Object> entry : updates.entrySet()){
-
-                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")) {
-
-                    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 User save(User  user){
+    public void save(User  user){
-        user.setPassword(passwordEncoder.encode(user.getPassword()));
+        userRepo.save(user);
-        return userRepo.save(user);
     }
 
     public Iterable<User> getAll(){
         return userRepo.findAll();
     }
 
-    public Iterable<User> getAllExceptAdmins(){
-        return userRepo.findAllExceptAdmins();
-    }
-
-
-    public Iterable<User> getAllTeachers (){return userRepo.findAllTeachers();}
-
-    public Iterable<User> getAllStudents(){return userRepo.findAllStudents();}
-
-
-    public User getUserById(long id) {
-        return userRepo.findById(id);
-    }
-
-    public void delete(User user) {
-        userRepo.delete(user);
-    }
 }

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

@@ -1,23 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-public enum Applications {
-    // without any token
-    Login,
-
-    // with any token
-    Profile,
-
-
-    // Students and higher authorization
-    Msg,
-    Forum,
-    Rdv,
-
-    // teachers and Secretary authorization
-    ManageCourses,
-    UsersList,
-
-    // InscriptionService authorization
-    Inscription,
-    StudentsList
-}

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

@@ -1,8 +1,9 @@
 package ovh.herisson.Clyde.Tables;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Entity;
-import org.hibernate.annotations.OnDelete;
+import jakarta.persistence.GeneratedValue;
-import org.hibernate.annotations.OnDeleteAction;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class Course {
@@ -11,16 +12,12 @@ public class Course {
     private int courseID;
     private int credits;
     private String title;
+    private String faculty;
 
-    @ManyToOne(fetch = FetchType.EAGER)
+    public Course(int credits, String title, String faculty){
-    @OnDelete(action = OnDeleteAction.SET_NULL)
-    @JoinColumn(name = "Users")
-    private User owner;
-
-    public Course(int credits, String title, User owner){
         this.credits = credits;
         this.title = title;
-        this.owner = owner;
+        this.faculty = faculty;
     }
 
     public Course() {}
@@ -37,6 +34,14 @@ public class Course {
         this.credits = credits;
     }
 
+    public String getFaculty() {
+        return faculty;
+    }
+
+    public void setFaculty(String faculty){
+        this.faculty = faculty;
+    }
+
     public String getTitle() {
         return title;
     }
@@ -44,12 +49,4 @@ public class Course {
     public void setTitle(String title){
         this.title = title;
     }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
 }

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

@@ -1,49 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-import jakarta.persistence.*;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
-
-@Entity
-public class CurriculumCourse {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
-    @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "Curriculum")
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    private Curriculum curriculum;
-
-    @ManyToOne(fetch = FetchType.EAGER)
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    @JoinColumn(name = "Course")
-    private Course course;
-
-    public CurriculumCourse(Curriculum curriculum, Course course){
-        this.curriculum = curriculum;
-        this.course = course;
-    }
-
-    public CurriculumCourse() {}
-
-    public int getId() {
-        return id;
-    }
-
-    public Course getCourse() {
-        return course;
-    }
-
-    public void setCourse(Course course){
-        this.course = course;
-    }
-
-    public Curriculum getCurriculum() {
-        return curriculum;
-    }
-
-    public void setCurriculum(Curriculum curriculum) {
-        this.curriculum = curriculum;
-    }
-}

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

@@ -6,21 +6,22 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 
 @Entity
-public class Curriculum {
+public class Cursus {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private int curriculumId;
+    private int cursusId;
     private int year;
     private String option;
-    public Curriculum(int year, String option){
+
+    public Cursus(int year, String option){
         this.year = year;
         this.option = option;
     }
 
-    public Curriculum() {}
+    public Cursus() {}
 
-    public int getCurriculumId(){
+    public int getCursusId(){
-        return this.curriculumId;
+        return this.cursusId;
     }
 
     public int getYear(){

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

@@ -0,0 +1,45 @@
+package ovh.herisson.Clyde.Tables;
+
+import jakarta.persistence.*;
+
+@Entity
+public class CursusCourse {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "Cursus")
+    private Cursus cursus;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "Course")
+    private Course course;
+
+    public CursusCourse(Cursus cursus, Course course){
+        this.cursus = cursus;
+        this.course = course;
+    }
+
+    public CursusCourse() {}
+
+    public int getId() {
+        return id;
+    }
+
+    public Course getCourse() {
+        return course;
+    }
+
+    public void setCourse(Course course){
+        this.course = course;
+    }
+
+    public Cursus getCursus() {
+        return cursus;
+    }
+
+    public void setCursus(Cursus cursus) {
+        this.cursus = cursus;
+    }
+}

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

@@ -1,38 +1,33 @@
 package ovh.herisson.Clyde.Tables;
 
 import jakarta.persistence.*;
+
 import java.util.Date;
 
-
-@Entity
 public class InscriptionRequest {
-    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
     private String firstName;
     private String lastName;
-    private String address;
+    private String adress;
     private String email;
     private String country;
     private Date birthDate;
 
-    private Long curriculumId;
+    @ManyToOne
+    @JoinColumn(name="Cursus")
+    private Cursus cursus;
     private RequestState state;
     private String profilePicture;
-
-    private String password;
     public InscriptionRequest(){}
-    public InscriptionRequest(String lastName, String firstName, String address, String email, String country, Date birthDate,Long curriculumId, RequestState state, String profilePicture, String password){
+    public InscriptionRequest(String lastName, String firstName, String adress, String email, String country, Date birthDate, RequestState state, String profilePicture){
         this.lastName = lastName;
         this.firstName = firstName;
-        this.address = address;
+        this.adress = adress;
         this.email = email;
         this.country = country;
         this.birthDate = birthDate;
-        this.curriculumId = curriculumId;
         this.state = state;
-        this.profilePicture = profilePicture;
-        this.password = password;
     }
 
     public int getId() {
@@ -55,12 +50,12 @@ public class InscriptionRequest {
         this.lastName = lastName;
     }
 
-    public String getAddress() {
+    public String getAdress() {
-        return address;
+        return adress;
     }
 
-    public void setAddress(String address) {
+    public void setAdress(String adress) {
-        this.address = address;
+        this.adress = adress;
     }
 
     public String getEmail() {
@@ -87,12 +82,12 @@ public class InscriptionRequest {
         this.birthDate = birthDate;
     }
 
-    public long getCurriculumId() {
+    public Cursus getCursus() {
-        return curriculumId;
+        return cursus;
     }
 
-    public void setCurriculumId(long curriculum) {
+    public void setCursus(Cursus cursus) {
-        this.curriculumId = curriculum;
+        this.cursus = cursus;
     }
 
     public RequestState getState() {
@@ -110,12 +105,4 @@ public class InscriptionRequest {
     public void setProfilePicture(String profilePicture) {
         this.profilePicture = profilePicture;
     }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
 }

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

@@ -1,78 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-import jakarta.persistence.*;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
-
-@Entity
-public class ReInscriptionRequest {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
-    @ManyToOne
-    @JoinColumn(name = "Users")
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    private User user;
-
-    @ManyToOne
-    @JoinColumn(name = "Curriculum")
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    private Curriculum newCurriculum;
-    private RequestState state;
-
-    //Permet de différencier les demandes de changement et une réinscription dans le même Curriculum
-    //Pour la réinscription on va le mettre a 0
-    private boolean type = false;
-
-    public ReInscriptionRequest(){}
-
-    public ReInscriptionRequest(User user, Curriculum newCurriculum, RequestState state, boolean type){
-        this.user = user;
-        this.newCurriculum = newCurriculum;
-        this.state = state;
-        this.type = type;
-    }
-
-    public ReInscriptionRequest(User user, Curriculum newCurriculum, RequestState state){
-        this.user = user;
-        this.newCurriculum = newCurriculum;
-        this.state = state;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public Curriculum getNewCurriculum() {
-        return newCurriculum;
-    }
-
-    public void setNewCurriculum(Curriculum newCurriculum) {
-        this.newCurriculum = newCurriculum;
-    }
-
-    public RequestState getState() {
-        return state;
-    }
-
-    public void setState(RequestState state) {
-        this.state = state;
-    }
-
-    public boolean isType() {
-        return type;
-    }
-
-    public void setType(boolean type) {
-        this.type = type;
-    }
-}

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

@@ -0,0 +1,69 @@
+package ovh.herisson.Clyde.Tables;
+
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+
+public class ReinscriptionRequest {
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    @ManyToOne
+    @JoinColumn(name = "User")
+    private User user;
+
+    @ManyToOne
+    @JoinColumn(name = "Cursus")
+    private Cursus newCursus;
+    private RequestState state;
+
+    //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;
+
+    public ReinscriptionRequest(){}
+
+    public ReinscriptionRequest(User user, Cursus newCursus, RequestState state, boolean type){
+        this.user = user;
+        this.newCursus = newCursus;
+        this.state = state;
+        this.type = type;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public Cursus getNewCursus() {
+        return newCursus;
+    }
+
+    public void setNewCursus(Cursus newCursus) {
+        this.newCursus = newCursus;
+    }
+
+    public RequestState getState() {
+        return state;
+    }
+
+    public void setState(RequestState state) {
+        this.state = state;
+    }
+
+    public boolean isType() {
+        return type;
+    }
+
+    public void setType(boolean type) {
+        this.type = type;
+    }
+}

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

@@ -3,5 +3,5 @@ package ovh.herisson.Clyde.Tables;
 public enum RequestState {
     Accepted,
     Refused,
-    Pending
+    Pending;
 }

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

@@ -4,6 +4,5 @@ public enum Role {
     Teacher,
     Student,
     Admin,
-    InscriptionService,
+    Secretary;
-    Secretary
 }

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

@@ -0,0 +1,42 @@
+package ovh.herisson.Clyde.Tables;
+
+import jakarta.persistence.*;
+
+@Entity
+public class Secretary {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "Users")
+    private User user;
+    private String faculty;
+
+    public Secretary(User user, String faculty){
+        this.user = user;
+        this.faculty = faculty;
+    }
+
+    public Secretary() {}
+
+    public int getId() {
+        return id;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public String getFaculty() {
+        return faculty;
+    }
+
+    public void setFaculty(String faculty) {
+        this.faculty = faculty;
+    }
+}

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

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

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

@@ -1,32 +1,32 @@
 package ovh.herisson.Clyde.Tables;
 
 import jakarta.persistence.*;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
 
 @Entity
-public class TeacherCourse {
+public class TeacherGivenCourse {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
 
-    @ManyToOne(fetch = FetchType.EAGER)
+    @ManyToOne(fetch = FetchType.LAZY)
-    @OnDelete(action = OnDeleteAction.CASCADE)
     @JoinColumn(name = "Users")
     private User user;
 
 
-    @ManyToOne(fetch = FetchType.EAGER)
+    @ManyToOne(fetch = FetchType.LAZY)
-    @OnDelete(action = OnDeleteAction.CASCADE)
     @JoinColumn(name = "Course")
     private Course course;
 
-    public TeacherCourse(User user, Course course){
+    //This flag helps make the difference between an assistant or a Teacher (who owns the course)
+    private boolean owned;
+
+    public TeacherGivenCourse(User user, Course course, boolean owned){
         this.user = user;
         this.course = course;
+        this.owned = owned;
     }
 
-    public TeacherCourse() {}
+    public TeacherGivenCourse() {}
 
     public int getId() {
         return id;
@@ -48,4 +48,11 @@ public class TeacherCourse {
         this.course = course;
     }
 
+    public boolean isOwned() {
+        return owned;
+    }
+
+    public void setOwned(boolean owned) {
+        this.owned = owned;
+    }
 }

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

@@ -1,8 +1,8 @@
 package ovh.herisson.Clyde.Tables;
 
 import jakarta.persistence.*;
-import org.hibernate.annotations.OnDelete;
+import org.springframework.scheduling.annotation.Scheduled;
-import org.hibernate.annotations.OnDeleteAction;
+import ovh.herisson.Clyde.Repositories.TokenRepository;
 
 import java.util.Date;
 
@@ -13,7 +13,6 @@ public class Token {
     private int id;
 
     @ManyToOne(fetch = FetchType.EAGER)
-    @OnDelete(action = OnDeleteAction.CASCADE)
     @JoinColumn(name ="Users")
     private User user;
     private String token;

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

@@ -1,15 +1,19 @@
 package ovh.herisson.Clyde.Tables;
 
 import jakarta.persistence.*;
+
 import java.util.Date;
 
+//Classe représentant un utilisateur l'attribut password demande surement un peu de rafinement niveau sécurité
+//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 Long regNo;
+    private int regNo;
     private String lastName;
     private String firstName;
     @Column(unique = true)
@@ -34,22 +38,9 @@ public class User {
         this.password = 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 Long getRegNo(){
+    public int getRegNo(){
         return this.regNo;
     }
     public String getLastName() {
@@ -80,8 +71,8 @@ public class User {
         return address;
     }
 
-    public void setAddress(String address) {
+    public void setAddress(String adress) {
-        this.address = address;
+        this.address = adress;
     }
 
     public String getCountry() {

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

@@ -1,50 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-import jakarta.persistence.*;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
-
-@Entity
-public class UserCurriculum {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
-    //Un étudiant peut avoir plusieurs curriculums
-    @ManyToOne(fetch = FetchType.EAGER)
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    @JoinColumn(name = "Users")
-    private User user;
-
-    @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "Curriculum")
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    private Curriculum curriculum;
-
-    public UserCurriculum(User user, Curriculum curriculum){
-        this.user = user;
-        this.curriculum = curriculum;
-    }
-
-    public UserCurriculum() {}
-
-    public int getId() {
-        return id;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public Curriculum getCurriculum() {
-        return curriculum;
-    }
-
-    public void setCurriculum(Curriculum curriculum) {
-        this.curriculum = curriculum;
-    }
-}

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

@@ -0,0 +1,46 @@
+package ovh.herisson.Clyde.Tables;
+
+import jakarta.persistence.*;
+
+@Entity
+public class UserCursus {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    //Un étudiant peut avoir plusieurs cursus
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "Users")
+    private User user;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "Cursus")
+    private Cursus cursus;
+
+    public UserCursus(User user, Cursus cursus){
+        this.user = user;
+        this.cursus = cursus;
+    }
+
+    public UserCursus() {}
+
+    public int getId() {
+        return id;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public Cursus getCursus() {
+        return cursus;
+    }
+
+    public void setCursus(Cursus cursus) {
+        this.cursus = cursus;
+    }
+}

backend/src/main/resources/application.properties

@@ -1,3 +1,2 @@
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
-spring.sql.init.mode=always

backend/src/test/java/ovh/herisson/Clyde/ClydeApplicationTests.java

@@ -8,7 +8,6 @@ class ClydeApplicationTests {
 
 	@Test
 	void contextLoads() {
-
 	}
 
 }

backend/src/test/java/ovh/herisson/Clyde/Endpoints/StorageControllerTest.java

@@ -1,105 +0,0 @@
-package ovh.herisson.Clyde.Endpoints;
-
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports;
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import org.junit.Assert;
-import org.junit.jupiter.api.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
-import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
-import org.springframework.http.MediaType;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.context.ActiveProfiles;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-import ovh.herisson.Clyde.ClydeApplication;
-import ovh.herisson.Clyde.EndPoints.StorageController;
-import ovh.herisson.Clyde.Repositories.FileRepository;
-import ovh.herisson.Clyde.Services.StorageService;
-import ovh.herisson.Clyde.Tables.FileType;
-import ovh.herisson.Clyde.Tables.StorageFile;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import static io.restassured.RestAssured.with;
-
-@Testcontainers
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles(value ="dev")
-public class StorageControllerTest {
-    @LocalServerPort
-    private Integer port;
-
-    @Autowired
-    private ClydeApplication controller;
-
-    @Autowired
-    private StorageController storageController;
-
-    @Autowired
-    private StorageService storageService;
-    @Autowired
-    private FileRepository fileRepository;
-    @Container
-    @ServiceConnection
-    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:alpine")
-            .withDatabaseName("clyde")
-            .withUsername("devel")
-            .withPassword("devel")
-            .withCreateContainerCmdModifier(cmd -> cmd.withHostConfig(new HostConfig().withPortBindings(new PortBinding(Ports.Binding.bindPort(5442), new ExposedPort(5432)))));
-
-    @BeforeAll
-    static void beforeAll(){
-        postgres.start();
-    }
-
-    @AfterAll
-    static void afterAll(){
-        postgres.stop();
-    }
-
-    @BeforeEach
-    void setup(){
-        RestAssured.baseURI = "http://localhost:" + port;
-    }
-
-    @AfterEach
-    void afterEach(){
-        fileRepository.deleteAll();
-    }
-    @Test
-    public void uploadFileTest() throws IOException {
-        File mmf = new File("test.txt");
-        mmf.createNewFile();
-
-        FileWriter fw = new FileWriter(mmf);
-        fw.write("Ceci est un test");
-        fw.close();
-
-        with().multiPart("file", mmf).pathParam("fileType", FileType.ProfilePicture).when().request("POST", "/upload/{fileType}").then().statusCode(200);
-
-        StorageFile sf = fileRepository.getStorageFileByName("test.txt");
-
-        //On vérifie que le fichier a bien été stocké dans la db
-        Assert.assertFalse(sf == null);
-
-        //On vérifie que le fichier a bel et bien été stocké dans le dossier cdn
-        File extFile = new File(sf.getUrl());
-        Assert.assertTrue(extFile.exists());
-
-        Assert.assertEquals("cdn", extFile.getParent());
-
-        //On delete tranquillement les fichiers (la méthode delete a déja été testée dans StorageServiceTest)
-        storageService.delete(sf);
-        mmf.delete();
-    }
-}

backend/src/test/java/ovh/herisson/Clyde/Endpoints/UserControllerTest.java

@@ -1,149 +0,0 @@
-package ovh.herisson.Clyde.Endpoints;
-
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports;
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import org.junit.Assert;
-import org.junit.jupiter.api.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
-import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.HttpStatusCode;
-import org.springframework.test.context.ActiveProfiles;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-import ovh.herisson.Clyde.ClydeApplication;
-import ovh.herisson.Clyde.Repositories.TokenRepository;
-import ovh.herisson.Clyde.Repositories.UserRepository;
-import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
-import ovh.herisson.Clyde.Services.TokenService;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.Token;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import static io.restassured.RestAssured.with;
-import static org.hamcrest.Matchers.equalTo;
-
-@Testcontainers
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles(value = "dev")
-public class UserControllerTest {
-    @LocalServerPort
-    private Integer port;
-
-    @Autowired
-    private ClydeApplication controller;
-
-    @Autowired
-    private TokenService tokenService;
-
-    @Autowired
-    private UserRepository userRepository;
-    @Autowired
-    private TokenRepository tokenRepository;
-    @Container
-    @ServiceConnection
-    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:alpine")
-            .withDatabaseName("clyde")
-            .withUsername("devel")
-            .withPassword("devel")
-            .withCreateContainerCmdModifier(cmd -> cmd.withHostConfig(new HostConfig().withPortBindings(new PortBinding(Ports.Binding.bindPort(5442), new ExposedPort(5432)))));
-
-    @BeforeAll
-    static void beforeAll(){
-        postgres.start();
-    }
-
-    @AfterAll
-    static void afterAll(){
-        postgres.stop();
-    }
-
-    @BeforeEach
-    void setup(){
-        RestAssured.baseURI = "http://localhost:" + port;
-    }
-
-    @AfterEach
-    void aftereach(){
-        tokenRepository.deleteAll();
-        userRepository.deleteAll();
-    }
-    @Test
-    //Verifie qu'un user qui n'a pas les permissions admin ou secretaire ne peut pas post
-    public void userPostTest(){
-        User god = new User("god","god","admin@admin.com","everywhere","every",new Date(0), null, Role.Admin,"goddoesntneedpassword");
-        Token godToken = new Token(god, tokenService.generateNewToken(), new Date());
-        userRepository.save(god);
-        tokenService.saveToken(godToken);
-
-        //Can god post herobrine himself ?
-        User herobrine = new User("brine","hero","herobrine@student.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Student,"test");
-
-        with().body(herobrine).contentType(ContentType.JSON).header("Authorization", godToken.getToken()).when().request("POST", "/user").then().statusCode(201);
-
-        userRepository.delete(herobrine);
-
-        //Can noob post herobrine without authorizations (no)
-        User noob = new User("boon","noob","noob@student.com","everywhere","every",new Date(0), null, Role.Student,"noob");
-        Token noobToken = new Token(noob, tokenService.generateNewToken(), new Date());
-        userRepository.save(noob);
-        tokenService.saveToken(noobToken);
-
-        with().body(herobrine).contentType(ContentType.JSON).header("Authorization", noobToken.getToken()).when().request("POST", "/user").then().statusCode(401);
-    }
-
-    @Test
-    public void userGetTest(){
-        User herobrine = new User("brine","hero","herobrine@student.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Student,"test");
-        userRepository.save(herobrine);
-
-        Token t = new Token(herobrine, tokenService.generateNewToken(), new Date());
-        tokenRepository.save(t);
-
-
-        with().header("Authorization", t.getToken()).when().request("GET", "/user").then().assertThat().statusCode(200).body("firstName",equalTo("hero"));
-    }
-
-    @Test
-    public void userPatchTest(){
-        User herobrine = new User("brine","hero","herobrine@admin.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Admin,"test");
-        userRepository.save(herobrine);
-
-        Token t = new Token(herobrine, tokenService.generateNewToken(), new Date());
-        tokenRepository.save(t);
-
-        Map<String, Object> data = new HashMap<String, Object>();
-        data.put("firstName", "test");
-
-        //Teste que le patch s'execute bien
-        with().body(data).contentType(ContentType.JSON).header("Authorization", t.getToken()).pathParam("id", herobrine.getRegNo()).when().request("PATCH", "/user/{id}").then().statusCode(200);
-
-        //Teste que la donnée a bien été altérée
-        with().header("Authorization", t.getToken()).when().request("GET", "/user").then().body("firstName",equalTo("test"));
-    }
-
-    @Test
-    public void UserDeleteTest(){
-        User god = new User("god","god","admin@admin.com","everywhere","every",new Date(0), null, Role.Admin,"goddoesntneedpassword");
-        Token godToken = new Token(god, tokenService.generateNewToken(), new Date());
-        userRepository.save(god);
-        tokenService.saveToken(godToken);
-
-        User herobrine = new User("brine","hero","herobrine@admin.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Student,"test");
-        userRepository.save(herobrine);
-
-        with().header("Authorization", godToken.getToken()).pathParam("id", herobrine.getRegNo()).when().request("DELETE", "/user/{id}").then().statusCode(200);
-        Assert.assertEquals(userRepository.existsById(herobrine.getRegNo()), false);
-    }
-}

backend/src/test/java/ovh/herisson/Clyde/Repositories/UserRepoTest.java

@@ -1,41 +0,0 @@
-package ovh.herisson.Clyde.Repositories;
-
-import org.junit.Assert;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.context.TestPropertySource;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.GregorianCalendar;
-
-@DataJpaTest
-@TestPropertySource(properties = {
-        "spring.test.database.replace=none",
-        "spring.datasource.url=jdbc:tc:postgresql:16-alpine:///db"
-})
-public class UserRepoTest {
-
-    @Autowired
-    UserRepository userRepo;
-
-    @BeforeEach
-    public void setup(){
-        User herobrine = new User("brine","hero","admin@admin.com","in your WalLs","ShadowsLand", new GregorianCalendar(2005, 4, 3).getTime(), null, Role.Admin,"admin");
-        userRepo.save(herobrine);
-    }
-
-    @AfterEach
-    public void clean(){
-        userRepo.deleteAll();
-    }
-    @Test
-    public void usertest(){
-        Assert.assertEquals("brine", userRepo.findById(1).getLastName());
-        Assert.assertTrue(new GregorianCalendar(2005, 4, 3).getTime().equals(userRepo.findById(1).getBirthDate()));
-    }
-
-}

backend/src/test/java/ovh/herisson/Clyde/Services/StorageServiceTest.java

@@ -1,80 +0,0 @@
-package ovh.herisson.Clyde.Services;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.web.multipart.MultipartFile;
-import org.testcontainers.shaded.com.google.common.net.MediaType;
-import ovh.herisson.Clyde.Repositories.FileRepository;
-import ovh.herisson.Clyde.Tables.FileType;
-import ovh.herisson.Clyde.Tables.StorageFile;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-
-@DataJpaTest
-@TestPropertySource(properties = {
-        "spring.test.database.replace=none",
-        "spring.datasource.url=jdbc:tc:postgresql:16-alpine:///db"
-})
-public class StorageServiceTest {
-    @Autowired
-    FileRepository fileRepo;
-
-    StorageService ss;
-
-    @BeforeEach
-    public void setup(){
-        if (ss == null){
-            ss = new StorageService(fileRepo);
-        }
-    }
-
-    @AfterEach
-    public void aftereach(){
-        fileRepo.deleteAll();
-    }
-    @Test
-    //Check si le fichier est bien sauvegardé dans la DB et si le fichier est bien sauvegardé au bon endroit
-    public void saveFile(){
-        //Test si le directory a bien été crée a l'init du fileService
-        Path rootloc = Paths.get("cdn/");
-
-        Assert.assertTrue(Files.exists(rootloc));
-    }
-
-    @Test
-    public void deleteFile() throws IOException {
-        File file = new File("cdn/test.txt");
-        file.createNewFile();
-
-        //On vérifie que le fichier a bien été crée
-        Assert.assertTrue(file.exists());
-
-        //StorageFile représentant le fichier
-        StorageFile sf = new StorageFile("testfile",file.getPath(), FileType.ProfilePicture);
-        fileRepo.save(sf);
-
-        //Check that the storagefile is properly saved
-        StorageFile resp = fileRepo.getStorageFileByName("testfile");
-        Assert.assertEquals(sf, resp);
-
-        ss.delete(sf);
-
-        //On vérifie que le fichier a bien été delete et que le StorageFile a été delete de la DB
-        Assert.assertFalse(file.exists());
-
-        resp = fileRepo.getStorageFileByName("testfile");
-        Assert.assertEquals(null, resp);
-    }
-}

backend/src/test/java/ovh/herisson/Clyde/Services/TokenServiceTest.java

@@ -1,93 +0,0 @@
-package ovh.herisson.Clyde.Services;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.context.TestPropertySource;
-import ovh.herisson.Clyde.Repositories.TokenRepository;
-import ovh.herisson.Clyde.Repositories.UserRepository;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.Token;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-@DataJpaTest
-@TestPropertySource(properties = {
-        "spring.test.database.replace=none",
-        "spring.datasource.url=jdbc:tc:postgresql:16-alpine:///db"
-})
-
-class TokenServiceTest {
-
-    @Autowired
-    TokenRepository tokenRepository;
-
-    @Autowired
-    UserRepository userRepository;
-
-
-    @AfterEach
-    public void aftereach(){
-        tokenRepository.deleteAll();
-        userRepository.deleteAll();
-    }
-    @Test
-    void saveToken() {
-        User herobrine = userRepository.findById(1);
-
-        User herobrinenul = new User("brine","heronul","pasadmin@student.com","in your WalLs","ShadowsLand", new GregorianCalendar(2005, 4, 3).getTime(), null, Role.Admin,"admin");
-
-        TokenService tokenService = new TokenService(tokenRepository);
-        Token testToken = new Token(herobrine, tokenService.generateNewToken(), new Date());
-        tokenService.saveToken(testToken);
-
-        Iterable<Token> t = tokenService.getAllTokens();
-        Token tok = t.iterator().next();
-
-        Assert.assertEquals(herobrine, tok.getUser());
-        Assert.assertNotEquals(herobrinenul, tok.getUser());
-    }
-
-
-    @Test
-    void saveTokenLimit(){
-        TokenService tokenService = new TokenService(tokenRepository);
-
-        //On va stocker les token qu'on va sauvegarder au préalable dans une liste pour tester que les tokens remplacés sont bien ceux avec la date d'expi la plus jeune
-        //A la fin il ne devrait donc rester que les 5 derniers tokens de tokenList
-
-        ArrayList<Token> tokenList = new ArrayList<>();
-        GregorianCalendar gc = new GregorianCalendar();
-
-        User malveillant = new User("Cargo", "John", "CargoJ@mail.com", "secret", "secret", null, null, null, "secret");
-        userRepository.save(malveillant);
-
-        for (int i = 0; i < 20; i++){
-            gc.add(Calendar.DAY_OF_WEEK, 1);
-
-            Token t = new Token(malveillant, tokenService.generateNewToken(), gc.getTime());
-            tokenList.add(t);
-
-            tokenService.saveToken(t);
-        }
-
-        //Testons les tokens
-        ArrayList <Token> resp = tokenRepository.getByUserOrderByExpirationDate(malveillant);
-        Assert.assertTrue(resp.size() == 5);
-
-        for (int i = 1; i <= resp.size(); i++){
-            Assert.assertEquals(tokenList.get(tokenList.size()-i), resp.get(resp.size()-i));
-        }
-    }
-}

backend/src/test/resources/application.properties

@@ -1,3 +0,0 @@
-spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver
-spring.jpa.hibernate.ddl-auto=create-drop
-spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect

frontend/build.gradle.kts

@@ -18,3 +18,8 @@ var dev = tasks.register<NpmTask>("dev") {
 tasks.register<NpmTask>("run") {
 	dependsOn(dev)
 }
+
+tasks.register<NpmTask>("test") {
+	dependsOn(tasks.npmInstall)
+	args.set(listOf("run", "test:unit"))
+}

frontend/package-lock.json

@@ -8,7 +8,6 @@
       "name": "clyde",
       "version": "0.0.0",
       "dependencies": {
-        "@canvasjs/vue-charts": "^1.0.4",
         "vite-plugin-top-level-await": "^1.4.1",
         "vue": "^3.4.15",
         "vue3-toastify": "^0.2.1"
@@ -30,20 +29,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@canvasjs/charts": {
-      "version": "3.7.45",
-      "resolved": "https://registry.npmjs.org/@canvasjs/charts/-/charts-3.7.45.tgz",
-      "integrity": "sha512-FPMX8wn+PEHzAa/GLBsL5lWB81AzKZLw51t7SiSUjMbtUN5/OIrmDcwUTw+53/Bbdd9gm2LLmxAdZsQ75JI31g=="
-    },
-    "node_modules/@canvasjs/vue-charts": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@canvasjs/vue-charts/-/vue-charts-1.0.4.tgz",
-      "integrity": "sha512-PzOA8xeb/f68a39uoFZNn843dGPU36bsqmbO5DWjP7k6FwkK5AeGkYa/H3RHC02Xc6mG68vg9aFNj2Fyqhu4UQ==",
-      "dependencies": {
-        "@canvasjs/charts": "^3.7.5",
-        "vue": ">=3.0.0"
-      }
-    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",

frontend/package.json

@@ -9,7 +9,6 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@canvasjs/vue-charts": "^1.0.4",
     "vite-plugin-top-level-await": "^1.4.1",
     "vue": "^3.4.15",
     "vue3-toastify": "^0.2.1"

frontend/public/i18n/EN.txt

@@ -1,9 +1,11 @@
+# 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
@@ -13,8 +15,6 @@ 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,32 +23,8 @@ 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
-app.studentList=Students List
-app.users=Users
 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
-profile.change.curriculum=Change curriculum
-name=Name
-Teacher=Teacher
-Student=Student
-Secretary=Secretary
-Curriculum=curriculum
-Credits=Credits
-InscriptionService=I.S.
-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,32 +23,7 @@ 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
-app.studentList=Liste des étudiants
-app.users=Utilisateurs
 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
-profile.change.curriculum=Changer cursus
-name=Nom
-Teacher=Enseignant
-Student=Etudiant
-Secretary=Secrétaire
-Curriculum=Cursus
-Credits=Credits
-InscriptionService=S.I.
-faculty=Faculté

frontend/src/App.vue

@@ -1,34 +1,35 @@
 <script setup>
   import { toast } from 'vue3-toastify';
-  import { ref } from 'vue'
+  import { ref, computed } from 'vue'
   import i18n, { setLang } from './i18n.js'
-  import { isLogged } from '@/rest/Users.js'
 
-  import { appList, currentView } from '@/rest/apps.js'
-		var prevURL;
-		var currentURL = window.location.hash;
 
-window.onhashchange = function() {
+  // Liste des apps
-    prevURL = currentURL;
+  import LoginPage from './Apps/Login.vue'
-    currentURL = window.location.hash;
+  import Inscription from "./Apps/Inscription.vue"
-}
+  import Profil from "./Apps/Profil.vue"
-const Logged = ref(isLogged());
 
-window.addEventListener('hashchange', () => {
+  const apps = {
- if((location.hash === "#/home" && prevURL === "#/login") || (location.hash === "#/home" && prevURL === "#/profil")){
+  	'/login': LoginPage,
-		window.location.reload();
+	'/inscription': Inscription,
+  '/profil': Profil
   }
-});
+  const currentPath = ref(window.location.hash)
+
+  window.addEventListener('hashchange', () => {
+    currentPath.value = window.location.hash
+  })
+
+  const currentView = computed(() => {
+    return apps[currentPath.value.slice(1) || '/']
+  })
+
   const home=ref(i18n("app.home"))
   const notifications=ref(i18n("app.notifications"))
   const settings=ref(i18n("app.settings"))
   const login=ref(i18n("app.login"))
   const active=ref(false)
   
-
-	const apps = ref([])
-	appList().then(e => apps.value = e)
-
 </script>
 
 <template>
@@ -38,7 +39,7 @@ window.addEventListener('hashchange', () => {
       <ul class="horizontal">
         <li title=home>
             <a class="icon" href="#home">
-                <img class="clyde" src="/Clyde.png" style="width: 40px; height: auto; margin-top:4px">
+                <img @click="draw" src="./assets/Clyde.png" style="width: 40px; height: auto; margin-top:4px">
             </a></li>
         <li title=home>
             <a class="icon" href="#home">
@@ -46,7 +47,7 @@ window.addEventListener('hashchange', () => {
             </a></li>
         <li style="float: right;" title=login>
             <a class="icon" href="#/login">
-                <div class="fa-solid fa-user" :style="Logged ? 'color: orange' : 'haha'" style="margin-top: 7px; margin-bottom: 3px; "></div>
+                <div class="fa-solid fa-user"  style="margin-top: 7px; margin-bottom: 3px;"></div>
             </a></li>
         <li style="float: right;" title=notifications>
             <a class="icon" href="#Notifications">
@@ -56,7 +57,7 @@ window.addEventListener('hashchange', () => {
             <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">{{i18n("app.language")}}</div>
+                  <div class="dropdown-content">Langage</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>
@@ -66,7 +67,7 @@ window.addEventListener('hashchange', () => {
                   </ul>
                   <div style='align-items:center;'>
                   <a style="cursor:pointer;font-size:20px;" href="#/profil" class="dropdown-content">
-                    {{i18n("app.manage.profile")}}
+                    Manage Profile
                   </a>
                   </div>
 
@@ -77,18 +78,34 @@ window.addEventListener('hashchange', () => {
 
     <div class="leftBar">
     <ul class="vertical">
-        <li v-for="app in apps">
+        <li style="margin-top: 25px;" >
-						<a :href="app.path">
+          <a href="#Messages">
-            <div class="fa-solid" :class="app.icon" style="font-size: 40px;"></div>
+            <div class="fa-solid fa-comment" style="font-size: 40px;"></div>
-            <div class="text">{{app.text}}</div>
+            <div class="text">{{i18n("app.messages")}}</div>
-						</a>
+          </a></li>
-				</li>
+        <li >
+          <a href="#Notifications">
+            <div class="fa-solid fa-bell" style="font-size: 40px;" ></div>
+            <div class="text">{{i18n("app.notifications")}}</div>
+          </a></li>
+        <li >
+          <a href="#Schedule">
+            <div class="fa-solid fa-calendar-days" style="font-size: 40px;"></div>
+            <div class="text">{{i18n("app.schedules")}}</div>
+          </a></li>
+        <li ><a href="#Forum">
+            <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="text">{{i18n("app.inscription.requests")}}</div></a></li>
     </ul>
+
     </div>
     <div class="page">
-        <Suspense>
+      <div style=" margin:50px;">
 		<component :is="currentView" />
-        </Suspense>
+      </div>
     </div>
   </div>
 </template>
@@ -96,8 +113,6 @@ window.addEventListener('hashchange', () => {
 <style scoped>
   
   .container{
-			height: 100%;
-			width: 100%;
     display:grid;
     grid-template-columns:[firstCol-start]70px[firstCol-end secondCol-start]auto[endCol];
     grid-template-rows:[firstRow-start]61px[firstRow-end secondRow-start] auto [endRow];
@@ -110,8 +125,6 @@ window.addEventListener('hashchange', () => {
 
   .page {
     grid-area:page;
-		height: 100%;
-		width: 100%;
     place-self:center;
   }
 
@@ -233,6 +246,7 @@ window.addEventListener('hashchange', () => {
 	  }
 
 	  .text {
+		position: absolute;
 		right: 0%;
 		width: 0%;
 		opacity: 0;
@@ -244,15 +258,9 @@ window.addEventListener('hashchange', () => {
 
 	  ul.vertical:hover .text {
 		opacity: 1;
-		width: 60%;
+		width: 70%;
 		transition-duration: .3s;
-		padding-left: 15px;
+		padding-left: 5px;
-	  }
-
-	  .clyde:hover{
-		  content: url("./assets/angry_clyde.png")
 	  }
     
 </style>
-
-<!-- vim:set noet sts=0 sw=4 ts=2: --> 

frontend/src/Apps/Inscription.vue

@@ -1,111 +1,32 @@
 <script setup>
-  import i18n from "@/i18n.js"
+  import Req from "./Request.vue"
-  import {ref} from 'vue'
+  const requests_example = [ {
-  import {validateRegister, getAllRegisters } from '@/rest/ServiceInscription.js'
+  id:0,
-
+  type:"Inscription",
-  const requests = ref(await getAllRegisters());
+  lastName:"DoefenschmirtzLEMAGNIFIQUE",
-  console.log(requests);
+  firstName:"Jhon",
-
+  address: "Radiator Springs",
-  async function upPage(id,review){
+  country: "USA",
-    await validateRegister(id,review);
+  birthdate:"2004-02-02",
-    requests.value = await getAllRegisters();
+  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>
-  <div style='display:flex; justify-content:center; min-width:1140px;' v-for="item of requests">
+  <Req v-for="item of requests_example" v-bind="item">
-  <div class="bodu" v-if="item.state === 'Pending'">
+      </Req>
-  <div class="container">
-    <div class="id"><a>{{item.id}}</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>
-    <div class="accept"><button @click="upPage(item.id,'Accepted')" style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div>
-    <div class="refuse"><button @click="upPage(item.id,'Refused')" style="background-color:rgb(105,0,0);">{{i18n("request.refuse")}}</button></div>
-  </div>
-  </div>
-  </div>
 </template>
-
-<style scoped>
-  .container{
-    color:white;
-    height:100px;
-    font-size:20px;
-    display:grid;
-    grid-template-columns:10% 14.2% 19% 14.2% 14.2% 14.2% 14.2%;
-    grid-template-areas:
-    "id type surname firstname infos accept refuse"; 
-    
-  }
-  
-  .infos {
-    grid-area:infos;
-    align-self:center;
-  }
-
-  .accept{
-    grid-area:accept;
-    align-self:center;
-  }
-
-  .refuse{
-    grid-area:refuse;
-    align-self:center;
-  }
-
-  .titles {
-    grid-area:titles;
-    background-color:rgb(215,215,215);
-  }
-  .id{
-    grid-area:id;
-    margin-left:40px;
-    align-self:center;
-  }
-
-  .type{
-    grid-area:type;
-    align-self:center;
-  }
-
-  .surname{
-    grid-area:surname;
-    align-self:center;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow:ellipsis;
-  }
-
-  .firstname{
-    grid-area:firstname;
-    align-self:center;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow:ellipsis;
-  }
-
-  button{
-    font-size:15px;
-     height:50px;
-     width:100px;
-    border:none;
-    border-radius:20px;
-
-  }
-
- .bodu {
-    margin-top:2%;
-    width:66%;
-    border:2px solid black;
-    border-radius:9px;
-    background-color:rgb(50,50,50);
-  }
-
-
-</style>
-
-

frontend/src/Apps/Login.vue

@@ -1,107 +1,77 @@
 <script setup>
-  import {reactive, ref } from 'vue'
+  import { login , register} from '@/rest/Users.js'
+  import { ref } from 'vue'
   import i18n from '@/i18n.js'
-  import { login , register , disconnect, isLogged} from '@/rest/Users.js'
-  import { getAllCurriculums } from '@/rest/curriculum.js'
-  import { uploadProfilePicture } from '@/rest/uploads.js'
-  import {toast} from 'vue3-toastify'
-  import 'vue3-toastify/dist/index.css';
-
-
   const loginPage= ref(true)
   const page = ref(0)
 
-  const outputs = reactive({
+  const emailID=ref("")
-    surname:null,
+  const passwordIN=ref("")
-    firstname:null,
+
-    password:null,
-    birthday:null,
-    email:null,
-    address:null,
-    country:null,
-    curriculum:null,
-  })
 
   const submitValue= ref(i18n("login.guest.submit"))
+  const surname=ref("")
+  const firstname=ref("")
+  const passwordOUT=ref("")
   const passwordConfirm=ref("")
- 
+  const birthday=ref("")
-  const imageSaved = ref(false)
+  const emailOUT=ref("")
-  const ppData = ref(false)
+  const address=ref("")
-
+  const country=ref("")
-  const curricula= await getAllCurriculums();
+  const cursus=ref("")
-  
+  const loginInfos = [{_emailID:emailID},{_passwordIN:passwordIN}]
-  function goBackHome(){
+  const registerInfos= [{_surname:surname},{_firstname:firstname},{_birthday:birthday},{_passwordOUT:passwordOUT},
-    setTimeout(() => {
+  {_passwordConfirm:passwordConfirm},{_emailOUT:emailOUT},{_address:address},{_country:country},{_cursus:cursus}]
-      window.location.href="#/home";
-      }, "500");
- } 
-  function verifyInputs(pass){
-    if(pass==passwordConfirm.value){
-      page.value++;
-      return toast('Password and Confirm Password are correct.', {
-      
-    type: "success",});
-    }
-    else{
-    return toast('Password and Confirm Password are different',{type: "error",});
-    }
-  }
-  if (isLogged()){
-  disconnect();
-  window.location.reload();}
-
-  
  
 </script>
 
 
 <template>
-    <div class="setup">
+      <div class='loginBox'>
+
         <div v-if="loginPage">
-      <div class='loginBox' style="margin-top:30%;">
+          <form @submit.prevent="login(emailID, passwordIN)"class="form">
-          <form @submit.prevent="login(outputs.email,outputs.password);goBackHome();"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="outputs.email">
+              <input type="text" v-model="emailID">
             </div>
             <div class="inputBox">
               <p>{{i18n("login.guest.password")}}</p>
-              <input type="password" v-model="outputs.password">
+              <input type="password" v-model="passwordIN">
             </div>
             <div class="register">
               <a @click="loginPage=!loginPage">{{i18n("login.guest.register")}}</a>
             </div>
-            <div class="inputBox" style="margin-bottom:35px;">
+            <div class="inputBox">
               <input type="submit" v-model="submitValue">
             </div>
           </form>
         </div>
-      </div>
+
         <div v-else>
-          <div class='loginBox' style="margin-top:30%; margin-bottom:50%;">
+          <form @submit.prevent="register(surname,firstname,emailOUT)" class="form">
-            <form class="form">
             <h1 style="color:rgb(239,60,168); font-family: sans-serif; text-align:center;">
               {{i18n("login.guest.welcome")}}
             </h1>
             <div v-if="page === 0">
               <div class="inputBox">
                 <p>{{i18n("login.guest.surname")}}</p>
-                <input type="text" v-model="outputs.surname">
+                <input type="text" v-model="surname">
               </div>
               <div class="inputBox">
                 <p>{{i18n("login.guest.firstname")}}</p>
-                <input type="text" v-model="outputs.firstname">
+                <input type="text" v-model="firstname">
               </div>
               <div class="inputBox">
                 <p>{{i18n("login.guest.birthday")}}</p>
-                <input type="date" v-model="outputs.birthday">
+                <input type="date" v-model="birthday">
               </div>
               <div class="inputBox">
                  <p>{{i18n("login.guest.password")}}</p>
-                 <input type="password" v-model="outputs.password">
+                 <input type="password" v-model="passwordOUT">
               </div>
               <div class="inputBox">
                 <p>{{i18n("login.guest.confirm")}} {{i18n("login.guest.password")}}</p>
@@ -109,7 +79,7 @@
               </div>
               
               <div class="switchpage">
-                <button @click="verifyInputs(outputs.password);">{{i18n("login.guest.nextpage")}}</button>
+                <button @click="page++">{{i18n("login.guest.nextpage")}}</button>
 
               </div>
               <div @click="(loginPage=!loginPage) && (page=0)" class="register">
@@ -119,34 +89,26 @@
             <div v-else>
               <div class="inputBox">
                 <p>{{i18n("login.guest.email")}}</p>
-                <input type="mail" v-model="outputs.email">
+                <input type="mail" v-model="emailOUT">
               </div>
               <div class="inputBox">
                 <p>{{i18n("login.guest.address")}}</p>
-                <input type="text" v-model="outputs.address">
+                <input type="text" v-model="address">
               </div>
               <div class="inputBox">
                 <p>{{i18n("login.guest.country")}}</p>
-                <input type="text" v-model="outputs.country">
+                <input type="text" v-model="country">
               </div>
-              <form class="inputBox"novalidate enctype="multipart/form-data">
-              	<p>{{i18n("profile.picture").toUpperCase()}}</p>
-              <label class="browser">
-                Parcourir . . .
-				        <input  type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*">
-              </label>
-              </form>
               <div class="inputBox">
-                <p>{{i18n("Curriculum").toUpperCase()}}</p> 
+                <p>CURSUS</p> 
-                  <select v-model="outputs.curriculum">
+                  <select v-model="cursus">
-                    <option v-for="item in curricula">{{item.curriculumId}}</option>
+                    <option value="Chemistry">Chemistry</option>
-                    
+                    <option value="Psycho">Psychology</option>
+                    <option value="IT">IT</option>
                   </select>
               </div>
               <div style="align-self:center;" class="inputBox">
-                <button style="margin-top:25px;" @click="register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData);">
+                <button style="margin-top:25px;" @click="console.log(outputs)">{{i18n("login.guest.submit")}}</button>
-                  {{i18n("login.guest.submit")}}
-                </button>
               </div>
               <div  class="switchpage">
                 <button @click="page--">{{i18n("login.guest.lastpage")}}</button>
@@ -158,25 +120,34 @@
           </form>
          </div>
         </div>
-  </div>
 </template>
 
 <style scoped>
-
+.Home{
-.setup {
+  position:absolute;
-  margin-left: auto;
+ 	display: flex;
-  margin-right:auto;
+  z-index: 100;
-  min-width:400px;
+	padding: 8px 16px;
-
+	color:rgb(255, 255, 255);
-  width:25%;
+	text-decoration: none;
-  height:60%;
 }
 
+.Home:hover{
+  width:40px;
+  background-color: black;
+	border-radius:6px;
+	color:white;
+  transform: translate(0px ,1px);
+}
+
+
 .loginBox {
   background-color: rgb(24,24,24);
+  width: 400px;
   display:flex;
   justify-content: center;
-  border-radius: 5%;
+  padding: 40px;
+  border-radius: 20px;
   box-shadow:0 5px 25px #000000;
   
 }
@@ -185,21 +156,23 @@
   width:100%;
   display: flex;
   flex-direction: column;
+  justify-content: center;
   align-items:center;
-  gap: 3%;
+  gap: 15px;
 }
 
 
 .inputBox input,button,select {
   
   width:100%;
+  background:rgb(255, 0 255);
   border: none;
-  margin-right: 12.5%;
+  margin-right: 50px;
-  padding-left: 2.5%;
+  padding-left: 10px;
-  padding-top:2.5%;
+  padding-top:10px;
-  padding-bottom:2.5%;
+  padding-bottom:10px;
   outline:none;
-  border-radius: 10px;
+  border-radius: 4px;
   font-size:1.35em;
 }
 
@@ -214,9 +187,8 @@
 
 .register{
   color:rgb(239,60,168);
-  width:70%;
+  width: 100%;
-  margin-bottom:20px;
+  display:flex;
-  margin-top:20px;
   cursor: pointer;
 }
 
@@ -245,21 +217,6 @@ input[type=submit],button,select{
 
 }
 
-input[type=file]{
-  display:none;
-}
-
-.browser{
-  display:inline-block;
-  cursor:pointer;
-  border-radius:20px;
-  background-color:rgb(239,60,168);
-  padding:5%;
-  font-size:1.35em;
-  font-family:sans-serif;
-  background:#FFFFFF;
-}
-
 button:active ,.switchpage:active{
   opacity:0.8;
 

frontend/src/Apps/ManageCourses.vue

@@ -1,291 +0,0 @@
-<script setup>
-  import i18n from "@/i18n.js"
-  import {reactive , ref} from 'vue'
-  import { getCourses,deleteCourse,alterCourse,createCourse } from "@/rest/courses.js"
-  import {getUser, getSelf, getTeachers } from "@/rest/Users.js"
-  
-  
-  const self = await getSelf();
-
-  const curriculum = ref(await getCourses(self.role));
-  const profList = await getTeachers();
-
-
-  const createMod = ref(false)
-  const deleteMod = ref(false)
-
-  const editElementID = ref("")
-
-  function editItem(id){
-    editElementID = id;
-  }
-
-  //Juste pour montrer le Create Mode
-    
-  const pattern = {
-    "title":null,
-    "credits":null,
-    "owner":null,
-  }
-
-  let toModify = Object.assign({},pattern);
-  let toAdd = Object.assign({}, pattern);
-
-  async function addToCourse(){
-    let isnull= false;
-     
-    for(const [key, value] of Object.entries(toAdd)){
-      console.log(toAdd.owner);
-      if(value === null){
-        isnull=true;
-      }
-      
-    }
-    if (!isnull){
-       await createCourse(toAdd.title,toAdd.credits,toAdd.owner);
-       toAdd= Object.assign({},pattern);
-
-       curriculum.value = await getCourses(self.role);
-
-
-    }}
-  
-  function setModify(item){
-     for(const el in profList){
-
-           if(profList[el].regNo === item.owner.regNo){
-        toModify.owner= profList[el];
-      }
-     }
-     toModify.credits= item.credits;
-     toModify.title= item.title;
-  }
-
-
-  async function patchCourse(course){
-    for (let element in toModify){
-        console.log(toModify,1)
-        console.log(toModify[element],2)
-      
-        if (element =="owner" && (toModify[element].regNo != course.owner.regNo)){
-          await alterCourse(course.courseId,{owner:toModify[element].regNo});
-        }
-        else if(element == "title" && (toModify[element] != course.title)){
-         await alterCourse(course.courseId,{title:toModify[element]});
-        }
-        else if(element == "credits" && (parseInt(toModify[element]) != course.credits)){
-         await alterCourse(course.courseId,{credits:parseInt(toModify[element])});
-        }
-    }
-      toModify= Object.assign({},pattern);
-
-      curriculum.value = await getCourses(self.role);
-
-    
-  }
-  //Juste pour montrer le Delete Mode
-  let toRemove = null;
-  
-  async function removeCourse(course) {
-      
-     await deleteCourse(course.courseId)
-    curriculum.value = await getCourses(self.role);
-    toRemove = null;
-}
-
-</script>
-<template>
-  <div class="body">
-    <div v-if="!deleteMod && !createMod && (self.role !== 'Teacher')" class="listTitle buttonGrid">
-      <button class="create" @click="editElementID= '';createMod = true;">
-        {{i18n("courses.createCourse")}}
-      </button>
-      <button class="delete" @click="deleteMod=true" >
-        {{i18n("courses.deleteCourse")}}
-      </button>
-    </div>
-    <div v-if="createMod">
-      <form class="listElement" style="width:40%;margin-right:auto;margin-left:auto;">
-        
-        <div style="margin-bottom:20px;">
-         {{i18n("name")}} : 
-        <input v-model="toAdd.title">
-        </div>
-        <div style="margin-bottom:20px;">
-          {{i18n("Teacher")}} : 
-         <select style="max-width:200px;" class="teacher" v-model="toAdd.owner">
-           <option v-for="item in profList" :value="item">{{item.lastName}}</option>
-        </select>
-        </div>
-        <div style="margin-bottom:20px;">
-          {{i18n("Credits")}} : 
-        <input v-model="toAdd.credits">
-        </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" style="width:40%;margin-right:auto;margin-left:auto;">
-        <div style="margin-bottom:20px;">
-          {{i18n("courses.toDelete")}} :
-         <select style="max-width:200px;" class="teacher" v-model="toRemove">
-          <option v-for="item in curriculum" :value='item'>{{item.title}}</option>
-          
-        </select>
-        </div>
-        <button class="delete" @click="deleteMod=!deleteMod; removeCourse(toRemove);"> {{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 curriculum" :key="item.title" style="width:50%;margin-left:auto; margin-right:auto;">
-      <div  v-if="editElementID !== item.title" style ="padding:15px 15px 15px 15px;">
-        <button   @click="editElementID = item.title; setModify(item); ">
-        {{i18n("courses.modify")}}
-        </button>
-      </div>
-      <div v-else>
-        <button @click="editElementID= '';patchCourse(item)"> {{i18n("courses.confirm")}} </button>
-        <button @click="editElementID= '';"> {{i18n("courses.back")}} </button>
-      </div>
-      <div  class="listElement" >
-
-      <div class="containerElement" v-if="editElementID !== item.title" >
-
-        <div class="name"> {{item.title}} </div>
-        <div class="teacher">{{item.owner.lastName}}</div> 
-        <div class="credits">{{i18n("Credits")}}:{{item.credits}}</div>  
-      </div>
-      <div class="containerElement"v-else>
-        <input style="max-width:200px;" class="name" v-model="toModify.title">
-        <select v-if="self.role === 'Secretary'" style="max-width:200px;" class="teacher" v-model="toModify.owner">
-          <option v-for="(item,index) in profList" :value='item'>{{item.lastName}}</option>
-        </select>
-        <div v-else class="teacher">{{item.owner.lastName}}</div> 
-        <input v-if="self.role==='Secretary'"style="max-width:100px;"class="credits" v-model="toModify.credits">  
-        <div v-else class="credits">{{i18n("Credits")}}:{{item.credits}}</div>  
-      </div>
-    </div>
-    </div>
-  </div>
-</template>
-
-<style scoped>
-.body {
-    width:100%;
-    margin-top:3.5%;
-  }
-
-.infosContainer {
-  min-width:350px;
-  padding-bottom:50px;
-  border:2px solid black;
-  font-size:25px;
-  color:white;
-  padding:20px;
-  background-color:rgb(50,50,50);
-  border-radius:20px;
-}
-
- .containerElement{ 
-    justify-content:center;
-    display:grid;
-    grid-template-columns:38.8% 38.8% 22.4%;
-    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{
- min-width:625px;
-  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{
-    min-width:380px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width:25%;
-    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,200 +1,140 @@
 <script setup>
-  import {reactive, ref } from 'vue'
+  import {reactive, ref} from 'vue'
-  import {getSelf,alterSelf,disconnect,deleteUser} from '../rest/Users.js'
+  import {getUser} from '../rest/Users.js'
-  import {getSelfCurriculum, getAllCurriculums} from '../rest/curriculum.js'
+ /* 
-  import {getCourses} from "../rest/courses.js"
+  const user = getUser(); 
-  import i18n from "@/i18n.js"
+*/
-  import { uploadProfilePicture } from '@/rest/uploads.js'
+ const user =reactive({
+  profilPicture:"../assets/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": []},
 
-  const user = ref(await getSelf());
+  ],
-  const UserCurriculum = ref(""); 
+  option:"IT",
-  const curricula = ref (await getAllCurriculums());
+  degree:"BAC1",
-  if(user.value.role === "Student"){
+  password:"CeciEstUnMotDePasse123",
-    UserCurriculum.value = await getSelfCurriculum();
+  })
-  }
   
-  if(user.role === "Teacher"){
+  /*
-    UserCurriculum.value = await getCourses("Teacher");
+  Teacher user
-  }
+  const user =reactive({
-  const modif = ref(false);
+  profilPicture:"../assets/clyde.png",
-  const curric = ref(false);
+  lastName:"Ghost",
-  const reg = ref(false);
+  firstName:"Clyde",
+  role:"teacher",
+  address: "Radiator Springs",
+  email:"ClydeGhost@gmail.com",
+  coursesOwned:[
+  {  
+  "id": 12,
+  "name": "Math pour l'info",
+  "faculty": "science",
+  "teacher": 42,
+  "Assistants": []},
+  { 
+  "id": 42,
+  "name": "Fonctionnement des ordinateurs",
+  "credits": 11,
+  "faculty": "science",
+  "teacher": 42,
+  "Assistants": []},
 
-  const pattern = {
+  ],
-    profilPictureUrl:null,
+  faculty:"Science",
-    email:null,
+  })*/
-    address:null,
-    password:null,
-  };
 
-  const patternInfos ={
+const modif = ref(false);
-    email: null,
-    password: null,
-    passwordConfirm:null,
-    id:null,
-  }
 
+const toModify = Object.assign({}, user);
 
-  let toModify= Object.assign({}, pattern);
-  let personnalInfos =  Object.assign({}, patternInfos);
-  
-  function resetInputs(inputs,list){
-    inputs=Object.assign({},list); 
-  }
-  
-  async function ChangeInfos(){
-    for (let element in toModify){
-         if (element =="email" && (toModify[element] !== null)){
-          await  alterSelf(user.value.regNo,{email : toModify[element]});
-        }      
-
-        if (element =="profilPictureUrl" && (toModify[element] !== null)){
-          await  alterSelf(user.value.regNo,{ profilPictureUrl : toModify[element]});
-        }
-        else if(element == "address" && (toModify[element] !== null)){
-          await  alterSelf(user.value.regNo,{address : toModify[element]});
-        }
-        else if(element == "password" && (toModify[element] !== null)){
-          await  alterSelf(user.value.regNo,{password : toModify[element]});
-        }
-    }
-      toModify= Object.assign({},pattern);
-        user.value = await getSelf()
-
-   } 
-  
-  function setModify(item){
-     toModify.address = item.address;
-     toModify.profilPictureUrl = item.profilPictureUrl;
-     toModify.email= item.email;
-     toModify.password= item.password;
-  }
-
-  
-  async function unRegister(){
-   deleteUser(user.value.regNo);
-   disconnect()
-   setTimeout(() => {
-      window.location.href="#/home";
-      }, "500");
-    
-  }
-
-  function getPP(){
-    if(user.value.profilePictureUrl === null){
-      return "/Clyde.png"
-    }
-    return user.profilePictureUrl
-  }
 </script>
 
+
+
 <template>
   <div class="body">
   <div class="container">
     <div class="profilPic">
-      <img class="subContainter" :src=getPP()>
+      <img class="subContainter" src="../assets/Clyde.png">
-
     </div>
       <div class="globalInfos">
-        <div v-if="modif==false && curric==false && reg==false " class="infosContainer" >
+        <div v-if="modif==false" class="infosContainer" >
           <div>
-            {{user.firstName}} {{user.lastName}}   
+            {{user.firstName}} {{user.lastName.toUpperCase()}}   
           </div>
           <div>
             E-mail: {{user.email}}      
           </div>
-          <div v-if="user.role==='Student'">
+          <div v-if="user.role==='student'">
-            {{user.option}} {{i18n(user.role)}} 
+            {{user.option}} {{user.role.toUpperCase()}} 
           </div>
           <div v-else>
-            Role:  {{i18n((user.role))}} 
+            Faculty: {{user.faculty}} 
+            Role: {{user.role}}
           </div>
           <div>
-            <button @click="modif=!modif; setModify(user)"> {{i18n("profile.modify.data")}} </button>
+            <button @click="modif=!modif"> Modifier données personnelles </button>
           </div>
-          <div v-if="(user.role==='Student')">
+          <div v-if="(user.role==='student')">
-            <button @click="reg=!reg">{{i18n("profile.reRegister")}}</button>
+            <button>Réinscription</button>
-            <button @click="unRegister()" style="float:right;background-color:rgb(150,0,0);">{{i18n("profile.unRegister")}}</button>
+            <button style="float:right;background-color:rgb(150,0,0);">Désinscription</button>
-          </div>
-          <div v-if="(user.role==='Student')">
-            <button @click="curric=!curric">{{i18n("profile.change.curriculum")}}</button>
           </div>
         </div>
-        <div v-else-if="modif" class="infosContainer">
+        <div v-else class="infosContainer">
           <div>
-            {{i18n("profile.picture")}}:
+            Profil Picture
-            <input type="file" @change="user.profilPicture = uploadProfilePicture($event.target.files);" accept="image/*">
+            <input type="file">
           </div>
           <div>
             E-mail:  
             <input type="mail" v-model="toModify.email" />
           </div>
           <div>
-            {{i18n("profile.address")}}:
+            Address:
-            <input type="text" v-model="toModify.id">
+            <input type="text" v-model="toModify.address">
           </div>
           <div>
-            {{i18n("login.password")}}:
+            Password
             <input type="password" v-model="toModify.password">
           </div>
           <div>
-            {{i18n("login.cPassword")}}:
+            Confirm Password
-            <input type="password" v-model="toModify.passwordConfirm">
-          </div>
-          <div>
-            <button @click=" modif=!modif; ChangeInfos();">{{i18n("courses.confirm")}}</button>
-            <button @click="modif=!modif; resetInputs(toModify,pattern);" style="float:right;">{{i18n("courses.back")}}</button>
-          </div>
-        </div>
-        <div v-else-if="curric" class="infosContainer">
-          <div style="height:40px;">
-            {{i18n("Curriculum")}}:  
-            <select v-model="curriculum" >
-              <option v-for="item in curricula" style="font-size:20px;" :value="item">{{item.option}}</option>        
-            </select>
-          </div>
-
-          <div>
-            <button @click=" curric=!curric;">{{i18n("courses.confirm")}}</button>
-            <button @click="curric=!curric; resetInputs(personnalInfos,patternInfos);" style="float:right;">{{i18n("courses.back")}}</button>
-          </div>
-        </div>
-        <div v-else-if="reg" class="infosContainer">
-          <div>
-            E-mail:  
-            <input type="mail" v-model="toModify.email" />
-          </div>
-          <div>
-            ID :
-            <input type="text" v-model="toModify.id">
-          </div>
-          <div>
-            {{i18n("login.password")}}:
-            <input type="password" v-model="toModify.password">
-          </div>
-          <div>
-            {{i18n("login.cPassword")}}:
             <input type="password" id="confirm">
           </div>
-
           <div>
-            <button @click=" reg=!reg;">{{i18n("courses.confirm")}}</button>
+            <button @click=" modif=!modif">Confirm</button>
-            <button @click=" reg=!reg; resetInputs(personnalInfos,patternInfos);" style="float:right;">{{i18n("courses.back")}}</button>
           </div>
         </div>
-
       </div>
+      <div v-if="modif==false"class="moreInfos">
 
-      <div v-if="modif==false && curric==false && reg==false "class="moreInfos">
+        <div v-if="(user.role==='student')">
-
-        <div v-if="(user.role ==='Student')">
           <div class="listTitle">
-            {{i18n("profile.course.list")}}
+           Liste des cours
           </div>
-          <div  class="listElement" v-for="item in UserCurriculum.courses">
+        <div  class="listElement "
+          v-for="item in user.cursus">
           <div class=" containerElement">
-            <div class="name"> {{item.title}} </div>
+            <div class="name"> {{item.name}} </div>
-            <div class="teacher">{{item.owner.lastName}}</div> 
+            <div class="teacher">{{item.teacher}}</div> 
             <div class="credits">Credits:{{item.credits}}</div>  
           </div>
           </div>
@@ -203,6 +143,18 @@
         <div>
         </div>
     
+      <div v-if="(user.role==='teacher')">
+          <div class="listTitle">
+           Liste des cours
+          </div>
+          <div class="listElement " v-for="item in user.coursesOwned">
+          {{item.name}}       
+          </div>
+        </div>
+        
+        <div>
+        </div>
+        
       </div>
   </div>
 </div>
@@ -210,19 +162,18 @@
 <style scoped>
 
 .container{
-  min-width:675px;
+  
   display:grid;
-  grid-template-columns:10vw 50vw;
+  grid-template-columns:200px 900px;
   grid-template-rows:200px auto;
-  column-gap:2.7%;
+  column-gap:30px;
-  row-gap:45px;
+  row-gap:25px;
   grid-template-areas:
   "profilPic globalInfos"
   "minfos minfos";
 }
 
 .profilPic{
-  width:100%;
   grid-area:profilPic;
 }
 
@@ -243,17 +194,13 @@
   grid-area:minfos;
 }
 .body {
-    min-width:960px;
     width:100%;
-    display:flex;
+    margin-bottom:10px;
-    align-items:center;
-    justify-content:center;
-    margin-top:5%;
   }
  .containerElement{ 
    justify-content:center;
     display:grid;
-    grid-template-columns:38.8% 38.8% 22.4%;
+    grid-template-columns:350px 350px 200px;
     grid-template-areas:
     "name teacher credits"; 
     column-gap:10px;
@@ -276,11 +223,10 @@
   }
 
 .listTitle{
-    min-width:197px;
     display: flex;
     justify-content: center;
     align-items: center;
-    width:8vw;
+    width:200px;
     margin-left:auto;
     margin-right:auto;
     border:2px solid black;
@@ -292,7 +238,6 @@
 }
 
 .listElement{
-  min-width:625px;
   border:2px solid black;
   font-size:25px;
   color:white;
@@ -303,7 +248,6 @@
 }
 
 .infosContainer {
-min-width:350px;
 padding-bottom:50px;
 border:2px solid black;
 font-size:25px;

frontend/src/Apps/Request.vue

@@ -0,0 +1,109 @@
+<script setup>
+  import i18n from "@/i18n.js"
+  const props = defineProps({
+  id: Number,
+  type: String,
+  lastName: String,
+  firstName: String,
+  address: String,
+  country: String,
+  birthDate: String,
+  cursus:String,
+  degree:String,});
+</script>
+
+
+<template>
+  <div class="bodu">
+  <div class="container">
+ 
+    <div class="id"><a>{{id}}</a></div>
+    <div class="type"><a>{{type}}</a></div>
+    <div class="surname"><a>{{lastName}}</a></div>
+    <div class="firstname"><a>{{firstName}}</a></div>
+    <div class="infos"><button style="background-color:rgb(105,05,105);" >{{i18n("request.moreInfos")}}   </button></div>
+    <div class="accept"><button style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div>
+    <div class="refuse"><button style="background-color:rgb(105,0,0);">{{i18n("request.refuse")}}</button></div>
+  </div>
+  </div>
+</template>
+
+<style scoped>
+  .container{
+    color:white;
+    height:100px;
+    font-size:20px;
+    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-areas:
+    "id type surname firstname infos accept refuse"; 
+    column-gap:10px;
+    
+  }
+  
+  .infos {
+    grid-area:infos;
+    align-self:center;
+  }
+
+  .accept{
+    grid-area:accept;
+    align-self:center;
+  }
+
+  .refuse{
+    grid-area:refuse;
+    align-self:center;
+  }
+
+  .titles {
+    grid-area:titles;
+    background-color:rgb(215,215,215);
+  }
+  .id{
+    grid-area:id;
+    margin-left:40px;
+    align-self:center;
+  }
+
+  .type{
+    grid-area:type;
+    align-self:center;
+  }
+
+  .surname{
+    grid-area:surname;
+    align-self:center;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow:ellipsis;
+  }
+
+  .firstname{
+    grid-area:firstname;
+    align-self:center;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow:ellipsis;
+  }
+
+  button{
+    font-size:15px;
+     height:50px;
+     width:100px;
+    border:none;
+    border-radius:20px;
+
+  }
+
+  .bodu {
+    width:100%;
+    margin-bottom:10px;
+    border:2px solid black;
+    border-radius:9px;
+    background-color:rgb(50,50,50);
+  }
+
+
+</style>
+

frontend/src/Apps/ScientificPublications/ResearcherProfile.vue

@@ -1,236 +0,0 @@
-<!----------------------------------------------------
-	File:  ResearcherProfile.vue
-	Author: Maxime Bartha
-	Scope: Extension Publicatons scientifiquess
-	Description: Researcher Profile Page containing his articles and his statistics
------------------------------------------------------>
-
-<script setup>
-import { ref, reactive } from "vue";
-const input = ref("");
-const statsOf = ref("");
-const statsBy = ref("");
-let chart;
-
-const jsonMockViewsByYears= [
-  {label: "2004", y:4},
-  {label: "2005", y:99},
-  {label: "2007", y:555},
-  {label: "2009", y:22},
-  {label: "2011", y:1666},
-]
-
-function inputKeyUp() {
-  let filter, ul, li, a, txtValue;
-  filter = input.value.toUpperCase();
-  if (document.getElementById("myUL") != null) {
-    ul = document.getElementById("myUL");
-    li = ul.getElementsByTagName("li");
-
-    // Loop through all list items, and hide those who don't match the search query
-    for (let i = 0; i < li.length; i++) {
-      a = li[i].getElementsByTagName("a")[0];
-      txtValue = a.textContent || a.innerText;
-      if (txtValue.toUpperCase().indexOf(filter) > -1) {
-        li[i].style.display = "";
-      } else {
-        li[i].style.display = "none";
-      }
-    }
-  }
-}
-
-const options = reactive({
-    backgroundColor:null,
-    theme: "light2",
-    animationEnabled: true,
-    title: {
-      fontColor: "white",
-      text : "please select options",
-    },
-    data: [
-      {
-        type: "pie",
-        indexLabel: "{label} (#percent%)",
-        yValueFormatString: "#,##0",
-        indexLabelFontColor: "white",
-        toolTipContent:
-          "<span style='\"'color: {color};'\"'>{label}</span> {y}(#percent%)",
-      }]
-	});
-
-function update(){
-      options.title = {
-        fontColor: "white",
-        text: statsOf.value + " By "+ statsBy.value,
-      }
-      if (statsOf.value === "views" && statsBy.value === "years") {
-        options.data[0].dataPoints = jsonMockViewsByYears;
-      }
-
-      options.title.text = statsOf.value + " By "+ statsBy.value;
-      chart.render()
-    }
-</script>
-
-<template>
-  <div id="main">
-    <div id="profilePicture">
-      <img src="/Clyde.png" />
-    </div>
-    <div id="researcherInfos">
-      <div class="surrounded">John Doe</div>
-      <div class="surrounded">Orcid : 12144-2144-12336-B</div>
-      <div class="surrounded">Email : John.Doe@umons.ac.be</div>
-
-      <div class="surrounded">
-        site :
-        <a href="http://localhost:5173" style="color: #007aff">here</a>
-      </div>
-      <div class="surrounded">Domain : physics, IT</div>
-      <div id="coAuthorList" class="surrounded">Co-authors list : D</div>
-    </div>
-    <div id="stats">
-      <div class="surrounded">
-        Stat type :
-        <select @change="update()" id="stats-select" v-model="statsOf">
-          <option value="views">Views</option>
-          <option value="co-authors">Co-authors</option>
-          <option value="articles">Articles</option>
-          <option value="language">Languages</option>
-        </select>
-      </div>
-      <div class="surrounded">
-        Class by:
-        <select @change="update()" id="classed-select" v-model="statsBy">
-          <option selected="selected" value="years">Years</option>
-          <option value="months">Months</option>
-          <option value="topics">Topics</option>
-        </select>
-      </div>
-      <div id="statsPie">
-		  <CanvasJSChart :options="options" id=chart @chart-ref="c => chart = c "/>
-      </div>
-    </div>
-    <div id="articles">
-      <input
-        type="text"
-        id="search-input"
-        @keyup="inputKeyUp()"
-        placeholder="search articles"
-        v-model="input"
-      />
-      <ul id="myUL">
-        <li><a href="#">Adele</a></li>
-        <li><a href="#">Agnes</a></li>
-
-        <li><a href="#">Billy</a></li>
-        <li><a href="#">Bob</a></li>
-
-        <li><a href="#">Calvin</a></li>
-        <li><a href="#">Christina</a></li>
-        <li><a href="#">Cindy</a></li>
-      </ul>
-    </div>
-  </div>
-</template>
-
-<style scoped>
-#main {
-  display: grid;
-  grid-template-columns: 22% auto;
-  grid-template-rows: 26% auto;
-  height: 100%;
-  width: 100%;
-}
-
-#profilePicture {
-  display: flex;
-  justify-content: center;
-}
-
-#profilePicture img {
-  align-self: center;
-  justify-self: center;
-  width: 60%;
-}
-
-#researcherInfos {
-  display: grid;
-  grid-template-columns: auto auto auto;
-  column-gap: 5px;
-  grid-template-rows: auto auto;
-}
-
-.surrounded {
-  border: 2px solid black;
-  color: white;
-  font-size: x-large;
-  align-self: center;
-  text-align: center;
-  background-color: rgba(255, 255, 255, 0.09);
-  border-radius: 20px;
-  margin-bottom: 10px;
-}
-
-.surrounded select {
-  margin-top: 2px;
-  margin-bottom: 2px;
-  border: 1px solid black;
-  color: white;
-  background-color: rgb(255, 255, 255, 0.1);
-  font-size: large;
-  align-self: center;
-  text-align: center;
-}
-
-#statsPie {
-
-}
-
-#articles {
-  background-color: orange;
-}
-
-#search-input {
-  width: 60%;
-  font-size: 16px;
-  padding: 12px 20px 12px 40px;
-  border: 1px solid #ddd;
-  margin-bottom: 12px;
-}
-
-#myUL {
-  list-style-type: none;
-  padding: 0;
-  margin: 0;
-}
-
-#myUL li a {
-  border: 1px solid #ddd;
-  /* Add a border to all links */
-  margin-top: -1px;
-  /* Prevent double borders */
-  background-color: #f6f6f6;
-  /* Grey background color */
-  padding: 12px;
-  /* Add some padding */
-  text-decoration: none;
-  /* Remove default text underline */
-  font-size: 18px;
-  /* Increase the font-size */
-  color: black;
-  /* Add a black text color */
-  display: block;
-  /* Make it into a block element to fill the whole list */
-}
-
-#myUL li a:hover:not(.header) {
-  background-color: #eee;
-}
-
-#Chart{
-    width: "100%";
-    height: "100%";
-}
-</style>

frontend/src/Apps/StudentsList.vue

@@ -1,84 +0,0 @@
-<script setup>
-  import i18n from "@/i18n.js"
-  import { reactive  } from 'vue'
-  import { getStudents } from '../rest/Users.js'
-
-  const users = await getStudents();
-</script> 
-<template style="margin-top:5%;">
-  <div style="display:flex; justify-content:center; " 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.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>
-    </div>
-    </div>
-  </div>
-</template>
-
-<style scoped>
-  .container{
-    color:white;
-    height:100px;
-    font-size:30px;
-    display:grid;
-    grid-template-columns:21.7% 21.7% 21.7% 21.7% 13.1%;
-    grid-template-areas:
-    "status option surname firstname infos"; 
-    
-  }
-  
-  .infos {
-    grid-area:infos;
-    align-self:center;
-  }
-
-  .option{
-    grid-area:option;
-    align-self:center;
-  }
-
-  .status{
-    grid-area:status;
-    align-self:center;
-  }
-
-  .surname{
-    grid-area:surname;
-    align-self:center;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow:ellipsis;
-  }
-
-  .firstname{
-    grid-area:firstname;
-    align-self:center;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow:ellipsis;
-  }
-
-  button{
-    font-size:15px;
-     height:50px;
-     width:75%;
-    border:none;
-    border-radius:20px;
-
-  }
-
-  .bodu {
-    margin-top:2%;
-    width:66%;
-    border:2px solid black;
-    border-radius:9px;
-    background-color:rgb(50,50,50);
-  }
-
-
-</style>
-

frontend/src/Apps/UsersList.vue

@@ -1,81 +0,0 @@
-
-<script setup>
-  import i18n from "@/i18n.js"
-  import { reactive  } from 'vue'
-  import { getAllUsers } from '../rest/Users.js'
-
-  const users = await getAllUsers();
-  
-</script> 
-<template style="margin-top:5%;">
-  <div style="display:flex; justify-content:center; min-width:1140px;" v-for="item in users">
-    <div class="bodu">
-      <div class="container">
-        <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>
-      </div>
-    </div>
-  </div>
-</template>
-
-<style scoped>
-  .container{
-    color:white;
-    height:100px;
-    font-size:30px;
-    display:grid;
-    grid-template-columns:27.7% 27.7% 27.7% 16.9%;
-    grid-template-areas:
-    "role surname firstname infos"; 
-
-  }
-  
-  .infos {
-
-    grid-area:infos;
-    align-self:center;
-  }
-
-  .role {
-    grid-area:role;
-    align-self:center;
-  }
-
-  .surname{
-    grid-area:surname;
-    align-self:center;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow:ellipsis;
-
-  }
-
-  .firstname{
-    grid-area:firstname;
-    align-self:center;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow:ellipsis;
-
-  }
-
-  button{
-    font-size:15px;
-     height:50px;
-     width:75%;
-    border:none;
-    border-radius:20px;
-
-  }
-
-  .bodu {
-    margin-top:2%;
-    width:66%;
-    border:2px solid black;
-    border-radius:9px;
-    background-color:rgb(50,50,50);
-  }
-</style>
-

frontend/src/assets/main.css

@@ -1,11 +1,4 @@
 body {
    background-color: rgb(53, 25, 60);
    margin:0;
-   width: 100vw;
-   height: 100vh;
-}
-
-#app {
-   width: 100%;
-   height: 100%;
 }

frontend/src/main.js

@@ -4,8 +4,5 @@ import 'https://kit.fontawesome.com/fb3bbd0a95.js'
 
 import { createApp } from 'vue'
 import App from './App.vue'
-import CanvasJSChart from '@canvasjs/vue-charts';
 
-const app = createApp(App);
+createApp(App).mount('#app')
-app.use(CanvasJSChart);
-app.mount('#app');

frontend/src/rest/ServiceInscription.js

@@ -3,43 +3,33 @@
  *
  * TODO: On time of writing, the backend doesn't support these endpoints so it could be modified in the future.
  */
-import {restGet, restPatch} from './restConsumer.js'
+import { restGet } from './restConsumer.js'
 
 /**
  * create a new register requests that can be recovered by the registering service
  * TODO: add info in the Object (I don't know what will be needed)
  */
 export async function createRegister(){
-	return restPost("/request/register");
+	return restPost("/requests/register"});
 }
 
 /**
  * list all register request in a list of Objects
- * Shall return a list of
- * - id
- * - type
- * - lastName
- * - firstName
- * - address
- * - country
- * - birthdate
- * - email
- * - curriculum
- * - degree
  */
-export async function getRegisters(id){
+export async function getRegisters(){
-	if(id != null)
+	return restGet("/requests/register")
-		return restGet("/request/register/" + id);
-	return restGet("/request/register")
 }
 
-export async function getAllRegisters(){
+/**
-  return restGet("/requests/register")
+ * Get info on a particular registering request
+ */
+export async function getRegisters(id){
+	return restGet("/requests/register/" + id);
 }
 
 /**
  * Change the state of a requests.
  */
 export async function validateRegister(id, state){
-  return restPatch("/request/register/" + id, state);
+	return restPost("/requests/register/" + id, {state: state});
 }

frontend/src/rest/Users.js

@@ -1,70 +1,11 @@
-import { restGet, restPost, restPatch, restDelete} from './restConsumer.js'
+import { restGet, restPost } from './restConsumer.js'
-import { getCookie, setCookie } from '@/utils.js'
 
 export async function login(user, pass, exp){
 	return restPost("/login", {identifier: user, password: pass, expirationDate: exp});
 }
 
-export function isLogged(){
+export async function register(user, pass, mail){
-	return getCookie("session_token") != "" 
+	return restPost("/user", {name: user, password: pass, mail: mail});
-}
-
-export function disconnect(){ 
-	setCookie("session_token", ";expires= Thu, 01 Jan 1970 00:00:01 GMT")
-}
-
-/**
- * Register a user (tokenless)
- * 
- * @param firstname
- * @param lastname
- * @param birthdate
- * @param password
- * @param mail
- * @param address
- * @param country
- * @param curriculum 
- * @param imageId	id of the image in database returned when uploaded
- */
-export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId){
-	return restPost("/register", {
-		firstName: firstname,
-		lastName: lastname,
-		birthDate: birthDate,
-		password: password,
-		email: email,
-		address: address,
-		country: country,
-		curriculumId: curriculumId,
-    profilePictureUrl: imageId,
-	});
-}
-
-/**
- * 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,
-	});
 }
 
 /**
@@ -73,29 +14,10 @@ export async function createUser(firstname, lastname, birthDate, email, address,
  * if the user is not authenticated. then an empty array should be returned
  */
 export async function getUser(id){
-	const endpoint = "/user/" +  id;
+	const endpoint = "/user" + id != null ? "/" + id : "";
 	return restGet(endpoint);
 }
 
-/**
- * Alterable datas of user.
- * usage by secretary
- *
- * @param id	regno of the user
- * @param data	data to change
- *
- * - lastName
- * - firstName
- * - birthDate
- * - role
- * - email
- * - photo
- * - Adress
- */
-export async function alterUser(id, data){
-	return restPatch("/user/" + id, data);
-}
-
 /**
  * Reserved for secretary roles. Allow to list all user on the plateform
  */
@@ -103,50 +25,3 @@ export async function getAllUsers(){
 	return restGet("/users");
 }
 
-/**
- * Return the list of teachers
- *
- * @return a list of teachers
- * each elements is of the form
- * - id
- * - name
- * - role
- */
-export async function getTeachers(){
-	return restGet("/teachers")
-}
-
-
-export async function getStudents(){
-  return restGet("/students")
-}
-/**
- * Get informations about yourself
- * - RegNo
- * - FirstName / LastName
- * - email
- * - adressId (?)
- * - birthDate
- * - role
- */
-export async function getSelf(){
-	return restGet("/user");
-}
-
-/**
- * Alterable datas are
- * - email
- * - photo
- * - Adress
- * - Password
- */
-export async function alterSelf(id,data){
-  console.log(data)
-	return restPatch("/user/"+id, data);
-}
-
-
-
-export async function deleteUser(id){
-  return restDelete("/user/" + id)
-}

frontend/src/rest/apps.js

@@ -1,68 +0,0 @@
-import { restGet } from './restConsumer.js' 
-import { ref, computed } from 'vue'
-import i18n from '@/i18n.js'
-
-// Liste des apps
-import LoginPage from '@/Apps/Login.vue'
-import Inscription from "@/Apps/Inscription.vue"
-import Profil from "@/Apps/Profil.vue"
-import Courses from "@/Apps/ManageCourses.vue"
-import Users from "@/Apps/UsersList.vue"
-import Students from "@/Apps/StudentsList.vue"
-import ResearcherProfile from "@/Apps/ScientificPublications/ResearcherProfile.vue";
-
-const apps = {
-		'/login': LoginPage,
-		'/inscription': Inscription,
-		'/profil': Profil,
-		'/manage-courses' : Courses,
-		'/users-list' : Users,
-		'/students-list' : Students,
-		'/researcher-profile' : ResearcherProfile,
-}
-
-const appsList = {
-		'Msg': { path: '#/msg', icon: 'fa-comment', text: i18n("app.messages") },
-		'Notification': { path: '#/notifs', icon: 'fa-bell', text: i18n("app.notifications") },
-		'Forum': { path: '#/forum', icon: 'fa-envelope', text: i18n("app.forum") },
-		'Schedule': { path: '#/schedule', icon: 'fa-calendar-days', text: i18n("app.schedules") },
-		'Inscription': { path: '#/inscription', icon: 'fa-users', text: i18n("app.inscription.requests") },
-		'ManageCourses': { path: '#/manage-courses', icon: 'fa-book', text: i18n("app.manage.courses") },
-		'StudentsList':{ path: '#/students-list',icon: 'fa-users',text: i18n("app.studentList")},
-		'UsersList':{ path: '#/users-list',icon: 'fa-users',text: i18n("app.users")},
-}
-
-const currentPath = ref(window.location.hash)
-
-export const currentView = computed(() => {
-		return apps[currentPath.value.slice(1) || '/']
-})
-
-/**
- * Return the list of app accesible by a logged (or not)
- * user.
- */
-export async function appList(){
-		let ret = [];
-		let userAppList = await restGet("/apps");
-		for (let userapp in userAppList) {
-				if(appsList[userAppList[userapp]] != null){
-						ret.push(appsList[userAppList[userapp]])
-				}
-		}
-		return ret;
-}
-
-/**
- * Check if the specified page is authorized for the
- * user
- */
-export async function checkPage(page){
-		return restGet("/apps/" + page)
-}
-
-window.addEventListener('hashchange', () => {
-		currentPath.value = window.location.hash
-})
-
-// vim:set noet sts=0 sw=4 ts=2 tw=2:

frontend/src/rest/courses.js

@@ -7,10 +7,8 @@ import { restGet, restPost, restDelete, restPatch } from './restConsumer.js'
 /**
  * Create a new course
  */
-export async function createCourse(name, credits, owner){
+export async function createCourse(name, credits, faculty, teacher, assistants){
-  console.log(owner);
+	return restPost("/courses", {name: name, credits: credits, faculty: faculty, teacher: teacher, assistants: assistants} )
-  
-	return restPost("/course", {title: name, credits: credits, owner} )
 }
 
 /**
@@ -36,25 +34,6 @@ export async function getCourse(id){
 	return restGet("/course/" + id);
 }
 
-/**
- * Get the list of courses to display on secretary's option
- *
- * @return list of courses of the form
- * - id
- * - name
- * - credits
- * - facutly
- * - teacher
- * - Assistants
- */
-export async function getCourses(role){
-  if(role==="Teacher"){
-  return restGet("/courses/owned")
-  }
-	return restGet("/courses")
-}
-
-
 /**
  * Change the options of a course
  *

frontend/src/rest/curriculum.js

@@ -1,50 +0,0 @@
-/**
- * curriculum API
- */
-
-import { restGet, restPost, restDelete, restPatch } from './restConsumer.js'
-
-/**
- * Create a new curriculum (bundle of courses)
- * @param courses	list of courses
- */
-export async function createcurriculum(courses){
-	return restPost("/curriculum", {courses: courses} );
-}
-
-/**
- * Delete the specified curriculum
- */
-export async function deletecurriculum(id){
-	return restDelete("/curriculum/" + id);
-}
-
-export async function getAllCurriculums(){
-  return restGet("/curriculums");
-}
-
-/**
- * Get informations on a particular curriculum
- *
- * @param id	identification of the curriculum
- *
- * @return list of courses 
- */
-export async function getcurriculum(id){
-	return restGet("/curriculum/" + id);
-}
-
-/**
- * Modify the courses of a curriculum
- *
- * @param id		the id of the curriculum
- * @param courses	list of new courses 
- */
-export async function altercurriculum(id, courses){
-	return restPatch("/curriculum/" + id, courses);
-}
-
-
-export async function getSelfCurriculum(){
-  return restGet("/curriculum");
-}

frontend/src/rest/cursus.js

@@ -0,0 +1,41 @@
+/**
+ * cursus API
+ */
+
+import { restGet, restPostn, restDelete, restPatch } from './restConsumer.js'
+
+/**
+ * Create a new cursus (bundle of courses)
+ * @param courses	list of courses
+ */
+export async function createCursus(courses){
+	return restPost("/cursus", {courses: courses} );
+}
+
+/**
+ * Delete the specified cursus
+ */
+export async function deleteCursus(id){
+	return restDelete("/cursus/" + id);
+}
+
+/**
+ * Get informations on a particular cursus
+ *
+ * @param id	identification of the cursus
+ *
+ * @return list of courses 
+ */
+export async function getCursus(id){
+	return restGet("/cursus/" + id);
+}
+
+/**
+ * Modify the courses of a cursus
+ *
+ * @param id		the id of the cursus
+ * @param courses	list of new courses 
+ */
+export async function alterCursus(id, courses){
+	return restPatch("/cursus/" + id, courses);
+}

frontend/src/rest/restConsumer.js

@@ -11,13 +11,8 @@ export async function restPost(endPoint, data) {
 	return await _rest(endPoint, {method: "POST", credentials: 'include', body: JSON.stringify(data)});
 }
 
-export async function restPostFile(endPoint, file){
+export async function restDelete(endPoint, data) {
-	let headers = new Headers();
+	return await _rest(endPoint, {method: "DELETE", credentials: 'include', body: JSON.stringify(data)});
-	return await _rest(endPoint, {method: "POST", credentials: 'include', body: file, headers: headers });
-}
-
-export async function restDelete(endPoint) {
-	return await _rest(endPoint, {method: "DELETE"});
 }
 
 export async function restPatch(endPoint, data) {
@@ -40,13 +35,13 @@ async function _rest(endPoint, config){
 		'Authorization': session_token,
 		'Content-Type': 'application/json',
 	});
-	config['headers'] = config['headers'] == null ? headers : config['headers'];
+	config['headers'] = 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.data.ok ? "Success" : "error";
+				return res.ok ? "Success" : "error";
 			}},
 		})
 		.then( e => e.json()).catch( e => e );

frontend/src/rest/uploads.js

@@ -1,11 +0,0 @@
-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)
-}