proposition of some fixes

backend/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
 	implementation("com.kohlschutter.junixsocket:junixsocket-core:2.9.0")
 	// implementation("org.springframework.session:spring-session-jdbc")
 	developmentOnly("org.springframework.boot:spring-boot-devtools")
-	developmentOnly("org.springframework.boot:spring-boot-docker-compose")
+	// developmentOnly("org.springframework.boot:spring-boot-docker-compose")
 	runtimeOnly("org.postgresql:postgresql")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 	testImplementation("org.springframework.boot:spring-boot-testcontainers")

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

@@ -8,9 +8,7 @@ import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.*;
 import ovh.herisson.Clyde.Tables.Curriculum;
 import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.User;
 
-import java.util.HashMap;
 import java.util.Map;
 
 @RestController
@@ -24,14 +22,11 @@ public class CurriculumController {
     private final UserCurriculumService userCurriculumServ;
     private final CurriculumCourseService curriculumCourseServ;
 
-    private final UserService userServ;
+    public CurriculumController(CurriculumService curriculumServ, AuthenticatorService authServ, UserCurriculumService userCurriculumServ, CurriculumCourseService curriculumCourseServ){
-
-    public CurriculumController(CurriculumService curriculumServ, AuthenticatorService authServ, UserCurriculumService userCurriculumServ, CurriculumCourseService curriculumCourseServ, UserService userServ){
         this.curriculumServ = curriculumServ;
         this.authServ = authServ;
         this.userCurriculumServ = userCurriculumServ;
         this.curriculumCourseServ = curriculumCourseServ;
-        this.userServ = userServ;
     }
 
     @GetMapping("/curriculum/{id}")
@@ -57,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);
@@ -115,20 +94,4 @@ public class CurriculumController {
         curriculumServ.delete(toDelete);
         return new ResponseEntity<>(HttpStatus.OK);
     }
-
-    @GetMapping("/externalcurriculum/{userId}")
-    public ResponseEntity<Map<String,Object>> getStudentsExternalCursus(@RequestHeader("Authorization") String token, @PathVariable String userId){
-        if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin, Role.Teacher},token))
-            return new UnauthorizedResponse<>(null);
-
-        User u = userServ.getUserById(Long.parseLong(userId));
-        HashMap<String,Object> toReturn = userCurriculumServ.findAllExternalCurriculumByStudent(u);
-
-        if (toReturn == null)
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        return new ResponseEntity<>(toReturn,HttpStatus.OK);
-    }
-
-
 }

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

@@ -3,7 +3,6 @@ package ovh.herisson.Clyde.EndPoints;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 import ovh.herisson.Clyde.Repositories.TokenRepository;
-import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
 import ovh.herisson.Clyde.Repositories.UserRepository;
 import ovh.herisson.Clyde.Services.*;
 import ovh.herisson.Clyde.Tables.*;
