Merge pull request 'Make app use full space' (#148 ) from tonitch/front/fullSpaceApp into master

Reviewed-on: #148 Reviewed-by: Wal <karpinskiwal@gmail.com> Reviewed-by: Maxime <231026@umons.ac.be>
Full screen apps
2024-03-24 22:32:46 +01:00 · 2024-03-23 23:56:24 +01:00 · 2024-03-23 13:57:46 +01:00 · 2024-03-22 20:15:45 +01:00 · 2024-03-22 20:14:20 +01:00 · 2024-03-22 13:56:04 +01:00
8 changed files with 121 additions and 102 deletions
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@ -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,9 @@ window.addEventListener('hashchange', () => {
    </ul>
    </div>
    <div class="page">
-      <div style=" margin:50px;">
        <Suspense>
-        
-		<component :is="currentView" />
+				<component :is="currentView" />
        </Suspense>
-      </div>
    </div>
  </div>
 </template>
@ -99,6 +96,8 @@ window.addEventListener('hashchange', () => {
 <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;
  }

--- a/frontend/src/Apps/Inscription.vue
+++ b/frontend/src/Apps/Inscription.vue
@ -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;
    
  }
  
@ -99,9 +97,9 @@

  }

-  .bodu {
-    width:100%;
-    margin-bottom:10px;
+ .bodu {
+    margin-top:2%;
+    width:66%;
    border:2px solid black;
    border-radius:9px;
    background-color:rgb(50,50,50);
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@ -56,10 +56,10 @@


 <template>
-      <div class='loginBox'>
-
+    <div class="setup">
        <div v-if="loginPage">
-          <form @submit.prevent=" login(outputs.email,outputs.password);goBackHome();"class="form">
+      <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")}}
            </h1>
@ -74,14 +74,15 @@
            <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>
-          <form class="form">
+          <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")}}
            </h1>
@ -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">
-              	<p>{{i18n("profile.picture").toUpperCase()}}</p> 
-				<input type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*">
+              <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> 
@ -153,35 +157,26 @@
            </div>
          </form>
         </div>
-        </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;

--- a/frontend/src/Apps/ManageCourses.vue
+++ b/frontend/src/Apps/ManageCourses.vue
@ -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")}}
@ -148,7 +149,8 @@
        <button @click="editElementID= '';patchCourse(item)"> {{i18n("courses.confirm")}} </button>
        <button @click="editElementID= '';"> {{i18n("courses.back")}} </button>
      </div>
-      <div  class="listElement" > 
+      <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;
+    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;
--- a/frontend/src/Apps/Profil.vue
+++ b/frontend/src/Apps/Profil.vue
@ -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;
--- a/frontend/src/Apps/StudentsList.vue
+++ b/frontend/src/Apps/StudentsList.vue
@ -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);
--- a/frontend/src/Apps/UsersList.vue
+++ b/frontend/src/Apps/UsersList.vue
@ -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>

--- a/frontend/src/assets/main.css
+++ b/frontend/src/assets/main.css
@ -1,4 +1,11 @@
 body {
   background-color: rgb(53, 25, 60);
   margin:0;
+   width: 100vw;
+   height: 100vh;
+}
+
+#app {
+   width: 100%;
+   height: 100%;
 }
Author	SHA1	Message	Date
Debucquoy Anthony	9e0db361b8	Merge pull request 'Make app use full space' (#148 ) from tonitch/front/fullSpaceApp into master All checks were successful Build and test backend / Build-backend (push) Successful in 2m26s Details deploy to production / deploy-frontend (push) Successful in 27s Details deploy to production / deploy-backend (push) Successful in 2m5s Details Build and test FrontEnd / Build-frontend (push) Successful in 24s Details Reviewed-on: #148 Reviewed-by: Wal <karpinskiwal@gmail.com> Reviewed-by: Maxime <231026@umons.ac.be>	2024-03-24 22:32:46 +01:00
Wawilski	7a13d412f1	Full screen apps All checks were successful Build and test backend / Build-backend (pull_request) Successful in 1m48s Details Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s Details	2024-03-23 23:56:24 +01:00
Wawilski	9de4b06e75	Login 'fixed' All checks were successful Build and test backend / Build-backend (pull_request) Successful in 2m53s Details Build and test FrontEnd / Build-frontend (pull_request) Successful in 26s Details	2024-03-23 13:57:46 +01:00
Wawilski	123fa97611	Merge branch 'wal/front/temp' into tonitch/front/fullSpaceApp	2024-03-22 20:15:45 +01:00
Wawilski	1fad792be7	Just to merge	2024-03-22 20:14:20 +01:00
Anthony Debucquoy	acd1262955	Make app use full space All checks were successful Build and test backend / Build-backend (pull_request) Successful in 1m50s Details Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s Details	2024-03-22 13:56:04 +01:00