Dhaverd/ computer-journal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Dhaverd:38e31a9e3d1151c6dec706a83c059bb59d2a4dda
Branches Tags
Dhaverd:master
..
compare: Dhaverd:a31c8aed394061b3c9c54d7a574f69f2811c2744
Branches Tags
Dhaverd:master

No commits in common. "38e31a9e3d1151c6dec706a83c059bb59d2a4dda" and "a31c8aed394061b3c9c54d7a574f69f2811c2744" have entirely different histories.
38e31a9e3d ... a31c8aed39

4 changed files with 10 additions and 32 deletions
Show Stats Expand all files Collapse all files

4
resources/css/app.css
View File

@ -23,10 +23,6 @@ @keyframes gradient {
} }
} }
.min-width-btn {
min-width: 1px!important;
}
.nav-link:link { .nav-link:link {
color: #4FDBFEFF!important; color: #4FDBFEFF!important;
} }

22
resources/views/About.vue
View File

@ -7,9 +7,6 @@ export default {
username: 'guest' username: 'guest'
}; };
}, },
props: {
isWide: Boolean
},
computed: { computed: {
user() { user() {
const authStore = useAuthStore(); const authStore = useAuthStore();
@ -28,24 +25,9 @@ export default {
</script> </script>
<template> <template>
<div v-if="user == null" class="d-flex justify-center align-center h-100 flex-column w-100"> <v-label class="text-h3">Welcome {{ user != null ? user.name : 'guest' }}!</v-label><br>
<v-label class="text-h3 d-flex justify-center align-center" :class="isWide ? 'w-100' : 'w-10'">Welcome guest!</v-label><br>
<div class="d-flex justify-center align-center ma-5 w-100">
<router-link to="/register" class="ma-3 text-decoration-none link-no-color flex-grow-0 min-width-btn" :class="isWide ? 'w-10' : 'w-100'">
<v-btn color="#F0A068FF" class="pa-3" :class="isWide ? 'w-100' : 'w-100 text-body-1'">Регистрация</v-btn>
</router-link>
<router-link to="/login" class="ma-3 text-decoration-none link-no-color flex-grow-0 min-width-btn" :class="isWide ? 'w-10' : 'w-100'">
<v-btn color="#F0A068FF" class="pa-3" :class="isWide ? 'w-100' : 'w-100 text-body-1'">Вход</v-btn>
</router-link>
</div>
</div>
<div v-else class="d-flex justify-center align-center h-100 flex-column w-100">
<v-label class="text-h3 d-flex justify-center align-center" :class="isWide ? 'w-100' : 'w-10'">Welcome {{ user.name }}!</v-label>
</div>
</template> </template>
<style scoped> <style scoped>
.w-10 {
width: 10%;
}
</style> </style>

12
resources/views/Login.vue
View File

@ -1,14 +1,14 @@
<template> <template>
<div class="w-100 h-100 d-flex justify-center"> <div class="w-100 h-100 d-flex justify-center">
<div class="d-flex flex-column align-center justify-center h-100 w-75"> <div class="d-flex flex-column justify-center h-100" :class="isWide ? 'w-50' : 'w-75'">
<v-form class="d-flex flex-column justify-center h-100 flex-grow-1" :class="isWide ? 'w-50' : 'w-75'" @submit.prevent="login"> <v-form @submit.prevent="login">
<v-label>Email:</v-label> <v-label>Логин:</v-label>
<v-text-field type="email" v-model="email" label="E-mail" class="flex-grow-0" required></v-text-field> <v-text-field type="email" v-model="email" label="E-mail" class="flex-grow-0" required></v-text-field>
<v-label>Пароль:</v-label> <v-label>Пароль:</v-label>
<v-text-field type="password" v-model="password" label="Пароль" class="flex-grow-0" required></v-text-field> <v-text-field type="password" v-model="password" label="Пароль" class="flex-grow-0" required></v-text-field>
<div class="d-flex justify-center align-center" :class="isWide ? '' : 'flex-column align-center'"> <div class="d-flex justify-center" :class="isWide ? '' : 'flex-column align-center'">
<v-btn type="submit" color="#F0A068FF" class="ma-5 min-width-btn flex-grow-0" :class="isWide ? 'w-25' : 'w-100 text-body-1'" block>Войти</v-btn> <v-btn type="submit" color="#F0A068FF" class="ma-5 flex-grow-0" :class="isWide ? 'w-25' : 'w-100 text-body-1'" block>Войти</v-btn>
<router-link to="/register" class="text-decoration-none link-no-color ma-5 flex-grow-0" :class="isWide ? 'w-25' : 'w-100'"> <router-link to="/register" class="text-decoration-none link-no-color ma-5" :class="isWide ? 'w-25' : 'w-100'">
<v-btn color="#F0A068FF" :class="isWide ? 'w-100' : 'w-100 text-body-1'">Регистрация</v-btn> <v-btn color="#F0A068FF" :class="isWide ? 'w-100' : 'w-100 text-body-1'">Регистрация</v-btn>
</router-link> </router-link>
</div> </div>

4
resources/views/Register.vue
View File

@ -37,8 +37,8 @@ export default {
<v-label>Пароль:</v-label> <v-label>Пароль:</v-label>
<v-text-field type="password" v-model="password" label="Пароль" class="flex-grow-0" required></v-text-field> <v-text-field type="password" v-model="password" label="Пароль" class="flex-grow-0" required></v-text-field>
<div class="d-flex justify-center" :class="isWide ? '' : 'flex-column align-center'"> <div class="d-flex justify-center" :class="isWide ? '' : 'flex-column align-center'">
<v-btn type="submit" color="#F0A068FF" class="ma-5 min-width-btn flex-grow-0" :class="isWide ? 'w-25' : 'w-100 text-body-1'" block>Зарегистрироваться</v-btn> <v-btn type="submit" color="#F0A068FF" class="ma-5" :class="isWide ? 'w-25' : 'w-100 text-body-1'" block>Зарегистрироваться</v-btn>
<router-link to="/login" class="text-decoration-none link-no-color ma-5 flex-grow-0" :class="isWide ? 'w-25' : 'w-100'"> <router-link to="/login" class="text-decoration-none link-no-color ma-5" :class="isWide ? 'w-25' : 'w-100'">
<v-btn color="#F0A068FF" :class="isWide ? 'w-100' : 'w-100 text-body-1'">Вход</v-btn> <v-btn color="#F0A068FF" :class="isWide ? 'w-100' : 'w-100 text-body-1'">Вход</v-btn>
</router-link> </router-link>
</div> </div>