Compare commits
	
		
			5 Commits
		
	
	
		
			jalonA
			...
			wal/front/
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 1fad792be7 | |||
| 3d6941ab93 | |||
| de72bd800c | |||
| b465dcfa92 | |||
| 73f3df0bc6 | 
| @ -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 | ||||
|  | ||||
| @ -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"] | ||||
|  | ||||
| @ -49,11 +49,11 @@ 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 jojo = new User("hhoo","yeay","teacher2@teacher2.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,jojo)); | ||||
|  | ||||
| @ -72,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); | ||||
|  | ||||
| @ -88,14 +88,14 @@ public class UserControllerTest { | ||||
|         tokenService.saveToken(godToken); | ||||
|  | ||||
|         //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); | ||||
|  | ||||
|         userRepository.delete(herobrine); | ||||
|  | ||||
|         //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()); | ||||
|         userRepository.save(noob); | ||||
|         tokenService.saveToken(noobToken); | ||||
| @ -105,7 +105,7 @@ public class UserControllerTest { | ||||
|  | ||||
|     @Test | ||||
|     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); | ||||
|  | ||||
|         Token t = new Token(herobrine, tokenService.generateNewToken(), new Date()); | ||||
|  | ||||
| @ -70,7 +70,7 @@ class TokenServiceTest { | ||||
|         ArrayList<Token> tokenList = new ArrayList<>(); | ||||
|         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); | ||||
|  | ||||
|         for (int i = 0; i < 20; i++){ | ||||
|  | ||||
| @ -52,7 +52,7 @@ window.addEventListener('hashchange', () => { | ||||
|             <a class="icon" href="#Notifications"> | ||||
|                 <div class="fa-solid fa-bell"  style="margin-top: 7px; margin-bottom: 3px;"></div> | ||||
|             </a></li> | ||||
|         <li @click="active=!active"  class="option"style="float: right;" title=settings> | ||||
|         <li @click="active=!active" class="option"style="float: right;" title=settings> | ||||
|             <a class="icon" > | ||||
|                 <div  class="fa-solid fa-gear"  style="margin-top: 7px; margin-bottom: 3px;"></div> | ||||
|                 <div v-if="active" class="dropdown"> | ||||
| @ -86,12 +86,10 @@ window.addEventListener('hashchange', () => { | ||||
|     </ul> | ||||
|     </div> | ||||
|     <div class="page"> | ||||
|       <div style=" margin:50px;"> | ||||
|         <Suspense> | ||||
|          | ||||
| 		<component :is="currentView" /> | ||||
|         </Suspense> | ||||
|       </div> | ||||
|     </div> | ||||
|   </div> | ||||
| </template> | ||||
|  | ||||
| @ -55,11 +55,11 @@ | ||||
| </script> | ||||
|  | ||||
|  | ||||
| <template> | ||||
| <template style="background-color:rgba(255,255,255,0.05); border-radius:50px" > | ||||
|       <div class='loginBox'> | ||||
|  | ||||
|         <div v-if="loginPage"> | ||||
|           <form @submit.prevent=" login(outputs.email,outputs.password);goBackHome();"class="form"> | ||||
|           <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> | ||||
| @ -80,7 +80,7 @@ | ||||
|           </form> | ||||
|         </div> | ||||
|  | ||||
|         <div v-else> | ||||
|         <div  v-else> | ||||
|           <form class="form"> | ||||
|             <h1 style="color:rgb(239,60,168); font-family: sans-serif; text-align:center;"> | ||||
|               {{i18n("login.guest.welcome")}} | ||||
| @ -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; | ||||
| } | ||||
|  | ||||
|  | ||||
		Reference in New Issue
	
	Block a user