From f64ea3c5e3bd0d136ec5886eb904a924f5b04dcb Mon Sep 17 00:00:00 2001
From: Dhaverd <jedi55@mail.ru>
Date: Mon, 4 Nov 2024 06:13:46 +0800
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D1=83=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D1=83=D1=8E,=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7?=
 =?UTF-8?q?=20=D0=BF=D0=B0=D1=80=D0=BE=D0=BB=D1=8F=20=D0=BD=D0=B0=20=D1=84?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BC=D1=8B=20=D0=B2=D1=85=D0=BE=D0=B4=D0=B0=20?=
 =?UTF-8?q?=D0=B8=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/App.vue            |  2 +-
 resources/views/Login.vue    | 25 ++++++++++---------------
 resources/views/Register.vue | 18 ++++++++++++++++--
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/resources/App.vue b/resources/App.vue
index fb92bfe..2474133 100644
--- a/resources/App.vue
+++ b/resources/App.vue
@@ -34,7 +34,7 @@
                     <v-label class="text-h6 h-auto w-auto pa-2">Welcome {{ authenticated ? userStore.user['name'] : 'guest' }}!</v-label><br>
                 </div>
                 <div class="d-flex" :class="menuOpen ? 'justify-center' : 'justify-end'">
-                    <p class="ml-3 mr-3" :class="menuOpen ? 'text-body-1' : 'text-h6'"><RouterLink to="/" class="nav-link text-decoration-none">Главная</RouterLink></p>
+                    <p class="ml-3 mr-3" :class="menuOpen ? 'text-body-1' : 'text-h6'"><a href="/" class="nav-link text-decoration-none">Главная</a></p>
                     <p v-if="!authenticated" class="ml-3 mr-3" :class="menuOpen ? 'text-body-1' : 'text-h6'"><RouterLink to="/login" class="nav-link text-decoration-none">Войти</RouterLink></p>
                     <p v-if="!authenticated" class="ml-3 mr-3" :class="menuOpen ? 'text-body-1' : 'text-h6'"><RouterLink to="/register" class="nav-link text-decoration-none">Регистрация</RouterLink></p>
                     <p v-if="authenticated" class="ml-3 mr-3" :class="menuOpen ? 'text-body-1' : 'text-h6'"><a href="#" class="nav-link text-decoration-none" @click="logout">Выйти</a></p>
diff --git a/resources/views/Login.vue b/resources/views/Login.vue
index c8ea3b2..354d4ac 100644
--- a/resources/views/Login.vue
+++ b/resources/views/Login.vue
@@ -5,28 +5,22 @@
                 <v-label>Логин:</v-label>
                 <v-text-field type="email" v-model="email" label="E-mail" class="flex-grow-0" required></v-text-field>
                 <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="showPassword ? 'text' : 'password'"
+                    v-model="password"
+                    label="Пароль"
+                    class="flex-grow-0"
+                    :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'"
+                    @click:append="showPassword = !showPassword"
+                    required></v-text-field>
                 <v-checkbox v-model="rememberMe" label="Запомнить меня"></v-checkbox>
                 <div class="d-flex justify-center" :class="isWide ? '' : 'flex-column align-center'">
-                    <!--<div>-->
                         <v-btn type="submit" color="#F0A068FF" class="ma-5 flex-grow-0" :class="isWide ? 'w-25' : 'w-100 text-body-1'" :loading="loading">Войти</v-btn>
-                    <!--</div>-->
                     <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>
                     </router-link>
                 </div>
             </v-form>
-            <!--
-            <v-label>Логин:</v-label>
-            <v-text-field label="Логин" class="flex-grow-0"></v-text-field>
-            <v-label>Пароль:</v-label>
-            <v-text-field label="Пароль" class="flex-grow-0"></v-text-field>
-            <div class="d-flex justify-center" :class="isWide ? '' : 'flex-column align-center'">
-                <v-btn color="#F0A068FF" class="ma-5" :class="isWide ? 'w-25' : 'w-100 text-body-1'">Войти</v-btn>
-                <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>
-                </router-link>
-            </div>-->
         </div>
     </div>
 </template>
@@ -46,7 +40,8 @@ export default {
             rememberMe: false,
             loading: false,
             errorMessage: '',
-            errorMessageContainerStyle: 'display: none;'
+            errorMessageContainerStyle: 'display: none;',
+            showPassword: false
         };
     },
     methods: {
diff --git a/resources/views/Register.vue b/resources/views/Register.vue
index fd8c14b..cf4664a 100644
--- a/resources/views/Register.vue
+++ b/resources/views/Register.vue
@@ -54,8 +54,22 @@ export default {
                 <v-label>E-mail:</v-label>
                 <v-text-field type="email" v-model="email" label="E-mail" class="flex-grow-0" required></v-text-field>
                 <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="c_password" label="Повторите пароль" class="flex-grow-0" required></v-text-field>
+                <v-text-field
+                    :type="showPassword ? 'text' : 'password'"
+                    :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'"
+                    @click:append="showPassword = !showPassword"
+                    v-model="password"
+                    label="Пароль"
+                    class="flex-grow-0"
+                    required></v-text-field>
+                <v-text-field
+                    :type="showRepeatPassword ? 'text' : 'password'"
+                    :append-icon="showRepeatPassword ? 'mdi-eye' : 'mdi-eye-off'"
+                    @click:append="showRepeatPassword = !showRepeatPassword"
+                    v-model="c_password"
+                    label="Повторите пароль"
+                    class="flex-grow-0"
+                    required></v-text-field>
                 <v-label :style="errorMessageContainerStyle">{{ errorMessage }}</v-label>
                 <div class="d-flex justify-center" :class="isWide ? '' : 'flex-column align-center'">
                     <v-btn type="submit" color="#F0A068FF" class="ma-5" :class="isWide ? 'w-25' : 'w-100 text-body-1'" :loading="loading">Зарегистрироваться</v-btn>