Compare commits
	
		
			7 Commits
		
	
	
		
			Leo/Backen
			...
			621f568ba2
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 621f568ba2 | |||
| 972d08a54d | |||
| 7a13d412f1 | |||
| 9de4b06e75 | |||
| 123fa97611 | |||
| 1fad792be7 | |||
| 
						
						
							
						
						acd1262955
	
				 | 
					
					
						
@ -25,7 +25,7 @@ dependencies {
 | 
			
		||||
	implementation("com.kohlschutter.junixsocket:junixsocket-core:2.9.0")
 | 
			
		||||
	// implementation("org.springframework.session:spring-session-jdbc")
 | 
			
		||||
	developmentOnly("org.springframework.boot:spring-boot-devtools")
 | 
			
		||||
	developmentOnly("org.springframework.boot:spring-boot-docker-compose")
 | 
			
		||||
  // developmentOnly("org.springframework.boot:spring-boot-docker-compose")
 | 
			
		||||
	runtimeOnly("org.postgresql:postgresql")
 | 
			
		||||
	testImplementation("org.springframework.boot:spring-boot-starter-test")
 | 
			
		||||
	testImplementation("org.springframework.boot:spring-boot-testcontainers")
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,46 +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.*;
 | 
			
		||||
import java.util.Calendar;
 | 
			
		||||
import java.util.Date;
 | 
			
		||||
import java.util.GregorianCalendar;
 | 
			
		||||
 | 
			
		||||
public class RegNoGenerator implements IdentifierGenerator {
 | 
			
		||||
    private static int count = 0;
 | 
			
		||||
    @Override
 | 
			
		||||
    public Object generate(SharedSessionContractImplementor session, Object object) {
 | 
			
		||||
        try{
 | 
			
		||||
            JdbcConnectionAccess jdbccon = session.getJdbcConnectionAccess();
 | 
			
		||||
            Connection conn = jdbccon.obtainConnection();
 | 
			
		||||
 | 
			
		||||
            Statement statement = conn.createStatement();
 | 
			
		||||
 | 
			
		||||
            Calendar c = new GregorianCalendar();
 | 
			
		||||
            int y = c.get(Calendar.YEAR);
 | 
			
		||||
            String query = "select count(reg_no) + "+count+" from Users where reg_no/10000 = " + y%1000;
 | 
			
		||||
 | 
			
		||||
            ResultSet set = statement.executeQuery(query);
 | 
			
		||||
            long resp = 0;
 | 
			
		||||
            if(set.next()){
 | 
			
		||||
                resp = set.getLong(1)+((y%1000)*10000);
 | 
			
		||||
                count += 1;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            conn.close();
 | 
			
		||||
            statement.close();
 | 
			
		||||
 | 
			
		||||
            return resp;
 | 
			
		||||
 | 
			
		||||
        } catch (SQLException e) {
 | 
			
		||||
            throw new RuntimeException(e);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public static void resetCount(){
 | 
			
		||||
        count = 0;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@ -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();
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -2,17 +2,16 @@ package ovh.herisson.Clyde.Services;
 | 
			
		||||
 | 
			
		||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 | 
			
		||||
import org.springframework.stereotype.Service;
 | 
			
		||||
import ovh.herisson.Clyde.RegNoGenerator;
 | 
			
		||||
import ovh.herisson.Clyde.Repositories.UserRepository;
 | 
			
		||||
import ovh.herisson.Clyde.Tables.Role;
 | 
			
		||||
import ovh.herisson.Clyde.Tables.User;
 | 
			
		||||
 | 
			
		||||
import java.util.*;
 | 
			
		||||
 | 
			
		||||
@Service
 | 
			
		||||
public class UserService {
 | 
			
		||||
    private final UserRepository userRepo;
 | 
			
		||||
    private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
 | 
			
		||||
 | 
			
		||||
    public UserService(UserRepository userRepo){
 | 
			
		||||
        this.userRepo = userRepo;
 | 
			
		||||
    }
 | 
			
		||||
@ -107,19 +106,10 @@ public class UserService {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public User save(User  user){
 | 
			
		||||
        RegNoGenerator.resetCount();
 | 
			
		||||
        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
 | 
			
		||||
        RegNoGenerator.resetCount();
 | 
			
		||||
        userRepo.saveAll(list);
 | 
			
		||||
        //Reset le compteur a zero pour les futurs ajouts
 | 
			
		||||
        RegNoGenerator.resetCount();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public Iterable<User> getAll(){
 | 
			
		||||
        return userRepo.findAll();
 | 
			
		||||
    }
 | 
			
		||||
@ -141,5 +131,4 @@ public class UserService {
 | 
			
		||||
    public void delete(User user) {
 | 
			
		||||
        userRepo.delete(user);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -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;
 | 
			
		||||
 | 
			
		||||
@ -1,2 +1,3 @@
 | 
			
		||||
spring.jpa.hibernate.ddl-auto=create-drop
 | 
			
		||||
spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
 | 
			
		||||
spring.sql.init.mode=always
 | 
			
		||||
@ -23,7 +23,6 @@ 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.Services.UserService;
 | 
			
		||||
import ovh.herisson.Clyde.Tables.Role;
 | 
			
		||||
import ovh.herisson.Clyde.Tables.Token;
 | 
			
		||||
import ovh.herisson.Clyde.Tables.User;
 | 
			
		||||
@ -48,8 +47,6 @@ public class UserControllerTest {
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private TokenService tokenService;
 | 
			
		||||
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private UserService userService;
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private UserRepository userRepository;
 | 
			
		||||
    @Autowired
 | 
			
		||||
@ -82,13 +79,12 @@ public class UserControllerTest {
 | 
			
		||||
        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());
 | 
			
		||||
        userService.save(god);
 | 
			
		||||
        userRepository.save(god);
 | 
			
		||||
        tokenService.saveToken(godToken);
 | 
			
		||||
 | 
			
		||||
        //Can god post herobrine himself ?
 | 
			
		||||
@ -101,7 +97,7 @@ public class UserControllerTest {
 | 
			
		||||
        //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());
 | 
			
		||||
        userService.save(noob);
 | 
			
		||||
        userRepository.save(noob);
 | 
			
		||||
        tokenService.saveToken(noobToken);
 | 
			
		||||
 | 
			
		||||
        with().body(herobrine).contentType(ContentType.JSON).header("Authorization", noobToken.getToken()).when().request("POST", "/user").then().statusCode(401);
 | 
			
		||||
 | 
			
		||||
@ -7,7 +7,6 @@ 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.Services.UserService;
 | 
			
		||||
import ovh.herisson.Clyde.Tables.Role;
 | 
			
		||||
import ovh.herisson.Clyde.Tables.User;
 | 
			
		||||
 | 
			
		||||
@ -25,7 +24,6 @@ public class UserRepoTest {
 | 
			
		||||
 | 
			
		||||
    @BeforeEach
 | 
			
		||||
    public void setup(){
 | 
			
		||||
        userRepo.deleteAll();
 | 
			
		||||
        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);
 | 
			
		||||
    }
 | 
			
		||||
@ -36,8 +34,8 @@ public class UserRepoTest {
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void usertest(){
 | 
			
		||||
        Assert.assertEquals("brine", userRepo.findByEmail("admin@admin.com").getLastName());
 | 
			
		||||
        Assert.assertTrue(new GregorianCalendar(2005, 4, 3).getTime().equals(userRepo.findByEmail("admin@admin.com").getBirthDate()));
 | 
			
		||||
        Assert.assertEquals("brine", userRepo.findById(1).getLastName());
 | 
			
		||||
        Assert.assertTrue(new GregorianCalendar(2005, 4, 3).getTime().equals(userRepo.findById(1).getBirthDate()));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -86,19 +86,18 @@ window.addEventListener('hashchange', () => {
 | 
			
		||||
    </ul>
 | 
			
		||||
    </div>
 | 
			
		||||
    <div class="page">
 | 
			
		||||
      <div style=" margin:50px;">
 | 
			
		||||
        <Suspense>
 | 
			
		||||
        
 | 
			
		||||
				<component :is="currentView" />
 | 
			
		||||
        </Suspense>
 | 
			
		||||
    </div>
 | 
			
		||||
  </div>
 | 
			
		||||
  </div>
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
<style scoped>
 | 
			
		||||
  
 | 
			
		||||
  .container{
 | 
			
		||||
			height: 100%;
 | 
			
		||||
			width: 100%;
 | 
			
		||||
    display:grid;
 | 
			
		||||
    grid-template-columns:[firstCol-start]70px[firstCol-end secondCol-start]auto[endCol];
 | 
			
		||||
    grid-template-rows:[firstRow-start]61px[firstRow-end secondRow-start] auto [endRow];
 | 
			
		||||
@ -111,6 +110,8 @@ window.addEventListener('hashchange', () => {
 | 
			
		||||
 | 
			
		||||
  .page {
 | 
			
		||||
    grid-area:page;
 | 
			
		||||
		height: 100%;
 | 
			
		||||
		width: 100%;
 | 
			
		||||
    place-self:center;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -16,10 +16,9 @@
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
<template> 
 | 
			
		||||
  <div  v-for="item of requests">
 | 
			
		||||
  <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>
 | 
			
		||||
@ -37,10 +36,9 @@
 | 
			
		||||
    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-columns:10% 14.2% 19% 14.2% 14.2% 14.2% 14.2%;
 | 
			
		||||
    grid-template-areas:
 | 
			
		||||
    "id type surname firstname infos accept refuse"; 
 | 
			
		||||
    column-gap:10px;
 | 
			
		||||
    
 | 
			
		||||
  }
 | 
			
		||||
  
 | 
			
		||||
@ -100,8 +98,8 @@
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 .bodu {
 | 
			
		||||
    width:100%;
 | 
			
		||||
    margin-bottom:10px;
 | 
			
		||||
    margin-top:2%;
 | 
			
		||||
    width:66%;
 | 
			
		||||
    border:2px solid black;
 | 
			
		||||
    border-radius:9px;
 | 
			
		||||
    background-color:rgb(50,50,50);
 | 
			
		||||
 | 
			
		||||
@ -56,9 +56,9 @@
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
<template>
 | 
			
		||||
      <div class='loginBox'>
 | 
			
		||||
 | 
			
		||||
    <div class="setup">
 | 
			
		||||
        <div v-if="loginPage">
 | 
			
		||||
      <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")}}
 | 
			
		||||
@ -74,13 +74,14 @@
 | 
			
		||||
            <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>
 | 
			
		||||
          <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")}}
 | 
			
		||||
@ -128,9 +129,12 @@
 | 
			
		||||
                <p>{{i18n("login.guest.country")}}</p>
 | 
			
		||||
                <input type="text" v-model="outputs.country">
 | 
			
		||||
              </div>
 | 
			
		||||
              <form novalidate enctype="multipart/form-data" class="inputBox">
 | 
			
		||||
              <form class="inputBox"novalidate enctype="multipart/form-data">
 | 
			
		||||
              	<p>{{i18n("profile.picture").toUpperCase()}}</p>
 | 
			
		||||
              <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> 
 | 
			
		||||
@ -154,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;
 | 
			
		||||
  
 | 
			
		||||
}
 | 
			
		||||
@ -190,9 +185,8 @@
 | 
			
		||||
  width:100%;
 | 
			
		||||
  display: flex;
 | 
			
		||||
  flex-direction: column;
 | 
			
		||||
  justify-content: center;
 | 
			
		||||
  align-items:center;
 | 
			
		||||
  gap: 15px;
 | 
			
		||||
  gap: 3%;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -200,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;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -220,8 +214,9 @@
 | 
			
		||||
 | 
			
		||||
.register{
 | 
			
		||||
  color:rgb(239,60,168);
 | 
			
		||||
  width: 100%;
 | 
			
		||||
  display:flex;
 | 
			
		||||
  width:70%;
 | 
			
		||||
  margin-bottom:20px;
 | 
			
		||||
  margin-top:20px;
 | 
			
		||||
  cursor: pointer;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -250,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;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -105,7 +105,8 @@
 | 
			
		||||
      </button>
 | 
			
		||||
    </div>
 | 
			
		||||
    <div v-if="createMod">
 | 
			
		||||
      <form class="listElement">
 | 
			
		||||
      <form class="listElement" style="width:40%;margin-right:auto;margin-left:auto;">
 | 
			
		||||
        
 | 
			
		||||
        <div style="margin-bottom:20px;">
 | 
			
		||||
         {{i18n("name")}} : 
 | 
			
		||||
        <input v-model="toAdd.title">
 | 
			
		||||
@ -125,7 +126,7 @@
 | 
			
		||||
      </form>
 | 
			
		||||
    </div>
 | 
			
		||||
    <div v-if="deleteMod">
 | 
			
		||||
      <form class="listElement">
 | 
			
		||||
      <form class="listElement" style="width:40%;margin-right:auto;margin-left:auto;">
 | 
			
		||||
        <div style="margin-bottom:20px;">
 | 
			
		||||
          {{i18n("courses.toDelete")}} :
 | 
			
		||||
         <select style="max-width:200px;" class="teacher" v-model="toRemove">
 | 
			
		||||
@ -138,7 +139,7 @@
 | 
			
		||||
      </form>
 | 
			
		||||
    </div>
 | 
			
		||||
 | 
			
		||||
    <div v-if="!createMod && !deleteMod" v-for="item in curriculum" :key="item.title">
 | 
			
		||||
    <div v-if="!createMod && !deleteMod" v-for="item in curriculum" :key="item.title" style="width:50%;margin-left:auto; margin-right:auto;">
 | 
			
		||||
      <div  v-if="editElementID !== item.title" style ="padding:15px 15px 15px 15px;">
 | 
			
		||||
        <button   @click="editElementID = item.title; setModify(item); ">
 | 
			
		||||
        {{i18n("courses.modify")}}
 | 
			
		||||
@ -149,6 +150,7 @@
 | 
			
		||||
        <button @click="editElementID= '';"> {{i18n("courses.back")}} </button>
 | 
			
		||||
      </div>
 | 
			
		||||
      <div  class="listElement" >
 | 
			
		||||
 | 
			
		||||
      <div class="containerElement" v-if="editElementID !== item.title" >
 | 
			
		||||
 | 
			
		||||
        <div class="name"> {{item.title}} </div>
 | 
			
		||||
@ -172,17 +174,27 @@
 | 
			
		||||
<style scoped>
 | 
			
		||||
.body {
 | 
			
		||||
    width:100%;
 | 
			
		||||
    margin-bottom:10px;
 | 
			
		||||
    margin-top:3.5%;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
.infosContainer {
 | 
			
		||||
  min-width:350px;
 | 
			
		||||
  padding-bottom:50px;
 | 
			
		||||
  border:2px solid black;
 | 
			
		||||
  font-size:25px;
 | 
			
		||||
  color:white;
 | 
			
		||||
  padding:20px;
 | 
			
		||||
  background-color:rgb(50,50,50);
 | 
			
		||||
  border-radius:20px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 .containerElement{ 
 | 
			
		||||
    justify-content:center;
 | 
			
		||||
    display:grid;
 | 
			
		||||
    grid-template-columns:350px 350px 200px;
 | 
			
		||||
    grid-template-columns:38.8% 38.8% 22.4%;
 | 
			
		||||
    grid-template-areas:
 | 
			
		||||
    "name teacher credits"; 
 | 
			
		||||
    column-gap:10px;
 | 
			
		||||
    
 | 
			
		||||
  }
 | 
			
		||||
    column-gap:10px;  }
 | 
			
		||||
  
 | 
			
		||||
  .name {
 | 
			
		||||
    grid-area:name;
 | 
			
		||||
@ -200,6 +212,7 @@
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
.listElement{
 | 
			
		||||
 min-width:625px;
 | 
			
		||||
  border:2px solid black;
 | 
			
		||||
  font-size:25px;
 | 
			
		||||
  color:white;
 | 
			
		||||
@ -207,6 +220,7 @@
 | 
			
		||||
  background-color:rgb(50,50,50);
 | 
			
		||||
  border-radius:20px;
 | 
			
		||||
  margin-bottom:10px;
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.modify{
 | 
			
		||||
@ -255,10 +269,11 @@
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .listTitle{
 | 
			
		||||
    min-width:380px;
 | 
			
		||||
    display: flex;
 | 
			
		||||
    justify-content: center;
 | 
			
		||||
    align-items: center;
 | 
			
		||||
    width:400px;
 | 
			
		||||
    width:25%;
 | 
			
		||||
    margin-left:auto;
 | 
			
		||||
    margin-right:auto;
 | 
			
		||||
    border:2px solid black;
 | 
			
		||||
@ -266,7 +281,8 @@
 | 
			
		||||
    color:white;
 | 
			
		||||
    padding:20px;
 | 
			
		||||
    background-color:rgb(50,50,50);
 | 
			
		||||
    border-radius:20px;margin-bottom:10px;
 | 
			
		||||
    border-radius:20px;
 | 
			
		||||
    margin-bottom:10px;
 | 
			
		||||
 | 
			
		||||
    button:hover{
 | 
			
		||||
      opacity:0.8;
 | 
			
		||||
 | 
			
		||||
@ -210,11 +210,11 @@
 | 
			
		||||
<style scoped>
 | 
			
		||||
 | 
			
		||||
.container{
 | 
			
		||||
  
 | 
			
		||||
  min-width:675px;
 | 
			
		||||
  display:grid;
 | 
			
		||||
  grid-template-columns:200px 900px;
 | 
			
		||||
  grid-template-columns:10vw 50vw;
 | 
			
		||||
  grid-template-rows:200px auto;
 | 
			
		||||
  column-gap:30px;
 | 
			
		||||
  column-gap:2.7%;
 | 
			
		||||
  row-gap:45px;
 | 
			
		||||
  grid-template-areas:
 | 
			
		||||
  "profilPic globalInfos"
 | 
			
		||||
@ -222,6 +222,7 @@
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.profilPic{
 | 
			
		||||
  width:100%;
 | 
			
		||||
  grid-area:profilPic;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -242,13 +243,17 @@
 | 
			
		||||
  grid-area:minfos;
 | 
			
		||||
}
 | 
			
		||||
.body {
 | 
			
		||||
    min-width:960px;
 | 
			
		||||
    width:100%;
 | 
			
		||||
    margin-bottom:10px;
 | 
			
		||||
    display:flex;
 | 
			
		||||
    align-items:center;
 | 
			
		||||
    justify-content:center;
 | 
			
		||||
    margin-top:5%;
 | 
			
		||||
  }
 | 
			
		||||
 .containerElement{ 
 | 
			
		||||
   justify-content:center;
 | 
			
		||||
    display:grid;
 | 
			
		||||
    grid-template-columns:350px 350px 200px;
 | 
			
		||||
    grid-template-columns:38.8% 38.8% 22.4%;
 | 
			
		||||
    grid-template-areas:
 | 
			
		||||
    "name teacher credits"; 
 | 
			
		||||
    column-gap:10px;
 | 
			
		||||
@ -271,10 +276,11 @@
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
.listTitle{
 | 
			
		||||
    min-width:197px;
 | 
			
		||||
    display: flex;
 | 
			
		||||
    justify-content: center;
 | 
			
		||||
    align-items: center;
 | 
			
		||||
    width:200px;
 | 
			
		||||
    width:8vw;
 | 
			
		||||
    margin-left:auto;
 | 
			
		||||
    margin-right:auto;
 | 
			
		||||
    border:2px solid black;
 | 
			
		||||
@ -286,6 +292,7 @@
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.listElement{
 | 
			
		||||
  min-width:625px;
 | 
			
		||||
  border:2px solid black;
 | 
			
		||||
  font-size:25px;
 | 
			
		||||
  color:white;
 | 
			
		||||
@ -296,6 +303,7 @@
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.infosContainer {
 | 
			
		||||
min-width:350px;
 | 
			
		||||
padding-bottom:50px;
 | 
			
		||||
border:2px solid black;
 | 
			
		||||
font-size:25px;
 | 
			
		||||
 | 
			
		||||
@ -5,8 +5,8 @@
 | 
			
		||||
 | 
			
		||||
  const users = await getStudents();
 | 
			
		||||
</script> 
 | 
			
		||||
<template>
 | 
			
		||||
  <div v-for="item in users">
 | 
			
		||||
<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>
 | 
			
		||||
@ -25,10 +25,9 @@
 | 
			
		||||
    height:100px;
 | 
			
		||||
    font-size:30px;
 | 
			
		||||
    display:grid;
 | 
			
		||||
    grid-template-columns:250px 250px 250px 250px 150px;
 | 
			
		||||
    grid-template-columns:21.7% 21.7% 21.7% 21.7% 13.1%;
 | 
			
		||||
    grid-template-areas:
 | 
			
		||||
    "status option surname firstname infos"; 
 | 
			
		||||
    column-gap:10px;
 | 
			
		||||
    
 | 
			
		||||
  }
 | 
			
		||||
  
 | 
			
		||||
@ -42,21 +41,6 @@
 | 
			
		||||
    align-self:center;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .refuse{
 | 
			
		||||
    grid-area:refuse;
 | 
			
		||||
    align-self:center;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .titles {
 | 
			
		||||
    grid-area:titles;
 | 
			
		||||
    background-color:rgb(215,215,215);
 | 
			
		||||
  }
 | 
			
		||||
  .id{
 | 
			
		||||
    grid-area:id;
 | 
			
		||||
    margin-left:40px;
 | 
			
		||||
    align-self:center;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .status{
 | 
			
		||||
    grid-area:status;
 | 
			
		||||
    align-self:center;
 | 
			
		||||
@ -81,15 +65,15 @@
 | 
			
		||||
  button{
 | 
			
		||||
    font-size:15px;
 | 
			
		||||
     height:50px;
 | 
			
		||||
     width:100px;
 | 
			
		||||
     width:75%;
 | 
			
		||||
    border:none;
 | 
			
		||||
    border-radius:20px;
 | 
			
		||||
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .bodu {
 | 
			
		||||
    width:100%;
 | 
			
		||||
    margin-bottom:10px;
 | 
			
		||||
    margin-top:2%;
 | 
			
		||||
    width:66%;
 | 
			
		||||
    border:2px solid black;
 | 
			
		||||
    border-radius:9px;
 | 
			
		||||
    background-color:rgb(50,50,50);
 | 
			
		||||
 | 
			
		||||
@ -7,8 +7,8 @@
 | 
			
		||||
  const users = await getAllUsers();
 | 
			
		||||
  
 | 
			
		||||
</script> 
 | 
			
		||||
<template>
 | 
			
		||||
  <div v-for="item in users">
 | 
			
		||||
<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>
 | 
			
		||||
@ -22,23 +22,20 @@
 | 
			
		||||
 | 
			
		||||
<style scoped>
 | 
			
		||||
  .container{
 | 
			
		||||
    justify-content:center;
 | 
			
		||||
    align-items:center;
 | 
			
		||||
    color:white;
 | 
			
		||||
    height:100px;
 | 
			
		||||
    font-size:30px;
 | 
			
		||||
    display:grid;
 | 
			
		||||
    grid-template-columns:250px 250px 250px 150px;
 | 
			
		||||
    grid-template-columns:27.7% 27.7% 27.7% 16.9%;
 | 
			
		||||
    grid-template-areas:
 | 
			
		||||
    "role surname firstname infos"; 
 | 
			
		||||
    column-gap:10px;
 | 
			
		||||
 | 
			
		||||
  }
 | 
			
		||||
  
 | 
			
		||||
  .infos {
 | 
			
		||||
 | 
			
		||||
    grid-area:infos;
 | 
			
		||||
    align-items:center;
 | 
			
		||||
    align-self:center;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .role {
 | 
			
		||||
@ -67,20 +64,18 @@
 | 
			
		||||
  button{
 | 
			
		||||
    font-size:15px;
 | 
			
		||||
     height:50px;
 | 
			
		||||
     width:100px;
 | 
			
		||||
     width:75%;
 | 
			
		||||
    border:none;
 | 
			
		||||
    border-radius:20px;
 | 
			
		||||
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .bodu {
 | 
			
		||||
    width:100%;
 | 
			
		||||
    margin-bottom:10px;
 | 
			
		||||
    margin-top:2%;
 | 
			
		||||
    width:66%;
 | 
			
		||||
    border:2px solid black;
 | 
			
		||||
    border-radius:9px;
 | 
			
		||||
    background-color:rgb(50,50,50);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
</style>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,4 +1,11 @@
 | 
			
		||||
body {
 | 
			
		||||
   background-color: rgb(53, 25, 60);
 | 
			
		||||
   margin:0;
 | 
			
		||||
   width: 100vw;
 | 
			
		||||
   height: 100vh;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#app {
 | 
			
		||||
   width: 100%;
 | 
			
		||||
   height: 100%;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user