jbourdon/social-media
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/oauth

Browse Source
This commit is contained in:
Kamigen
2024-04-28 19:30:48 -04:00
parent 9fb40b1219 ef18885b56
commit cfb2d372a5
88 changed files with 2209 additions and 2281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/LoginView.vue
View File

@@ -13,14 +13,14 @@
<v-row align="center" justify="center">
<!-- Header -->
<v-col cols="8" lg="8" md="10" sm="10" xs="10" style=" align-items: center; ">
<img class="login-picture" src="../../images/loginpage/loginhutopy.png">
<img class="login-picture" src="/images/hutopymedia/loginpage/loginhutopy.png">
</v-col>
<!-- Connexion-objects -->
<v-col cols="3" lg="4" md="10" sm="10" xs="10" class="connexion-container">
<h1 class="text-center display-6 h1-connexion">Connexion</h1>
<h2 class="text-center display-3 h2-connexion">Comment souhaitez-vous
vous connecter à votre compte?</h2>
<h2 class="text-center display-3 h2-connexion">Comment souhaitez-vous vous connecter à votre
compte?</h2>
<v-card-text>
<v-form class="label-mail-password">
<v-text-field prepend-icon="mdi-email" type="text" v-model="user.email"
@@ -43,9 +43,7 @@
<v-btn color="primary" class="ma-2 btnhome" @click="login">Login</v-btn>
</v-card-actions>
<div class="text-center">
<h2 class="text-center display-3 h2pasinscrit">
Pas encore
inscrit?</h2>
<h2 class="text-center display-3 h2pasinscrit">Pas encore inscrit?</h2>
<router-link :to="{ name: 'contact' }">
<v-btn color="#6b0065" class="inscriptionbtn"
style="height: 50px; width: 200px; border-radius: 30px; font-size: 1.2rem;">Inscriptions</v-btn>
@@ -63,7 +61,7 @@
<div class="sm:hidden flex flex-col items-center justify-start"
style="background-color: #f4f4f4; height: 100vh;">
<img style="margin-top: 10%; width: 350px; box-shadow: 0 4px 6px rgba(0, 0, 0, .5); border-radius: 25px; "
src="../../images/loginpage/loginhutopy.png">
src="/images/hutopymedia/loginpage/loginhutopy.png">
<h1 class="h1-connexion">Connexion</h1>
<h2 class="h2-connexion">Comment souhaitez-vous
@@ -93,10 +91,7 @@
</div>
</div>
</v-app>
</template>
@@ -119,8 +114,8 @@ let errorSnackBar = ref(false);
async function login() {
// TODO: Make the store handle errors
try {
await store.login(api, user.value.email, user.value.password)
router.push('/');
await store.login(api, user.value.email, user.value.password)
router.push('/');
} catch (error) {
errorSnackBar.value = true;
}
@@ -146,7 +141,6 @@ const googleCallback = (response) => {
}
@media (min-width: 300px) {
.h1-connexion {
font-size: 2em;