Merge branch 'main' of gitlab.com:keanuapp/keanuapp-weblite into main

This commit is contained in:
Nathan Freitas 2021-07-12 09:41:46 -04:00
commit 9a3af7b4c4
No known key found for this signature in database
GPG key ID: A801183E69B37AA9
2 changed files with 33 additions and 6 deletions

View file

@ -1,6 +1,14 @@
<template> <template>
<div class="home"> <div class="home">
<YouAre class="mt-4" v-if="!loading" /> <YouAre class="mt-4" v-if="!loading" />
<v-container fluid class="text-center mt-8">
<v-row align="center" justify="center">
<v-col class="text-center" cols="auto">
<v-img src="@/assets/logo.svg" width="64" height="64" />
</v-col>
</v-row>
</v-container>
<v-card class="members ma-3" flat> <v-card class="members ma-3" flat>
<v-card-title class="h2">{{ $t("room.room_list_rooms") }}</v-card-title> <v-card-title class="h2">{{ $t("room.room_list_rooms") }}</v-card-title>
<v-card-text class="pa-0"> <v-card-text class="pa-0">

View file

@ -1,11 +1,30 @@
<template> <template>
<div class="login-root"> <div class="pa-4">
<v-btn v-if="showBackArrow" icon @click.stop="$navigation.pop"> <div class="chat-header">
<v-icon>arrow_back</v-icon> <v-container fluid>
</v-btn> <v-row no-gutters>
<v-col>
<v-img src="@/assets/logo.svg" width="32" height="32" xclass="d-inline-block header-button-left" />
</v-col>
<v-col>
<div class="room-name">{{ $t("login.title") }}</div>
</v-col>
<v-col class="text-right">
<v-btn
text
v-if="showCloseButton"
@click.stop="$navigation.pop"
>
<v-icon>close</v-icon>
</v-btn>
</v-col>
</v-row>
</v-container>
</div>
<div color="rgba(255,255,255,0.1)" class="text-center"> <div color="rgba(255,255,255,0.1)" class="text-center">
<div class="h2">{{$t('login.title')}}</div>
<v-form v-model="isValid"> <v-form v-model="isValid">
<v-text-field <v-text-field
v-model="user.user_id" v-model="user.user_id"
@ -71,7 +90,7 @@ export default {
currentUser() { currentUser() {
return this.$store.state.auth.user; return this.$store.state.auth.user;
}, },
showBackArrow() { showCloseButton() {
return this.$navigation && this.$navigation.canPop(); return this.$navigation && this.$navigation.canPop();
} }
}, },