Maxime/Clyde
1
0
Fork 0
forked from PGL/Clyde
Code Pull Requests Activity

Merge remote-tracking branch 'origin/master' into Leo/InscriptionDesEtudiants

Browse Source 
# Conflicts:
#	frontend/src/Apps/Inscription.vue
#	frontend/src/Apps/Login.vue
#	frontend/src/Apps/Profil.vue
#	frontend/src/Apps/StudentsList.vue
This commit is contained in:
LeoMoulin
2024-04-01 10:30:29 +02:00
parent 4a314449ad 9e0db361b8
commit 47e4fb2f8c
7 changed files with 120 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
frontend/src/Apps/Login.vue
View File

@ -24,11 +24,9 @@
const submitValue= ref(i18n("login.guest.submit"))
const passwordConfirm=ref("")
//Allows to display MA or BAB for years
let yearprefix = "";
const imageSaved = ref(false)
let ppData = "";
const ppData = ref(false)
const curricula= await getAllCurriculums();
@ -71,10 +69,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>
@ -89,14 +87,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>
@ -143,8 +142,14 @@
<p>{{i18n("login.guest.country")}}</p>
<input type="text" v-model="outputs.country">
</div>
<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 novalidate enctype="multipart/form-data" class="inputBox">
<p>{{i18n("profile.picture").toUpperCase()}}</p>
<p>{{i18n("profile.picture").toUpperCase()}}</p>
<input type="file" @change="uploadPP($event.target.files); imageSaved = true;" accept="image/*">
</form>
<div class="inputBox">
@ -157,7 +162,6 @@
Si vous êtes déja inscrits dans cette université veuillez vous connecter a votre compte et utilisez les fonctions
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());">
{{i18n("login.guest.nextpage")}}
@ -177,25 +181,19 @@
</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%;
}
@ -204,8 +202,7 @@
width: 400px;
display:flex;
justify-content: center;
padding: 40px;
border-radius: 20px;
border-radius: 5%;
box-shadow:0 5px 25px #000000;
}
@ -214,9 +211,8 @@
width:100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items:center;
gap: 15px;
gap: 3%;
}
@ -224,12 +220,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;
}
@ -244,14 +240,15 @@
.register{
color:rgb(239,60,168);
width: 100%;
display:flex;
width:70%;
margin-bottom:20px;
margin-top:20px;
cursor: pointer;
}
.switchpage{
width:100px;
background:rgb(255, 0 255);
background:rgb(255, 0,255);
border: none;
padding-right:0;
padding-top:10px;
@ -274,6 +271,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;