From 8442101c40a8c1a278af6a52ec05015cf0e64024 Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Mon, 1 Apr 2024 11:43:42 +0200
Subject: [PATCH] Fixed some css

---
 frontend/src/Apps/AboutRequest.vue | 20 +++++++++++++++++---
 frontend/src/Apps/AboutStudent.vue | 14 +++++++++++---
 frontend/src/Apps/Inscription.vue  | 14 +++++++-------
 frontend/src/Apps/Login.vue        | 13 ++++++++-----
 frontend/src/Apps/StudentsList.vue |  8 ++++----
 5 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/frontend/src/Apps/AboutRequest.vue b/frontend/src/Apps/AboutRequest.vue
index a818e18..186f75c 100644
--- a/frontend/src/Apps/AboutRequest.vue
+++ b/frontend/src/Apps/AboutRequest.vue
@@ -52,10 +52,11 @@ function getPP(){
 
 <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"
@@ -64,6 +65,7 @@ function getPP(){
 
 .profilPic{
   grid-area:profilPic;
+  width:100%;
 }
 
 .globalInfos {
@@ -73,8 +75,12 @@ function getPP(){
 }
 
 .body {
+  min-width:960px;
   width:100%;
-  margin-bottom:10px;
+  display:flex;
+  align-items:center;
+  justify-content:center;
+  margin-top:5%;
 }
 
 .subContainter{
@@ -138,4 +144,12 @@ function getPP(){
   column-gap:40px;
   padding-left: 25px;
 }
+button{
+  font-size:15px;
+  height:50px;
+  width:100px;
+  border:none;
+  border-radius:20px;
+
+}
 </style>
\ No newline at end of file
diff --git a/frontend/src/Apps/AboutStudent.vue b/frontend/src/Apps/AboutStudent.vue
index 52f0fe1..394014a 100644
--- a/frontend/src/Apps/AboutStudent.vue
+++ b/frontend/src/Apps/AboutStudent.vue
@@ -85,10 +85,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"
@@ -106,8 +107,12 @@
 }
 
 .body {
+  min-width:960px;
   width:100%;
-  margin-bottom:10px;
+  display:flex;
+  align-items:center;
+  justify-content:center;
+  margin-top:5%;
 }
 
 .subContainter{
@@ -135,6 +140,9 @@
   grid-template-areas:
   "minfos minfos";
   grid-template-columns:600px 600px;
+  align-items:center;
+  justify-content:center;
+  margin-left: 320%;
 }
 
 .listTitle{
diff --git a/frontend/src/Apps/Inscription.vue b/frontend/src/Apps/Inscription.vue
index b02cfcd..2788cf5 100644
--- a/frontend/src/Apps/Inscription.vue
+++ b/frontend/src/Apps/Inscription.vue
@@ -21,10 +21,10 @@
 <template>
   <div v-if="windowsState === 1">
     <AboutRequest :target="targetId"></AboutRequest>
-    <button style="background-color:rgb(105,05,105);" @click="windowsState=0;">Retour</button>
+    <button style="background-color:rgb(105,05,105);margin-left: 30%" @click="windowsState=0;">Retour</button>
   </div>
   <div v-if="windowsState === 0">
-    <div  v-for="item of requests">
+    <div style='display:flex; justify-content:center; min-width:1140px;' v-for="item of requests">
     <div class="bodu">
     <div class="container">
       <div class="date">{{item.submissionDate.slice(0, 10)}}</div>
@@ -38,7 +38,7 @@
     </div>
     </div>
   </div>
-  <div v-if="windowsState === 2">
+  <div style='display:flex; justify-content:center; min-width:1140px;margin-top: 10%' v-if="windowsState === 2">
     <p>Etes vous sur de vouloir accepter cette demande ?</p>
     <button style="background-color:rgb(105,05,105);" @click="upPage(targetId,'Accepted');windowsState=0;">Valider</button>
     <button style="background-color:rgb(105,05,105);" @click="windowsState=0;">Retour</button>
@@ -51,7 +51,7 @@
     height:100px;
     font-size:20px;
     display:grid;
-    grid-template-columns:[firstCol-start]150px[firstCol-end secondCol-start]200px[secondCol-end thirdCol-start]200px[thirdCol-end fourthCol-start]150px[fourthCol-end]150px[fifthCol-end]150px[sixthCol-end]150px[endCol];
+    grid-template-columns:15% 15% 10% 14.2% 14.2% 14.2% 14.2%;
     grid-template-areas:
     "date state surname firstname accept refuse infos";
     column-gap:10px;
@@ -74,7 +74,7 @@
 
   .titles {
     grid-area:titles;
-    background-color:rgb(215,215,215);
+    align-self:center;
   }
   .date{
     grid-area:date;
@@ -119,8 +119,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);
diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue
index df0d248..a1cf99a 100644
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@@ -53,18 +53,22 @@
   async function uploadPP(arg){
     const data = await uploadProfilePicture(arg);
     ppData = data.url;
-    console.log(ppData);
   }
 
   //This functions makes the distinction between a master cursus (year 4 or more) and a bachelor cursus (year 3 or less)
   function getCursusDisplay(cursus){
     if (cursus.year <= 3){
-      return "BAB " + cursus.year + " " + cursus.option;
+      return cursus.curriculumId + " BAB " + cursus.year + " " + cursus.option;
     }else{
-      return "MA" + (parseInt(cursus.year)-3).toString() + " " + cursus.option;
+      return cursus.curriculumId + " MA" + (parseInt(cursus.year)-3).toString() + " " + cursus.option;
     }
   }
 
+  //This function return the id of a decorated cursus (decorated by the function up)
+  function parseDecoratedCursus(cursus){
+    let id = cursus.substring(0, cursus.indexOf(" ")+1);
+    return id;
+  }
 </script>
 
 
@@ -164,7 +168,7 @@
                 changer de cursus/réinscription sinon continuez ici.
               </p>
               <div style="align-self:center;" class="inputBox">
-                <button style="margin-top:25px;" @click="page++; register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData, null, new Date());">
+                <button style="margin-top:25px;" @click="page++; register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, parseDecoratedCursus(outputs.curriculum), ppData, null, new Date());">
                   {{i18n("login.guest.nextpage")}}
                 </button>
               </div>
@@ -249,7 +253,6 @@
 
 .switchpage{
   width:100px;
-  background:rgb(255, 0,255);
   border: none;
   padding-right:0;
   padding-top:10px;
diff --git a/frontend/src/Apps/StudentsList.vue b/frontend/src/Apps/StudentsList.vue
index ded264b..62f4acb 100644
--- a/frontend/src/Apps/StudentsList.vue
+++ b/frontend/src/Apps/StudentsList.vue
@@ -12,7 +12,7 @@
 <template style="margin-top:5%;">
   <div v-if="list === false">
     <AboutStudent :target=targetRegNo />
-    <button style="background-color:rgb(105,05,105);" @click="list = true;">Back</button>
+    <button style="background-color:rgb(105,05,105);width:5%; margin-left: 10%;" @click="list = true;">Back</button>
   </div>
   <div style="display:flex; justify-content:center; " v-for="item in users" v-if="list === true">
     <div class="bodu">
@@ -35,7 +35,7 @@
     height:100px;
     font-size:30px;
     display:grid;
-    grid-template-columns:21.7% 21.7% 21.7% 21.7% 13.1%;
+    grid-template-columns:21.7% 21.7% 21.7% 20% 13.1%;
     grid-template-areas:
     "status option surname firstname infos"; 
     column-gap:10px;
@@ -74,8 +74,8 @@
 
   button{
     font-size:15px;
-     height:50px;
-     width:75%;
+    height:50px;
+    width:75%;
     border:none;
     border-radius:20px;