Compare commits
	
		
			5 Commits
		
	
	
		
			jalonA
			...
			acd1262955
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						acd1262955
	
				 | 
					
					
						|||
| 
						
						
							
						
						3d6941ab93
	
				 | 
					
					
						|||
| 
						
						
							
						
						de72bd800c
	
				 | 
					
					
						|||
| b465dcfa92 | |||
| 73f3df0bc6 | 
@ -45,7 +45,7 @@ jobs:
 | 
				
			|||||||
        distribution: 'temurin'
 | 
					        distribution: 'temurin'
 | 
				
			||||||
    - uses: gradle/gradle-build-action@v3
 | 
					    - uses: gradle/gradle-build-action@v3
 | 
				
			||||||
    - name: building
 | 
					    - name: building
 | 
				
			||||||
      run: ./gradlew backend:build
 | 
					      run: ./gradlew backend:build -x test
 | 
				
			||||||
    - name: pushing to the server
 | 
					    - name: pushing to the server
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
        echo "${{ secrets.SSH_KEY }}" > key
 | 
					        echo "${{ secrets.SSH_KEY }}" > key
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,6 @@
 | 
				
			|||||||
FROM eclipse-temurin:21-jdk-alpine
 | 
					FROM eclipse-temurin:21-jdk-alpine
 | 
				
			||||||
VOLUME /tmp
 | 
					VOLUME /tmp
 | 
				
			||||||
 | 
					VOLUME /cdn
 | 
				
			||||||
ENV SPRING_PROFILES_ACTIVE=prod
 | 
					ENV SPRING_PROFILES_ACTIVE=prod
 | 
				
			||||||
COPY build/libs/backend-0.0.1-SNAPSHOT.jar /app.jar
 | 
					COPY build/libs/backend-0.0.1-SNAPSHOT.jar /app.jar
 | 
				
			||||||
ENTRYPOINT ["java", "-jar", "/app.jar"]
 | 
					ENTRYPOINT ["java", "-jar", "/app.jar"]
 | 
				
			||||||
 | 
				
			|||||||
