Merge branch 'master' into wal/front/Translations

backend/build.gradle.kts

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

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

@@ -1,20 +1,14 @@
 package ovh.herisson.Clyde.EndPoints;
 
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
 import ovh.herisson.Clyde.Repositories.TokenRepository;
 import ovh.herisson.Clyde.Repositories.UserRepository;
 import ovh.herisson.Clyde.Services.TokenService;
-import ovh.herisson.Clyde.Tables.Role;
+import ovh.herisson.Clyde.Tables.*;
-import ovh.herisson.Clyde.Tables.Token;
-import ovh.herisson.Clyde.Tables.User;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Date;
 
 @RestController
@@ -26,6 +20,7 @@ public class MockController {
     public final UserRepository userRepo;
     public final TokenRepository tokenRepo;
     public final TokenService tokenService;
+
     ArrayList<User> mockUsers;
 
 
@@ -62,3 +57,4 @@ public class MockController {
         userRepo.deleteAll(mockUsers);
     }
 }
+

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

@@ -1,13 +1,13 @@
 package ovh.herisson.Clyde.Services;
 
-import org.springframework.core.io.UrlResource;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import ovh.herisson.Clyde.Repositories.FileRepository;
-import ovh.herisson.Clyde.Tables.FileType;
+import ovh.herisson.Clyde.Tables.*;
-import ovh.herisson.Clyde.Tables.StorageFile;
+
+import java.io.File;
 import java.io.IOException;
-import org.springframework.core.io.Resource;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -53,4 +53,12 @@ public class StorageService {
 
         return url;
     }
+
+    public void delete(StorageFile file) throws SecurityException {
+        File f = new File(file.getUrl());
+        f.delete();
+
+        //Delete l'entité
+        fileRepo.delete(file);
+    }
 }

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

@@ -4,7 +4,10 @@ import jakarta.persistence.*;
 
 import java.util.Date;
 
+
+@Entity
 public class InscriptionRequest {
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
     private String firstName;

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

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

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

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

frontend/src/App.vue

@@ -41,7 +41,7 @@
       <ul class="horizontal">
         <li title=home>
             <a class="icon" href="#home">
-                <img @click="draw" src="./assets/Clyde.png" style="width: 40px; height: auto; margin-top:4px">
+                <img class="clyde" src="./assets/Clyde.png" style="width: 40px; height: auto; margin-top:4px">
             </a></li>
         <li title=home>
             <a class="icon" href="#home">
@@ -268,4 +268,8 @@
 		padding-left: 15px;
 	  }
 
+	  .clyde:hover{
+		  content: url("./assets/angry_clyde.png")
+	  }
+    
 </style>

frontend/src/rest/restConsumer.js

@@ -41,7 +41,8 @@ async function _rest(endPoint, config){
 			pending: config['pending'] != null ? config['pending'] : 'pending',
 			error: config['error'] != null ? config['error'] : 'Network Failure...',
 			success: config['success'] != null ? config['success'] : {render(res){
-				return res.ok ? "Success" : "error";
+				console.log(res);
+				return res.data.ok ? "Success" : "error";
 			}},
 		})
 		.then( e => e.json()).catch( e => e );