Just to merge

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

@@ -15,7 +15,7 @@ import java.util.Date;
 
 public class MockController {
     private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-    public final UserService userService;
+
     public final UserRepository userRepo;
     public final TokenRepository tokenRepo;
     public final TokenService tokenService;
@@ -27,8 +27,7 @@ public class MockController {
     ArrayList<User> mockUsers;
 
 
-    public MockController(UserService userService, UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService){
-        this.userService = userService;
+    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService){
         this.tokenRepo = tokenRepo;
         this.userRepo = userRepo;
         this.tokenService = tokenService;
@@ -46,19 +45,19 @@ public class MockController {
 
     @PostMapping("/mock")
     public void postMock(){
+
         // user part
 
+
         User herobrine = new User("brine","hero","admin@admin.com","behind","ShadowsLand",new Date(0), null,Role.Admin,passwordEncoder.encode("admin"));
         User joe = new User("Mama","Joe","student@student.com","roundabout","England",new Date(0), null,Role.Student,passwordEncoder.encode("student"));
         User meh = new User("Polo","Marco","secretary@secretary.com","a Box","Monaco",new Date(0), null,Role.Secretary,passwordEncoder.encode("secretary"));
         User joke = new User("Gaillard","Corentin","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
         User jojo = new User("Bridoux","Justin","teacher2@teacher2.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
         User lena = new User("Louille","Lena","inscriptionService@InscriptionService.com","no","yes",new Date(0), null,Role.InscriptionService,passwordEncoder.encode("inscriptionService"));
+        mockUsers = new ArrayList<>(Arrays.asList(herobrine,joe,meh,joke,lena,jojo));
 
-        mockUsers = new ArrayList<>(Arrays.asList(joke, herobrine, joe, meh, jojo));
-        userService.saveAll(mockUsers);
-        userService.save(lena);
-
+        userRepo.saveAll(mockUsers);
 
         // Course / Curriculum part
 

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

@@ -1,41 +0,0 @@
-package ovh.herisson.Clyde;
-
-import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.id.IdentifierGenerator;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-public class RegNoGenerator implements IdentifierGenerator {
-    private final UserSaveCounter usv = UserSaveCounter.getInstance();
-    @Override
-    public Object generate(SharedSessionContractImplementor session, Object object) {
-        try{
-            JdbcConnectionAccess jdbccon = session.getJdbcConnectionAccess();
-            Connection conn = jdbccon.obtainConnection();
-
-            Statement statement = conn.createStatement();
-
-            int n = usv.getCount();
-            String query = "select count(reg_no)+"+n+" from Users";
-            usv.increment();
-
-            ResultSet set = statement.executeQuery(query);
-            long resp = 0;
-            if(set.next()){
-                resp = set.getLong(1)+1000;
-                System.out.println(resp);
-            }
-
-            conn.close();
-            statement.close();
-
-            return resp;
-
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

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

@@ -5,10 +5,13 @@ import org.springframework.data.repository.CrudRepository;
 import ovh.herisson.Clyde.Tables.User;
 
 public interface UserRepository extends CrudRepository<User, Long> {
+
     User findById(long id);
 
     User findByEmail(String email);
 
+
+
     @Query("select u from User u where u.role = ovh.herisson.Clyde.Tables.Role.Teacher")
     Iterable<User> findAllTeachers();
 

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

@@ -5,15 +5,13 @@ import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.UserRepository;
 import ovh.herisson.Clyde.Tables.Role;
 import ovh.herisson.Clyde.Tables.User;
-import ovh.herisson.Clyde.UserSaveCounter;
-
 import java.util.*;
 
 @Service
 public class UserService {
     private final UserRepository userRepo;
     private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-    private final UserSaveCounter usc = UserSaveCounter.getInstance();
+
     public UserService(UserRepository userRepo){
         this.userRepo = userRepo;
     }
@@ -108,19 +106,10 @@ public class UserService {
     }
 
     public User save(User  user){
-        usc.reset();
         user.setPassword(passwordEncoder.encode(user.getPassword()));
         return userRepo.save(user);
     }
 
-    public void saveAll(ArrayList<User> list){
-        //S'assure que le compteur est bien a 0
-        usc.reset();
-        userRepo.saveAll(list);
-        //Reset le compteur a zero pour les futurs ajouts
-        usc.reset();
-    }
-
     public Iterable<User> getAll(){
         return userRepo.findAll();
     }
@@ -142,5 +131,4 @@ public class UserService {
     public void delete(User user) {
         userRepo.delete(user);
     }
-
 }

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

@@ -1,8 +1,6 @@
 package ovh.herisson.Clyde.Tables;
 
 import jakarta.persistence.*;
-import org.hibernate.annotations.GenericGenerator;
-
 import java.util.Date;
 
 
@@ -10,8 +8,7 @@ import java.util.Date;
 @Table(name = "Users")
 public class User {
     @Id
-    @GenericGenerator(name = "userGen", type = ovh.herisson.Clyde.RegNoGenerator.class)
-    @GeneratedValue(generator = "userGen")
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long regNo;
     private String lastName;
     private String firstName;

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

@@ -1,25 +0,0 @@
-package ovh.herisson.Clyde;
-
-public final class UserSaveCounter {
-    private static UserSaveCounter instance;
-    private int count = 0;
-
-    public void increment() {
-        this.count+=1;
-    }
-
-    public int getCount() {
-        return count;
-    }
-
-    public void reset(){
-        this.count = 0;
-    }
-    public static UserSaveCounter getInstance(){
-        if (instance == null){
-            instance = new UserSaveCounter();
-            return instance;
-        }
-        return instance;
-    }
-}

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

frontend/src/App.vue

@@ -86,14 +86,12 @@ window.addEventListener('hashchange', () => {
     </ul>
     </div>
     <div class="page">
-      <div style=" margin:50px;">
         <Suspense>
         
 		<component :is="currentView" />
         </Suspense>
     </div>
   </div>
-  </div>
 </template>
 
 <style scoped>

frontend/src/Apps/Login.vue

@@ -55,7 +55,7 @@
 </script>
 
 
-<template>
+<template style="background-color:rgba(255,255,255,0.05); border-radius:50px" >
       <div class='loginBox'>
 
         <div v-if="loginPage">
@@ -157,31 +157,14 @@
 </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);
-}
-
 
 .loginBox {
   background-color: rgb(24,24,24);
-  width: 400px;
-  display:flex;
+  width: 100%;
+  height:100%;
   justify-content: center;
-  padding: 40px;
-  border-radius: 20px;
+  padding: 10%;
+  border-radius: 5%;
   box-shadow:0 5px 25px #000000;
   
 }
@@ -190,9 +173,8 @@
   width:100%;
   display: flex;
   flex-direction: column;
-  justify-content: center;
   align-items:center;
-  gap: 15px;
+  gap: 3%;
 }
 
 
@@ -200,12 +182,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;
 }