@@ -27,9 +26,8 @@ public class MockController {
     public final InscriptionService inscriptionService;
     ArrayList<User> mockUsers;
 
-    public final UserCurriculumRepository ucr;
 
-    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService, UserCurriculumRepository ucr){
+    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService){
         this.tokenRepo = tokenRepo;
         this.userRepo = userRepo;
         this.tokenService = tokenService;
@@ -37,7 +35,6 @@ public class MockController {
         this.curriculumService = curriculumService;
         this.courseService = courseService;
         this.inscriptionService = inscriptionService;
-        this.ucr = ucr;
     }
 
     /** Saves an example of each user type by :
@@ -50,14 +47,15 @@ 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);
 
@@ -66,22 +64,11 @@ public class MockController {
         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, 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);
@@ -105,9 +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) 1,RequestState.Pending,"yes.png","password", null, new Date());
+        InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 1,RequestState.Pending,"yes.png","password");
 
         inscriptionService.save(inscriptionRequest);
+        
     }
 }
 

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

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

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/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/InscriptionService.java

@@ -81,7 +81,7 @@ public class InscriptionService {
             );
 
             userRepo.save(userFromRequest);
-            userCurriculumRepo.save(new UserCurriculum(userFromRequest, curriculumRepo.findById(inscrRequest.getCurriculumId()),0));
+            userCurriculumRepo.save(new UserCurriculum(userFromRequest, curriculumRepo.findById(inscrRequest.getCurriculumId())));
         }
         inscrRequest.setState(requestState);
         save(inscrRequest);

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

@@ -87,8 +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());
         return toReturn;
     }
 

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

@@ -1,79 +1,20 @@
 package ovh.herisson.Clyde.Services;
 
 import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Repositories.CurriculumRepository;
-import ovh.herisson.Clyde.Repositories.ExternalCurriculumRepository;
 import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
 import ovh.herisson.Clyde.Tables.Curriculum;
-import ovh.herisson.Clyde.Tables.ExternalCurriculum;
 import ovh.herisson.Clyde.Tables.User;
-import ovh.herisson.Clyde.Tables.UserCurriculum;
-
-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;
-    }
-
-
-    public HashMap<String,Object> findAllExternalCurriculumByStudent(User student) {
-        ArrayList<ExternalCurriculum> list = externalCurriculumRepo.getExternalCurriculumByUser(student);
-
-        ArrayList<HashMap<String, Object>> externalCurriculumList = new ArrayList<HashMap<String, Object>>();
-
-        for (int i = 0; i < list.size(); i++) {
-            HashMap<String, Object> element = new HashMap<>();
-            element.put("id", list.get(0).getId());
-            element.put("user", list.get(0).getUser());
-            element.put("university", list.get(0).getUniversity());
-            element.put("formation", list.get(0).getFormation());
-            element.put("completion", list.get(0).getCompletion());
-            element.put("startYear", list.get(0).getStartYear());
-            element.put("endYear", list.get(0).getEndYear());
-            element.put("justifDocUrl", list.get(0).getJustifdocUrl());
-            element.put("state", list.get(0).getState());
-            externalCurriculumList.add(element);
-        }
-
-        HashMap<String, Object> toReturn = new HashMap<String, Object>();
-        toReturn.put("externalCurriculumList", externalCurriculumList);
-        return toReturn;
-    }
-
 }

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

@@ -1,66 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-
-import jakarta.persistence.*;
-
-@Entity
-public class ExemptionsRequest {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
-    @ManyToOne
-    @JoinColumn(name = "Users")
-    private User user;
-
-    @ManyToOne
-    @JoinColumn(name = "Course")
-    private Course course;
-    private String justifDocument;
-
-    private RequestState state;
-
-
-    public ExemptionsRequest(User user, Course course, String justifDocument, RequestState state){
-        this.user = user;
-        this.course = course;
-        this.justifDocument = justifDocument;
-        this.state = state;
-    }
-
-
-    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;
-    }
-}

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

@@ -1,113 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-
-import jakarta.persistence.*;
-
-//This table stores a student's curriculum from another university
-@Entity
-public class ExternalCurriculum {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
-    @ManyToOne
-    @JoinColumn(name="Users")
-    private User user;
-
-    @ManyToOne
-    @JoinColumn(name="University")
-    private University university;
-
-    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;
-
-    //Accepted if the document justifies the claimed formation
-    private RequestState state;
-
-    public ExternalCurriculum(){}
-
-    public ExternalCurriculum(User user, University university, String formation, String completion, int startYear, int endYear, String justifdocUrl, RequestState state){
-        this.user = user;
-        this.university = university;
-        this.formation = formation;
-        this.completion = completion;
-        this.startYear = startYear;
-        this.endYear = endYear;
-        this.justifdocUrl = justifdocUrl;
-        this.state = state;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public University getUniversity() {
-        return university;
-    }
-
-    public void setUniversity(University university) {
-        this.university = university;
-    }
-
-    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 RequestState getState() {
-        return state;
-    }
-
-    public void setState(RequestState state) {
-        this.state = state;
-    }
-}

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

@@ -19,12 +19,10 @@ public class InscriptionRequest {
     private Long curriculumId;
     private RequestState state;
     private String profilePicture;
-    private String password;
-    private String identityCard;
-    private Date submissionDate;
-    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){
+    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;
@@ -35,8 +33,6 @@ public class InscriptionRequest {
         this.state = state;
         this.profilePicture = profilePicture;
         this.password = password;
-        this.identityCard = identityCard;
-        this.submissionDate = submissionDate;
     }
 
     public int getId() {
@@ -122,20 +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;
-    }
 }

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

@@ -1,59 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-import jakarta.persistence.*;
-
-@Entity
-public class ScholarshipRequest {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
-    @ManyToOne
-    @JoinColumn(name = "Users")
-    private User user;
-    private RequestState state;
-    private String requestForm;
-    private int amount;
-
-
-    public ScholarshipRequest(User user, RequestState state, String requestForm, int amount){
-        this.user = user;
-        this.state = state;
-        this.requestForm = requestForm;
-        this.amount = amount;
-    }
-
-    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 String getRequestForm() {
-        return requestForm;
-    }
-
-    public void setRequestForm(String requestForm) {
-        this.requestForm = requestForm;
-    }
-
-    public int getAmount() {
-        return amount;
-    }
-
-    public void setAmount(int amount) {
-        this.amount = amount;
-    }
-}

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

@@ -1,28 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-
-@Entity
-public class UninscriptionRequest {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-    private RequestState state;
-
-    public UninscriptionRequest(RequestState state){
-        this.state = state;
-    }
-
-    public UninscriptionRequest(){}
-
-    public RequestState getState() {
-        return state;
-    }
-
-    public void setState(RequestState state) {
-        this.state = state;
-    }
-}

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

@@ -1,27 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-
-import jakarta.persistence.*;
-
-@Entity
-public class University {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
-    private String name;
-
-    public University(){}
-
-    public University(String name){
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

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;
-    }
 }

frontend/package-lock.json

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

frontend/package.json

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

frontend/src/App.vue

@@ -52,7 +52,7 @@ window.addEventListener('hashchange', () => {
             <a class="icon" href="#Notifications">
                 <div class="fa-solid fa-bell"  style="margin-top: 7px; margin-bottom: 3px;"></div>
             </a></li>
-        <li @click="active=!active"  class="option"style="float: right;" title=settings>
+        <li @click="active=!active" class="option"style="float: right;" title=settings>
             <a class="icon" >
                 <div  class="fa-solid fa-gear"  style="margin-top: 7px; margin-bottom: 3px;"></div>
                 <div v-if="active" class="dropdown">
@@ -86,12 +86,9 @@ window.addEventListener('hashchange', () => {
     </ul>
     </div>
     <div class="page">
-      <div style=" margin:50px;">
         <Suspense>
-        
+				<component :is="currentView" />
-		<component :is="currentView" />
         </Suspense>
-      </div>
     </div>
   </div>
 </template>
@@ -99,6 +96,8 @@ window.addEventListener('hashchange', () => {
 <style scoped>
   
   .container{
+			height: 100%;
+			width: 100%;
     display:grid;
     grid-template-columns:[firstCol-start]70px[firstCol-end secondCol-start]auto[endCol];
     grid-template-rows:[firstRow-start]61px[firstRow-end secondRow-start] auto [endRow];
@@ -111,6 +110,8 @@ window.addEventListener('hashchange', () => {
 
   .page {
     grid-area:page;
+		height: 100%;
+		width: 100%;
     place-self:center;
   }
 

frontend/src/Apps/AboutRequest.vue

@@ -1,141 +0,0 @@
-<script setup>
-import i18n from "@/i18n.js"
-import {getUser} from '../rest/Users.js'
-import {getcurriculum, getSomeonesCurriculumList} from "@/rest/curriculum.js";
-import {getRegisters} from "@/rest/ServiceInscription.js";
-
-const props = defineProps(['target']);
-let request = await getRegisters(props.target);
-const cursus = await getcurriculum(request.curriculum);
-
-function getPP(){
-  if(request.profilePictureUrl === null){
-    return "/Clyde.png"
-  }
-  return request.profilePictureUrl;
-}
-</script>
-
-<template>
-  <div class="body">
-    <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>
-      </div>
-    </div>
-  </div>
-
-</template>
-
-
-<style scoped>
-.container{
-  display:grid;
-  grid-template-columns:200px 900px;
-  grid-template-rows:200px auto;
-  column-gap:30px;
-  row-gap:45px;
-  grid-template-areas:
-  "profilPic globalInfos"
-  "minfos minfos";
-}
-
-.profilPic{
-  grid-area:profilPic;
-}
-
-.globalInfos {
-  grid-area:globalInfos;
-  align-self :center;
-
-}
-
-.body {
-  width:100%;
-  margin-bottom:10px;
-}
-
-.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;
-}
-
-.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/AboutStudent.vue

@@ -1,174 +0,0 @@
-<script setup>
-  import i18n from "@/i18n.js"
-  import {getUser} from '../rest/Users.js'
-  import {getSomeonesCurriculumList} from "@/rest/curriculum.js";
-
-  const props = defineProps(['target']);
-  let user = await getUser(props.target);
-  let UserCurriculum = await getSomeonesCurriculumList(props.target);
-
-  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">
-    <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>
-      </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>
-
-</template>
-
-
-<style scoped>
-.container{
-  display:grid;
-  grid-template-columns:200px 900px;
-  grid-template-rows:200px auto;
-  column-gap:30px;
-  row-gap:45px;
-  grid-template-areas:
-  "profilPic globalInfos"
-  "minfos minfos";
-}
-
-.profilPic{
-  grid-area:profilPic;
-}
-
-.globalInfos {
-  grid-area:globalInfos;
-  align-self :center;
-
-}
-
-.body {
-  width:100%;
-  margin-bottom:10px;
-}
-
-.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;
-}
-
-.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.vue

@@ -2,46 +2,31 @@
   import i18n from "@/i18n.js"
   import {ref} from 'vue'
   import {validateRegister, getAllRegisters } from '@/rest/ServiceInscription.js'
-  import AboutRequest from "@/Apps/AboutRequest.vue";
 
   const requests = ref(await getAllRegisters());
-  let targetId = "";
+  console.log(requests);
-
-  //0 = liste, 1 = détails, 2 = sure?
-  let windowsState = ref(0);
 
   async function upPage(id,review){
     await validateRegister(id,review);
     requests.value = await getAllRegisters();
+
   }
 </script>
 
 
 
 <template> 
-  <div v-if="windowsState === 1">
+  <div style='display:flex; justify-content:center; min-width:1140px;' v-for="item of requests">
-    <AboutRequest :target="targetId"></AboutRequest>
+  <div class="bodu" v-if="item.state === 'Pending'">
-    <button style="background-color:rgb(105,05,105);" @click="windowsState=0;">Retour</button>
+  <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 v-if="windowsState === 0">
-    <div  v-for="item of requests">
-    <div class="bodu">
-    <div class="container">
-      <div class="date">{{item.submissionDate.slice(0, 10)}}</div>
-      <div class="state">{{item.state}}</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>
-    </div>
   </div>
-  <div 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>
 
@@ -51,10 +36,10 @@
     height:100px;
     font-size:20px;
     display:grid;
-    grid-template-columns:[firstCol-start]150px[firstCol-end secondCol-start]200px[secondCol-end thirdCol-start]200px[thirdCol-end fourthCol-start]150px[fourthCol-end]150px[fifthCol-end]150px[sixthCol-end]150px[endCol];
+    grid-template-columns:10% 14.2% 19% 14.2% 14.2% 14.2% 14.2%;
     grid-template-areas:
-    "date state surname firstname accept refuse infos";
+    "id type surname firstname infos accept refuse"; 
-    column-gap:10px;
+    
   }
   
   .infos {
@@ -76,14 +61,8 @@
     grid-area:titles;
     background-color:rgb(215,215,215);
   }
-  .date{
+  .id{
-    grid-area:date;
+    grid-area:id;
-    margin-left:40px;
-    align-self:center;
-  }
-
-  .state{
-    grid-area:state;
     margin-left:40px;
     align-self:center;
   }
@@ -118,9 +97,9 @@
 
   }
 
-  .bodu {
+ .bodu {
-    width:100%;
+    margin-top:2%;
-    margin-bottom:10px;
+    width:66%;
     border:2px solid black;
     border-radius:9px;
     background-color:rgb(50,50,50);

frontend/src/Apps/Login.vue

@@ -25,10 +25,8 @@
   const submitValue= ref(i18n("login.guest.submit"))
   const passwordConfirm=ref("")
  
-  //Allows to display MA or BAB for years
-  let yearprefix = "";
   const imageSaved = ref(false)
-  let ppData = "";
+  const ppData = ref(false)
 
   const curricula= await getAllCurriculums();
   
@@ -52,29 +50,16 @@
   disconnect();
   window.location.reload();}
 
-  async function uploadPP(arg){
-    const data = await uploadProfilePicture(arg);
-    ppData = data.url;
-    console.log(ppData);
-  }
   
-  //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;
-    }
-  }
 
 </script>
 
 
 <template>
-      <div class='loginBox'>
+    <div class="setup">
-
         <div v-if="loginPage">
-          <form @submit.prevent=" login(outputs.email,outputs.password);goBackHome();"class="form">
+      <div class='loginBox' style="margin-top:30%;">
+          <form @submit.prevent="login(outputs.email,outputs.password);goBackHome();"class="form">
             <h1 style="color:rgb(239,60,168); font-family: sans-serif;">
               {{i18n("login.guest.signin")}}
             </h1>
@@ -89,14 +74,15 @@
             <div class="register">
               <a @click="loginPage=!loginPage">{{i18n("login.guest.register")}}</a>
             </div>
-            <div class="inputBox">
+            <div class="inputBox" style="margin-bottom:35px;">
               <input type="submit" v-model="submitValue">
             </div>
           </form>
         </div>
-
+      </div>
         <div v-else>
-          <form class="form">
+          <div class='loginBox' style="margin-top:30%; margin-bottom:50%;">
+            <form class="form">
             <h1 style="color:rgb(239,60,168); font-family: sans-serif; text-align:center;">
               {{i18n("login.guest.welcome")}}
             </h1>
@@ -130,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">
@@ -143,24 +129,23 @@
                 <p>{{i18n("login.guest.country")}}</p>
                 <input type="text" v-model="outputs.country">
               </div>
-              <form novalidate enctype="multipart/form-data" class="inputBox">
+              <form class="inputBox"novalidate enctype="multipart/form-data">
               	<p>{{i18n("profile.picture").toUpperCase()}}</p>
-				        <input type="file" @change="uploadPP($event.target.files); imageSaved = true;" accept="image/*">
+              <label class="browser">
+                Parcourir . . .
+				        <input  type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*">
+              </label>
               </form>
               <div class="inputBox">
                 <p>{{i18n("Curriculum").toUpperCase()}}</p> 
                   <select v-model="outputs.curriculum">
-                    <option v-for="item in curricula">{{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++; register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData, null, new Date());">
+                <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">
@@ -170,42 +155,28 @@
                 <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>
-            </div>
           </form>
          </div>
-        </div>
+    </div>
+  </div>
 </template>
 
 <style scoped>
-.Home{
-  position:absolute;
- 	display: flex;
-  z-index: 100;
-	padding: 8px 16px;
-	color:rgb(255, 255, 255);
-	text-decoration: none;
-}
 
-.Home:hover{
+.setup {
-  width:40px;
+  margin-left: auto;
-  background-color: black;
+  margin-right:auto;
-	border-radius:6px;
+  min-width:400px;
-	color:white;
-  transform: translate(0px ,1px);
-}
 
+  width:25%;
+  height:60%;
+}
 
 .loginBox {
   background-color: rgb(24,24,24);
-  width: 400px;
   display:flex;
   justify-content: center;
-  padding: 40px;
+  border-radius: 5%;
-  border-radius: 20px;
   box-shadow:0 5px 25px #000000;
   
 }
@@ -214,9 +185,8 @@
   width:100%;
   display: flex;
   flex-direction: column;
-  justify-content: center;
   align-items:center;
-  gap: 15px;
+  gap: 3%;
 }
 
 
@@ -224,12 +194,12 @@
   
   width:100%;
   border: none;
-  margin-right: 50px;
+  margin-right: 12.5%;
-  padding-left: 10px;
+  padding-left: 2.5%;
-  padding-top:10px;
+  padding-top:2.5%;
-  padding-bottom:10px;
+  padding-bottom:2.5%;
   outline:none;
-  border-radius: 4px;
+  border-radius: 10px;
   font-size:1.35em;
 }
 
@@ -244,8 +214,9 @@
 
 .register{
   color:rgb(239,60,168);
-  width: 100%;
+  width:70%;
-  display:flex;
+  margin-bottom:20px;
+  margin-top:20px;
   cursor: pointer;
 }
 
@@ -274,6 +245,21 @@ input[type=submit],button,select{
 
 }
 
+input[type=file]{
+  display:none;
+}
+
+.browser{
+  display:inline-block;
+  cursor:pointer;
+  border-radius:20px;
+  background-color:rgb(239,60,168);
+  padding:5%;
+  font-size:1.35em;
+  font-family:sans-serif;
+  background:#FFFFFF;
+}
+
 button:active ,.switchpage:active{
   opacity:0.8;
 

frontend/src/Apps/ManageCourses.vue

@@ -105,7 +105,8 @@
       </button>
     </div>
     <div v-if="createMod">
-      <form class="listElement">
+      <form class="listElement" style="width:40%;margin-right:auto;margin-left:auto;">
+        
         <div style="margin-bottom:20px;">
          {{i18n("name")}} : 
         <input v-model="toAdd.title">
@@ -125,7 +126,7 @@
       </form>
     </div>
     <div v-if="deleteMod">
-      <form class="listElement">
+      <form class="listElement" style="width:40%;margin-right:auto;margin-left:auto;">
         <div style="margin-bottom:20px;">
           {{i18n("courses.toDelete")}} :
          <select style="max-width:200px;" class="teacher" v-model="toRemove">
@@ -138,7 +139,7 @@
       </form>
     </div>
 
-    <div v-if="!createMod && !deleteMod" v-for="item in curriculum" :key="item.title">
+    <div v-if="!createMod && !deleteMod" v-for="item in curriculum" :key="item.title" style="width:50%;margin-left:auto; margin-right:auto;">
       <div  v-if="editElementID !== item.title" style ="padding:15px 15px 15px 15px;">
         <button   @click="editElementID = item.title; setModify(item); ">
         {{i18n("courses.modify")}}
@@ -149,6 +150,7 @@
         <button @click="editElementID= '';"> {{i18n("courses.back")}} </button>
       </div>
       <div  class="listElement" >
+
       <div class="containerElement" v-if="editElementID !== item.title" >
 
         <div class="name"> {{item.title}} </div>
@@ -172,17 +174,27 @@
 <style scoped>
 .body {
     width:100%;
-    margin-bottom:10px;
+    margin-top:3.5%;
   }
+
+.infosContainer {
+  min-width:350px;
+  padding-bottom:50px;
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+}
+
  .containerElement{ 
-   justify-content:center;
+    justify-content:center;
     display:grid;
-    grid-template-columns:350px 350px 200px;
+    grid-template-columns:38.8% 38.8% 22.4%;
     grid-template-areas:
     "name teacher credits"; 
-    column-gap:10px;
+    column-gap:10px;  }
-    
-  }
   
   .name {
     grid-area:name;
@@ -200,6 +212,7 @@
   }
 
 .listElement{
+ min-width:625px;
   border:2px solid black;
   font-size:25px;
   color:white;
@@ -207,6 +220,7 @@
   background-color:rgb(50,50,50);
   border-radius:20px;
   margin-bottom:10px;
+
 }
 
 .modify{
@@ -255,10 +269,11 @@
   }
 
   .listTitle{
+    min-width:380px;
     display: flex;
     justify-content: center;
     align-items: center;
-    width:400px;
+    width:25%;
     margin-left:auto;
     margin-right:auto;
     border:2px solid black;
@@ -266,7 +281,8 @@
     color:white;
     padding:20px;
     background-color:rgb(50,50,50);
-    border-radius:20px;margin-bottom:10px;
+    border-radius:20px;
+    margin-bottom:10px;
 
     button:hover{
       opacity:0.8;

frontend/src/Apps/Profil.vue

@@ -210,10 +210,11 @@
 <style scoped>
 
 .container{
+  min-width:675px;
   display:grid;
-  grid-template-columns:200px 900px;
+  grid-template-columns:10vw 50vw;
   grid-template-rows:200px auto;
-  column-gap:30px;
+  column-gap:2.7%;
   row-gap:45px;
   grid-template-areas:
   "profilPic globalInfos"
@@ -221,6 +222,7 @@
 }
 
 .profilPic{
+  width:100%;
   grid-area:profilPic;
 }
 
@@ -241,13 +243,17 @@
   grid-area:minfos;
 }
 .body {
+    min-width:960px;
     width:100%;
-    margin-bottom:10px;
+    display:flex;
+    align-items:center;
+    justify-content:center;
+    margin-top:5%;
   }
  .containerElement{ 
    justify-content:center;
     display:grid;
-    grid-template-columns:350px 350px 200px;
+    grid-template-columns:38.8% 38.8% 22.4%;
     grid-template-areas:
     "name teacher credits"; 
     column-gap:10px;
@@ -270,10 +276,11 @@
   }
 
 .listTitle{
+    min-width:197px;
     display: flex;
     justify-content: center;
     align-items: center;
-    width:200px;
+    width:8vw;
     margin-left:auto;
     margin-right:auto;
     border:2px solid black;
@@ -285,6 +292,7 @@
 }
 
 .listElement{
+  min-width:625px;
   border:2px solid black;
   font-size:25px;
   color:white;
@@ -295,6 +303,7 @@
 }
 
 .infosContainer {
+min-width:350px;
 padding-bottom:50px;
 border:2px solid black;
 font-size:25px;

frontend/src/Apps/ScientificPublications/ResearcherProfile.vue

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

frontend/src/Apps/StudentsList.vue

@@ -1,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/AboutStudent.vue";
+
   const users = await getStudents();
-
-  let targetRegNo = "";
-  let list = ref(true);
 </script> 
-
+<template style="margin-top:5%;">
-<template>
+  <div style="display:flex; justify-content:center; " v-for="item in users">
-  <div v-if="list === false">
-    <AboutStudent :target=targetRegNo />
-    <button style="background-color:rgb(105,05,105);" @click="list = true;">Back</button>
-  </div>
-  <div 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:250px 250px 250px 250px 150px;
+    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 {
@@ -51,21 +41,6 @@
     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;
-  }
-
   .status{
     grid-area:status;
     align-self:center;
@@ -90,15 +65,15 @@
   button{
     font-size:15px;
      height:50px;
-     width:100px;
+     width:75%;
     border:none;
     border-radius:20px;
 
   }
 
   .bodu {
-    width:100%;
+    margin-top:2%;
-    margin-bottom:10px;
+    width:66%;
     border:2px solid black;
     border-radius:9px;
     background-color:rgb(50,50,50);

frontend/src/Apps/UsersList.vue

@@ -7,8 +7,8 @@
   const users = await getAllUsers();
   
 </script> 
-<template>
+<template style="margin-top:5%;">
-  <div v-for="item in users">
+  <div style="display:flex; justify-content:center; min-width:1140px;" v-for="item in users">
     <div class="bodu">
       <div class="container">
         <div class="role"><a style="margin-left:30px">{{i18n(item.role)}}</a></div>
@@ -22,23 +22,20 @@
 
 <style scoped>
   .container{
-    justify-content:center;
-    align-items:center;
     color:white;
     height:100px;
     font-size:30px;
     display:grid;
-    grid-template-columns:250px 250px 250px 150px;
+    grid-template-columns:27.7% 27.7% 27.7% 16.9%;
     grid-template-areas:
     "role surname firstname infos"; 
-    column-gap:10px;
 
   }
   
   .infos {
 
     grid-area:infos;
-    align-items:center;
+    align-self:center;
   }
 
   .role {
@@ -67,20 +64,18 @@
   button{
     font-size:15px;
      height:50px;
-     width:100px;
+     width:75%;
     border:none;
     border-radius:20px;
 
   }
 
   .bodu {
-    width:100%;
+    margin-top:2%;
-    margin-bottom:10px;
+    width:66%;
     border:2px solid black;
     border-radius:9px;
     background-color:rgb(50,50,50);
   }
-
-
 </style>
 

frontend/src/assets/main.css

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

frontend/src/main.js

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

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){
+export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId){
 	return restPost("/register", {
 		firstName: firstname,
 		lastName: lastname,
@@ -36,9 +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
 	});
 }
 
@@ -54,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

@@ -9,7 +9,7 @@ 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/AboutStudent.vue";
+import ResearcherProfile from "@/Apps/ScientificPublications/ResearcherProfile.vue";
 
 const apps = {
 		'/login': LoginPage,
@@ -18,6 +18,7 @@ const apps = {
 		'/manage-courses' : Courses,
 		'/users-list' : Users,
 		'/students-list' : Students,
+		'/researcher-profile' : ResearcherProfile,
 }
 
 const appsList = {

frontend/src/rest/curriculum.js

@@ -48,7 +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/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)
 }