I DUNNO

README.md

@@ -9,33 +9,10 @@ Projet du groupe 01:
 - William Karpinski: Extension gestion des horaires
 - Léo Moulin: Extension inscription des étudiants
 
-## Running
-
-Le projet peut être lancé grace à docker compose.
-
-```sh
-$ docker compose up 
-```
-
-Dans le cas ou vous modifiers des fichiers, pour éviter que les images de docker soient recrées avec les changement
-
-```sh
-$ docker compose up --force-recreate --build
-```
-
 ## Dévelopement
 
-Dans le cas ou vous êtes dans une phase de développement, il est plus simple d'utiliser gradle pour lancer le backend et frontend dans un mode de développement.
-**Attention**: Ce mode n'est pas fait pour être utilisé en production!
-
-```sh
-$ ./gradlew run --parallel
 ```
+$ ./gradlew backend:run frontend:run --parallel
+```
+
 permet de lancer le frontend sur [http://localhost:5173](http://localhost:5173) ansi que le frontend sur [http://localhost:8080](http://localhost:8080) 
-
-Ceci requière également docker pour lancer une instance de postgresql pris en charge par spring.
-
-Il est possible de se passer entièrement de docker en supprimant la dépendance dans le fichier `backend/build.gradle.kts`: ~~`developmentOnly("org.springframework.boot:spring-boot-docker-compose")`~~
-Il est alors nécéssaire d'avoir une instance de postgresql tournant sur `localhost:5432` avec une table `clyde`, utilisateur: `devel` et password: `devel`
-(cette configuration peut également être changée dans le fichier resources/application.properties de spring)
-

backend/Dockerfile

@@ -1,15 +1,6 @@
-## Building phase
-FROM gradle:jdk21-alpine AS BUILD
-WORKDIR /backend
-  
-COPY . .
-RUN gradle build -x test
-
-## Running Phase
 FROM eclipse-temurin:21-jdk-alpine
-WORKDIR /backend
+VOLUME /tmp
 VOLUME /cdn
-# ENV SPRING_PROFILES_ACTIVE=prod
+ENV SPRING_PROFILES_ACTIVE=prod
-COPY --from=BUILD /backend/build/libs/Clyde-0.0.1-SNAPSHOT.jar /backend/app.jar
+COPY build/libs/backend-0.0.1-SNAPSHOT.jar /app.jar
-EXPOSE 8080
+ENTRYPOINT ["java", "-jar", "/app.jar"]
-ENTRYPOINT ["java", "-jar", "/backend/app.jar"]

backend/build.gradle.kts

@@ -16,8 +16,6 @@ repositories {
 }
 
 dependencies {
-	compileOnly("org.projectlombok:lombok")
-	annotationProcessor("org.projectlombok:lombok")
 	implementation("org.springframework.boot:spring-boot-starter-jdbc")
 	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
 	implementation("org.springframework.boot:spring-boot-starter-mail")
@@ -27,7 +25,6 @@ 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")
 	runtimeOnly("org.postgresql:postgresql")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 	testImplementation("org.springframework.boot:spring-boot-testcontainers")

backend/settings.gradle.kts

@@ -1,13 +0,0 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.6/userguide/multi_project_builds.html in the Gradle documentation.
- */
-
-plugins {
-    // Apply the foojay-resolver plugin to allow automatic download of JDKs
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
-}
-
-rootProject.name = "Clyde"

backend/src/main/java/ovh/herisson/Clyde/DTO/Msg/DiscussionDTO.java

@@ -1,34 +0,0 @@
-package ovh.herisson.Clyde.DTO.Msg;
-
-/******************************************************
- * @file DiscussionDTO.java
- * @author Anthony Debucquoy
- * @scope Extension messagerie
- *
- * File to format a discussion using messageDTO 
- ******************************************************/
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import ovh.herisson.Clyde.Tables.User;
-import ovh.herisson.Clyde.Tables.Msg.Discussion;
-import ovh.herisson.Clyde.DTO.Msg.MessagesDTO;
-
-@Data
-@AllArgsConstructor
-public class DiscussionDTO {
-	private long id;
-	private String name;
-	private List<User> members;
-	private List<MessagesDTO> msgs;
-
-	public static DiscussionDTO construct(Discussion d, User u){
-		List<MessagesDTO> msgsdto = new ArrayList<>();
-		d.getMsgs().forEach(x -> msgsdto.add(MessagesDTO.construct(x, u)));
-		return new DiscussionDTO(d.getId(), d.getName(), d.getMembers(), msgsdto);
-	} 
-}

backend/src/main/java/ovh/herisson/Clyde/DTO/Msg/MessagesDTO.java

@@ -1,33 +0,0 @@
-package ovh.herisson.Clyde.DTO.Msg;
-
-/******************************************************
- * @file MessagesDTO.java
- * @author Anthony Debucquoy
- * @scope Extension messagerie
- *
- * File to Format the response adding the sender field
- ******************************************************/
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import ovh.herisson.Clyde.Tables.User;
-import ovh.herisson.Clyde.Tables.Msg.Message;
-import java.util.Date;
-
-@Data
-@AllArgsConstructor
-public class MessagesDTO {
-	private long id;
-	private String content; 
-	private User author;
-	private boolean sender;
-	private Date created;
-	//TODO: Attachment
-
-	public static MessagesDTO construct(Message m, User user){
-		boolean sender = false;
-		if(m.getAuthor().equals(user))
-			sender = true;
-		return new MessagesDTO(m.getId(), m.getContent(), m.getAuthor(), sender, m.getCreated());
-	}
-}

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

@@ -47,6 +47,7 @@ public class ApplicationsController {
 
         //if unAuthed
         authorizedApps.add(Applications.Login);
+        authorizedApps.add(Applications.Schedule);
 
 		User user = authServ.getUserFromToken(token);
 		if(user == null)
@@ -64,8 +65,8 @@ public class ApplicationsController {
         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, Role.Teacher},token)){
+        if (!authServ.isNotIn(new Role[]{Role.InscriptionService,Role.Admin},token)){
-            authorizedApps.add(Applications.Requests);
+            authorizedApps.add(Applications.Inscription);
             authorizedApps.add(Applications.StudentsList);}
 
         if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){ 

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

@@ -135,5 +135,4 @@ public class CourseController {
         courseServ.delete(courseServ.findById(id));
         return new ResponseEntity<>(HttpStatus.OK);
     }
-
 }

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

@@ -4,13 +4,11 @@ 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.Repositories.Inscription.ExternalCurriculumRepository;
-import ovh.herisson.Clyde.Repositories.Inscription.InscriptionRepository;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.*;
-import ovh.herisson.Clyde.Tables.*;
+import ovh.herisson.Clyde.Tables.Curriculum;
+import ovh.herisson.Clyde.Tables.Role;
 
-import java.util.HashMap;
 import java.util.Map;
 
 @RestController
@@ -23,18 +21,12 @@ public class CurriculumController {
 
     private final UserCurriculumService userCurriculumServ;
     private final CurriculumCourseService curriculumCourseServ;
-    private final InscriptionRepository ir;
-    private final UserService userServ;
 
-    private final ExternalCurriculumRepository ecr;
+    public CurriculumController(CurriculumService curriculumServ, AuthenticatorService authServ, UserCurriculumService userCurriculumServ, CurriculumCourseService curriculumCourseServ){
-    public CurriculumController(CurriculumService curriculumServ, AuthenticatorService authServ, UserCurriculumService userCurriculumServ, CurriculumCourseService curriculumCourseServ, InscriptionRepository ir, UserService userServ, ExternalCurriculumRepository ecr){
         this.curriculumServ = curriculumServ;
         this.authServ = authServ;
         this.userCurriculumServ = userCurriculumServ;
         this.curriculumCourseServ = curriculumCourseServ;
-        this.ir = ir;
-        this.userServ = userServ;
-        this.ecr = ecr;
     }
 
     @GetMapping("/curriculum/{id}")
@@ -60,22 +52,6 @@ public class CurriculumController {
         return new ResponseEntity<>(curriculumCourseServ.getDepthCurriculum(curriculum),HttpStatus.OK);
     }
 
-
-    //Return the list of all curicullums of an user
-    @GetMapping("/onescurriculum/{userId}")
-    public ResponseEntity<Map<String ,Object>> findOnesCurriculum(@RequestHeader("Authorization") String token, @PathVariable String userId){
-        if (authServ.getUserFromToken(token) == null)
-            return new UnauthorizedResponse<>(null);
-
-        User u = userServ.getUserById(Long.parseLong(userId));
-        HashMap<String,Object> toReturn = userCurriculumServ.findAllCurriculumByStudent(u);
-
-        if (toReturn == null)
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        return new ResponseEntity<>(toReturn,HttpStatus.OK);
-    }
-
     @GetMapping("/curriculums")
     public ResponseEntity<Iterable<Map<String, Object>>> findAllIndDepth(){
         return new ResponseEntity<>(curriculumCourseServ.getAllDepthCurriculum(),HttpStatus.OK);
@@ -118,5 +94,4 @@ public class CurriculumController {
         curriculumServ.delete(toDelete);
         return new ResponseEntity<>(HttpStatus.OK);
     }
-
 }

backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/ExternalCurriculumController.java

@@ -1,55 +0,0 @@
-package ovh.herisson.Clyde.EndPoints.Inscription;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import ovh.herisson.Clyde.Repositories.Inscription.ExternalCurriculumRepository;
-import ovh.herisson.Clyde.Repositories.Inscription.InscriptionRepository;
-import ovh.herisson.Clyde.Repositories.UserRepository;
-import ovh.herisson.Clyde.Tables.Inscription.ExternalCurriculum;
-import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.ArrayList;
-import java.util.Map;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class ExternalCurriculumController {
-
-    public final ExternalCurriculumRepository ecr;
-    public final InscriptionRepository inscriptionRepository;
-    public final UserRepository userRepository;
-
-    public ExternalCurriculumController(ExternalCurriculumRepository ecr, InscriptionRepository inscriptionRepository, UserRepository userRepository) {
-        this.ecr = ecr;
-        this.inscriptionRepository = inscriptionRepository;
-        this.userRepository = userRepository;
-    }
-
-    //everyone can post some externalcurriculums (the validity of the elements is assured by the inscription service)
-    @PostMapping("/externalcurriculum")
-    public ResponseEntity<ExternalCurriculum> postExternalCurriculum(@RequestBody Map<String, Object> externalCurrInfos){
-        InscriptionRequest ir = inscriptionRepository.findById((Integer) externalCurrInfos.get("inscriptionRequestId"));
-
-        ExternalCurriculum toSave = new ExternalCurriculum(ir, (String) externalCurrInfos.get("school"),(String) externalCurrInfos.get("formation"),(String) externalCurrInfos.get("completion"), (Integer)externalCurrInfos.get("startYear"), (Integer)externalCurrInfos.get("endYear"), (String)externalCurrInfos.get("justifDocUrl"), null);
-
-        return new ResponseEntity<>(ecr.save(toSave), HttpStatus.OK);
-    }
-
-    @GetMapping("/externalcurriculum/{inscReqId}")
-    public ResponseEntity<ArrayList<ExternalCurriculum>> getExternalCurrListByInscrReq(@PathVariable long inscReqId){
-        InscriptionRequest ir = inscriptionRepository.findById(inscReqId);
-
-        ArrayList<ExternalCurriculum> toReturn = ecr.getExternalCurriculumByInscriptionRequest(ir);
-        return new ResponseEntity<>(toReturn, HttpStatus.OK);
-    }
-
-    @GetMapping("/externalcurriculumbyuser/{userId}")
-    public ResponseEntity<ArrayList<ExternalCurriculum>> getExternalCurrByUser(@PathVariable long userId){
-        User user = userRepository.findById(userId);
-
-        ArrayList<ExternalCurriculum> toReturn = ecr.getExternalCurriculumByUser(user);
-        return new ResponseEntity<>(toReturn, HttpStatus.OK);
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/MinervalController.java

@@ -1,55 +0,0 @@
-package ovh.herisson.Clyde.EndPoints.Inscription;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import ovh.herisson.Clyde.Repositories.Inscription.MinervalRepository;
-import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
-import ovh.herisson.Clyde.Services.AuthenticatorService;
-import ovh.herisson.Clyde.Tables.Inscription.Minerval;
-import ovh.herisson.Clyde.Tables.Role;
-
-import java.util.*;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class MinervalController {
-    private final AuthenticatorService authServ;
-    private final MinervalRepository mr;
-
-    public MinervalController(AuthenticatorService authServ, MinervalRepository mr) {
-        this.authServ = authServ;
-        this.mr = mr;
-    }
-
-    //A new minerval entry is posted when the inscription service accept a registration request
-    @PostMapping("/minerval/{studentRegNo}")
-    public ResponseEntity<Object> postMinerval(@RequestHeader("Authorization") String token, @PathVariable long studentRegNo){
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService},token))
-            return new UnauthorizedResponse<>(null);
-
-        Calendar c = new GregorianCalendar();
-
-        mr.save(new Minerval(studentRegNo, 0, 835, c.get(Calendar.YEAR)));
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @GetMapping("/minerval/{studentRegNo}")
-    public ResponseEntity<Minerval> getCurrentMinervalbyRegNo(@PathVariable long studentRegNo){
-        ArrayList<Minerval> mlist = mr.getMinervalsByStudentRegNoOrderByYearDesc(studentRegNo);
-
-        //The list is ordered by year in descending order then the index 0 contains the actual minerval (for this year)
-        Minerval m = mlist.get(0);
-        return new ResponseEntity<>(m, HttpStatus.OK);
-    }
-
-    @PatchMapping("/minerval")
-    public ResponseEntity<Object> updateMinerval(@RequestBody Minerval updatedMinerval){
-        Minerval minerval = mr.findById(updatedMinerval.getId());
-
-        minerval.setPaidAmount(updatedMinerval.getPaidAmount());
-        minerval.setToPay(updatedMinerval.getToPay());
-        mr.save(minerval);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/PaymentController.java

@@ -1,37 +0,0 @@
-package ovh.herisson.Clyde.EndPoints.Inscription;
-
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import ovh.herisson.Clyde.Repositories.Inscription.PaymentRepository;
-import ovh.herisson.Clyde.Tables.Inscription.Payment;
-
-import java.util.ArrayList;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class PaymentController {
-
-    private final PaymentRepository paymentRepository;
-
-    public PaymentController(PaymentRepository paymentRepository){
-        this.paymentRepository = paymentRepository;
-    }
-
-    //Post a payment record
-    @PostMapping("/payment")
-    public ResponseEntity<Object> postPayment(@RequestBody Payment payment){
-        paymentRepository.save(payment);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-
-    //Get all payment records of a student
-    @GetMapping("/payment/{studentRegNo}")
-    public ResponseEntity<ArrayList<Payment>> getPaymentsByUser(@PathVariable long studentRegNo){
-        ArrayList<Payment> toReturn = paymentRepository.getPaymentsByStudentRegNo(studentRegNo);
-        return new ResponseEntity<>(toReturn, HttpStatus.OK);
-    }
-
-}

backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/RequestsController.java

@@ -1,97 +0,0 @@
-package ovh.herisson.Clyde.EndPoints.Inscription;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import ovh.herisson.Clyde.Repositories.CourseRepository;
-import ovh.herisson.Clyde.Repositories.Inscription.ExemptionsRequestRepository;
-import ovh.herisson.Clyde.Repositories.Inscription.ScholarshipRequestRepository;
-import ovh.herisson.Clyde.Repositories.Inscription.UninscriptionRequestRepository;
-import ovh.herisson.Clyde.Repositories.UserRepository;
-import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
-import ovh.herisson.Clyde.Services.AuthenticatorService;
-import ovh.herisson.Clyde.Tables.*;
-import ovh.herisson.Clyde.Tables.Inscription.ExemptionsRequest;
-import ovh.herisson.Clyde.Tables.Inscription.ScholarshipRequest;
-import ovh.herisson.Clyde.Tables.Inscription.UninscriptionRequest;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Map;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class RequestsController {
-
-    public final ExemptionsRequestRepository err;
-    public final ScholarshipRequestRepository srr;
-    public final UserRepository userRepository;
-    public final AuthenticatorService authServ;
-    public final UninscriptionRequestRepository uninscriptionRequestRepository;
-    public final CourseRepository courseRepository;
-
-    public RequestsController(ExemptionsRequestRepository err, ScholarshipRequestRepository srr, UserRepository userRepository, AuthenticatorService authServ, UninscriptionRequestRepository uninscriptionRequestRepository, CourseRepository courseRepository) {
-        this.err = err;
-        this.srr = srr;
-        this.userRepository = userRepository;
-        this.authServ = authServ;
-        this.uninscriptionRequestRepository = uninscriptionRequestRepository;
-        this.courseRepository = courseRepository;
-    }
-
-    @PostMapping(value="/exemptionreq")
-    public ResponseEntity<String> createExemptionReq(@RequestBody Map<String, Object> exemptionsRequestInfo){
-        User user = userRepository.findById((Integer) exemptionsRequestInfo.get("userRegNo"));
-        Course course = courseRepository.findById((Integer) exemptionsRequestInfo.get("courseId"));
-
-        ExemptionsRequest exemptionsRequest = new ExemptionsRequest(user, course, (String) exemptionsRequestInfo.get("justifDocument"), RequestState.Pending, new Date());
-
-        err.save(exemptionsRequest);
-
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PostMapping(value="/scholarshipreq")
-    public ResponseEntity<String> createScholarshipReq(@RequestBody Map<String, Object> scholarshipRequestInfo){
-        User user = userRepository.findById((Integer)scholarshipRequestInfo.get("userId"));
-        ScholarshipRequest toCreate = new ScholarshipRequest(user, RequestState.Pending, 0, new Date(), (String) scholarshipRequestInfo.get("taxDocUrl"), (String) scholarshipRequestInfo.get("residencyDocUrl"));
-
-        srr.save(toCreate);
-
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    //Get all the exemptions Request
-    @GetMapping(value = "/exemptionsreq")
-    public ResponseEntity<ArrayList<ExemptionsRequest>> getAllExemptionsRequests(@RequestHeader("Authorization") String token){
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService},token))
-            return new UnauthorizedResponse<>(null);
-
-        ArrayList<ExemptionsRequest> toReturn = new ArrayList<>();
-
-        err.findAll().forEach(toReturn::add);
-
-        return new ResponseEntity<>(toReturn, HttpStatus.OK);
-    }
-
-    //Get all the scholarships requests
-    @GetMapping(value = "/scholarshipreq")
-    public ResponseEntity<ArrayList<ScholarshipRequest>> getAllScholarshipRequests(@RequestHeader("Authorization") String token){
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService},token))
-            return new UnauthorizedResponse<>(null);
-
-        ArrayList<ScholarshipRequest> toReturn = new ArrayList<>();
-
-        srr.findAll().forEach(toReturn::add);
-
-        return new ResponseEntity<>(toReturn, HttpStatus.OK);
-    }
-
-    @PostMapping(value = "/uninscriptionreq")
-    public ResponseEntity<String> postUnregReq(@RequestBody Map<String,Object> uninscr){
-        User u = userRepository.findById((int) uninscr.get("userId"));
-        UninscriptionRequest ur = new UninscriptionRequest(RequestState.Pending, (String) uninscr.get("reason"), new Date(), u);
-        uninscriptionRequestRepository.save(ur);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

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

@@ -1,13 +1,13 @@
-package ovh.herisson.Clyde.EndPoints.Inscription;
+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.Inscription.InscriptionService;
+import ovh.herisson.Clyde.Services.InscriptionService;
 import ovh.herisson.Clyde.Services.ProtectionService;
-import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
+import ovh.herisson.Clyde.Tables.InscriptionRequest;
 import ovh.herisson.Clyde.Tables.RequestState;
 import ovh.herisson.Clyde.Tables.Role;
 import java.util.Map;
@@ -79,22 +79,4 @@ public class InscriptionController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-
-    //Allow teacher or admin to accept or refuse the equivalence
-    @PatchMapping("/request/registerequiv/{id}/{newstate}")
-    public ResponseEntity<Object> editRegisterEquiv(@RequestHeader("Authorization") String token, @PathVariable long id, @PathVariable RequestState newstate){
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Teacher}, token))
-            return new UnauthorizedResponse<>(null);
-
-        InscriptionRequest toEdit = inscriptionServ.getById(id);
-        toEdit.setEquivalenceState(newstate);
-
-        inscriptionServ.save(toEdit);
-
-        if (toEdit.getState() == RequestState.Accepted && (toEdit.getEquivalenceState() == RequestState.Accepted || toEdit.getEquivalenceState() == RequestState.Unrequired))
-        {
-            inscriptionServ.createUser(toEdit);
-        }
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
 }

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

@@ -5,14 +5,10 @@ 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.Repositories.CurriculumRepository;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.AuthenticatorService;
 import ovh.herisson.Clyde.Services.ProtectionService;
-import ovh.herisson.Clyde.Tables.Curriculum;
+import ovh.herisson.Clyde.Tables.InscriptionRequest;
-import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
-import ovh.herisson.Clyde.Tables.RequestState;
-
 import java.util.Date;
 import java.util.Map;
 
@@ -20,7 +16,7 @@ import java.util.Map;
 @CrossOrigin(originPatterns = "*", allowCredentials = "true")
 public class LoginController {
     private final AuthenticatorService authServ;
-    private final CurriculumRepository curriculumRepository;
+
     static public class RequestLogin{
         private final String identifier;
         private final String password;
@@ -33,9 +29,8 @@ public class LoginController {
         }
     }
 
-    public LoginController(AuthenticatorService authServ, CurriculumRepository curriculumRepository){
+    public LoginController(AuthenticatorService authServ){
         this.authServ = authServ;
-        this.curriculumRepository = curriculumRepository;
     }
 
     @PostMapping(value = "/login")
@@ -53,18 +48,9 @@ public class LoginController {
 
     @PostMapping("/register")
     public ResponseEntity<Map<String,Object>> register(@RequestBody InscriptionRequest inscriptionRequest){
-        //We ensure here that if the targeted cursus year is more than first grade then we need the teacher equivalence approval
-        Curriculum curr = curriculumRepository.findById(inscriptionRequest.getCurriculumId());
-
-        if (curr.getYear() > 1){
-            inscriptionRequest.setEquivalenceState(RequestState.Pending);
-        }else{
-            inscriptionRequest.setEquivalenceState(RequestState.Unrequired);
-        }
 
         InscriptionRequest returnedInscriptionRequest = authServ.register(inscriptionRequest);
 
-
         return new ResponseEntity<>(ProtectionService.requestWithoutPassword(returnedInscriptionRequest), HttpStatus.CREATED);
     }
 }

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

@@ -2,18 +2,10 @@ package ovh.herisson.Clyde.EndPoints;
 
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
-import ovh.herisson.Clyde.Repositories.*;
+import ovh.herisson.Clyde.Repositories.TokenRepository;
-import ovh.herisson.Clyde.Repositories.Inscription.ExternalCurriculumRepository;
+import ovh.herisson.Clyde.Repositories.UserRepository;
-import ovh.herisson.Clyde.Repositories.Inscription.MinervalRepository;
-import ovh.herisson.Clyde.Repositories.Inscription.ScholarshipRequestRepository;
 import ovh.herisson.Clyde.Services.*;
-import ovh.herisson.Clyde.Services.Inscription.InscriptionService;
 import ovh.herisson.Clyde.Tables.*;
-import ovh.herisson.Clyde.Tables.Inscription.ExternalCurriculum;
-import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
-import ovh.herisson.Clyde.Tables.Inscription.Minerval;
-import ovh.herisson.Clyde.Tables.Inscription.ScholarshipRequest;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -30,28 +22,19 @@ public class MockController {
     public final CurriculumCourseService CurriculumCourseService;
     public final CurriculumService curriculumService;
     public final CourseService courseService;
-    public final ExternalCurriculumRepository externalCurriculumRepository;
+
     public final InscriptionService inscriptionService;
     ArrayList<User> mockUsers;
 
-    public final UserCurriculumRepository ucr;
 
-    public final MinervalRepository minervalRepository;
+    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService){
-
-    public final ScholarshipRequestRepository scholarshipRequestRepository;
-
-    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, ExternalCurriculumRepository externalCurriculumRepository, InscriptionService inscriptionService, UserCurriculumRepository ucr, MinervalRepository minervalRepository, ScholarshipRequestRepository scholarshipRequestRepository){
         this.tokenRepo = tokenRepo;
         this.userRepo = userRepo;
         this.tokenService = tokenService;
         this.CurriculumCourseService = CurriculumCourseService;
         this.curriculumService = curriculumService;
         this.courseService = courseService;
-        this.externalCurriculumRepository = externalCurriculumRepository;
         this.inscriptionService = inscriptionService;
-        this.ucr = ucr;
-        this.minervalRepository = minervalRepository;
-        this.scholarshipRequestRepository = scholarshipRequestRepository;
     }
 
     /** Saves an example of each user type by :
@@ -64,41 +47,28 @@ public class MockController {
     public void postMock(){
 
         // user part
+
+
         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"));
-        User popo = new User("Smith", "Paul", "paulsmith@gmail.com", "306 rue du poulet", "belgique", new Date(0), null, Role.Student, passwordEncoder.encode("jesuispaulleroi"));
+        mockUsers = new ArrayList<>(Arrays.asList(herobrine,joe,meh,joke,lena,jojo));
-        mockUsers = new ArrayList<>(Arrays.asList(herobrine,joe,meh,joke,lena,jojo, popo));
 
         userRepo.saveAll(mockUsers);
 
-        Minerval minerval = new Minerval(joe.getRegNo(), 0, 852, 2023);
-        minervalRepository.save(minerval);
         // Course / Curriculum part
 
         Curriculum infoBab1 = new Curriculum(1,"info");
         Curriculum chemistryBab1 = new Curriculum(1,"chemistry");
         Curriculum psychologyBab1 = new Curriculum(1,"psychology");
-        Curriculum infoBab2 = new Curriculum(2,"info");
-        Curriculum masterinfo1 = new Curriculum(4, "info");
-        Curriculum masterinfo2 = new Curriculum(5, "info");
 
         curriculumService.save(infoBab1);
         curriculumService.save(chemistryBab1);
         curriculumService.save(psychologyBab1);
-        curriculumService.save(infoBab2);
-        curriculumService.save(masterinfo1);
-        curriculumService.save(masterinfo2);
 
-        ucr.save(new UserCurriculum(joe, infoBab1, 2022));
-        ucr.save(new UserCurriculum(joe, chemistryBab1, 2023));
-        ucr.save(new UserCurriculum(joe, infoBab1, 2023));
-        ucr.save(new UserCurriculum(joe, psychologyBab1, 2020));
-        ucr.save(new UserCurriculum(popo, infoBab1, 2022));
-        ucr.save(new UserCurriculum(popo, infoBab2, 2023));
 
         Course progra1 = new Course(5,"Programmation et algorithmique 1",joke);
         Course chemistry1 = new Course(12, "Thermochimie",joke);
@@ -110,12 +80,10 @@ public class MockController {
         courseService.save(psycho1);
         courseService.save(commun);
 
-        ScholarshipRequest ssr1 = new ScholarshipRequest(joe, RequestState.Pending, 0, new Date(), "test", "test");
-        scholarshipRequestRepository.save(ssr1);
 
         CurriculumCourseService.save(new CurriculumCourse(infoBab1,progra1));
         CurriculumCourseService.save(new CurriculumCourse(infoBab1,commun));
-        CurriculumCourseService.save(new CurriculumCourse(infoBab1, psycho1));
+
         CurriculumCourseService.save(new CurriculumCourse(psychologyBab1,psycho1));
         CurriculumCourseService.save(new CurriculumCourse(psychologyBab1,commun));
 
@@ -124,12 +92,10 @@ public class MockController {
         CurriculumCourseService.save(new CurriculumCourse(chemistryBab1,chemistry1));
 
 
-        InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 4,RequestState.Pending,"yes.png","password", null, new Date(), RequestState.Pending);
+        InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 1,RequestState.Pending,"yes.png","password");
 
         inscriptionService.save(inscriptionRequest);
-
+        
-        ExternalCurriculum externalCurriculum = new ExternalCurriculum(inscriptionRequest, "HEH", "Bachelier en informatique", "Completed", 2015, 2018, null, null);
-        externalCurriculumRepository.save(externalCurriculum);
     }
 }
 

backend/src/main/java/ovh/herisson/Clyde/EndPoints/Msg/MessagesController.java

@@ -1,126 +0,0 @@
-package ovh.herisson.Clyde.EndPoints.Msg;
-
-/******************************************************
- * @file MessagesController.java
- * @author Anthony Debucquoy
- * @scope Extension messagerie
- *
- * Entry point for the messages application
- ******************************************************/
-
-import org.springframework.beans.factory.annotation.Autowired;
-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.PatchMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RestController;
-
-import lombok.AllArgsConstructor;
-import ovh.herisson.Clyde.DTO.Msg.DiscussionDTO;
-import ovh.herisson.Clyde.Repositories.UserRepository;
-import ovh.herisson.Clyde.Repositories.Msg.DiscussionRepository;
-import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
-import ovh.herisson.Clyde.Services.AuthenticatorService;
-import ovh.herisson.Clyde.Services.UserService;
-import ovh.herisson.Clyde.Services.Msg.DiscussionService;
-import ovh.herisson.Clyde.Tables.User;
-import ovh.herisson.Clyde.Tables.Msg.Discussion;
-import ovh.herisson.Clyde.Tables.Msg.Message;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-@AllArgsConstructor
-public class MessagesController {
-
-	private AuthenticatorService authServ;
-	private DiscussionService discServ;
-	private DiscussionRepository discRepo;
-	private UserService userServ;
-
-	@GetMapping("/discussions")
-	public ResponseEntity<Iterable<Discussion>> getDiscussions(@RequestHeader("Authorization") String token ){
-		User user = authServ.getUserFromToken(token);
-		if(user == null){
-			return new UnauthorizedResponse<>(null);
-		}
-
-		Iterable<Discussion> mock = discServ.getOwned(authServ.getUserFromToken(token));
-
-		return new ResponseEntity<>(mock, HttpStatus.OK); 
-	} 
-
-	@GetMapping("/discussion/{id}")
-	public ResponseEntity<DiscussionDTO> getDiscussion(@RequestHeader("Authorization") String token, @PathVariable long id){
-		User user = authServ.getUserFromToken(token);
-		if(user == null || !discServ.hasDiscussion(user, id) ){
-			return new UnauthorizedResponse<>(null);
-		}
-		return new ResponseEntity<>(DiscussionDTO.construct(discRepo.findById(id).orElse(null), authServ.getUserFromToken(token)), HttpStatus.OK);
-	} 
-
-	@PatchMapping("/discussion/{id}")
-	public ResponseEntity<Discussion> AlterDiscussion(@RequestHeader("Authorization") String token, @PathVariable long id, @RequestBody Discussion data){
-		User user = authServ.getUserFromToken(token);
-		if(user == null){
-			return new UnauthorizedResponse<>(null);
-		}
-
-		Discussion disc = discRepo.findById(id).orElse(null);
-		disc.setName(data.getName());
-		discRepo.save(disc);
-		return new ResponseEntity<>(disc, HttpStatus.OK);
-	}
-
-	@PatchMapping("/discussion/{id}/add")
-	public ResponseEntity<Discussion> invite(@RequestHeader("Authorization") String token, @PathVariable long id, @RequestBody User data){
-		User user = authServ.getUserFromToken(token);
-		if(user == null){
-			return new UnauthorizedResponse<>(null);
-		}
-
-		Discussion disc = discRepo.findById(id).orElse(null);
-		User invited = userServ.getUserById(data.getRegNo());
-		disc.addMember(invited);
-		discRepo.save(disc);
-		return new ResponseEntity<>(disc, HttpStatus.OK);
-	}
-
-	@PatchMapping("/discussion/{id}/remove")
-	public ResponseEntity<Discussion> removeMember(@RequestHeader("Authorization") String token, @PathVariable long id, @RequestBody User data){
-		User user = authServ.getUserFromToken(token);
-		if(user == null){
-			return new UnauthorizedResponse<>(null);
-		}
-
-		Discussion disc = discRepo.findById(id).orElse(null);
-		User member = userServ.getUserById(data.getRegNo());
-		disc.delMember(member);
-		discRepo.save(disc);
-		return new ResponseEntity<>(disc, HttpStatus.OK);
-	}
-
-	@PostMapping("/discussion/{id}")
-	public ResponseEntity<Discussion> sendMessage(@RequestHeader("Authorization") String token, @PathVariable long id, @RequestBody Message msg){
-		User user = authServ.getUserFromToken(token);
-		if(user == null){
-			return new UnauthorizedResponse<>(null);
-		}
-
-		Discussion disc = discRepo.findById(id).orElse(null);
-		msg.setAuthor(user);
-		if(disc != null)
-			discServ.CreateMessage(disc, msg);
-		return new ResponseEntity<>(disc, HttpStatus.OK);
-	}
-
-
-	@PostMapping("/discussion")
-	public ResponseEntity<Discussion> createDiscussion(@RequestHeader("Authorization") String token, @RequestBody Discussion data){
-		return new ResponseEntity<>(discServ.create(data.getName(), authServ.getUserFromToken(token)), HttpStatus.OK);
-	}
-}

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

@@ -1,44 +0,0 @@
-package ovh.herisson.Clyde.EndPoints;
-
-import java.util.List;
-
-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.PostMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
-
-import lombok.AllArgsConstructor;
-import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
-import ovh.herisson.Clyde.Services.AuthenticatorService;
-import ovh.herisson.Clyde.Tables.Notification;
-import ovh.herisson.Clyde.Tables.User;
-
-@RestController
-@AllArgsConstructor
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class NotificationController {
-
-	private AuthenticatorService authServ;
-
-	@GetMapping("/notifications")
-	public ResponseEntity<List<Notification>> getNotifications(@RequestHeader("Authorization") String token){
-		User u = authServ.getUserFromToken(token);
-		if(u == null){
-            return new UnauthorizedResponse<>(null);
-		}
-		List<Notification> n = u.getNotifications();
-		return new ResponseEntity<>(n, HttpStatus.OK);
-
-	}
-
-	@PostMapping("/notifications/{id}")
-	public ResponseStatus archiveNotification(@RequestHeader("Authorization") String token, @PathVariable long id){
-		return null;
-	}
-	
-}

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

@@ -0,0 +1,37 @@
+package ovh.herisson.Clyde;
+
+import javax.sql.DataSource;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@Configuration
+@EnableScheduling
+public class JdbcConfig {
+
+	@Bean
+	@Profile("!prod")
+	public DataSource psqlSource(){
+		DriverManagerDataSource source = new DriverManagerDataSource();
+		source.setDriverClassName("org.postgresql.Driver");
+		source.setUrl("jdbc:postgresql://localhost:5442/clyde");
+		source.setUsername("devel");
+		source.setPassword("devel");
+
+		return source;
+	}
+
+	@Bean
+	@Profile("prod")
+	public DataSource psqlSourceProd(){
+		DriverManagerDataSource source = new DriverManagerDataSource();
+		source.setDriverClassName("org.postgresql.Driver");
+		source.setUrl("jdbc:postgresql:clyde?socketFactory=org.newsclub.net.unix.AFUNIXSocketFactory$FactoryArg&socketFactoryArg=/var/run/postgresql/.s.PGSQL.5432");
+		source.setUsername("clyde");
+
+		return source;
+	}
+}

backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExemptionsRequestRepository.java

@@ -1,8 +0,0 @@
-package ovh.herisson.Clyde.Repositories.Inscription;
-
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Inscription.ExemptionsRequest;
-
-public interface ExemptionsRequestRepository extends CrudRepository<ExemptionsRequest, Long> {
-
-}

backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExternalCurriculumRepository.java

@@ -1,15 +0,0 @@
-package ovh.herisson.Clyde.Repositories.Inscription;
-
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Inscription.ExternalCurriculum;
-import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.ArrayList;
-
-public interface ExternalCurriculumRepository extends CrudRepository<ExternalCurriculum, Long> {
-    ArrayList<ExternalCurriculum> getExternalCurriculumByInscriptionRequest(InscriptionRequest ir);
-
-    ArrayList<ExternalCurriculum> getExternalCurriculumByUser(User user);
-    ExternalCurriculum getExternalCurriculumById(long id);
-}

backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/MinervalRepository.java

@@ -1,12 +0,0 @@
-package ovh.herisson.Clyde.Repositories.Inscription;
-
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Inscription.Minerval;
-
-import java.util.ArrayList;
-
-public interface MinervalRepository extends CrudRepository<Minerval, Long> {
-    public ArrayList<Minerval> getMinervalsByStudentRegNoOrderByYearDesc(Long studentRegNo);
-
-    public Minerval findById(long id);
-}

backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/PaymentRepository.java

@@ -1,10 +0,0 @@
-package ovh.herisson.Clyde.Repositories.Inscription;
-
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Inscription.Payment;
-
-import java.util.ArrayList;
-
-public interface PaymentRepository extends CrudRepository<Payment, Long> {
-    public ArrayList<Payment> getPaymentsByStudentRegNo(long regNo);
-}

backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ScholarshipRequestRepository.java

@@ -1,8 +0,0 @@
-package ovh.herisson.Clyde.Repositories.Inscription;
-
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Inscription.ScholarshipRequest;
-
-public interface ScholarshipRequestRepository extends CrudRepository<ScholarshipRequest, Long> {
-
-}

backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/UninscriptionRequestRepository.java

@@ -1,7 +0,0 @@
-package ovh.herisson.Clyde.Repositories.Inscription;
-
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Inscription.UninscriptionRequest;
-
-public interface UninscriptionRequestRepository extends CrudRepository<UninscriptionRequest, Long> {
-}

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

@@ -1,7 +1,7 @@
-package ovh.herisson.Clyde.Repositories.Inscription;
+package ovh.herisson.Clyde.Repositories;
 
 import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
+import ovh.herisson.Clyde.Tables.InscriptionRequest;
 
 
 public interface InscriptionRepository extends CrudRepository<InscriptionRequest,Long> {

backend/src/main/java/ovh/herisson/Clyde/Repositories/Msg/DiscussionRepository.java

@@ -1,23 +0,0 @@
-package ovh.herisson.Clyde.Repositories.Msg;
-
-/******************************************************
- * @file DiscussionRepository.java
- * @author Anthony Debucquoy
- * @scope Extension messagerie
- *
- * Repository of Discussion allowing to fetch discussion by user 
- ******************************************************/
-
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-
-import ovh.herisson.Clyde.Tables.Msg.Discussion;
-
-public interface DiscussionRepository extends CrudRepository<Discussion, Long>{
-
-	@Query("SELECT d FROM Discussion d INNER JOIN FETCH d.members dm WHERE dm.id = ?1")
-	List<Discussion> findByMembership(long userid);
-}

backend/src/main/java/ovh/herisson/Clyde/Repositories/Msg/MessageRepository.java

@@ -1,14 +0,0 @@
-package ovh.herisson.Clyde.Repositories.Msg;
-
-/******************************************************
- * @file MessageRepository.java
- * @author Anthony Debucquoy
- * @scope Extension messagerie
- ******************************************************/
-
-
-import org.springframework.data.repository.CrudRepository;
-
-import ovh.herisson.Clyde.Tables.Msg.Message;
-
-public interface MessageRepository extends CrudRepository<Message, Long> {}

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

@@ -1,8 +0,0 @@
-package ovh.herisson.Clyde.Repositories;
-
-import org.springframework.data.repository.CrudRepository;
-
-import ovh.herisson.Clyde.Tables.Notification;
-
-interface NotificationRepository extends CrudRepository<Notification, Long> {}
-

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

@@ -6,12 +6,8 @@ import ovh.herisson.Clyde.Tables.Curriculum;
 import ovh.herisson.Clyde.Tables.User;
 import ovh.herisson.Clyde.Tables.UserCurriculum;
 
-import java.util.ArrayList;
-
 public interface UserCurriculumRepository extends CrudRepository<UserCurriculum, Long> {
 
     @Query("select uc.curriculum from UserCurriculum uc where uc.user = ?1")
     Curriculum findByUser(User student);
-
-    ArrayList<UserCurriculum> findByUserOrderByCurriculum(User student);
 }

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

@@ -1,10 +1,7 @@
 package ovh.herisson.Clyde.Services;
 
 import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Services.Inscription.InscriptionService;
 import ovh.herisson.Clyde.Tables.*;
-import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
-
 import java.util.Date;
 
 @Service

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

@@ -18,6 +18,7 @@ public class CurriculumService {
     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/Inscription/InscriptionService.java

@@ -1,105 +0,0 @@
-package ovh.herisson.Clyde.Services.Inscription;
-
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Repositories.*;
-import ovh.herisson.Clyde.Repositories.Inscription.ExternalCurriculumRepository;
-import ovh.herisson.Clyde.Repositories.Inscription.InscriptionRepository;
-import ovh.herisson.Clyde.Repositories.Inscription.MinervalRepository;
-import ovh.herisson.Clyde.Tables.*;
-import ovh.herisson.Clyde.Tables.Inscription.ExternalCurriculum;
-import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
-import ovh.herisson.Clyde.Tables.Inscription.Minerval;
-
-import java.util.ArrayList;
-
-@Service
-public class InscriptionService {
-
-    private final InscriptionRepository inscriptionRepo;
-
-    private final UserRepository userRepo;
-
-    private final UserCurriculumRepository userCurriculumRepo;
-
-    private final CurriculumRepository curriculumRepo;
-
-    private final MinervalRepository minervalRepository;
-    private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-    private final ExternalCurriculumRepository externalCurriculumRepository;
-
-    public InscriptionService(InscriptionRepository inscriptionRepo, UserRepository userRepo, UserCurriculumRepository userCurriculumRepo, CurriculumRepository curriculumRepo, MinervalRepository minervalRepository, ExternalCurriculumRepository externalCurriculumRepository){
-        this.inscriptionRepo = inscriptionRepo;
-        this.userRepo = userRepo;
-        this.userCurriculumRepo = userCurriculumRepo;
-        this.curriculumRepo = curriculumRepo;
-        this.minervalRepository = minervalRepository;
-        this.externalCurriculumRepository = externalCurriculumRepository;
-    }
-
-    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;
-
-        inscrRequest.setState(requestState);
-        save(inscrRequest);
-
-        //saves the user from the request if accepted from teacher and inscription services
-        if (requestState == RequestState.Accepted && (inscrRequest.getEquivalenceState() == RequestState.Accepted || inscrRequest.getEquivalenceState() == RequestState.Unrequired))
-        {
-            return createUser(inscrRequest);
-        }
-        return true;
-    }
-
-    public boolean createUser(InscriptionRequest inscrRequest){
-        //We must send an email here
-
-        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()),0));
-
-        //Create a minerval for the new student
-        Minerval minerval = new Minerval(userFromRequest.getRegNo(), 0, 852, 2023);
-        minervalRepository.save(minerval);
-
-        //Assign the externals curriculums from the inscription request to newly created student
-        ArrayList<ExternalCurriculum> extCurrList = externalCurriculumRepository.getExternalCurriculumByInscriptionRequest(inscrRequest);
-        for (int i = 0; i < extCurrList.size(); i++){
-            extCurrList.get(i).setUser(userFromRequest);
-            externalCurriculumRepository.save(extCurrList.get(i));
-        }
-        return true;
-    }
-    public void delete(InscriptionRequest toDelete) {
-        inscriptionRepo.delete(toDelete);
-    }
-}

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

@@ -0,0 +1,94 @@
+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/Msg/DiscussionService.java

@@ -1,64 +0,0 @@
-package ovh.herisson.Clyde.Services.Msg;
-
-import java.util.List;
-
-/******************************************************
- * @file DiscussionService.java
- * @author Anthony Debucquoy
- * @scope Extension messagerie
- *
- * Various function utilised by the messages application
- ******************************************************/
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.fasterxml.jackson.databind.util.JSONPObject;
-
-import ovh.herisson.Clyde.Repositories.Msg.DiscussionRepository;
-import ovh.herisson.Clyde.Services.UserService;
-import ovh.herisson.Clyde.Tables.Notification;
-import ovh.herisson.Clyde.Tables.User;
-import ovh.herisson.Clyde.Tables.Msg.Discussion;
-import ovh.herisson.Clyde.Tables.Msg.Message;
-
-@Service
-public class DiscussionService {
-
-	@Autowired
-	private DiscussionRepository discRepo;
-	@Autowired
-	private UserService userServ;
-
-	public Discussion create(String name, User author){
-		return discRepo.save(new Discussion(name, author));
-	}
-
-	/**
-	 * list discussions owned by a certain user
-	 */
-	public Iterable<Discussion> getOwned(User author){
-		return discRepo.findByMembership(author.getRegNo());
-	}
-
-	/**
-	 * Create a message and link it to it's discussion
-	 */
-	public Discussion CreateMessage(Discussion disc, Message msg){
-		for(User u: disc.getMembers()){
-			userServ.Notify(u, new Notification("msg.notification.new", msg.getContent(), "/#/msg"));
-		}
-		disc.addMessage(msg);
-		return discRepo.save(disc);
-	}
-
-	/**
-	 * Check if a user is in a discussion
-	 */
-    public boolean hasDiscussion(User user, long id) {
-		Discussion disc = discRepo.findById(id).orElse(null);
-		List<User> members = disc.getMembers();
-		return members.contains(user);
-    }
-}

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

@@ -1,9 +0,0 @@
-package ovh.herisson.Clyde.Services;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class NotificationService {
-
-}

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

@@ -1,7 +1,7 @@
 package ovh.herisson.Clyde.Services;
 
 import ovh.herisson.Clyde.Tables.Course;
-import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
+import ovh.herisson.Clyde.Tables.InscriptionRequest;
 import ovh.herisson.Clyde.Tables.User;
 
 import java.util.ArrayList;
@@ -87,9 +87,7 @@ public class ProtectionService {
         toReturn.put("curriculum", inscriptionRequest.getCurriculumId());
         toReturn.put("state", inscriptionRequest.getState());
         toReturn.put("profilePictureUrl", inscriptionRequest.getProfilePicture());
-        toReturn.put("identityCard", inscriptionRequest.getIdentityCard());
+
-        toReturn.put("submissionDate", inscriptionRequest.getSubmissionDate());
-        toReturn.put("equivalenceState", inscriptionRequest.getEquivalenceState());
         return toReturn;
     }
 

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

@@ -1,52 +1,20 @@
 package ovh.herisson.Clyde.Services;
 
 import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Repositories.CurriculumRepository;
-import ovh.herisson.Clyde.Repositories.Inscription.ExternalCurriculumRepository;
 import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
-import ovh.herisson.Clyde.Tables.*;
+import ovh.herisson.Clyde.Tables.Curriculum;
-
+import ovh.herisson.Clyde.Tables.User;
-import java.util.ArrayList;
-import java.util.HashMap;
 
 @Service
 public class UserCurriculumService {
 
     private final UserCurriculumRepository userCurriculumRepository;
-    private final CurriculumRepository curriculumRepo;
 
-    private final ExternalCurriculumRepository externalCurriculumRepo;
+    public UserCurriculumService(UserCurriculumRepository userCurriculumRepository) {
-    public UserCurriculumService(UserCurriculumRepository userCurriculumRepository, CurriculumRepository curriculumRepo, ExternalCurriculumRepository externalCurriculumRepo) {
         this.userCurriculumRepository = userCurriculumRepository;
-        this.curriculumRepo = curriculumRepo;
-        this.externalCurriculumRepo = externalCurriculumRepo;
     }
 
     public Curriculum findByUser(User student){
         return userCurriculumRepository.findByUser(student);
     }
-
-    public HashMap<String,Object> findAllCurriculumByStudent(User student) {
-        ArrayList<UserCurriculum> list = userCurriculumRepository.findByUserOrderByCurriculum(student);
-
-        ArrayList<HashMap<String, Object>> curriculumlist = new ArrayList<HashMap<String, Object>>();
-
-        for (int i = 0; i < list.size(); i++) {
-            HashMap<String, Object> element = new HashMap<>();
-            Curriculum c = list.get(i).getCurriculum();
-
-
-            element.put("curriculumId", c.getCurriculumId());
-            element.put("year", c.getYear());
-            element.put("option", c.getOption());
-            element.put("dateyear", list.get(i).getYear());
-            curriculumlist.add(element);
-        }
-
-        HashMap<String, Object> toReturn = new HashMap<String, Object>();
-        toReturn.put("curriculumList", curriculumlist);
-        return toReturn;
-    }
-
-
 }

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

@@ -3,7 +3,6 @@ package ovh.herisson.Clyde.Services;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.UserRepository;
-import ovh.herisson.Clyde.Tables.Notification;
 import ovh.herisson.Clyde.Tables.Role;
 import ovh.herisson.Clyde.Tables.User;
 import java.util.*;
@@ -132,10 +131,4 @@ public class UserService {
     public void delete(User user) {
         userRepo.delete(user);
     }
-
-	public void Notify(User u, Notification n){
-		n.setUser(u);
-		u.getNotifications().add(n);
-		userRepo.save(u);
-	}
 }

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

@@ -3,6 +3,7 @@ package ovh.herisson.Clyde.Tables;
 public enum Applications {
     // without any token
     Login,
+    Schedule,
 
     // with any token
     Profile,
@@ -18,6 +19,6 @@ public enum Applications {
     UsersList,
 
     // InscriptionService authorization
-    Requests,
+    Inscription,
     StudentsList
 }

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

@@ -1,7 +1,8 @@
 package ovh.herisson.Clyde.Tables;
 
 public enum FileType {
+
     ProfilePicture,
-    EducationCertificate,
+
-    JustificationDocument
+    EducationCertificate
 }

backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExemptionsRequest.java

@@ -1,83 +0,0 @@
-package ovh.herisson.Clyde.Tables.Inscription;
-
-
-import jakarta.persistence.*;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
-import ovh.herisson.Clyde.Tables.Course;
-import ovh.herisson.Clyde.Tables.RequestState;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.Date;
-
-@Entity
-public class ExemptionsRequest {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
-    @JoinColumn(name = "Users")
-    @ManyToOne(fetch = FetchType.EAGER)
-    private User user;
-
-    @JoinColumn(name = "Course")
-    @ManyToOne(fetch = FetchType.EAGER)
-    private Course course;
-    private String justifDocument;
-
-    private RequestState state;
-
-    private Date date;
-
-    public ExemptionsRequest(User user, Course course, String justifDocument, RequestState state, Date date){
-        this.user = user;
-        this.course = course;
-        this.justifDocument = justifDocument;
-        this.state = state;
-        this.date = date;
-    }
-
-
-    public ExemptionsRequest(){}
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public Course getCourse() {
-        return course;
-    }
-
-    public void setCourse(Course course) {
-        this.course = course;
-    }
-
-    public String getJustifDocument() {
-        return justifDocument;
-    }
-
-    public void setJustifDocument(String justifDocument) {
-        this.justifDocument = justifDocument;
-    }
-
-
-    public RequestState getState() {
-        return state;
-    }
-
-    public void setState(RequestState state) {
-        this.state = state;
-    }
-
-    public Date getDate() {
-        return date;
-    }
-
-    public void setDate(Date date) {
-        this.date = date;
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExternalCurriculum.java

@@ -1,114 +0,0 @@
-package ovh.herisson.Clyde.Tables.Inscription;
-
-
-import jakarta.persistence.*;
-import ovh.herisson.Clyde.Tables.User;
-
-//This table stores a student's curriculum from another university
-@Entity
-public class ExternalCurriculum {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
-    //An external curriculum is first linked to an inscription request and when it is accepted and the user is created we link it to the user
-    @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name="InscriptionRequest")
-    private InscriptionRequest inscriptionRequest;
-
-    @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name="Users")
-    private User user;
-
-    private String school;
-
-    private String formation;
-
-    //This string denotes the completion of the external formation or the last year completed by the student in this formation
-    private String completion;
-
-    private int startYear;
-    private int endYear;
-    private String justifdocUrl;
-
-    public ExternalCurriculum(){}
-
-    public ExternalCurriculum(InscriptionRequest ir, String school, String formation, String completion, int startYear, int endYear, String justifdocUrl,User user){
-        this.inscriptionRequest = ir;
-        this.school = school;
-        this.formation = formation;
-        this.completion = completion;
-        this.startYear = startYear;
-        this.endYear = endYear;
-        this.justifdocUrl = justifdocUrl;
-        this.user = user;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public InscriptionRequest getInscriptionRequest() {
-        return inscriptionRequest;
-    }
-
-    public void setInscriptionRequest(InscriptionRequest inscriptionRequest) {
-        this.inscriptionRequest = inscriptionRequest;
-    }
-
-    public String getSchool() {
-        return school;
-    }
-
-    public void setSchool(String school) {
-        this.school = school;
-    }
-
-    public String getFormation() {
-        return formation;
-    }
-
-    public void setFormation(String formation) {
-        this.formation = formation;
-    }
-
-    public String getCompletion(){
-        return completion;
-    }
-
-    public void setCompletion(String completion) {
-        this.completion = completion;
-    }
-
-    public int getStartYear() {
-        return startYear;
-    }
-
-    public void setStartYear(int startYear) {
-        this.startYear = startYear;
-    }
-
-    public int getEndYear() {
-        return endYear;
-    }
-
-    public void setEndYear(int endYear) {
-        this.endYear = endYear;
-    }
-
-    public void setJustifdocUrl(String justifdocUrl) {
-        this.justifdocUrl = justifdocUrl;
-    }
-
-    public String getJustifdocUrl() {
-        return justifdocUrl;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public User getUser() {
-        return user;
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/Minerval.java

@@ -1,64 +0,0 @@
-package ovh.herisson.Clyde.Tables.Inscription;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-
-@Entity
-public class Minerval {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private long id;
-
-    private long studentRegNo;
-    private int paidAmount;
-    private int toPay;
-
-    //If the academic year is 2023-2024 then 2023 will be stored here (we take the lowest year)
-    private int year;
-    public Minerval(){}
-
-    public Minerval(long studentRegNo, int paidAmount, int toPay, int year){
-        this.studentRegNo = studentRegNo;
-        this.paidAmount = paidAmount;
-        this.toPay = toPay;
-        this.year = year;
-    }
-
-    public long getStudentRegNo() {
-        return studentRegNo;
-    }
-
-    public void setStudentRegNo(long studentRegNo) {
-        this.studentRegNo = studentRegNo;
-    }
-
-    public int getPaidAmount() {
-        return paidAmount;
-    }
-
-    public void setPaidAmount(int paidAmount) {
-        this.paidAmount = paidAmount;
-    }
-
-    public int getToPay() {
-        return toPay;
-    }
-
-    public void setToPay(int toPay) {
-        this.toPay = toPay;
-    }
-
-    public int getYear() {
-        return year;
-    }
-
-    public void setYear(int year) {
-        this.year = year;
-    }
-
-    public long getId() {
-        return id;
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/Payment.java

@@ -1,84 +0,0 @@
-package ovh.herisson.Clyde.Tables.Inscription;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-
-import java.util.Date;
-
-@Entity
-public class Payment {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private long id;
-
-    private long studentRegNo;
-    private String card;
-    private String client;
-    private Date expDate;
-    private int amount;
-    private Date date;
-    public Payment(){}
-
-    public Payment(long studentRegNo, String card, String client, Date expDate, int amount, Date date){
-        this.studentRegNo = studentRegNo;
-        this.card = card;
-        this.client = client;
-        this.expDate = expDate;
-        this.amount = amount;
-        this.date = date;
-    }
-
-    public long getStudentRegNo() {
-        return studentRegNo;
-    }
-
-    public void setStudentRegNo(long studentRegNo) {
-        this.studentRegNo = studentRegNo;
-    }
-
-    public String getCard() {
-        return card;
-    }
-
-    public void setCard(String card) {
-        this.card = card;
-    }
-
-    public String getClient() {
-        return client;
-    }
-
-    public void setClient(String client) {
-        this.client = client;
-    }
-
-    public Date getExpDate() {
-        return expDate;
-    }
-
-    public void setExpDate(Date expDate) {
-        this.expDate = expDate;
-    }
-
-    public int getAmount() {
-        return amount;
-    }
-
-    public void setAmount(int amount) {
-        this.amount = amount;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public Date getDate() {
-        return date;
-    }
-
-    public void setDate(Date date) {
-        this.date = date;
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ScholarshipRequest.java

@@ -1,88 +0,0 @@
-package ovh.herisson.Clyde.Tables.Inscription;
-
-import jakarta.persistence.*;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
-import ovh.herisson.Clyde.Tables.RequestState;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.Date;
-
-@Entity
-public class ScholarshipRequest {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private long id;
-
-    @JoinColumn(name="Users")
-    @ManyToOne(fetch = FetchType.EAGER)
-    private User user;
-    private RequestState state;
-    private Date date;
-    private int amount;
-    private String taxDocUrl;
-    private String residencyDocUrl;
-
-    public ScholarshipRequest(User user, RequestState state, int amount, Date date, String taxDocUrl, String residencyDocUrl){
-        this.user = user;
-        this.state = state;
-        this.amount = amount;
-        this.date = date;
-        this.taxDocUrl = taxDocUrl;
-        this.residencyDocUrl = residencyDocUrl;
-    }
-
-    public ScholarshipRequest(){}
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public RequestState getState() {
-        return state;
-    }
-
-    public void setState(RequestState state) {
-        this.state = state;
-    }
-
-    public int getAmount() {
-        return amount;
-    }
-
-    public void setAmount(int amount) {
-        this.amount = amount;
-    }
-
-    public Date getDate() {
-        return date;
-    }
-
-    public void setDate(Date date) {
-        this.date = date;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public String getResidencyDocUrl() {
-        return residencyDocUrl;
-    }
-
-    public void setResidencyDocUrl(String residencyDocUrl) {
-        this.residencyDocUrl = residencyDocUrl;
-    }
-
-    public String getTaxDocUrl() {
-        return taxDocUrl;
-    }
-
-    public void setTaxDocUrl(String taxDocUrl) {
-        this.taxDocUrl = taxDocUrl;
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/UninscriptionRequest.java

@@ -1,67 +0,0 @@
-package ovh.herisson.Clyde.Tables.Inscription;
-
-import jakarta.persistence.*;
-import ovh.herisson.Clyde.Tables.RequestState;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.Date;
-
-@Entity
-public class UninscriptionRequest {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private long id;
-    private RequestState state;
-    private String reason;
-    private Date date;
-
-    @JoinColumn(name = "Users")
-    @ManyToOne(fetch = FetchType.EAGER)
-    private User user;
-
-    public UninscriptionRequest(RequestState state,String reason, Date date, User user){
-        this.state = state;
-        this.reason = reason;
-        this.date = date;
-        this.user = user;
-    }
-
-    public UninscriptionRequest(){}
-
-    public RequestState getState() {
-        return state;
-    }
-
-    public void setState(RequestState state) {
-        this.state = state;
-    }
-
-    public String getReason() {
-        return reason;
-    }
-
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public void setDate(Date date) {
-        this.date = date;
-    }
-
-    public Date getDate() {
-        return date;
-    }
-}
-

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

@@ -1,8 +1,6 @@
-package ovh.herisson.Clyde.Tables.Inscription;
+package ovh.herisson.Clyde.Tables;
 
 import jakarta.persistence.*;
-import ovh.herisson.Clyde.Tables.RequestState;
-
 import java.util.Date;
 
 
@@ -17,16 +15,14 @@ public class InscriptionRequest {
     private String email;
     private String country;
     private Date birthDate;
+
     private Long curriculumId;
     private RequestState state;
     private String profilePicture;
-    private String password;
-    private String identityCard;
-    private Date submissionDate;
-    private RequestState equivalenceState;
-    public InscriptionRequest(){}
 
-    public InscriptionRequest(String lastName, String firstName, String address, String email, String country, Date birthDate,Long curriculumId, RequestState state, String profilePicture, String password, String identityCard, Date submissionDate, RequestState equivalenceState){
+    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){
         this.lastName = lastName;
         this.firstName = firstName;
         this.address = address;
@@ -37,9 +33,6 @@ public class InscriptionRequest {
         this.state = state;
         this.profilePicture = profilePicture;
         this.password = password;
-        this.identityCard = identityCard;
-        this.submissionDate = submissionDate;
-        this.equivalenceState = equivalenceState;
     }
 
     public int getId() {
@@ -125,28 +118,4 @@ public class InscriptionRequest {
     public void setPassword(String password) {
         this.password = password;
     }
-
-    public String getIdentityCard() {
-        return identityCard;
-    }
-
-    public void setIdentityCard(String identityCard) {
-        this.identityCard = identityCard;
-    }
-
-    public Date getSubmissionDate() {
-        return submissionDate;
-    }
-
-    public void setSubmissionDate(Date submissionDate) {
-        this.submissionDate = submissionDate;
-    }
-
-    public RequestState getEquivalenceState() {
-        return equivalenceState;
-    }
-
-    public void setEquivalenceState(RequestState equivalenceState) {
-        this.equivalenceState = equivalenceState;
-    }
 }

backend/src/main/java/ovh/herisson/Clyde/Tables/Msg/Discussion.java

@@ -1,72 +0,0 @@
-package ovh.herisson.Clyde.Tables.Msg;
-
-/******************************************************
- * @file Discussion.java
- * @author Anthony Debucquoy
- * @scope Extension messagerie
- *
- * Discussion allow to regroupe multiple user in and message together
- * for the messages application to work
- ******************************************************/
-
-
-import java.util.List;
-
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.OneToMany;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import ovh.herisson.Clyde.Tables.User;
-
-@Entity
-@Getter
-@Setter
-@NoArgsConstructor
-public class Discussion{
-
-	@Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-	private long id;
-	private String name;
-
-    @ManyToMany
-	@JoinTable(
-		name = "discussion_members",
-		joinColumns = @JoinColumn(name = "discussion_id"),
-		inverseJoinColumns = @JoinColumn(name = "user_id")
-	)
-	private List<User> members;
-
-	@OneToMany(mappedBy="discussion", orphanRemoval = true, cascade = CascadeType.ALL)
-	private List<Message> msgs;
-
-	public Discussion(String name){
-		this.name = name;
-	}
-
-	public Discussion(String name, User user){
-		this.name = name;
-		this.members = List.of(user);
-	}
-
-	public void addMessage(Message msg){
-		msg.setDiscussion(this);
-		msgs.add(msg);
-	}
-
-    public void addMember(User user) {
-		members.add(user);
-    }
-
-    public void delMember(User user) {
-		members.remove(user);
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/Tables/Msg/Message.java

@@ -1,66 +0,0 @@
-package ovh.herisson.Clyde.Tables.Msg;
-
-/******************************************************
- * @file Message.java
- * @author Anthony Debucquoy
- * @scope Extension messagerie
- *
- * Represent a message sent to a discussion
- ******************************************************/
-
-
-import org.hibernate.annotations.CreationTimestamp;
-import org.hibernate.annotations.UpdateTimestamp;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import java.util.Date;
-
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.PrePersist;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import ovh.herisson.Clyde.Tables.User;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Entity
-public class Message {
-	
-	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	private long id;
-	private String content; 
-
-	@CreationTimestamp
-	@Column(nullable = false)
-	private Date created;
-
-	@ManyToOne
-	private User author;
-
-	public User getAuthor() {
-        return author;
-    }
-
-    @OneToOne
-	private Message response;
-
-	@ManyToOne(optional = false)
-	@JsonIgnore
-	private Discussion discussion;
-	
-}

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

@@ -1,48 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-import java.util.Date;
-
-import org.hibernate.annotations.CreationTimestamp;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import jakarta.annotation.Nullable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@Entity
-public class Notification {
-
-	private enum Status {
-		Unread, 
-		Read,
-	}
-
-	@Id
-	private int id;
-	
-	private String subject;
-
-	private String body;
-
-	private Status status = Status.Unread;
-
-	private String link;
-
-	@ManyToOne
-	private User user;
-
-	@CreationTimestamp
-	private Date creation;
-
-	public Notification(String subject, @Nullable String body, @Nullable String link){
-		this.subject = subject;
-		this.body = body;
-		this.link = link;
-	}
-}

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

@@ -1,11 +1,8 @@
-package ovh.herisson.Clyde.Tables.Inscription;
+package ovh.herisson.Clyde.Tables;
 
 import jakarta.persistence.*;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
-import ovh.herisson.Clyde.Tables.Curriculum;
-import ovh.herisson.Clyde.Tables.RequestState;
-import ovh.herisson.Clyde.Tables.User;
 
 @Entity
 public class ReInscriptionRequest {

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

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

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

@@ -1,21 +1,11 @@
 package ovh.herisson.Clyde.Tables;
 
 import jakarta.persistence.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import ovh.herisson.Clyde.Tables.Msg.Discussion;
-import ovh.herisson.Clyde.Tables.Msg.Message;
-
 import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
 
 
 @Entity
 @Table(name = "Users")
-@NoArgsConstructor
-@Data
 public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
@@ -28,24 +18,8 @@ public class User {
     private String country;
     private Date birthDate;
     private String profilePictureUrl;
-    private Role role;
+    private ovh.herisson.Clyde.Tables.Role role;
-	@JsonIgnore
     private String password;
-
-	@JsonIgnore
-	@OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
-	private List<Notification> notifications; 
-
-	////// Extension Messagerie /////
-	@JsonIgnore
-	@OneToMany(mappedBy = "author", cascade = CascadeType.ALL)
-	private List<Message> msgs;
-
-	@JsonIgnore
-	@ManyToMany( mappedBy = "members" )
-	private List<Discussion> discussions;
-	/////////////////////////////////
-
     public User(String lastName, String firstName, String email, String address,
                 String country, Date birthDate, String profilePictureUrl, Role role, String password)
     {
@@ -73,4 +47,76 @@ public class User {
         this.password = password;
         this.role = Role.Student;
     }
+    public User() {}
+
+    public Long getRegNo(){
+        return this.regNo;
+    }
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public Date getBirthDate() {
+        return birthDate;
+    }
+
+    public void setBirthDate(Date birthDate) {
+        this.birthDate = birthDate;
+    }
+
+    public String getProfilePictureUrl(){return this.profilePictureUrl;}
+
+    public void setProfilePictureUrl(String profilePictureUrl){
+        this.profilePictureUrl = profilePictureUrl;
+    }
+    public ovh.herisson.Clyde.Tables.Role getRole() {
+        return role;
+    }
+
+    public void setRole(ovh.herisson.Clyde.Tables.Role role) {
+        this.role = role;
+    }
+    public String getPassword(){
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
 }

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

@@ -21,12 +21,9 @@ public class UserCurriculum {
     @OnDelete(action = OnDeleteAction.CASCADE)
     private Curriculum curriculum;
 
-    private int year;
+    public UserCurriculum(User user, Curriculum curriculum){
-
-    public UserCurriculum(User user, Curriculum curriculum, int year){
         this.user = user;
         this.curriculum = curriculum;
-        this.year = year;
     }
 
     public UserCurriculum() {}
@@ -50,12 +47,4 @@ public class UserCurriculum {
     public void setCurriculum(Curriculum curriculum) {
         this.curriculum = curriculum;
     }
-
-    public int getYear() {
-        return year;
-    }
-
-    public void setYear(int year) {
-        this.year = year;
-    }
 }

backend/src/main/resources/application.properties

@@ -1,12 +1,3 @@
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
-spring.sql.init.mode=always
+spring.sql.init.mode=always
-
-# spring.datasource.url=jdbc:postgresql://localhost:5442/clyde
-spring.datasource.url=jdbc:postgresql://db:5432/clyde
-spring.datasource.username=devel
-spring.datasource.password=devel
-
-# spring.config.activate.on-profile=prod
-# spring.datasource.url=jdbc:postgresql:clyde?socketFactory=org.newsclub.net.unix.AFUNIXSocketFactory$FactoryArg&socketFactoryArg=/var/run/postgresql/.s.PGSQL.5432
-# spring.datasource.username=clyde

compose.yaml

@@ -1,29 +0,0 @@
-services: 
-  db:
-    image: 'postgres:16'
-    environment:
-      - 'POSTGRES_DB=clyde'
-      - 'POSTGRES_USER=devel'
-      - 'POSTGRES_PASSWORD=devel'
-    # Uncomment this to allow connections to the db from outside the container
-    # ports: 
-    #   - '5442:5432'
-  back:
-    build: backend/.
-    ports:
-      - "8080:8080"
-    volumes:
-      - cdn:/backend/cdn
-    ulimits:
-      nofile:
-        soft: 65536
-        hard: 65536
-  front:
-    build: frontend/.
-    volumes:
-      - cdn:/app/front/dist/cdn
-    ports:
-      - "8000:8080"
-
-volumes:
-  cdn:

frontend/Dockerfile

@@ -1,11 +0,0 @@
-# https://v2.vuejs.org/v2/cookbook/dockerize-vuejs-app
-FROM node:lts-alpine
-RUN npm install -g http-server
-WORKDIR /app/front
-COPY package*.json ./
-RUN npm install
-COPY . .
-ENV VITE_CLYDE_MODE=container
-RUN npm run build
-EXPOSE 8080
-CMD [ "http-server", "dist" ]

frontend/public/i18n/EN.txt

@@ -52,4 +52,3 @@ Curriculum=curriculum
 Credits=Credits
 InscriptionService=I.S.
 faculty=Faculty
-msg.notification.new=You have a new message

frontend/public/i18n/FR.txt

@@ -52,4 +52,3 @@ Curriculum=Cursus
 Credits=Credits
 InscriptionService=S.I.
 faculty=Faculté
-msg.notification.new=Vous avez un nouveau message!

frontend/src/App.vue

@@ -3,7 +3,6 @@
   import { ref } from 'vue'
   import i18n, { setLang } from './i18n.js'
   import { isLogged } from '@/rest/Users.js'
-	import { notifications, fetchNotifications, archiveNotification } from '@/rest/notifications.js'
 
   import { appList, currentView } from '@/rest/apps.js'
 		var prevURL;
@@ -15,21 +14,16 @@ window.onhashchange = function() {
 }
 const Logged = ref(isLogged());
 
-if(Logged){
-	fetchNotifications();
-}
-
 window.addEventListener('hashchange', () => {
  if((location.hash === "#/home" && prevURL === "#/login") || (location.hash === "#/home" && prevURL === "#/profil")){
 		window.location.reload();
  }
 });
   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 notification = ref(false)
-
 
 	const apps = ref([])
 	appList().then(e => apps.value = e)
@@ -51,14 +45,11 @@ 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' : ''" style="margin-top: 7px; margin-bottom: 3px; "></div>
+                <div class="fa-solid fa-user" :style="Logged ? 'color: orange' : 'haha'" style="margin-top: 7px; margin-bottom: 3px; "></div>
             </a></li>
         <li style="float: right;" title=notifications>
-            <a class="icon" @click.cancel="notification = !notification">
+            <a class="icon" href="#Notifications">
-                <div class="fa-solid fa-bell" :style="notifications.length != 0 ? 'color:orange': '' " style="margin-top: 7px; margin-bottom: 3px;"></div>
+                <div class="fa-solid fa-bell"  style="margin-top: 7px; margin-bottom: 3px;"></div>
-										<ul v-if=notification id="notification">
-												<li v-for="notif in notifications"> {{ i18n(notif.subject) }} - {{ notif.body }}</li>	
-										</ul>
             </a></li>
         <li @click="active=!active" class="option"style="float: right;" title=settings>
             <a class="icon" >
@@ -227,6 +218,8 @@ window.addEventListener('hashchange', () => {
 		background-color: black;
 		border-radius:6px;
 		color:white;
+		transform: translate(0px ,1px);
+		
 	}
 
 	  ul.vertical:hover {
@@ -258,15 +251,6 @@ window.addEventListener('hashchange', () => {
 	  .clyde:hover{
 		  content: url("./assets/angry_clyde.png")
 	  }
-
-		#notification{
-			position: absolute;
-			top: 61px;
-			right: 0;
-			background-color: white;
-			width: 300px;
-			height: 600px;
-		}
     
 </style>
 

frontend/src/Apps/Inscription.vue

@@ -0,0 +1,111 @@
+<script setup>
+  import i18n from "@/i18n.js"
+  import {ref} from 'vue'
+  import {validateRegister, getAllRegisters } from '@/rest/ServiceInscription.js'
+
+  const requests = ref(await getAllRegisters());
+  console.log(requests);
+
+  async function upPage(id,review){
+    await validateRegister(id,review);
+    requests.value = await getAllRegisters();
+
+  }
+</script>
+
+
+
+<template> 
+  <div style='display:flex; justify-content:center; min-width:1140px;' v-for="item of requests">
+  <div class="bodu" v-if="item.state === 'Pending'">
+  <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/Inscription/AboutRequest.vue

@@ -1,132 +0,0 @@
-<script setup>
-import i18n from "@/i18n.js"
-import {getSelf, getUser} from '../../rest/Users.js'
-import {getcurriculum,getSomeonesCurriculumList} from "@/rest/curriculum.js";
-import {getRegisters} from "@/rest/ServiceInscription.js";
-import {get} from "jsdom/lib/jsdom/named-properties-tracker.js";
-import {getExternalCurriculumByInscrReq} from "@/rest/externalCurriculum.js";
-import {ref} from "vue";
-import ExternalCurriculumList from "@/Apps/Inscription/ExternalCurriculumList.vue";
-import {editEquivalenceState} from "@/rest/requests.js";
-
-const props = defineProps(['target']);
-const request = await getRegisters(props.target);
-const cursus = await getcurriculum(request.curriculum);
-const user = await getSelf();
-const list = ref(false);
-const externalCurriculum = await getExternalCurriculumByInscrReq(request.id)
-
-function getPP(){
-  if(request.profilePictureUrl === null){
-    return "/Clyde.png"
-  }
-  return request.profilePictureUrl;
-}
-
-async function editEquivalence(id, newstate){
-  await editEquivalenceState(id, newstate)
-}
-</script>
-
-<template>
-  <div class="body" v-if="list == false">
-    <div class="container">
-      <div class="profilPic">
-        <img class="subContainter" :src=getPP()>
-      </div>
-      <div class = "globalInfos">
-        <div class="infosContainer">
-          <div>
-            FirstName/Name : {{request.firstName}} {{request.lastName}}
-          </div>
-          <div>
-            E-mail: {{request.email}}
-          </div>
-          <div>
-            Adresse : {{request.address}}
-          </div>
-          <div>
-            Pays : {{request.country}}
-          </div>
-          <div>
-            Date de naissance : {{request.birthDate}}
-          </div>
-          <div>
-            Cursus voulu : BAB {{cursus.year}} {{cursus.option}}
-          </div>
-          <div v-if="cursus.year > 1">
-            <button style="background-color:rgb(105,05,105);margin-left: 5%" @click="list=!list" v-if="(user.role == 'Teacher' || user.role == 'Admin')&& request.equivalenceState == 'Pending'">See external curriculums</button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div v-if="list==true">
-    <ExternalCurriculumList :ext-curr-list="externalCurriculum" :inscr-req-id="request.id"></ExternalCurriculumList>
-    <div style="margin-left: 15%;margin-top: 5%;">
-      <button style="margin-left: 2%" @click="list = false;editEquivalence(request.id, 'Accepted'); request.equivalenceState='Accepted'">Accept Equivalence</button>
-      <button style="margin-left: 2%" @click="list = false;editEquivalence(request.id, 'Refused'); request.equivalenceState='Refused'">Refuse Equivalence</button>
-      <button style="margin-left: 2%" @click="list=false">Return to profile</button>
-    </div>
-  </div>
-</template>
-
-
-<style scoped>
-.container{
-  min-width:675px;
-  display:grid;
-  grid-template-columns:10vw 50vw;
-  grid-template-rows:200px auto;
-  column-gap:2.7%;
-  row-gap:45px;
-  grid-template-areas:
-  "profilPic globalInfos"
-  "minfos minfos";
-}
-
-.profilPic{
-  grid-area:profilPic;
-  width:100%;
-}
-
-.globalInfos {
-  grid-area:globalInfos;
-  align-self :center;
-
-}
-
-.body {
-  min-width:960px;
-  width:100%;
-  display:flex;
-  align-items:center;
-  justify-content:center;
-  margin-top:5%;
-}
-
-.subContainter{
-  width:100%;
-  background-color:rgb(50,50,50);
-  border-radius:20px;
-  border:4px solid black;
-}
-
-.infosContainer {
-  padding-bottom:50px;
-  border:2px solid black;
-  font-size:25px;
-  color:white;
-  padding:20px;
-  background-color:rgb(50,50,50);
-  border-radius:20px;
-}
-
-button{
-  font-size:15px;
-  height:50px;
-  width:100px;
-  border:none;
-  border-radius:20px;
-}
-</style>

frontend/src/Apps/Inscription/AboutStudent.vue

@@ -1,192 +0,0 @@
-<script setup>
-  import i18n from "@/i18n.js"
-  import {getUser} from '../../rest/Users.js'
-  import {getSomeonesCurriculumList} from "@/rest/curriculum.js";
-  import {ref} from "vue";
-  import ExternalCurriculumList from "@/Apps/Inscription/ExternalCurriculumList.vue";
-  import {getExternalCurriculumByUser} from "@/rest/externalCurriculum.js";
-
-  const props = defineProps(['target'])
-  const user = await getUser(props.target)
-  const UserCurriculum = await getSomeonesCurriculumList(props.target)
-  const externalcurrlist = await getExternalCurriculumByUser(user.regNo)
-  const extercurrlist = ref(false)
-
-  function getPP(){
-    if(user.profilePictureUrl === null){
-      return "/Clyde.png"
-    }
-    return user.profilePictureUrl
-  }
-
-  //Cette function renvoie l'année académique concernée si on est dans l'année 2023-2024 elle renvoie 2023
-  //car dans la db l'année scolaire 2023-2024 est representée juste par 2023 (le même système s'applique pour chaque années on prend la borne inférieure
-  function getYear(){
-    let date = new Date();
-    if (date.getMonth() <= 6){
-      return date.getFullYear()-1
-    }
-    return date.getFullYear()
-  }
-
-</script>
-
-<template>
-  <div class="body" v-if="extercurrlist==false">
-    <div class="container">
-      <div class="profilPic">
-        <img class="subContainter" :src=getPP()>
-      </div>
-      <div class = "globalInfos">
-        <div class="infosContainer">
-          <div>
-            FirstName/Name : {{user.firstName}} {{user.lastName}}
-          </div>
-          <div>
-            E-mail: {{user.email}}
-          </div>
-          <div>
-            Adresse : {{user.address}}
-          </div>
-          <div>
-            Pays : {{user.country}}
-          </div>
-          <div>
-            Date de naissance : {{user.birthDate}}
-          </div>
-          <div>
-            <button @click="extercurrlist=!extercurrlist">See external curriculums</button>
-          </div>
-        </div>
-      </div>
-      <div class="moreInfos">
-        <div class = "oldcursus">
-          <div class="listTitle">
-            Anciens Cursus
-          </div>
-          <div  class="listElement">
-            <div class=" containerElement" v-for="item in UserCurriculum.curriculumList">
-              <div class="year" v-if="parseInt(item.dateyear) !== getYear()">Bac {{item.year}}</div>
-              <div class="option" v-if="parseInt(item.dateyear) !== getYear()">{{item.option}}</div>
-              <div class="dateyear" v-if="parseInt(item.dateyear) !== getYear()">Année {{item.dateyear}}-{{item.dateyear+1}}</div>
-            </div>
-          </div>
-        </div>
-        <div class="newcursus">
-          <div class="listTitle">
-            Cursus Actuel
-          </div>
-          <div  class="listElement">
-            <div class=" containerElement" v-for="item in UserCurriculum.curriculumList" >
-                <div class="year" v-if="parseInt(item.dateyear) === getYear()">Bac {{item.year}}</div>
-                <div class="option" v-if="parseInt(item.dateyear) === getYear()">{{item.option}}</div>
-                <div class="dateyear" v-if="parseInt(item.dateyear) === getYear()">Année {{item.dateyear}}-{{item.dateyear+1}}</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div v-if="extercurrlist==true">
-      <ExternalCurriculumList :ext-curr-list="externalcurrlist"></ExternalCurriculumList>
-  </div>
-</template>
-
-
-<style scoped>
-.container{
-  min-width:675px;
-  display:grid;
-  grid-template-columns:10vw 50vw;
-  grid-template-rows:200px auto;
-  column-gap:2.7%;
-  row-gap:45px;
-  grid-template-areas:
-  "profilPic globalInfos"
-  "minfos minfos";
-}
-
-.profilPic{
-  grid-area:profilPic;
-}
-
-.globalInfos {
-  grid-area:globalInfos;
-  align-self :center;
-
-}
-
-.body {
-  min-width:960px;
-  width:100%;
-  display:flex;
-  align-items:center;
-  justify-content:center;
-  margin-top:5%;
-}
-
-.subContainter{
-  width:100%;
-  background-color:rgb(50,50,50);
-  border-radius:20px;
-  border:4px solid black;
-}
-
-.infosContainer {
-  padding-bottom:50px;
-  border:2px solid black;
-  font-size:25px;
-  color:white;
-  padding:20px;
-  background-color:rgb(50,50,50);
-  border-radius:20px;
-}
-
-.moreInfos {
-  display:grid;
-  grid-template-rows:200px auto;
-  column-gap:50px;
-  row-gap:45px;
-  grid-template-areas:
-  "minfos minfos";
-  grid-template-columns:600px 600px;
-  align-items:center;
-  justify-content:center;
-  margin-left: 320%;
-}
-
-.listTitle{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width:250px;
-  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;
-}
-
-.listElement{
-  border:2px solid black;
-  font-size:25px;
-  color:white;
-  padding:20px;
-  background-color:rgb(50,50,50);
-  border-radius:20px;
-  margin-bottom:10px;
-}
-
-.containerElement{
-  justify-content:center;
-  display:grid;
-  grid-template-columns:100px 100px 300px;
-  grid-template-areas:
-    "year option dateyear";
-  column-gap:40px;
-  padding-left: 25px;
-}
-</style>

frontend/src/Apps/Inscription/CourseList.vue

@@ -1,139 +0,0 @@
-<script setup>
-
-import {reactive, ref} from "vue";
-import i18n from "@/i18n.js";
-import {getCourse} from "@/rest/courses.js";
-import {getcurriculum} from "@/rest/curriculum.js";
-import {uploadFile, uploadProfilePicture} from "@/rest/uploads.js";
-import {createExemptionsRequest} from "@/rest/requests.js";
-import {getSelf} from "@/rest/Users.js";
-
-const props = defineProps(["cursuslist"])
-const selectedCurriculum = ref(props.cursuslist[0])
-const user = await getSelf()
-
-const courseslist = ref(await getcurriculum(selectedCurriculum.value.curriculumId))
-const list = ref(true)
-
-const ppData = ref({})
-async function updateCourseList(){
-  courseslist.value = await getcurriculum(selectedCurriculum.value.curriculumId)
-}
-
-async function postExemptionRequest(file, type){
-  const a = await uploadFile(file, type);
-  exemptReq.justifDocument = a.url
-  await createExemptionsRequest(exemptReq)
-}
-const exemptReq = reactive({
-  userRegNo : user.regNo,
-  courseId : null,
-  justifDocument : "",
-})
-</script>
-
-<template style="margin-top:5%;">
-  <div v-if="list == true">
-    <span>Selected Cursus :   </span>
-    <select v-model="selectedCurriculum" @change="updateCourseList">
-      <option v-for="item in props.cursuslist" :value="item">Bac {{item.year}} {{item.option}}</option>
-    </select>
-    <div style="display:flex; justify-content:center;" v-for="item in courseslist.courses">
-      <div class="bodu">
-        <div class="container">
-          <div class="title">{{item.title}}</div>
-          <div class="firstname">{{item.owner.firstName}}</div>
-          <div class="lastname">{{item.owner.lastName}}</div>
-          <div class="credits">credits : {{item.credits}}</div>
-          <div class="askexemption"><button style="background-color:rgb(105,0,0);" @click="list= !list;exemptReq.courseId=item.courseId">Ask exemption</button></div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div v-else>
-      <p>Please upload the justification document for the exemption </p>
-    <label class="browser">
-      <input  type="file" @change="ppData.value = $event.target.files" accept="image/*" ref="filepath">
-    </label>
-    <button style="width:15%; margin-top: 5%;" @click="postExemptionRequest(ppData.value, 'JustificationDocument');">
-      Submit exemption request
-    </button>
-  </div>
-</template>
-
-<style scoped>
-.container{
-  color:white;
-  height:100px;
-  font-size:30px;
-  display:grid;
-  grid-template-columns:30% 20% 15% 15% 15%;
-  grid-template-areas:"title firstname lastname credits askexemption";
-  column-gap:10px;
-}
-
-.title {
-  grid-area:title;
-  align-self:center;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow:ellipsis;
-  font-size: 50%;
-  margin-left:30px;
-}
-
-.credits {
-  grid-area:credits;
-  align-self:center;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow:ellipsis;
-  font-size: 50%;
-}
-
-.askexemption {
-  grid-area:askexemption;
-  align-self:center;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow:ellipsis;
-}
-.lastname{
-  grid-area:lastname;
-  align-self:center;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow:ellipsis;
-  font-size: 50%;
-}
-
-
-.firstname{
-  grid-area:firstname;
-  align-self:center;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow:ellipsis;
-  font-size: 50%;
-  padding-left: 30%;
-}
-
-
-.bodu {
-  margin-top:2%;
-  width:100%;
-  border:2px solid black;
-  border-radius:9px;
-  background-color:rgb(50,50,50);
-}
-
-button{
-  border:none;
-  background-color:rgb(239, 60, 168);
-  border-radius:10px;
-  height:35px;
-  margin-top:10px;
-
-}
-</style>
-

frontend/src/Apps/Inscription/ExternalCurriculumList.vue

@@ -1,87 +0,0 @@
-<script setup>
-  import i18n from "@/i18n.js";
-  import {ref} from "vue";
-
-  const props = defineProps(["extCurrList"])
-
-  const extCurrList = ref(props.extCurrList)
-  console.log(extCurrList)
-</script>
-
-<template style="margin-top:5%;">
-  <div style="display:flex; justify-content:center; " v-for="item in extCurrList">
-    <div class="bodu">
-      <div class="container">
-        <div class="status"><a style="margin-left:30px">{{item.state}}</a></div>
-        <div class="school"><a>{{item.school}}</a></div>
-        <div class="formation"><a>{{item.formation}}</a></div>
-        <div class="completion"><a>{{item.completion}}</a></div>
-        <div class="download"><button>Download document</button></div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<style scoped>
-.container{
-  color:white;
-  height:100px;
-  font-size:30px;
-  display:grid;
-  grid-template-columns:15% 10% 20% 15% 13.1%;
-  grid-template-areas:
-    "status school formation completion download";
-  column-gap:10px;
-}
-
-.status {
-  grid-area:status;
-  align-self:center;
-  font-size: 70%;
-}
-
-.school{
-  grid-area:school;
-  align-self:center;
-  font-size: 70%;
-}
-
-.formation{
-  grid-area:formation;
-  align-self:center;
-  font-size: 70%;
-}
-
-.completion{
-  grid-area:completion;
-  align-self:center;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow:ellipsis;
-  font-size: 70%;
-}
-
-.download{
-  grid-area: download;
-  align-self:center;
-}
-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/Inscription/ManageRequests.vue

@@ -1,196 +0,0 @@
-<script setup>
-  import i18n from "@/i18n.js"
-  import {ref} from 'vue'
-  import {validateRegister, getAllRegisters } from '@/rest/ServiceInscription.js'
-  import AboutRequest from "@/Apps/Inscription/AboutRequest.vue";
-  import {getAllExemptionsRequest, getAllScholarShipsRequest} from "@/rest/requests.js";
-
-  const requests = ref(await getAllRegisters());
-  let targetId = "";
-
-  const requestType = ref("inscription");
-  const filterType = ref("None");
-
-  //0 = liste, 1 = détails, 2 = sure?
-  let windowsState = ref(0);
-
-  async function upPage(id,review){
-    await validateRegister(id,review);
-
-    requests.value = await getAllRegisters();
-  }
-
-  async function loadRequests(){
-    if (requestType.value === "inscription"){
-      requests.value = await getAllRegisters();
-    }
-    if (requestType.value === "scholarship"){
-      requests.value = await getAllScholarShipsRequest();
-    }
-    if(requestType.value === "exemption"){
-      requests.value = await getAllExemptionsRequest();
-    }
-  }
-</script>
-
-
-
-<template>
-  <div v-if="windowsState === 1">
-    <AboutRequest :target="targetId"></AboutRequest>
-  </div>
-  <div v-if="windowsState === 0">
-    <div style="margin-top: 2%;margin-left: 2%">
-      <span>Request type :   </span>
-      <select v-model="requestType" @change="loadRequests()">
-        <option>inscription</option>
-        <option>scholarship</option>
-        <option>exemption</option>
-      </select>
-      <span style="margin-left: 5%">
-        Filter :
-        <select v-model="filterType">
-          <option>None</option>
-          <option>Pending</option>
-          <option>Accepted</option>
-          <option>Refused</option>
-      </select>
-      </span>
-    </div>
-    <div style='display:flex; justify-content:center; min-width:1140px;' v-for="item of requests">
-      <div class="bodu" style="width: 95%" v-if="filterType == 'None' || filterType == item.state">
-        <div class="container" style="grid-template-columns:11% 15% 20% 10% 10% 9% 9%;grid-template-areas:'date state equivalencestate surname firstname accept refuse infos';" v-if="requestType === 'inscription'">
-          <!--
-            The condition below avoids an error occuring because loadRequests() finishes after the vue refresh
-            then submissionDate is undefined an it triggers an error in the console despite the fact that it is working
-            properly at the end.
-           -->
-          <div class="date" v-if="item.submissionDate !== undefined">{{item.submissionDate.slice(0, 10)}}</div>
-          <div class="state" style="font-size: 80%">Approval : {{item.state}}</div>
-          <div class="equivalencestate" style="font-size: 80%">Teacher approval : {{item.equivalenceState}}</div>
-          <div class="surname">{{item.lastName}}</div>
-          <div class="firstname">{{item.firstName}}</div>
-          <div class="accept" v-if="item.state === 'Pending'"><button @click="windowsState=2;targetId=item.id;" style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div>
-          <div class="refuse" v-if="item.state === 'Pending'"><button @click="upPage(item.id,'Refused')" style="background-color:rgb(105,0,0);">{{i18n("request.refuse")}}</button></div>
-          <div class="infos"><button style="background-color:rgb(105,05,105);" @click="targetId=item.id;windowsState=1;">{{i18n("request.moreInfos")}}</button></div>
-        </div>
-        <div class="container" style="grid-template-columns:25% 15% 15% 25% 14.2%;grid-template-areas:'date reqState studentfirstname studentlastname  infos';" v-if="requestType === 'scholarship'">
-          <div class="date" v-if="item.date !== undefined"> {{item.date.slice(0,10)}}</div>
-          <div class="studentfirstname">{{item.user.firstName}}</div>
-          <div class="studentlastname">{{item.user.lastName}}</div>
-          <div class="reqState">{{item.state}}</div>
-          <div class="infos"><button>More infos</button></div>
-        </div>
-        <div class="container" style="grid-template-columns:17% 15% 12% 15% 25%;grid-template-areas:'date reqState studentfirstname studentlastname course infos';"v-if="requestType === 'exemption'">
-          <div class="date" v-if="item.date != undefined">{{item.date.slice(0,10)}}</div>
-          <div class="studentfirstname">{{item.user.firstName}}</div>
-          <div class="studentlastname">{{item.user.lastName}}</div>
-          <div class="course">{{item.course.title}}</div>
-          <div class="reqState">{{item.state}}</div>
-          <div class="infos"><button>More infos</button></div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div style='display:flex; justify-content:center; min-width:1140px;margin-top: 10%' v-if="windowsState === 2">
-    <p>Etes vous sur de vouloir accepter cette demande ?</p>
-    <button style="background-color:rgb(105,05,105);" @click="upPage(targetId,'Accepted');windowsState=0;">Valider</button>
-    <button style="background-color:rgb(105,05,105);" @click="windowsState=0;">Retour</button>
-  </div>
-</template>
-
-<style scoped>
-  .container{
-    color:white;
-    height:100px;
-    font-size:20px;
-    display:grid;
-    column-gap:10px;
-  }
-
-  .equivalencestate{
-    grid-area: equivalencestate;
-    align-self: center;
-  }
-  .studentfirstname{
-    grid-area: studentfirstname;
-    align-self: center;
-  }
-
-  .studentlastname{
-    grid-area: studentlastname;
-    align-self: center;
-  }
-
-  .course{
-    grid-area: course;
-    align-self: center;
-  }
-  .reqState{
-    grid-area: reqState;
-    align-self: center;
-  }
-  .infos {
-    grid-area:infos;
-    align-self:center;
-  }
-
-  .accept{
-    grid-area:accept;
-    align-self:center;
-  }
-
-  .refuse{
-    grid-area:refuse;
-    align-self:center;
-  }
-
-  .date{
-    grid-area:date;
-    margin-left:40px;
-    align-self:center;
-  }
-
-  .state{
-    grid-area:state;
-    margin-left:40px;
-    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,16 +1,16 @@
 <script setup>
   import {reactive, ref } from 'vue'
   import i18n from '@/i18n.js'
-  import {login, register, disconnect, isLogged} from '@/rest/Users.js'
+  import { login , register , disconnect, isLogged} from '@/rest/Users.js'
-  import {getAllCurriculums, getcurriculum} from '@/rest/curriculum.js'
+  import { getAllCurriculums } from '@/rest/curriculum.js'
   import { uploadProfilePicture } from '@/rest/uploads.js'
   import {toast} from 'vue3-toastify'
   import 'vue3-toastify/dist/index.css';
-  import {createExternalCurriculum} from "@/rest/externalCurriculum.js";
+
 
   const loginPage= ref(true)
   const page = ref(0)
-
+  
   const outputs = reactive({
     surname:null,
     firstname:null,
@@ -20,32 +20,13 @@
     address:null,
     country:null,
     curriculum:null,
-    equivalenceState: "Unrequired"
   })
 
-  const notcompletedCheck = ref(false);
-
-  const externalCurr = reactive({
-    inscriptionRequestId : null,
-    school:null,
-    formation :null,
-    completion : null,
-    startYear : null,
-    endYear: null,
-    justifdocUrl : null
-  })
-
-  //Stores some externalCurriculums in order to upload them all at the confirmation of the registration request
-  const externalCurrTab = ref([]);
-
   const submitValue= ref(i18n("login.guest.submit"))
   const passwordConfirm=ref("")
  
   const imageSaved = ref(false)
-  let ppData = ""
+  const ppData = ref(false)
-
-  //Contains the id of the newly created request (useful to link the student's formations informations to the request)
-  let requestId = ""
 
   const curricula= await getAllCurriculums();
   
@@ -69,39 +50,8 @@
   disconnect();
   window.location.reload();}
 
-  async function uploadPP(arg){
+  
-    const data = await uploadProfilePicture(arg);
-    ppData = data.url;
-  }
 
-  //This functions makes the distinction between a master cursus (year 4 or more) and a bachelor cursus (year 3 or less)
-  function getCursusDisplay(cursus){
-    if (cursus.year <= 3){
-      return "BAB " + cursus.year + " " + cursus.option;
-    }else{
-      return "MA" + (parseInt(cursus.year)-3).toString() + " " + cursus.option;
-    }
-  }
-
-  async function getCurriculumYear(curriculumId){
-    const curriculum = await getcurriculum(curriculumId);
-    return parseInt(curriculum.year);
-  }
-
-
-
-  //Post the register request and return the id of the newly created request and also post the external curriculum list in the database
-  async function postRegisterReq(){
-    const val = await register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData, null, new Date(), outputs.equivalenceState);
-    for (let item in externalCurrTab.value){
-      await createExternalCurriculum(val.id, externalCurrTab.value[item].school, externalCurrTab.value[item].formation, externalCurrTab.value[item].completion, externalCurrTab.value[item].startYear, externalCurrTab.value[item].endYear, externalCurrTab.value[item].justifdocUrl);
-    }
-  }
-
-
-  function deleteExtCursus(extcursus){
-    externalCurrTab.value.splice(externalCurrTab.value.indexOf(extcursus),1)
-  }
 </script>
 
 
@@ -166,7 +116,7 @@
                 <a>{{i18n("login.guest.alregister")}}</a>
               </div>
             </div>
-            <div v-if="page === 1">
+            <div v-else>
               <div class="inputBox">
                 <p>{{i18n("login.guest.email")}}</p>
                 <input type="mail" v-model="outputs.email">
@@ -179,30 +129,23 @@
                 <p>{{i18n("login.guest.country")}}</p>
                 <input type="text" v-model="outputs.country">
               </div>
-              <form class="inputBox" novalidate enctype="multipart/form-data">
+              <form class="inputBox"novalidate enctype="multipart/form-data">
               	<p>{{i18n("profile.picture").toUpperCase()}}</p>
-              </form>
               <label class="browser">
                 Parcourir . . .
 				        <input  type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*">
               </label>
-              <form novalidate enctype="multipart/form-data" class="inputBox">
-              	<p>{{i18n("profile.picture").toUpperCase()}}</p>
-				        <input type="file" @change="uploadPP($event.target.files); imageSaved = true;" accept="image/*">
               </form>
               <div class="inputBox">
                 <p>{{i18n("Curriculum").toUpperCase()}}</p> 
                   <select v-model="outputs.curriculum">
-                    <option v-for="item in curricula" :value="item.curriculumId">{{getCursusDisplay(item)}}</option>
+                    <option v-for="item in curricula">{{item.curriculumId}}</option>
+                    
                   </select>
               </div>
-              <p style="color:rgb(239,60,168);">
-                Si vous êtes déja inscrits dans cette université veuillez vous connecter a votre compte et utilisez les fonctions
-                changer de cursus/réinscription sinon continuez ici.
-              </p>
               <div style="align-self:center;" class="inputBox">
-                <button style="margin-top:25px;" @click="page++;">
+                <button style="margin-top:25px;" @click="register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData);">
-                  {{i18n("login.guest.nextpage")}}
+                  {{i18n("login.guest.submit")}}
                 </button>
               </div>
               <div  class="switchpage">
@@ -212,69 +155,10 @@
                 <a>{{i18n("login.guest.alregister")}}</a>
               </div>
             </div>
-            <div v-if="page === 2">
-              <form novalidate enctype="multipart/form-data" class="inputBox">
-                Carte d'identité :
-              </form>
-              <button @click="page++">{{i18n("login.guest.nextpage")}}</button>
-            </div>
-            <div v-if="page === 3">
-              <p>
-                Vous avez séléctionné un cursus qui possède des prérequis veuillez ajouter vos formations antérieures
-                dans l'enseignement supérieur, votre dossier sera vérifié par un membre du service d'inscription.
-              </p>
-              <button @click="page++">Ajouter une formation</button>
-              <button @click="postRegisterReq();">Envoyer la demande d'inscription</button>
-            </div>
-            <div v-if="page===4">
-              <form @submit.prevent=""class="form">
-                <div class="inputBox">
-                  <p>Ecole</p>
-                  <input type="text" v-model="externalCurr.school">
-                </div>
-                <div class="inputBox">
-                  <p>Formation</p>
-                  <input type="text" v-model="externalCurr.formation">
-                </div>
-                <div class="inputBox">
-                  <p>Cochez la case si vous n'avez terminé cette formation</p>
-                  <input v-model="notcompletedCheck" type="checkbox" id="checkboxformation">
-                  <div v-if="notcompletedCheck">
-                    <p>En quelle année de la formation vous êtes vous arrété (exemple: 3ème) ?</p>
-                    <input type="text" v-model="externalCurr.completion">
-                  </div>
-                </div>
-                <div class="inputBox">
-                  <p>Année de début</p>
-                  <input type="text" v-model="externalCurr.startYear">
-                </div>
-                <div class="inputBox">
-                  <p>Année de fin</p>
-                  <input type="text" v-model="externalCurr.endYear">
-                </div>
-                <div class="inputBox" style="margin-bottom:35px;">
-                  <input type="submit" v-model="submitValue" @click="externalCurrTab.push({inscriptionReqId:null, school:externalCurr.school, formation:externalCurr.formation, completion:externalCurr.completion, startYear:externalCurr.startYear, endYear:externalCurr.endYear, justifdocUrl:externalCurr.justifdocUrl});console.log(externalCurrTab);page--;">
-                </div>
-              </form>
-            </div>
           </form>
          </div>
     </div>
   </div>
-  <div style="display:flex; justify-content:center; " v-for="item in externalCurrTab" v-if="page===3">
-    <div class="bodu">
-      <div class="container">
-        <div class="school"><a style="margin-left:30px;">{{item.school}}</a></div>
-        <div class="formation"><a>{{item.formation}}</a></div>
-        <div class="edit">
-          <button style="background-color:rgb(105,05,105);font-size:15px;height:50px;width:75%;border:none;border-radius:20px;" @click="externalCurr.school=item.school; externalCurr.completion=item.completion; externalCurr.formation=item.formation;externalCurr.endYear=item.endYear; externalCurr.startYear=item.startYear; externalCurr.justifdocUrl;page++;">Edit </button>
-        </div>
-        <div class="remove">
-          <button style="background-color:rgb(105,05,105);font-size:15px;height:50px;width:75%;border:none;border-radius:20px;" @click="deleteExtCursus(item)">Remove </button>
-        </div>
-      </div>
-    </div>
-  </div>
 </template>
 
 <style scoped>
@@ -283,14 +167,13 @@
   margin-left: auto;
   margin-right:auto;
   min-width:400px;
-  width:25%;
-  height:50%;
-}
 
+  width:25%;
+  height:60%;
+}
 
 .loginBox {
   background-color: rgb(24,24,24);
-  width: 400px;
   display:flex;
   justify-content: center;
   border-radius: 5%;
@@ -325,7 +208,7 @@
   z-index: 100;
   font-family:sans-serif ; 
   color:rgb(239,60,168);
-  transition: 0.5;
+  transition:0.5;
 
 }
 
@@ -337,16 +220,9 @@
   cursor: pointer;
 }
 
-.bodu {
-  margin-top:2%;
-  width:50%;
-  border:2px solid black;
-  border-radius:9px;
-  background-color:rgb(50,50,50);
-}
-
 .switchpage{
   width:100px;
+  background:rgb(255, 0 255);
   border: none;
   padding-right:0;
   padding-top:10px;
@@ -354,7 +230,7 @@
   outline:none;
   border-radius: 4px;
   font-size:0.8em;
-  align-self: right;
+  align-self:right;
 
 }
 
@@ -384,22 +260,11 @@ input[type=file]{
   background:#FFFFFF;
 }
 
-.container{
-  margin-top: 2%;
-  color:white;
-  height:60px;
-  font-size:30px;
-  display:grid;
-  grid-template-columns:30% 30% 20% 20%;
-  grid-template-areas:
-    "school formation completion edit remove";
-  column-gap:10px;
-}
-
 button:active ,.switchpage:active{
   opacity:0.8;
 
 }
 
 
+
 </style>

frontend/src/Apps/Msg.vue

@@ -1,213 +0,0 @@
-<!----------------------------------------------------
-	File:  Msg.vue
-	Author: Anthony Debucquoy
-	Scope: Extension messagerie
-	Description: Main msg page
------------------------------------------------------>
-
-<script setup>
-	import { ref, reactive } from 'vue'
-	import { discussionsList, currentDiscussion, fetchDiscussion, createDiscussion, sendMessage, updateDiscussionName, invite, removeMember} from '@/rest/msg.js'
-
-	const msgContent = ref("");
-	const addMember = ref(false);
-	const currentTitle = ref("");
-
-	function formatTime(date){
-		return date.getHours() + ":" + date.getMinutes() + " " + date.getDate() + "/" + date.getMonth();
-	}
-
-</script>
-
-<template>
-	<div id="msg">
-		<div id="discList">
-			<div @click="fetchDiscussion(discussion.id).then(e => currentTitle = currentDiscussion.name)" class="discItem" v-for="discussion in discussionsList" :key="discussion.id">{{ discussion.name }}</div>
-			<button id="createDiscussion" @click="createDiscussion('New Discussion')">+</button>
-		</div>
-		<div id="discussion" v-if="currentDiscussion.length != 0">
-			<h1 id=msgName ><input class="InputTitle" type="text" @change="updateDiscussionName(currentDiscussion.id, currentTitle)" v-model="currentTitle"></h1>
-			<div id=msgs>
-				<div class="msg" v-for="msg in currentDiscussion.msgs" :sender="msg.sender" :key="msg.id">
-					{{ msg.content }}<br/>
-					<span class="sender"><span v-if="!msg.sender">{{ msg.author.firstName }} {{ msg.author.lastName.toUpperCase() }}</span> {{formatTime(new Date(msg.created))}}</span>
-				</div>
-			</div>
-			<div id=messageBox>
-				<input type="text" @keyup.enter="sendMessage(currentDiscussion.id, msgContent, null); msgContent = ''" v-model="msgContent">
-				<input type="submit" @click="sendMessage(currentDiscussion.id, msgContent, null); msgContent = ''" value="send">
-			</div>
-		</div>
-		<div id="members" v-if="currentDiscussion.length != 0">
-			<div class="memberItem" v-for="member in currentDiscussion.members" @click="removeMember(currentDiscussion.id, member.regNo)" :key="member.id"><span>{{ member.firstName }} {{ member.lastName.toUpperCase() }}</span></div>
-			<input type=text id="addMembers" @focus="addMember = true" @blur="addMember = false;$event.target.value = ''" @change="invite(currentDiscussion.id, $event.target.value)" :placeholder="addMember ? 'Regno' : '+'"/>
-		</div>
-	</div>
-</template>
-
-<style scoped>
-
-div#msg{
-	position: relative;
-	width: 100%;
-	height: 100%;
-
-	display: grid;
-	grid-template-columns: 20% auto 10%;
-}
-
-div#discList{
-	margin: 30px 0 30px 30px;
-	background-color: rgba(255, 255, 255, 0.05);
-	border-radius: 10px;
-	overflow: hidden;
-	padding: 10px;
-	display: flex;
-	flex-direction: column;
-}
-
-div#members{
-	margin: 30px 0;
-	border-radius: 10px 0 0 10px;
-	background-color: red;
-	background-color: rgba(255, 255, 255, 0.05);
-	overflow: hidden;
-	display: flex;
-	padding: 10px 0 0 10px;
-	flex-direction: column;
-}
-
-.InputTitle{
-	all: inherit;
-	margin: auto;
-}
-
-.discItem{
-	color: darkorange;
-	display: flex;
-	font-family: sans-serif;
-	font-weight: bold;
-	height: 4vh;
-	margin: 5px;
-	border-radius: 0 30px 30px 0;
-	align-items: center;
-	justify-content: center;
-	border: 1px solid darkorange;
-}
-
-.memberItem{
-	color: darkorange;
-	display: flex;
-	font-family: sans-serif;
-	font-weight: bold;
-	height: 4vh;
-	margin: 5px;
-	border-radius: 30px 0 0 30px;
-	align-items: center;
-	justify-content: center;
-	border: 1px solid darkorange;
-}
-
-.memberItem:hover span{
-	display: none;
-}
-
-.memberItem:hover{
-	background-color: red;
-}
-
-.memberItem:hover:before{
-	color: white;
-	content: "X"
-}
-
-#createDiscussion{
-	height: 4vh;
-	margin: 5px;
-	color: white;
-	background-color: green;
-	border-radius: 0 30px 30px 0;
-	border: none;
-	font-weight: 900;
-	font-size: 2em;
-}
-#addMembers{
-	height: 4vh;
-	margin: 5px;
-	text-align: center;
-	color: white;
-	background-color: green;
-	border-radius: 30px 0 0 30px;
-	border: none;
-	font-weight: 900;
-	font-size: 2em;
-}
-
-div#discussion{
-	display: flex;
-	flex-direction: column;
-	margin: 30px;
-	background-color: rgba(255, 255, 255, 0.05);
-	border-radius: 10px;
-	overflow: hidden;
-}
-
-#msgName{
-	text-align: center;
-	display: block;
-	background-color: #2a1981;
-	border-radius: 5px;
-	color: white;
-	width: 75%;
-	margin: 30px auto;
-}
-
-.discItem:hover{
-	background-color: gray;
-}
-
-#msgs{
-	display: flex;
-	flex-grow: 1;
-	flex-direction: column;
-}
-
-.msg {
-	background-color: aliceblue;
-	font-family: sans-serif;
-	margin: 10px;
-	padding: 5px;
-	border-radius: 3px;
-	max-width: 50%;
-	align-self: start;
-}
-
-.sender{
-	display: inline-block;
-	color: gray;
-	font-size: 0.5em;
-}
-
-.msg[sender=true]{
-	background-color: darkorange;
-	align-self: end;
-}
-
-#messageBox{
-	width: 100%;
-	height: 30px;
-	background-color: white;
-	display: flex;
-}
-
-#messageBox input[type="text"]{
-	all: inherit;
-	padding: 0 10px;
-}
-
-#messageBox input[type="submit"]{
-	border: inherit;
-	padding: 0 10px;
-}
-
-</style>

frontend/src/Apps/Profil.vue

@@ -1,22 +1,16 @@
 <script setup>
   import {reactive, ref } from 'vue'
   import {getSelf,alterSelf,disconnect,deleteUser} from '../rest/Users.js'
-  import {getSelfCurriculum, getAllCurriculums, getSomeonesCurriculumList} from '../rest/curriculum.js'
+  import {getSelfCurriculum, getAllCurriculums} from '../rest/curriculum.js'
   import {getCourses} from "../rest/courses.js"
   import i18n from "@/i18n.js"
-  import {uploadFile, uploadProfilePicture} from '@/rest/uploads.js'
+  import { uploadProfilePicture } from '@/rest/uploads.js'
-  import CourseList from "@/Apps/Inscription/CourseList.vue";
-  import {editMinerval, getCurrentMinerval} from "@/rest/minerval.js";
-  import {postPayment} from "@/rest/payment.js";
-  import {addUninscReq, createScholarshipRequest} from "@/rest/requests.js";
 
   const user = ref(await getSelf());
   const UserCurriculum = ref(""); 
   const curricula = ref (await getAllCurriculums());
-  const minerv = ref({});
   if(user.value.role === "Student"){
-    minerv.value = ref(await getCurrentMinerval(user.value.regNo));
+    UserCurriculum.value = await getSelfCurriculum();
-    UserCurriculum.value = await getSomeonesCurriculumList(user.value.regNo);
   }
 
   if(user.role === "Teacher"){
@@ -25,13 +19,6 @@
   const modif = ref(false);
   const curric = ref(false);
   const reg = ref(false);
-  const courseslist = ref(false);
-  const minerval = ref(false);
-  const paymentPage = ref(false);
-  const scholarship = ref(false);
-  const scholarshipinfos = ref(false);
-  const uninscr = ref(false);
-  const sure = ref(0);
 
   const pattern = {
     profilPictureUrl:null,
@@ -47,32 +34,7 @@
     id:null,
   }
 
-  //Used to modelize a payment
+  
-  const paymentData={
-    studentRegNo: user.value.regNo,
-    date:null,
-    card:null,
-    client:null,
-    expDate:null,
-    amount: null
-  }
-
-  //Used to modelize a scholarship request
-  const scholarshipData=reactive({
-    userId: user.value.regNo,
-    state:null,
-    date:null,
-    amount:0,
-    taxDocUrl : "",
-    residencyDocUrl : ""
-  })
-
-  //Used to post a uninscription request
-  const uninscriptionData = reactive({
-    reason : null,
-    userId : user.value.regNo
-  })
-  const paymentAmount = ref(0);
   let toModify= Object.assign({}, pattern);
   let personnalInfos =  Object.assign({}, patternInfos);
   
@@ -124,47 +86,17 @@
     }
     return user.profilePictureUrl
   }
-
-  function getYear(){
-    let date = new Date();
-    if (date.getMonth() <= 6){
-      return date.getFullYear()-1
-    }
-    return date.getFullYear()
-  }
-
-  //This function travels through the student cursus array and extract the current cursus of the student
-  function getActualCurriculumList(){
-    let actualCurriculumList = [];
-    for (let i = 0; i < UserCurriculum.value.curriculumList.length; i++){
-      if (UserCurriculum.value.curriculumList[i].dateyear === getYear()){
-        actualCurriculumList.push(UserCurriculum.value.curriculumList[i]);
-      }
-    }
-    return actualCurriculumList
-  }
-
-  async function postScholarshipRequest(file1, type1, file2, type2){
-    const a = await uploadFile(file1, type1)
-    scholarshipData.taxDocUrl =  a.url;
-
-    const b = await uploadFile(file2, type2)
-    scholarshipData.residencyDocUrl = b.url;
-
-    scholarshipData.date = Date.now();
-
-    await createScholarshipRequest(scholarshipData)
-  }
 </script>
 
 <template>
   <div class="body">
-  <div class="container" v-if="courseslist == false">
+  <div class="container">
     <div class="profilPic">
       <img class="subContainter" :src=getPP()>
+
     </div>
       <div class="globalInfos">
-        <div v-if="modif==false && curric==false && reg==false && minerval==false && paymentPage == false && scholarship==false && uninscr == false" class="infosContainer">
+        <div v-if="modif==false && curric==false && reg==false " class="infosContainer" >
           <div>
             {{user.firstName}} {{user.lastName}}   
           </div>
@@ -182,87 +114,11 @@
           </div>
           <div v-if="(user.role==='Student')">
             <button @click="reg=!reg">{{i18n("profile.reRegister")}}</button>
-            <button @click="uninscr = !uninscr" style="float:right;background-color:rgb(150,0,0);">{{i18n("profile.unRegister")}}</button>
+            <button @click="unRegister()" style="float:right;background-color:rgb(150,0,0);">{{i18n("profile.unRegister")}}</button>
           </div>
           <div v-if="(user.role==='Student')">
             <button @click="curric=!curric">{{i18n("profile.change.curriculum")}}</button>
           </div>
-          <div v-if="(user.role==='Student')">
-            <button @click="courseslist=!courseslist">Manage Courses</button>
-            <button @click="minerval = !minerval" style="margin-left: 2%">Manage minerval</button>
-          </div>
-        </div>
-        <div v-else-if="uninscr" class="infosContainer">
-            <div v-if="sure != 2">Please enter the reason you leave the university</div>
-            <textarea v-if="sure != 2" v-model="uninscriptionData.reason"></textarea>
-            <div v-if="sure != 2">
-              <button @click="sure++">Submit</button>
-            </div>
-            <div v-if="sure==1">
-              Are you sure that you want to unregister ?
-              <button @click="addUninscReq(uninscriptionData.userId, uninscriptionData.reason);sure++">Yes</button>
-              <button @click="sure=0">No</button>
-            </div>
-            <p v-if="sure==2">You request has been send !</p>
-        </div>
-        <div v-else-if="minerval" class="infosContainer">
-          <div v-if="minerv.value.toPay != 0">
-            Payment : {{minerv.value.toPay}}€ left to pay
-            <div v-if="minerv.value.paidAmount <= 50">
-              <button @click="minerval = !minerval; paymentPage = !paymentPage; paymentAmount = 50">Pay deposit (50€)</button>
-            </div>
-            <div>
-              <button @click="minerval = !minerval; paymentPage = !paymentPage; paymentAmount = minerv.value.toPay">Pay all the rest ({{minerv.value.toPay}}€)</button>
-            </div>
-          </div>
-          <div v-else>
-            Payment : School fees have already been paid this year
-          </div>
-          <div>
-            <button @click="scholarship=!scholarship; minerval=!minerval">Ask for a scholarship</button>
-          </div>
-        </div>
-        <div v-else-if="scholarship && !scholarshipinfos" class="infosContainer">
-          <p>Please upload the required documents</p>
-          <div>
-            Tax justification document :
-            <input type="file" @change="scholarshipData.taxDocUrl = $event.target.files">
-          </div>
-          <div>
-            Residency justification document :
-            <input type="file" style="margin-top:2%" @change="scholarshipData.residencyDocUrl = $event.target.files">
-          </div>
-          <button style="margin-top: 5%" @click="scholarshipinfos = !scholarshipinfos;postScholarshipRequest(scholarshipData.taxDocUrl, 'JustificationDocument',scholarshipData.residencyDocUrl, 'JustificationDocument');">Submit scholarship request</button>
-        </div>
-        <div v-else-if="scholarship && scholarshipinfos" class="infosContainer">
-          <div>
-            Your request has been sent to the inscription service you will get notified when
-            the request is reviewed.
-          </div>
-          <button @click="scholarshipinfos=!scholarshipinfos; scholarship=!scholarship">
-            Go back to profile
-          </button>
-        </div>
-        <div v-else-if="paymentPage" class="infosContainer">
-          Proceed to payment of {{paymentAmount}}€
-          <div style="margin-top: 1%">
-            Client:
-            <input type="text" v-model="paymentData.client">
-          </div>
-          <div style="margin-top: 1%">
-            Card:
-            <input type="text" v-model="paymentData.card">
-          </div>
-          <div style="margin-top: 1%">
-            ExpDate:
-            <input type="date" v-model="paymentData.expDate">
-          </div>
-          <div style="margin-top: 1%">
-            <button @click="paymentPage=!paymentPage;minerval=!minerval;paymentData.amount=paymentAmount;paymentData.date=new Date();postPayment(paymentData);minerv.value.toPay -= paymentAmount; minerv.value.paidAmount += paymentAmount; editMinerval(minerv.value)">Process Payment</button>
-          </div>
-          <div>
-            <button @click="minerval = !minerval; paymentPage = !paymentPage;">Back</button>
-          </div>
         </div>
         <div v-else-if="modif" class="infosContainer">
           <div>
@@ -326,38 +182,29 @@
             <button @click=" reg=!reg; resetInputs(personnalInfos,patternInfos);" style="float:right;">{{i18n("courses.back")}}</button>
           </div>
         </div>
+
       </div>
-      <div v-if="user.role == 'Student' && modif==false && curric==false && reg==false && minerval==false && scholarship == false && uninscr == false" class="moreInfos">
+      
-        <div class = "oldcursus">
+      <div v-if="modif==false && curric==false && reg==false "class="moreInfos">
-            <div class="listTitle">
+
-              Anciens Cursus
+        <div v-if="(user.role ==='Student')">
-            </div>
+          <div class="listTitle">
-            <div  class="listElement">
+            {{i18n("profile.course.list")}}
-              <div class=" containerElement" v-for="item in UserCurriculum.curriculumList">
-                <div class="year" v-if="parseInt(item.dateyear) !== getYear()">Bac {{item.year}}</div>
-                <div class="option" v-if="parseInt(item.dateyear) !== getYear()">{{item.option}}</div>
-                <div class="dateyear" v-if="parseInt(item.dateyear) !== getYear()">Année {{item.dateyear}}-{{item.dateyear+1}}</div>
-              </div>
-            </div>
           </div>
-          <div class="actualcursus">
+          <div  class="listElement" v-for="item in UserCurriculum.courses">
-            <div class="listTitle">
+          <div class=" containerElement">
-              Cursus Actuel
+            <div class="name"> {{item.title}} </div>
-            </div>
+            <div class="teacher">{{item.owner.lastName}}</div> 
-            <div  class="listElement">
+            <div class="credits">Credits:{{item.credits}}</div>  
-              <div class=" containerElement" v-for="item in UserCurriculum.curriculumList" >
-                <div class="year" v-if="parseInt(item.dateyear) === getYear()">Bac {{item.year}}</div>
-                <div class="option" v-if="parseInt(item.dateyear) === getYear()">{{item.option}}</div>
-                <div class="dateyear" v-if="parseInt(item.dateyear) === getYear()">Année {{item.dateyear}}-{{item.dateyear+1}}</div>
-              </div>
-            </div>
           </div>
+          </div>
+        </div>
+        
+        <div>
+        </div>
+    
       </div>
   </div>
-    <div v-if="courseslist === true" style="width: 80%">
-      <CourseList :cursuslist="getActualCurriculumList()"/>
-      <button style="width: 10%; margin-top: 5%" @click="courseslist = false">Return to profile</button>
-    </div>
 </div>
 </template>
 <style scoped>
@@ -393,32 +240,7 @@
 }
 
 .moreInfos {
-  margin-top: 50%;
+  grid-area:minfos;
-  display:grid;
-  grid-template-rows:200px auto;
-  column-gap:50px;
-  row-gap:45px;
-  grid-template-areas:
-  "minfos minfos";
-  grid-template-columns:600px 600px;
-  align-items:center;
-  justify-content:center;
-  margin-left: 320%;
-}
-
-.listTitle{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width:250px;
-  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;
 }
 .body {
     min-width:960px;
@@ -426,19 +248,18 @@
     display:flex;
     align-items:center;
     justify-content:center;
-    margin-top:7%;
+    margin-top:5%;
   }
- .containerElement{
+ .containerElement{ 
    justify-content:center;
-   display:grid;
+    display:grid;
-   grid-template-columns:100px 100px 300px;
+    grid-template-columns:38.8% 38.8% 22.4%;
-   grid-template-areas:
+    grid-template-areas:
-    "year option dateyear";
+    "name teacher credits"; 
-   column-gap:40px;
+    column-gap:10px;
-   padding-left: 25px;
     
   }
-
+  
   .name {
     grid-area:name;
     align-self:center;
@@ -454,8 +275,24 @@
     align-self:center;
   }
 
+.listTitle{
+    min-width:197px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width:8vw;
+    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;
+}
 
 .listElement{
+  min-width:625px;
   border:2px solid black;
   font-size:25px;
   color:white;

frontend/src/Apps/Schedule.vue

@@ -0,0 +1,211 @@
+<script setup>
+  import { ref } from 'vue'
+ 
+  const schedule = [
+    {course:"Math Pour L'info",
+     start:"Wed Mar 27 2024 10:15 GMT+0100",
+     end:"Wed Mar 27 2024 12:15 GMT+0100"},
+    {
+      course:"Calculus",
+      start:"Wed Mar 27 2024 08:00 GMT+0100",
+      end:"Wed Mar 27 2024 10:00 GMT+0100"
+      
+  },
+  {
+      course:"Physique II",
+      start:"Tue Mar 26 2024 10:15 GMT+0100",
+      end:"Tue Mar 26 2024 12:15 GMT+0100"      
+  },
+    {
+      course:"Math Pour L'info",
+      start:"Thu Mar 28 2024 10:15 GMT+0100",
+      end:"Thu Mar 28 2024 12:15 GMT+0100"      
+  }]
+  function formatDate(date) {
+    var d = new Date(date),
+        month = '' + (d.getMonth() + 1),
+        day = '' + d.getDate(),
+        year = d.getFullYear();
+
+    if (month.length < 2) 
+        month = '0' + month;
+    if (day.length < 2) 
+        day = '0' + day;
+
+    return [day, month, year].join('-');
+  }
+  function getMonday(d) {
+    d = new Date(d);
+    var day = d.getDay(),
+    diff = d.getDate() - day + (day == 0 ? -6 : 1);
+    return new Date(d.setDate(diff));
+  }
+
+  function getAnyDays(d){
+
+    var day = new Date(mondayOfWeek.value);
+    day.setDate(day.getDate() + d );
+
+    return day;
+  }
+
+  const mondayOfWeek=ref(getMonday(new Date(schedule[1].start)))
+
+  function isNotCourse(element){
+    return element==null;
+  }
+
+  function durationCourse(element){
+    const hour = element.end.substring(3,5) -element.start.substring(3,5);
+    
+    
+    return (element.end - element.start)%2;
+  }
+  function sortByDate(a, b) {
+    const nameA = a.start; // ignore upper and lowercase
+    const nameB = b.start; // ignore upper and lowercase
+    
+    if (nameA < nameB) {
+      return -1;
+    }
+    if (nameA > nameB) {
+      return 1;
+    }
+    return 0; 
+      }
+
+  function transpose(a) {
+    const trans = [[],[],[],[],[],[]];
+    for(let i = 0; i < 6;i++){
+      for(let j=0; j< 7; j++){
+        if(a[j][i] !== null){
+          trans[i].push(a[j][i]);
+        }
+      }
+    }
+    return trans;
+}
+
+  function matrixFromList(list){
+    const matrix = [[],[],[],[],[],[],[]];
+    for(let key in list){
+      const temp = [];
+      const day = new Date(list[key].start);
+      matrix[day.getDay()].push(list[key]);
+      matrix[day.getDay()].sort((a,b) => sortByDate(a,b));
+    }
+      return matrix;
+  }
+
+  
+  const schedule2 = matrixFromList(schedule);
+  const scheduleByWeek = transpose(schedule2);
+  
+  console.log(scheduleByWeek)
+
+</script>
+<template>
+  <div class="grid">
+    <div class="options" >
+    </div>
+    <div class="schedule">
+      <table class="table">
+        <tr style="background-color:rgb(24,24,24)">
+          <th/>
+          <th class="header">Lundi {{formatDate(getAnyDays(0))}}</th>
+          <th class="header">Mardi {{formatDate(getAnyDays(1))}}</th>
+          <th class="header">Mercredi {{formatDate(getAnyDays(2))}}</th>
+          <th class="header">Jeudi {{formatDate(getAnyDays(3))}}</th>
+          <th class="header">Vendredi {{formatDate(getAnyDays(4))}}</th>
+          <th class="header">Samedi {{formatDate(getAnyDays(5))}}</th>
+          <th class="header">Dimanche {{formatDate(getAnyDays(6))}}</th>
+        </tr>
+        <tr v-for="(n,index) in 12">
+          <th class="hour">{{8 + index}}:00-{{9+index}}:00</th>
+            <td v-for="m in 7"></td>
+        </tr>
+      </table>
+      <div class="courseGrid">
+        <div v-for="i in 7">
+          Test
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<style scoped>
+  .grid{
+    display:grid;
+    margin-top:2%;
+    align-items:center;
+    justify-content:center;
+    grid-template-columns:15vw 70vw;
+    column-gap:2.5vw;
+
+    grid-template-areas:"options schedule";
+  }
+  .schedule{
+    position:relative;  
+    border-radius:20px;
+    grid-area:schedule;
+    width:100%;
+    height:85vh;
+    background-color:rgba(255,255,255,0.1);    
+  }
+  .options{
+    border-radius:20px;
+    grid-area:options;
+    background-color:rgba(255,255,255,0.1);
+    width:100%;
+    height:85vh;
+  }
+
+  .table{
+    width:100%;
+    height:100%;
+    border-spacing:0;
+    border-collapse:separate;
+    border-radius: 20px;
+    border: 2px solid black
+  }
+  
+  .hour{
+    background-color:rgb(72,72,72)
+
+  }
+  
+  .header{
+    align-items:center;
+    width:12.5%;
+    color:#FFFFFF;
+  }
+  table th:not(:last-child),
+  table td:not(:last-child) {
+  border-right: 1px solid black;
+  }
+  
+  table tr:not(:last-child)>td,
+  table tr:not(:last-child)>th
+  {
+    border-bottom:1px solid black;
+  }
+  
+  .courseGrid{
+    top:13.75%;   
+    left:12.5%;
+    position:absolute;
+    width:87.5%;
+    height:86.25%; 
+    display:grid;
+    grid-template-columns:repeat(7,1fr);
+      }
+  
+
+  .course{
+    width:100%;
+    height:100%;
+    background-color:rgb(100,0,100);
+  }
+
+  
+</style>

frontend/src/Apps/StudentsList.vue

@@ -1,29 +1,19 @@
 <script setup>
   import i18n from "@/i18n.js"
-  import {provide, reactive, ref} from 'vue'
+  import { reactive  } from 'vue'
   import { getStudents } from '../rest/Users.js'
-  import AboutStudent from "@/Apps/Inscription/AboutStudent.vue";
+
   const users = await getStudents();
-
+</script> 
-  let targetRegNo = "";
-  let list = ref(true);
-</script>
-
 <template style="margin-top:5%;">
-  <div v-if="list === false">
+  <div style="display:flex; justify-content:center; " v-for="item in users">
-    <AboutStudent :target=targetRegNo />
-    <button style="background-color:rgb(105,05,105);width:5%; margin-left: 10%;" @click="list = true;">Back</button>
-  </div>
-  <div style="display:flex; justify-content:center; " v-for="item in users" v-if="list === true">
     <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">
+        <div class="infos"><button style="background-color:rgb(105,05,105);" >{{i18n("request.moreInfos")}}   </button></div>
-          <button style="background-color:rgb(105,05,105);" @click="list = false; targetRegNo = item.regNo;">{{i18n("request.moreInfos")}} </button>
-        </div>
     </div>
     </div>
   </div>
@@ -35,10 +25,10 @@
     height:100px;
     font-size:30px;
     display:grid;
-    grid-template-columns:21.7% 21.7% 21.7% 20% 13.1%;
+    grid-template-columns:21.7% 21.7% 21.7% 21.7% 13.1%;
     grid-template-areas:
     "status option surname firstname infos"; 
-    column-gap:10px;
+    
   }
   
   .infos {
@@ -74,8 +64,8 @@
 
   button{
     font-size:15px;
-    height:50px;
+     height:50px;
-    width:75%;
+     width:75%;
     border:none;
     border-radius:20px;
 

frontend/src/rest/ServiceInscription.js

@@ -3,7 +3,7 @@
  *
  * TODO: On time of writing, the backend doesn't support these endpoints so it could be modified in the future.
  */
-import {restGet, restPatch, restPost} from './restConsumer.js'
+import {restGet, restPatch} from './restConsumer.js'
 
 /**
  * create a new register requests that can be recovered by the registering service
@@ -43,4 +43,3 @@ export async function getAllRegisters(){
 export async function validateRegister(id, state){
   return restPatch("/request/register/" + id, state);
 }
-

frontend/src/rest/Users.js

@@ -26,7 +26,7 @@ export function disconnect(){
  * @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, identityCardId, submissionDate, equivalence){
+export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId){
 	return restPost("/register", {
 		firstName: firstname,
 		lastName: lastname,
@@ -36,10 +36,7 @@ export async function register(firstname, lastname, birthDate, password, email,
 		address: address,
 		country: country,
 		curriculumId: curriculumId,
-    	profilePicture: imageId,
+    profilePictureUrl: imageId,
-		identityCard : identityCardId,
-		submissionDate : submissionDate,
-		equivalenceState : equivalence
 	});
 }
 
@@ -55,7 +52,7 @@ export async function register(firstname, lastname, birthDate, password, email,
  * @param country
  * @param imageId	id of the image in database returned when uploaded
  *
- * PS: the password is not required as it is generated by the backend and sent to the user
+ * 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){

frontend/src/rest/apps.js

@@ -4,23 +4,21 @@ import i18n from '@/i18n.js'
 
 // Liste des apps
 import LoginPage from '@/Apps/Login.vue'
-import Inscription from "@/Apps/Inscription/ManageRequests.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 AboutStudent from "@/Apps/Inscription/AboutStudent.vue";
+import Schedule from "@/Apps/Schedule.vue"
-import Msg from "@/Apps/Msg.vue"
-import ManageRequests from "@/Apps/Inscription/ManageRequests.vue";
 
 const apps = {
+		'/schedule': Schedule,
 		'/login': LoginPage,
-		'/requests': ManageRequests,
+		'/inscription': Inscription,
 		'/profil': Profil,
 		'/manage-courses' : Courses,
 		'/users-list' : Users,
 		'/students-list' : Students,
-		'/msg' : Msg,
 }
 
 const appsList = {
@@ -28,7 +26,7 @@ const appsList = {
 		'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") },
-		'Requests': { path: '#/requests', icon: 'fa-users', text: "Requests" },
+		'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")},

frontend/src/rest/curriculum.js

@@ -48,9 +48,3 @@ export async function altercurriculum(id, courses){
 export async function getSelfCurriculum(){
   return restGet("/curriculum");
 }
-
-export async function getSomeonesCurriculumList(user){
-	return restGet("/onescurriculum/"+user)
-}
-
-

frontend/src/rest/externalCurriculum.js

@@ -1,23 +0,0 @@
-import {restGet, restPatch, restPost} from "@/rest/restConsumer.js";
-import {parseInteger} from "jsdom/lib/jsdom/living/helpers/strings.js";
-
-export async function createExternalCurriculum(inscriptionRequestId,school, formation, completion, startYear, endYear, justifdocUrl){
-    return restPost("/externalcurriculum", {
-        inscriptionRequestId: inscriptionRequestId,
-        school:school,
-        formation :formation,
-        completion : completion,
-        startYear : parseInteger(startYear),
-        endYear: parseInteger(endYear),
-        justifdocUrl : justifdocUrl
-    })
-}
-
-export async function getExternalCurriculumByInscrReq(inscrReqId){
-    return restGet("/externalcurriculum/"+inscrReqId)
-}
-
-export async function getExternalCurriculumByUser(userId){
-    return restGet("/externalcurriculumbyuser/"+userId)
-}
-

frontend/src/rest/minerval.js

@@ -1,9 +0,0 @@
-import {restGet, restPatch, restPost} from "@/rest/restConsumer.js";
-
-export async function getCurrentMinerval(userRegNo){
-    return restGet("/minerval/"+userRegNo)
-}
-
-export async function editMinerval(updatedMinerval){
-    return restPatch("/minerval", updatedMinerval)
-}

frontend/src/rest/msg.js

@@ -1,60 +0,0 @@
-/*******************************************************
- * File: msg.js
- * Author: Anthony Debucquoy
- * Scope: Extension messagerie
- * Description: Messages frontend api consumer
- *******************************************************/
-
-import { restGet, restPost, restPatch } from './restConsumer.js'
-import { ref } from 'vue'
-
-/**
- * - id
- * - name
- * - members
- */
-export const discussionsList = ref();
-export const currentDiscussion = ref([]);
-let timerSet = false
-
-
-export async function createDiscussion(name){
-	let disc = await restPost("/discussion", {name: name});
-	discussionsList.value.push(disc);
-}
-
-
-export async function invite(id, regNo){
-	restPatch("/discussion/"+ id+ "/add", {regNo: parseInt(regNo)}).then(() => fetchDiscussion(id))
-}
-
-export async function removeMember(id, regNo){
-	restPatch("/discussion/"+ id+ "/remove", {regNo: parseInt(regNo)}).then(() => fetchDiscussion(id))
-}
-
-export async function sendMessage(id, content, responseId){
-	let data = {
-		content: content,
-		response: responseId,
-	}
-	restPost("/discussion/" + id, data).then(() => fetchDiscussion(id));
-}
-
-export async function updateDiscussionName(id, name){
-	restPatch("/discussion/" + id, {name: name}).then(() => fetchDiscussions());
-}
-
-
-async function fetchDiscussions(){
-	discussionsList.value = await restGet("/discussions");
-}
-
-export async function fetchDiscussion(id){
-	currentDiscussion.value = await restGet("/discussion/" + id);
-	if(!timerSet){
-		timerSet = true;
-		setTimeout(() => {timerSet = false;fetchDiscussion(currentDiscussion.value.id)} , 5000);
-	}
-}
-
-await fetchDiscussions();

frontend/src/rest/notifications.js

@@ -1,12 +0,0 @@
-import { ref } from 'vue'
-import { restGet, restPost } from '@/rest/restConsumer.js'
-
-export const notifications = ref({});
-
-export function fetchNotifications(){
-	restGet("/notifications").then( e => notifications.value = e );
-}
-
-export function archiveNotification(id){
-	restPost("/notifications/" + id).then( e => fetchNotifications() );
-}

frontend/src/rest/payment.js

@@ -1,6 +0,0 @@
-import {restPost} from "@/rest/restConsumer.js";
-
-export async function postPayment(payment){
-    return restPost("/payment", payment)
-}
-

frontend/src/rest/requests.js

@@ -1,25 +0,0 @@
-import {restGet, restPatch, restPost} from "@/rest/restConsumer.js";
-
-export async function createExemptionsRequest(exempReq){
-    return restPost("/exemptionreq", exempReq)
-}
-
-export async function createScholarshipRequest(reqInfo){
-    return restPost("/scholarshipreq", reqInfo)
-}
-
-export async function getAllScholarShipsRequest(){
-    return restGet("/scholarshipreq")
-}
-
-export async function getAllExemptionsRequest(){
-    return restGet("/exemptionsreq")
-}
-
-export async function editEquivalenceState(id, newstate){
-    return restPatch("/request/registerequiv/"+id+"/"+newstate)
-}
-
-export async function addUninscReq(userId, reason){
-    return restPost("/uninscriptionreq", {"userId" : userId, "reason" : reason})
-}

frontend/src/rest/restConsumer.js

@@ -1,27 +1,27 @@
 import { getCookie } from '../utils.js'
 import { toast } from 'vue3-toastify'
 
-const restURL = import.meta.env.VITE_CLYDE_MODE === 'container' ? "http://localhost:8080": import.meta.env.DEV ? "http://localhost:8080" : "https://clyde.herisson.ovh/api"
+const restURL = import.meta.env.PROD ? "https://clyde.herisson.ovh/api" : "http://localhost:8080"
 
-export function restGet(endPoint) {
+export async function restGet(endPoint) {
-	return _rest(endPoint, {method: "GET"});
+	return await _rest(endPoint, {method: "GET"});
 }
 
-export function restPost(endPoint, data) {
+export async function restPost(endPoint, data) {
-	return _rest(endPoint, {method: "POST", credentials: 'include', body: JSON.stringify(data)});
+	return await _rest(endPoint, {method: "POST", credentials: 'include', body: JSON.stringify(data)});
 }
 
-export function restPostFile(endPoint, file){
+export async function restPostFile(endPoint, file){
 	let headers = new Headers();
-	return _rest(endPoint, {method: "POST", credentials: 'include', body: file, headers: headers });
+	return await _rest(endPoint, {method: "POST", credentials: 'include', body: file, headers: headers });
 }
 
-export function restDelete(endPoint) {
+export async function restDelete(endPoint) {
-	return _rest(endPoint, {method: "DELETE"});
+	return await _rest(endPoint, {method: "DELETE"});
 }
 
-export function restPatch(endPoint, data) {
+export async function restPatch(endPoint, data) {
-	return _rest(endPoint, {method: "PATCH", credentials: 'include', body: JSON.stringify(data)});
+	return await _rest(endPoint, {method: "PATCH", credentials: 'include', body: JSON.stringify(data)});
 }
 
 /**
@@ -33,7 +33,7 @@ export function restPatch(endPoint, data) {
  *
  *  @Example _rest("/ping", {user: data}) -> {id:0, txt:"pong"}
  */
-function _rest(endPoint, config){
+async function _rest(endPoint, config){
 	endPoint.at(0) != "/" ? console.error("Carefull, you certainly should put a / at the begenning of your endPoint ") : true;
 	let session_token = getCookie("session_token");
 	let headers = new Headers({
@@ -41,16 +41,13 @@ function _rest(endPoint, config){
 		'Content-Type': 'application/json',
 	});
 	config['headers'] = config['headers'] == null ? headers : config['headers'];
-
+	return toast.promise(fetch(restURL + endPoint, config),
-	let ret = fetch(restURL + endPoint, config);
-	if(config['toast']){
-		ret = toast.promise(ret,
 		{
 			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 ret.then( e => e.json()).catch( e => e );
+		.then( e => e.json()).catch( e => e );
 }

frontend/src/rest/uploads.js

@@ -7,17 +7,5 @@ import { restPostFile } from '@/rest/restConsumer.js'
 export async function uploadProfilePicture(file){
 	const formData = new FormData();
 	formData.append("file", file[0]);
-
+	return restPostFile("/upload/ProfilePicture", formData)
-	return restPostFile("/upload/ProfilePicture", formData);
 }
-
-
-/**
- * More generic version of the upload method
- */
-
-export async function uploadFile(file, type){
-	const formData = new FormData();
-	formData.append("file", file[0]);
-	return restPostFile("/upload/"+type, formData)
-}