proposition of some fixes

Reviewed-on: #146
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>

.gitea/workflows/backend.yaml

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

.gitea/workflows/deploy.yaml

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

backend/.gitignore

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

backend/Dockerfile

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

backend/build.gradle.kts

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

backend/compose.yaml

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

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

@@ -64,9 +64,12 @@ 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},token))
+        if (!authServ.isNotIn(new Role[]{Role.InscriptionService,Role.Admin},token)){
             authorizedApps.add(Applications.Inscription);
+            authorizedApps.add(Applications.StudentsList);}
 
+        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){ 
+          authorizedApps.add(Applications.UsersList);}
         return authorizedApps;
     }
 }

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

@@ -74,7 +74,8 @@ public class CourseController {
     public ResponseEntity<Map<String ,Object>> postCourse(@RequestHeader("Authorization") String token,
                                              @RequestBody Course course)
     {
-
+        System.out.println(course);
+        System.out.println(token);
         if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token))
             return new UnauthorizedResponse<>(null);
 

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

@@ -57,7 +57,6 @@ public class InscriptionController {
                                                                  @RequestHeader("Authorization") String token,
                                                                  @RequestBody RequestState state)
     {
-
         if (authServ.isNotIn(new Role[]{Role.InscriptionService,Role.Admin},token))
             return new UnauthorizedResponse<>(null);
 

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

@@ -49,12 +49,13 @@ public class MockController {
         // user part
 
 
-        User herobrine = new User("brine","hero","admin@admin.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Admin,passwordEncoder.encode("admin"));
-        User joe = new User("Mama","Joe","student@student.com","roundabout","DaWarudo",new Date(0), null,Role.Student,passwordEncoder.encode("student"));
-        User meh = new User("Inspiration","lackOf","secretary@secretary.com","a Box","the street",new Date(0), null,Role.Secretary,passwordEncoder.encode("secretary"));
-        User joke = new User("CthemBalls","Lemme","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
+        User herobrine = new User("brine","hero","admin@admin.com","behind","ShadowsLand",new Date(0), null,Role.Admin,passwordEncoder.encode("admin"));
+        User joe = new User("Mama","Joe","student@student.com","roundabout","England",new Date(0), null,Role.Student,passwordEncoder.encode("student"));
+        User meh = new User("Polo","Marco","secretary@secretary.com","a Box","Monaco",new Date(0), null,Role.Secretary,passwordEncoder.encode("secretary"));
+        User joke = new User("Gaillard","Corentin","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
+        User jojo = new User("Bridoux","Justin","teacher2@teacher2.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
         User lena = new User("Louille","Lena","inscriptionService@InscriptionService.com","no","yes",new Date(0), null,Role.InscriptionService,passwordEncoder.encode("inscriptionService"));
-        mockUsers = new ArrayList<>(Arrays.asList(herobrine,joe,meh,joke,lena));
+        mockUsers = new ArrayList<>(Arrays.asList(herobrine,joe,meh,joke,lena,jojo));
 
         userRepo.saveAll(mockUsers);
 
@@ -71,7 +72,7 @@ public class MockController {
 
         Course progra1 = new Course(5,"Programmation et algorithmique 1",joke);
         Course chemistry1 = new Course(12, "Thermochimie",joke);
-        Course psycho1 = new Course(21, "rien faire t'as cru c'est psycho",joke);
+        Course psycho1 = new Course(21, "Neuroreaction of isolated brain cells",joke);
         Course commun = new Course(2, "cours commun",joke);
 
         courseService.save(progra1);
@@ -91,7 +92,7 @@ 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.Refused,"yes.png","password");
+        InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 1,RequestState.Pending,"yes.png","password");
 
         inscriptionService.save(inscriptionRequest);
         

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

@@ -11,7 +11,6 @@ import ovh.herisson.Clyde.Tables.StorageFile;
 @RestController
 @CrossOrigin(originPatterns = "*", allowCredentials = "true")
 public class StorageController {
-
     private final StorageService storageServ;
 
     public StorageController(StorageService storageServ){

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

@@ -122,9 +122,10 @@ public class UserController {
         return new ResponseEntity<>(ProtectionService.usersWithoutPasswords(students), HttpStatus.OK);
     }
 
+
     @DeleteMapping("/user/{id}")
     public ResponseEntity<String> deleteStudent(@RequestHeader("Authorization") String token, @PathVariable Long id){
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token))
+        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token) && !id.equals(authServ.getUserFromToken(token).getRegNo()))
             return new UnauthorizedResponse<>(null);
 
         User toDelete = userService.getUserById(id);

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

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

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

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

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

@@ -15,8 +15,6 @@ import java.util.UUID;
 
 @Service
 public class StorageService {
-
-
     private final Path rootLocation = Paths.get("cdn/");
     private final FileRepository fileRepo;
 
@@ -58,7 +56,7 @@ public class StorageService {
         String url = this.rootLocation.resolve(Paths.get(Objects.requireNonNull(stringUuid)))
                 .normalize().toString();
 
-        return fileRepo.save(new StorageFile(file.getName(),url, fileType));
+        return fileRepo.save(new StorageFile(file.getOriginalFilename(),url, fileType));
     }
 
     public void delete(StorageFile file) throws SecurityException {

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

@@ -123,6 +123,7 @@ public class UserService {
 
     public Iterable<User> getAllStudents(){return userRepo.findAllStudents();}
 
+
     public User getUserById(long id) {
         return userRepo.findById(id);
     }

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

@@ -15,7 +15,9 @@ public enum Applications {
 
     // teachers and Secretary authorization
     ManageCourses,
+    UsersList,
 
     // InscriptionService authorization
-    Inscription
+    Inscription,
+    StudentsList
 }

backend/src/main/resources/application.properties

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

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

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

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

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

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

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

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

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

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

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

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

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

backend/src/test/resources/application.properties

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

frontend/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/public/i18n/EN.txt

@@ -26,6 +26,8 @@ app.inscription.requests=Inscription Requests
 app.manage.courses=Manage Courses
 app.language=Language
 app.manage.profile=Manage profile
+app.studentList=Students List
+app.users=Users
 request.moreInfos=More Infos
 request.accept=Accept
 request.refuse=Refuse
@@ -41,10 +43,12 @@ profile.unRegister=Unregister
 profile.course.list=Courses list
 profile.address=Address
 profile.picture=Profile picture
+profile.change.curriculum=Change curriculum
 name=Name
-teacher=Teacher
-student=Student
-secretary=Secretary
-curriculum=curriculum
-credits=Credits
+Teacher=Teacher
+Student=Student
+Secretary=Secretary
+Curriculum=curriculum
+Credits=Credits
+InscriptionService=I.S.
 faculty=Faculty

frontend/public/i18n/FR.txt

@@ -26,6 +26,8 @@ app.inscription.requests=Demandes d'Inscription
 app.manage.courses=Gérer les cours
 app.language=Langue
 app.manage.profile=Gérer le profil
+app.studentList=Liste des étudiants
+app.users=Utilisateurs
 request.moreInfos=Plus d'Infos
 request.accept=Accepter
 request.refuse=Refuser
@@ -41,10 +43,12 @@ profile.unRegister=Désinscription
 profile.course.list=Liste des cours
 profile.address=Adresse
 profile.picture=Photo de profil
+profile.change.curriculum=Changer cursus
 name=Nom
-teacher=Enseignant
-student=Etudiant
-secretary=Secrétaire
-curriculum=Cursus
-credits=Credits
+Teacher=Enseignant
+Student=Etudiant
+Secretary=Secrétaire
+Curriculum=Cursus
+Credits=Credits
+InscriptionService=S.I.
 faculty=Faculté

frontend/src/App.vue

@@ -5,14 +5,26 @@
   import { isLogged } from '@/rest/Users.js'
 
   import { appList, currentView } from '@/rest/apps.js'
+		var prevURL;
+		var currentURL = window.location.hash;
 
+window.onhashchange = function() {
+    prevURL = currentURL;
+    currentURL = window.location.hash;
+}
+const Logged = ref(isLogged());
+
+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 Logged = ref(isLogged());
 
 	const apps = ref([])
 	appList().then(e => apps.value = e)
@@ -26,7 +38,7 @@
       <ul class="horizontal">
         <li title=home>
             <a class="icon" href="#home">
-                <img class="clyde" src="./assets/Clyde.png" style="width: 40px; height: auto; margin-top:4px">
+                <img class="clyde" src="/Clyde.png" style="width: 40px; height: auto; margin-top:4px">
             </a></li>
         <li title=home>
             <a class="icon" href="#home">
@@ -66,18 +78,17 @@
     <div class="leftBar">
     <ul class="vertical">
         <li v-for="app in apps">
-						<a href="app.path">
+						<a :href="app.path">
             <div class="fa-solid" :class="app.icon" style="font-size: 40px;"></div>
             <div class="text">{{app.text}}</div>
 						</a>
 				</li>
     </ul>
-
     </div>
     <div class="page">
-      <div style=" margin:50px;">
+        <Suspense>
 				<component :is="currentView" />
-      </div>
+        </Suspense>
     </div>
   </div>
 </template>
@@ -85,6 +96,8 @@
 <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];
@@ -97,6 +110,8 @@
 
   .page {
     grid-area:page;
+		height: 100%;
+		width: 100%;
     place-self:center;
   }
 

frontend/src/Apps/Inscription.vue

@@ -1,10 +1,111 @@
 <script setup>
-  import Req from "./Request.vue"
-  import { getRegisters } from '@/rest/ServiceInscription.js'
+  import i18n from "@/i18n.js"
+  import {ref} from 'vue'
+  import {validateRegister, getAllRegisters } from '@/rest/ServiceInscription.js'
 
-  const requests_example = getRegisters();
+  const requests = ref(await getAllRegisters());
+  console.log(requests);
+
+  async function upPage(id,review){
+    await validateRegister(id,review);
+    requests.value = await getAllRegisters();
+
+  }
 </script>
 
+
+
 <template> 
-  <Req v-for="item of requests_example"/>
+  <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/Login.vue

@@ -1,86 +1,115 @@
 <script setup>
-  import { ref } from 'vue'
+  import {reactive, ref } from 'vue'
   import i18n from '@/i18n.js'
-  import { login , register, disconnect } from '@/rest/Users.js'
+  import { login , register , disconnect, isLogged} from '@/rest/Users.js'
+  import { getAllCurriculums } from '@/rest/curriculum.js'
   import { uploadProfilePicture } from '@/rest/uploads.js'
+  import {toast} from 'vue3-toastify'
+  import 'vue3-toastify/dist/index.css';
+
 
   const loginPage= ref(true)
   const page = ref(0)
   
+  const outputs = reactive({
+    surname:null,
+    firstname:null,
+    password:null,
+    birthday:null,
+    email:null,
+    address:null,
+    country:null,
+    curriculum:null,
+  })
+
   const submitValue= ref(i18n("login.guest.submit"))
-  const surname=ref("")
-  const firstname=ref("")
-  const password=ref("")
   const passwordConfirm=ref("")
-  const birthday=ref("")
-  const email=ref("")
-  const address=ref("")
-  const country=ref("")
-  const curriculum=ref("")
  
   const imageSaved = ref(false)
   const ppData = ref(false)
 
-  disconnect()
+  const curricula= await getAllCurriculums();
+  
+  function goBackHome(){
+    setTimeout(() => {
+      window.location.href="#/home";
+      }, "500");
+ } 
+  function verifyInputs(pass){
+    if(pass==passwordConfirm.value){
+      page.value++;
+      return toast('Password and Confirm Password are correct.', {
+      
+    type: "success",});
+    }
+    else{
+    return toast('Password and Confirm Password are different',{type: "error",});
+    }
+  }
+  if (isLogged()){
+  disconnect();
+  window.location.reload();}
+
+  
 
 </script>
 
 
 <template>
-      <div class='loginBox'>
-
+    <div class="setup">
         <div v-if="loginPage">
-          <form @submit.prevent="login(email, password)"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>
             <div class="inputBox">
               <p>ID / {{i18n("login.guest.email")}}</p> 
-              <input type="text" v-model="email">
+              <input type="text" v-model="outputs.email">
             </div>
             <div class="inputBox">
               <p>{{i18n("login.guest.password")}}</p>
-              <input type="password" v-model="password">
+              <input type="password" v-model="outputs.password">
             </div>
             <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 @submit.prevent="register(firstname, surname, birthday, password, mail, address, country, curriculum)" 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>
             <div v-if="page === 0">
               <div class="inputBox">
                 <p>{{i18n("login.guest.surname")}}</p>
-                <input type="text" v-model="surname">
+                <input type="text" v-model="outputs.surname">
               </div>
               <div class="inputBox">
                 <p>{{i18n("login.guest.firstname")}}</p>
-                <input type="text" v-model="firstname">
+                <input type="text" v-model="outputs.firstname">
               </div>
               <div class="inputBox">
                 <p>{{i18n("login.guest.birthday")}}</p>
-                <input type="date" v-model="birthday">
+                <input type="date" v-model="outputs.birthday">
               </div>
               <div class="inputBox">
                  <p>{{i18n("login.guest.password")}}</p>
-                 <input type="password" v-model="password">
+                 <input type="password" v-model="outputs.password">
               </div>
               <div class="inputBox">
                 <p>{{i18n("login.guest.confirm")}} {{i18n("login.guest.password")}}</p>
                  <input type="password" v-model="passwordConfirm">
-				 <!-- TODO: Verify password is same as passwordConfirm -->
               </div>
               
               <div class="switchpage">
-                <button @click="page++">{{i18n("login.guest.nextpage")}}</button>
+                <button @click="verifyInputs(outputs.password);">{{i18n("login.guest.nextpage")}}</button>
 
               </div>
               <div @click="(loginPage=!loginPage) && (page=0)" class="register">
@@ -90,30 +119,34 @@
             <div v-else>
               <div class="inputBox">
                 <p>{{i18n("login.guest.email")}}</p>
-                <input type="mail" v-model="email">
+                <input type="mail" v-model="outputs.email">
               </div>
               <div class="inputBox">
                 <p>{{i18n("login.guest.address")}}</p>
-                <input type="text" v-model="address">
+                <input type="text" v-model="outputs.address">
               </div>
               <div class="inputBox">
                 <p>{{i18n("login.guest.country")}}</p>
-                <input type="text" v-model="country">
+                <input type="text" v-model="outputs.country">
               </div>
-              <form novalidate enctype="multipart/form-data" class="inputBox">
-              	<p>ProfilePicture</p> 
+              <form class="inputBox"novalidate enctype="multipart/form-data">
+              	<p>{{i18n("profile.picture").toUpperCase()}}</p>
+              <label class="browser">
+                Parcourir . . .
 				        <input  type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*">
+              </label>
               </form>
               <div class="inputBox">
-                <p>{{i18n("curriculum").toUpperCase()}}</p> 
-                  <select v-model="curriculum">
-                    <option value="Chemistry">Chemistry</option>
-                    <option value="Psycho">Psychology</option>
-                    <option value="IT">IT</option>
+                <p>{{i18n("Curriculum").toUpperCase()}}</p> 
+                  <select v-model="outputs.curriculum">
+                    <option v-for="item in curricula">{{item.curriculumId}}</option>
+                    
                   </select>
               </div>
               <div style="align-self:center;" class="inputBox">
-                <button style="margin-top:25px;" @click="console.log(outputs)">{{i18n("login.guest.submit")}}</button>
+                <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.submit")}}
+                </button>
               </div>
               <div  class="switchpage">
                 <button @click="page--">{{i18n("login.guest.lastpage")}}</button>
@@ -125,34 +158,25 @@
           </form>
          </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{
-  width:40px;
-  background-color: black;
-	border-radius:6px;
-	color:white;
-  transform: translate(0px ,1px);
-}
+.setup {
+  margin-left: auto;
+  margin-right:auto;
+  min-width:400px;
 
+  width:25%;
+  height:60%;
+}
 
 .loginBox {
   background-color: rgb(24,24,24);
-  width: 400px;
   display:flex;
   justify-content: center;
-  padding: 40px;
-  border-radius: 20px;
+  border-radius: 5%;
   box-shadow:0 5px 25px #000000;
   
 }
@@ -161,9 +185,8 @@
   width:100%;
   display: flex;
   flex-direction: column;
-  justify-content: center;
   align-items:center;
-  gap: 15px;
+  gap: 3%;
 }
 
 
@@ -171,12 +194,12 @@
   
   width:100%;
   border: none;
-  margin-right: 50px;
-  padding-left: 10px;
-  padding-top:10px;
-  padding-bottom:10px;
+  margin-right: 12.5%;
+  padding-left: 2.5%;
+  padding-top:2.5%;
+  padding-bottom:2.5%;
   outline:none;
-  border-radius: 4px;
+  border-radius: 10px;
   font-size:1.35em;
 }
 
@@ -191,8 +214,9 @@
 
 .register{
   color:rgb(239,60,168);
-  width: 100%;
-  display:flex;
+  width:70%;
+  margin-bottom:20px;
+  margin-top:20px;
   cursor: pointer;
 }
 
@@ -221,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

@@ -1,100 +1,103 @@
 <script setup>
   import i18n from "@/i18n.js"
-  import {ref} from 'vue'
-const curriculum=[
-  {
-  "id": 12,
-  "name": "Math pour l'info",
-  "credits": 11,
-  "faculty": "science",
-  "teacher": 42,
-  "Assistants": []},
-  {
-  "id": 42,
-  "name": "Operating Systems",
-  "credits": 8,
-  "faculty": "science",
-  "teacher": 62,
-  "Assistants": []},
-  {
-  "id": 52,
-  "name": "Fonctionnement des ordinateurs",
-  "credits": 11,
-  "faculty": "science",
-  "teacher": 59,
-  "Assistants": []},
+  import {reactive , ref} from 'vue'
+  import { getCourses,deleteCourse,alterCourse,createCourse } from "@/rest/courses.js"
+  import {getUser, getSelf, getTeachers } from "@/rest/Users.js"
   
-  ]
   
-  const profList=[42,45,62,84,59]
+  const self = await getSelf();
+
+  const curriculum = ref(await getCourses(self.role));
+  const profList = await getTeachers();
+
 
   const createMod = ref(false)
   const deleteMod = ref(false)
 
-  const editElementID = ref(""); 
+  const editElementID = ref("")
 
   function editItem(id){
     editElementID = id;
   }
 
   //Juste pour montrer le Create Mode
+    
   const pattern = {
-
-  "id": 0,
-  "name": null,
+    "title":null,
     "credits":null,
-  "faculty": null,
-  "teacher": null,
-  "Assistants": []}
-
+    "owner":null,
+  }
 
+  let toModify = Object.assign({},pattern);
   let toAdd = Object.assign({}, pattern);
 
-  function addToCourse (){
-  if (curriculum.length>0){
-    toAdd.id=(curriculum[curriculum.length-1].id)-1;}
-    else{
-    toAdd.id=0;
-    }
+  async function addToCourse(){
     let isnull= false;
+     
     for(const [key, value] of Object.entries(toAdd)){
+      console.log(toAdd.owner);
       if(value === null){
         isnull=true;
       }
+      
     }
     if (!isnull){
-      curriculum.push(toAdd);
-      }
+       await createCourse(toAdd.title,toAdd.credits,toAdd.owner);
        toAdd= Object.assign({},pattern);
+
+       curriculum.value = await getCourses(self.role);
+
+
+    }}
+  
+  function setModify(item){
+     for(const el in profList){
+
+           if(profList[el].regNo === item.owner.regNo){
+        toModify.owner= profList[el];
+      }
+     }
+     toModify.credits= item.credits;
+     toModify.title= item.title;
   }
 
 
+  async function patchCourse(course){
+    for (let element in toModify){
+        console.log(toModify,1)
+        console.log(toModify[element],2)
+      
+        if (element =="owner" && (toModify[element].regNo != course.owner.regNo)){
+          await alterCourse(course.courseId,{owner:toModify[element].regNo});
+        }
+        else if(element == "title" && (toModify[element] != course.title)){
+         await alterCourse(course.courseId,{title:toModify[element]});
+        }
+        else if(element == "credits" && (parseInt(toModify[element]) != course.credits)){
+         await alterCourse(course.courseId,{credits:parseInt(toModify[element])});
+        }
+    }
+      toModify= Object.assign({},pattern);
+
+      curriculum.value = await getCourses(self.role);
+
+    
+  }
   //Juste pour montrer le Delete Mode
-  let toRemove;
+  let toRemove = null;
   
-  function removeCourse() {
-  console.log("ok");
-  console.log(toRemove);
-  let rem=-1;
-  for(const [key, value] of Object.entries(curriculum)){
-    console.log(key);
-    console.log(value)
-    if(value.name === toRemove){
-         rem = key;
-        break;
-      }
-    }
-    console.log(rem)
-  if (rem > -1){
-    curriculum.splice(rem, 1);}
-  console.log(curriculum);
+  async function removeCourse(course) {
+      
+     await deleteCourse(course.courseId)
+    curriculum.value = await getCourses(self.role);
+    toRemove = null;
 }
 
 </script>
 <template>
   <div class="body">
-    <div v-if="!deleteMod && !createMod" class="listTitle buttonGrid">
-      <button class="create" @click="createMod = true">
+    <div v-if="!deleteMod && !createMod && (self.role !== 'Teacher')" class="listTitle buttonGrid">
+      <button class="create" @click="editElementID= '';createMod = true;">
         {{i18n("courses.createCourse")}}
       </button>
       <button class="delete" @click="deleteMod=true" >
@@ -102,71 +105,66 @@ const curriculum=[
       </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.name">
+        <input v-model="toAdd.title">
         </div>
         <div style="margin-bottom:20px;">
-          {{i18n("teacher")}} : 
-         <select style="max-width:200px;" class="teacher" v-model="toAdd.teacher">
-          <option v-for="item in profList">{{item}}</option>
+          {{i18n("Teacher")}} : 
+         <select style="max-width:200px;" class="teacher" v-model="toAdd.owner">
+           <option v-for="item in profList" :value="item">{{item.lastName}}</option>
         </select>
         </div>
         <div style="margin-bottom:20px;">
-          {{i18n("credits")}} : 
+          {{i18n("Credits")}} : 
         <input v-model="toAdd.credits">
         </div>
-        <div style="margin-bottom:20px;">
-          {{i18n("faculty")}} : 
-        <input v-model="toAdd.faculty">
-        </div>
       <button class="create" @click="createMod=!createMod; addToCourse();"> {{i18n("courses.confirm")}} </button>
       <button style="float:right;" @click="createMod=!createMod">{{i18n("courses.back")}}</button>
       </form>
     </div>
     <div v-if="deleteMod">
-      <form class="listElement">
+      <form class="listElement" style="width:40%;margin-right:auto;margin-left:auto;">
         <div style="margin-bottom:20px;">
           {{i18n("courses.toDelete")}} :
          <select style="max-width:200px;" class="teacher" v-model="toRemove">
-          <option v-for="item in curriculum">{{item.name}}</option>
+          <option v-for="item in curriculum" :value='item'>{{item.title}}</option>
           
         </select>
         </div>
-        <div style="margin-bottom:20px;">
-          {{i18n("login.password")}}: 
-        <input >
-        </div>
-        <div style="margin-bottom:20px;">
-          {{i18n("login.cPassword")}} : 
-        <input>
-        </div>
-        <button class="delete" @click="deleteMod=!deleteMod;removeCourse();"> {{i18n("courses.deleteCourse")}} </button>
+        <button class="delete" @click="deleteMod=!deleteMod; removeCourse(toRemove);"> {{i18n("courses.deleteCourse")}} </button>
         <button style="float:right;" @click="deleteMod=!deleteMod"> {{i18n("courses.back")}}</button>
       </form>
     </div>
 
-    <div v-if="!createMod && !deleteMod" v-for="item in curriculum" :key="item.name">
-      <div style ="padding:15px 15px 15px 15px;">
-      <button  v-if="editElementID !== item.name"  @click="editElementID = item.name">
+    <div v-if="!createMod && !deleteMod" v-for="item in curriculum" :key="item.title" style="width:50%;margin-left:auto; margin-right:auto;">
+      <div  v-if="editElementID !== item.title" style ="padding:15px 15px 15px 15px;">
+        <button   @click="editElementID = item.title; setModify(item); ">
         {{i18n("courses.modify")}}
         </button>
-      <button v-else @click="editElementID= ''"> {{i18n("courses.confirm")}} </button>
+      </div>
+      <div v-else>
+        <button @click="editElementID= '';patchCourse(item)"> {{i18n("courses.confirm")}} </button>
+        <button @click="editElementID= '';"> {{i18n("courses.back")}} </button>
       </div>
       <div  class="listElement" >
-      <div class="containerElement" v-if="editElementID !== item.name" >
 
-        <div class="name"> {{item.name}} </div>
-        <div class="teacher">{{item.teacher}}</div> 
-        <div class="credits">{{i18n("credits")}}:{{item.credits}}</div>  
+      <div class="containerElement" v-if="editElementID !== item.title" >
+
+        <div class="name"> {{item.title}} </div>
+        <div class="teacher">{{item.owner.lastName}}</div> 
+        <div class="credits">{{i18n("Credits")}}:{{item.credits}}</div>  
       </div>
       <div class="containerElement"v-else>
-        <input style="max-width:200px;" class="name" v-model="item.name">
-        <select style="max-width:200px;" class="teacher" v-model="item.teacher">
-          <option v-for="item in profList">{{item}}</option>
+        <input style="max-width:200px;" class="name" v-model="toModify.title">
+        <select v-if="self.role === 'Secretary'" style="max-width:200px;" class="teacher" v-model="toModify.owner">
+          <option v-for="(item,index) in profList" :value='item'>{{item.lastName}}</option>
         </select>
-        <input style="max-width:100px;"class="credits" v-model="item.credits">  
+        <div v-else class="teacher">{{item.owner.lastName}}</div> 
+        <input v-if="self.role==='Secretary'"style="max-width:100px;"class="credits" v-model="toModify.credits">  
+        <div v-else class="credits">{{i18n("Credits")}}:{{item.credits}}</div>  
       </div>
     </div>
     </div>
@@ -176,17 +174,27 @@ const curriculum=[
 <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;
     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;
@@ -204,6 +212,7 @@ const curriculum=[
   }
 
 .listElement{
+ min-width:625px;
   border:2px solid black;
   font-size:25px;
   color:white;
@@ -211,6 +220,7 @@ const curriculum=[
   background-color:rgb(50,50,50);
   border-radius:20px;
   margin-bottom:10px;
+
 }
 
 .modify{
@@ -259,10 +269,11 @@ const curriculum=[
   }
 
   .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;
@@ -270,7 +281,8 @@ const curriculum=[
     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

@@ -1,108 +1,129 @@
 <script setup>
   import {reactive, ref } from 'vue'
-  import {getUser} from '../rest/Users.js'
+  import {getSelf,alterSelf,disconnect,deleteUser} from '../rest/Users.js'
+  import {getSelfCurriculum, getAllCurriculums} from '../rest/curriculum.js'
+  import {getCourses} from "../rest/courses.js"
   import i18n from "@/i18n.js"
- /* 
-  const user = getUser(); 
-*/
- const user =reactive({
-  profilPicture:"../assets/clyde.png",
-  lastName:"Ghost",
-  firstName:"Clyde",
-  role:"student",
-  address: "Radiator Springs",
-  email:"ClydeGhost@gmail.com",
-  curriculum:[
-  {
-  "id": 12,
-  "name": "Math pour l'info",
-  "credits": 11,
-  "faculty": "science",
-  "teacher": 42,
-  "Assistants": []},
-  {
-  "id": 42,
-  "name": "Fonctionnement des ordinateurs",
-  "credits": 11,
-  "faculty": "science",
-  "teacher": 42,
-  "Assistants": []},
+  import { uploadProfilePicture } from '@/rest/uploads.js'
 
-  ],
-  option:"IT",
-  degree:"BAC1",
-  password:"CeciEstUnMotDePasse123",
-  })
-  
-  /*
-  Teacher user
-  const user =reactive({
-  profilPicture:"../assets/clyde.png",
-  lastName:"Ghost",
-  firstName:"Clyde",
-  role:"teacher",
-  address: "Radiator Springs",
-  email:"ClydeGhost@gmail.com",
-  coursesOwned:[
-  {  
-  "id": 12,
-  "name": "Math pour l'info",
-  "faculty": "science",
-  "teacher": 42,
-  "Assistants": []},
-  { 
-  "id": 42,
-  "name": "Fonctionnement des ordinateurs",
-  "credits": 11,
-  "faculty": "science",
-  "teacher": 42,
-  "Assistants": []},
-
-  ],
-  faculty:"Science",
-  })*/
+  const user = ref(await getSelf());
+  const UserCurriculum = ref(""); 
+  const curricula = ref (await getAllCurriculums());
+  if(user.value.role === "Student"){
+    UserCurriculum.value = await getSelfCurriculum();
+  }
 
+  if(user.role === "Teacher"){
+    UserCurriculum.value = await getCourses("Teacher");
+  }
   const modif = ref(false);
+  const curric = ref(false);
+  const reg = ref(false);
 
-const toModify = Object.assign({}, user);
+  const pattern = {
+    profilPictureUrl:null,
+    email:null,
+    address:null,
+    password:null,
+  };
   
+  const patternInfos ={
+    email: null,
+    password: null,
+    passwordConfirm:null,
+    id:null,
+  }
+
+  
+  let toModify= Object.assign({}, pattern);
+  let personnalInfos =  Object.assign({}, patternInfos);
+  
+  function resetInputs(inputs,list){
+    inputs=Object.assign({},list); 
+  }
+  
+  async function ChangeInfos(){
+    for (let element in toModify){
+         if (element =="email" && (toModify[element] !== null)){
+          await  alterSelf(user.value.regNo,{email : toModify[element]});
+        }      
+
+        if (element =="profilPictureUrl" && (toModify[element] !== null)){
+          await  alterSelf(user.value.regNo,{ profilPictureUrl : toModify[element]});
+        }
+        else if(element == "address" && (toModify[element] !== null)){
+          await  alterSelf(user.value.regNo,{address : toModify[element]});
+        }
+        else if(element == "password" && (toModify[element] !== null)){
+          await  alterSelf(user.value.regNo,{password : toModify[element]});
+        }
+    }
+      toModify= Object.assign({},pattern);
+        user.value = await getSelf()
+
+   } 
+  
+  function setModify(item){
+     toModify.address = item.address;
+     toModify.profilPictureUrl = item.profilPictureUrl;
+     toModify.email= item.email;
+     toModify.password= item.password;
+  }
+
+  
+  async function unRegister(){
+   deleteUser(user.value.regNo);
+   disconnect()
+   setTimeout(() => {
+      window.location.href="#/home";
+      }, "500");
+    
+  }
+
+  function getPP(){
+    if(user.value.profilePictureUrl === null){
+      return "/Clyde.png"
+    }
+    return user.profilePictureUrl
+  }
 </script>
 
-
-
 <template>
   <div class="body">
   <div class="container">
     <div class="profilPic">
-      <img class="subContainter" src="../assets/Clyde.png">
+      <img class="subContainter" :src=getPP()>
+
     </div>
       <div class="globalInfos">
-        <div v-if="modif==false" class="infosContainer" >
+        <div v-if="modif==false && curric==false && reg==false " class="infosContainer" >
           <div>
-            {{user.firstName}} {{user.lastName.toUpperCase()}}   
+            {{user.firstName}} {{user.lastName}}   
           </div>
           <div>
             E-mail: {{user.email}}      
           </div>
-          <div v-if="user.role==='student'">
-            {{user.option}} {{i18n(user.role).toUpperCase()}} 
+          <div v-if="user.role==='Student'">
+            {{user.option}} {{i18n(user.role)}} 
           </div>
           <div v-else>
-            {{i18n("faculty")}}: {{user.faculty}} 
-            Role:  {{i18n(user.role).toUpperCase()}} 
+            Role:  {{i18n((user.role))}} 
           </div>
           <div>
-            <button @click="modif=!modif"> {{i18n("profile.modify.data")}} </button>
+            <button @click="modif=!modif; setModify(user)"> {{i18n("profile.modify.data")}} </button>
           </div>
-          <div v-if="(user.role==='student')">
-            <button>{{i18n("profile.reRegister")}}</button>
-            <button style="float:right;background-color:rgb(150,0,0);">{{i18n("profile.unRegister")}}</button>
+          <div v-if="(user.role==='Student')">
+            <button @click="reg=!reg">{{i18n("profile.reRegister")}}</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>
-        <div v-else class="infosContainer">
+        <div v-else-if="modif" class="infosContainer">
           <div>
             {{i18n("profile.picture")}}:
-            <input type="file">
+            <input type="file" @change="user.profilPicture = uploadProfilePicture($event.target.files);" accept="image/*">
           </div>
           <div>
             E-mail:  
@@ -110,7 +131,42 @@ const toModify = Object.assign({}, user);
           </div>
           <div>
             {{i18n("profile.address")}}:
-            <input type="text" v-model="toModify.address">
+            <input type="text" v-model="toModify.id">
+          </div>
+          <div>
+            {{i18n("login.password")}}:
+            <input type="password" v-model="toModify.password">
+          </div>
+          <div>
+            {{i18n("login.cPassword")}}:
+            <input type="password" v-model="toModify.passwordConfirm">
+          </div>
+          <div>
+            <button @click=" modif=!modif; ChangeInfos();">{{i18n("courses.confirm")}}</button>
+            <button @click="modif=!modif; resetInputs(toModify,pattern);" style="float:right;">{{i18n("courses.back")}}</button>
+          </div>
+        </div>
+        <div v-else-if="curric" class="infosContainer">
+          <div style="height:40px;">
+            {{i18n("Curriculum")}}:  
+            <select v-model="curriculum" >
+              <option v-for="item in curricula" style="font-size:20px;" :value="item">{{item.option}}</option>        
+            </select>
+          </div>
+
+          <div>
+            <button @click=" curric=!curric;">{{i18n("courses.confirm")}}</button>
+            <button @click="curric=!curric; resetInputs(personnalInfos,patternInfos);" style="float:right;">{{i18n("courses.back")}}</button>
+          </div>
+        </div>
+        <div v-else-if="reg" class="infosContainer">
+          <div>
+            E-mail:  
+            <input type="mail" v-model="toModify.email" />
+          </div>
+          <div>
+            ID :
+            <input type="text" v-model="toModify.id">
           </div>
           <div>
             {{i18n("login.password")}}:
@@ -120,22 +176,25 @@ const toModify = Object.assign({}, user);
             {{i18n("login.cPassword")}}:
             <input type="password" id="confirm">
           </div>
-          <div>
-            <button @click=" modif=!modif">{{i18n("courses.confirm")}}</button>
-          </div>
-        </div>
-      </div>
-      <div v-if="modif==false"class="moreInfos">
 
-        <div v-if="(user.role==='student')">
+          <div>
+            <button @click=" reg=!reg;">{{i18n("courses.confirm")}}</button>
+            <button @click=" reg=!reg; resetInputs(personnalInfos,patternInfos);" style="float:right;">{{i18n("courses.back")}}</button>
+          </div>
+        </div>
+
+      </div>
+      
+      <div v-if="modif==false && curric==false && reg==false "class="moreInfos">
+
+        <div v-if="(user.role ==='Student')">
           <div class="listTitle">
             {{i18n("profile.course.list")}}
           </div>
-        <div  class="listElement "
-          v-for="item in user.curriculum">
+          <div  class="listElement" v-for="item in UserCurriculum.courses">
           <div class=" containerElement">
-            <div class="name"> {{item.name}} </div>
-            <div class="teacher">{{item.teacher}}</div> 
+            <div class="name"> {{item.title}} </div>
+            <div class="teacher">{{item.owner.lastName}}</div> 
             <div class="credits">Credits:{{item.credits}}</div>  
           </div>
           </div>
@@ -144,18 +203,6 @@ const toModify = Object.assign({}, user);
         <div>
         </div>
     
-      <div v-if="(user.role==='teacher')">
-          <div class="listTitle">
-            {{i18n("profile.course.list")}}
-          </div>
-          <div class="listElement " v-for="item in user.coursesOwned">
-          {{item.name}}       
-          </div>
-        </div>
-        
-        <div>
-        </div>
-        
       </div>
   </div>
 </div>
@@ -163,18 +210,19 @@ const toModify = Object.assign({}, user);
 <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;
-  row-gap:25px;
+  column-gap:2.7%;
+  row-gap:45px;
   grid-template-areas:
   "profilPic globalInfos"
   "minfos minfos";
 }
 
 .profilPic{
+  width:100%;
   grid-area:profilPic;
 }
 
@@ -195,13 +243,17 @@ const toModify = Object.assign({}, user);
   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;
@@ -224,10 +276,11 @@ const toModify = Object.assign({}, user);
   }
 
 .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;
@@ -239,6 +292,7 @@ const toModify = Object.assign({}, user);
 }
 
 .listElement{
+  min-width:625px;
   border:2px solid black;
   font-size:25px;
   color:white;
@@ -249,6 +303,7 @@ const toModify = Object.assign({}, user);
 }
 
 .infosContainer {
+min-width:350px;
 padding-bottom:50px;
 border:2px solid black;
 font-size:25px;

frontend/src/Apps/Request.vue

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

frontend/src/Apps/ScientificPublications/ResearcherProfile.vue

@@ -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

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

frontend/src/Apps/UsersList.vue

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

frontend/src/assets/main.css

@@ -1,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/ServiceInscription.js

@@ -33,9 +33,13 @@ export async function getRegisters(id){
 	return restGet("/request/register")
 }
 
+export async function getAllRegisters(){
+  return restGet("/requests/register")
+}
+
 /**
  * Change the state of a requests.
  */
 export async function validateRegister(id, state){
-	return restPatch("/request/register/" + id, {state: state});
+  return restPatch("/request/register/" + id, state);
 }

frontend/src/rest/Users.js

@@ -1,4 +1,4 @@
-import { restGet, restPost } from './restConsumer.js'
+import { restGet, restPost, restPatch, restDelete} from './restConsumer.js'
 import { getCookie, setCookie } from '@/utils.js'
 
 export async function login(user, pass, exp){
@@ -26,16 +26,17 @@ 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, curriculum, imageId){
+export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId){
 	return restPost("/register", {
-		firstname: firstname,
-		lastname: lastname,
+		firstName: firstname,
+		lastName: lastname,
 		birthDate: birthDate,
 		password: password,
 		email: email,
 		address: address,
 		country: country,
-		curriculum: curriculum
+		curriculumId: curriculumId,
+    profilePictureUrl: imageId,
 	});
 }
 
@@ -72,7 +73,7 @@ export async function createUser(firstname, lastname, birthDate, email, address,
  * if the user is not authenticated. then an empty array should be returned
  */
 export async function getUser(id){
-	const endpoint = "/user" + id != null ? "/" + id : "";
+	const endpoint = "/user/" +  id;
 	return restGet(endpoint);
 }
 
@@ -102,7 +103,23 @@ export async function getAllUsers(){
 	return restGet("/users");
 }
 
+/**
+ * Return the list of teachers
+ *
+ * @return a list of teachers
+ * each elements is of the form
+ * - id
+ * - name
+ * - role
+ */
+export async function getTeachers(){
+	return restGet("/teachers")
+}
 
+
+export async function getStudents(){
+  return restGet("/students")
+}
 /**
  * Get informations about yourself
  * - RegNo
@@ -123,6 +140,13 @@ export async function getSelf(){
  * - Adress
  * - Password
  */
-export async function alterSelf(data){
-	return restPatch("/user", data);
+export async function alterSelf(id,data){
+  console.log(data)
+	return restPatch("/user/"+id, data);
+}
+
+
+
+export async function deleteUser(id){
+  return restDelete("/user/" + id)
 }

frontend/src/rest/apps.js

@@ -7,12 +7,18 @@ import LoginPage from '@/Apps/Login.vue'
 import Inscription from "@/Apps/Inscription.vue"
 import Profil from "@/Apps/Profil.vue"
 import Courses from "@/Apps/ManageCourses.vue"
+import Users from "@/Apps/UsersList.vue"
+import Students from "@/Apps/StudentsList.vue"
+import ResearcherProfile from "@/Apps/ScientificPublications/ResearcherProfile.vue";
 
 const apps = {
 		'/login': LoginPage,
 		'/inscription': Inscription,
 		'/profil': Profil,
 		'/manage-courses' : Courses,
+		'/users-list' : Users,
+		'/students-list' : Students,
+		'/researcher-profile' : ResearcherProfile,
 }
 
 const appsList = {
@@ -22,6 +28,8 @@ const appsList = {
 		'Schedule': { path: '#/schedule', icon: 'fa-calendar-days', text: i18n("app.schedules") },
 		'Inscription': { path: '#/inscription', icon: 'fa-users', text: i18n("app.inscription.requests") },
 		'ManageCourses': { path: '#/manage-courses', icon: 'fa-book', text: i18n("app.manage.courses") },
+		'StudentsList':{ path: '#/students-list',icon: 'fa-users',text: i18n("app.studentList")},
+		'UsersList':{ path: '#/users-list',icon: 'fa-users',text: i18n("app.users")},
 }
 
 const currentPath = ref(window.location.hash)

frontend/src/rest/courses.js

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

frontend/src/rest/curriculum.js

@@ -2,7 +2,7 @@
  * curriculum API
  */
 
-import { restGet, restPostn, restDelete, restPatch } from './restConsumer.js'
+import { restGet, restPost, restDelete, restPatch } from './restConsumer.js'
 
 /**
  * Create a new curriculum (bundle of courses)
@@ -19,6 +19,10 @@ export async function deletecurriculum(id){
 	return restDelete("/curriculum/" + id);
 }
 
+export async function getAllCurriculums(){
+  return restGet("/curriculums");
+}
+
 /**
  * Get informations on a particular curriculum
  *
@@ -39,3 +43,8 @@ export async function getcurriculum(id){
 export async function altercurriculum(id, courses){
 	return restPatch("/curriculum/" + id, courses);
 }
+
+
+export async function getSelfCurriculum(){
+  return restGet("/curriculum");
+}

frontend/src/rest/restConsumer.js

@@ -16,8 +16,8 @@ export async function restPostFile(endPoint, file){
 	return await _rest(endPoint, {method: "POST", credentials: 'include', body: file, headers: headers });
 }
 
-export async function restDelete(endPoint, data) {
-	return await _rest(endPoint, {method: "DELETE", credentials: 'include', body: JSON.stringify(data)});
+export async function restDelete(endPoint) {
+	return await _rest(endPoint, {method: "DELETE"});
 }
 
 export async function restPatch(endPoint, data) {