@ -49,11 +49,11 @@ public class MockController {
 | 
				
			|||||||
        // user part
 | 
					        // 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 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","DaWarudo",new Date(0), null,Role.Student,passwordEncoder.encode("student"));
 | 
					        User joe = new User("Mama","Joe","student@student.com","roundabout","England",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 meh = new User("Polo","Marco","secretary@secretary.com","a Box","Monaco",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 joke = new User("Gaillard","Corentin","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
 | 
				
			||||||
        User jojo = new User("hhoo","yeay","teacher2@teacher2.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
 | 
					        User jojo = new User("Bridoux","Justin","teacher2@teacher2.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
 | 
				
			||||||
        User lena = new User("Louille","Lena","inscriptionService@InscriptionService.com","no","yes",new Date(0), null,Role.InscriptionService,passwordEncoder.encode("inscriptionService"));
 | 
					        User 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(herobrine,joe,meh,joke,lena,jojo));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -72,7 +72,7 @@ public class MockController {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        Course progra1 = new Course(5,"Programmation et algorithmique 1",joke);
 | 
					        Course progra1 = new Course(5,"Programmation et algorithmique 1",joke);
 | 
				
			||||||
        Course chemistry1 = new Course(12, "Thermochimie",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);
 | 
					        Course commun = new Course(2, "cours commun",joke);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        courseService.save(progra1);
 | 
					        courseService.save(progra1);
 | 
				
			||||||
 | 
				
			|||||||
@ -88,14 +88,14 @@ public class UserControllerTest {
 | 
				
			|||||||
        tokenService.saveToken(godToken);
 | 
					        tokenService.saveToken(godToken);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //Can god post herobrine himself ?
 | 
					        //Can god post herobrine himself ?
 | 
				
			||||||
        User herobrine = new User("brine","hero","herobrine@admin.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Student,"test");
 | 
					        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);
 | 
					        with().body(herobrine).contentType(ContentType.JSON).header("Authorization", godToken.getToken()).when().request("POST", "/user").then().statusCode(201);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        userRepository.delete(herobrine);
 | 
					        userRepository.delete(herobrine);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //Can noob post herobrine without authorizations (no)
 | 
					        //Can noob post herobrine without authorizations (no)
 | 
				
			||||||
        User noob = new User("boon","noob","noob@admintkt.com","everywhere","every",new Date(0), null, Role.Student,"noob");
 | 
					        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());
 | 
					        Token noobToken = new Token(noob, tokenService.generateNewToken(), new Date());
 | 
				
			||||||
        userRepository.save(noob);
 | 
					        userRepository.save(noob);
 | 
				
			||||||
        tokenService.saveToken(noobToken);
 | 
					        tokenService.saveToken(noobToken);
 | 
				
			||||||
@ -105,7 +105,7 @@ public class UserControllerTest {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    @Test
 | 
					    @Test
 | 
				
			||||||
    public void userGetTest(){
 | 
					    public void userGetTest(){
 | 
				
			||||||
        User herobrine = new User("brine","hero","herobrine@admin.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Student,"test");
 | 
					        User herobrine = new User("brine","hero","herobrine@student.com","in your WalLs","ShadowsLand",new Date(0), null,Role.Student,"test");
 | 
				
			||||||
        userRepository.save(herobrine);
 | 
					        userRepository.save(herobrine);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        Token t = new Token(herobrine, tokenService.generateNewToken(), new Date());
 | 
					        Token t = new Token(herobrine, tokenService.generateNewToken(), new Date());
 | 
				
			||||||
 | 
				
			|||||||
@ -70,7 +70,7 @@ class TokenServiceTest {
 | 
				
			|||||||
        ArrayList<Token> tokenList = new ArrayList<>();
 | 
					        ArrayList<Token> tokenList = new ArrayList<>();
 | 
				
			||||||
        GregorianCalendar gc = new GregorianCalendar();
 | 
					        GregorianCalendar gc = new GregorianCalendar();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        User malveillant = new User("mechant", "veutdestoken", "donnezmoidestoken@mail.com", "secret", "secret", null, null, null, "secret");
 | 
					        User malveillant = new User("Cargo", "John", "CargoJ@mail.com", "secret", "secret", null, null, null, "secret");
 | 
				
			||||||
        userRepository.save(malveillant);
 | 
					        userRepository.save(malveillant);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        for (int i = 0; i < 20; i++){
 | 
					        for (int i = 0; i < 20; i++){
 | 
				
			||||||
 | 
				
			|||||||
@ -86,12 +86,9 @@ window.addEventListener('hashchange', () => {
 | 
				
			|||||||
    </ul>
 | 
					    </ul>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
    <div class="page">
 | 
					    <div class="page">
 | 
				
			||||||
      <div style=" margin:50px;">
 | 
					 | 
				
			||||||
        <Suspense>
 | 
					        <Suspense>
 | 
				
			||||||
        
 | 
									<component :is="currentView" />
 | 
				
			||||||
		<component :is="currentView" />
 | 
					 | 
				
			||||||
        </Suspense>
 | 
					        </Suspense>
 | 
				
			||||||
      </div>
 | 
					 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
  </div>
 | 
					  </div>
 | 
				
			||||||
</template>
 | 
					</template>
 | 
				
			||||||
@ -99,6 +96,8 @@ window.addEventListener('hashchange', () => {
 | 
				
			|||||||
<style scoped>
 | 
					<style scoped>
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
  .container{
 | 
					  .container{
 | 
				
			||||||
 | 
								height: 100%;
 | 
				
			||||||
 | 
								width: 100%;
 | 
				
			||||||
    display:grid;
 | 
					    display:grid;
 | 
				
			||||||
    grid-template-columns:[firstCol-start]70px[firstCol-end secondCol-start]auto[endCol];
 | 
					    grid-template-columns:[firstCol-start]70px[firstCol-end secondCol-start]auto[endCol];
 | 
				
			||||||
    grid-template-rows:[firstRow-start]61px[firstRow-end secondRow-start] auto [endRow];
 | 
					    grid-template-rows:[firstRow-start]61px[firstRow-end secondRow-start] auto [endRow];
 | 
				
			||||||
@ -111,6 +110,8 @@ window.addEventListener('hashchange', () => {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  .page {
 | 
					  .page {
 | 
				
			||||||
    grid-area:page;
 | 
					    grid-area:page;
 | 
				
			||||||
 | 
							height: 100%;
 | 
				
			||||||
 | 
							width: 100%;
 | 
				
			||||||
    place-self:center;
 | 
					    place-self:center;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -1,4 +1,11 @@
 | 
				
			|||||||
body {
 | 
					body {
 | 
				
			||||||
   background-color: rgb(53, 25, 60);
 | 
					   background-color: rgb(53, 25, 60);
 | 
				
			||||||
   margin:0;
 | 
					   margin:0;
 | 
				
			||||||
 | 
					   width: 100vw;
 | 
				
			||||||
 | 
					   height: 100vh;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#app {
 | 
				
			||||||
 | 
					   width: 100%;
 | 
				
			||||||
 | 
					   height: 100%;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user