From d48945604a575086e590544c846894ad0deda76f Mon Sep 17 00:00:00 2001 From: artem Date: Sat, 4 May 2024 10:15:16 +0300 Subject: [PATCH] logout + change password --- .../components/dropdowns/ProfileDropdown.vue | 2 +- src/pages/auth/Login.vue | 5 -- src/pages/auth/Logout.vue | 10 +++ .../preferences/modals/ResetPasswordModal.vue | 89 ++++++++----------- src/router/index.ts | 5 ++ src/stores/user-store.ts | 15 +++- 6 files changed, 65 insertions(+), 61 deletions(-) create mode 100644 src/pages/auth/Logout.vue diff --git a/src/components/navbar/components/dropdowns/ProfileDropdown.vue b/src/components/navbar/components/dropdowns/ProfileDropdown.vue index 031cb9d..02dc20d 100644 --- a/src/components/navbar/components/dropdowns/ProfileDropdown.vue +++ b/src/components/navbar/components/dropdowns/ProfileDropdown.vue @@ -108,7 +108,7 @@ withDefaults( list: [ { name: "logout", - to: "login", + to: "logout", icon: "mso-logout", }, ], diff --git a/src/pages/auth/Login.vue b/src/pages/auth/Login.vue index 2ecf9f2..de9d200 100644 --- a/src/pages/auth/Login.vue +++ b/src/pages/auth/Login.vue @@ -40,11 +40,6 @@
- + + + \ No newline at end of file diff --git a/src/pages/preferences/modals/ResetPasswordModal.vue b/src/pages/preferences/modals/ResetPasswordModal.vue index 2d4adef..be206ee 100644 --- a/src/pages/preferences/modals/ResetPasswordModal.vue +++ b/src/pages/preferences/modals/ResetPasswordModal.vue @@ -7,57 +7,27 @@ close-button @update:modelValue="emits('cancel')" > -

Reset password

+

Сброс пароля

- - -
-
-
- -
-

Must be at least 8 characters long

-
-
-
- -
-

Must contain at least 6 unique characters

-
-
+
@@ -75,53 +45,64 @@ type="submit" @click="submit" > - Update Password
diff --git a/src/router/index.ts b/src/router/index.ts index 8b71169..4e594a5 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -74,6 +74,11 @@ const routes: Array = [ path: "/auth", component: AuthLayout, children: [ + { + name: "logout", + path: "logout", + component: () => import("../pages/auth/Logout.vue"), + }, { name: "login", path: "login", diff --git a/src/stores/user-store.ts b/src/stores/user-store.ts index 9dff53b..2093552 100644 --- a/src/stores/user-store.ts +++ b/src/stores/user-store.ts @@ -14,12 +14,25 @@ export const useUserStore = defineStore("user", { } const dataProfile = JSON.parse(localStorage.getItem("profile")!); const dataUser = JSON.parse(localStorage.getItem("user")!); + const dateCreate = new Date(Date.parse(dataProfile.created_at)); + const yyyy = dateCreate.getFullYear().toString(); + const mm = dateCreate.getMonth() + 1; + const dd = dateCreate.getDate(); + let stringDD = dd.toString(); + let strinMM = mm.toString(); + if (dd < 10) { + stringDD = '0' + stringDD + }; + if (mm < 10) { + strinMM = '0' + strinMM; + } + const formattedToday = stringDD + '/' + strinMM + '/' + yyyy; return { profileID: dataProfile.id || "", userName: dataProfile.first_name || "", userSurname: dataProfile.surname || "", email: dataUser.email || "", - memberSince: "8/12/2020", + memberSince: formattedToday, pfp: "https://picsum.photos/id/22/200/300", is2FAEnabled: false, };