From a9c5affd27da5f9f9a9283506db3dc52b5a1c7de Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Tue, 23 May 2023 12:18:25 +0100 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=20=D1=8D=D0=BA?= =?UTF-8?q?=D1=81=D0=BF=D0=BE=D1=80=D1=82=20=D0=BD=D0=B5=D0=BD=D1=83=D0=B6?= =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D1=81=D0=B5=D0=BA=D1=86=D0=B8=D0=B9=20?= =?UTF-8?q?=D0=B8=D0=B7=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 18 ------------------ src/views/LandingPages/SignIn/BasicView.vue | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 23e02c0..c531e24 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,8 +1,5 @@ import { createRouter, createWebHistory } from "vue-router"; import PresentationView from "../views/Presentation/PresentationView.vue"; -import AboutView from "../views/LandingPages/AboutUs/AboutView.vue"; -import ContactView from "../views/LandingPages/ContactUs/ContactView.vue"; -import AuthorView from "../views/LandingPages/Author/AuthorView.vue"; import SignInBasicView from "../views/LandingPages/SignIn/BasicView.vue"; import Project from "../views/LandingPages/Project/Project.vue"; import Profile from "../views/LandingPages/Profile/Profile.vue"; @@ -99,21 +96,6 @@ const router = createRouter({ component: ForgotPassword, }, - { - path: "/pages/landing-pages/about-us", - name: "about", - component: AboutView, - }, - { - path: "/pages/landing-pages/contact-us", - name: "contactus", - component: ContactView, - }, - { - path: "/pages/landing-pages/author", - name: "author", - component: AuthorView, - }, { path: "/pages/landing-pages/basic", name: "signin-basic", diff --git a/src/views/LandingPages/SignIn/BasicView.vue b/src/views/LandingPages/SignIn/BasicView.vue index d7f7b07..1ac6717 100644 --- a/src/views/LandingPages/SignIn/BasicView.vue +++ b/src/views/LandingPages/SignIn/BasicView.vue @@ -22,6 +22,13 @@ const loggedUserName = computed(() => sessionStorage.getItem('username')); const isStaff = computed(() => sessionStorage.getItem('is_staff')); const token = computed(() => sessionStorage.getItem('token')); +//Тут мы попробуем использовать local storage потому что оно должно работать между вкладками +const isAuthenticatedLocal = computed(() => !!localStorage.getItem('access_token')); +const userIdLocal = computed(() => localStorage.getItem('user_id')); +const loggedUserNameLocal = computed(() => localStorage.getItem('username')); +const isStaffLocal = computed(() => localStorage.getItem('is_staff')); +const tokenLocal = computed(() => localStorage.getItem('token')); + const login = async () => { if (!username.value || !password.value) { errorMessage.value = "Please fill in both fields."; @@ -42,6 +49,13 @@ const login = async () => { sessionStorage.setItem('user_id', response.data.id); sessionStorage.setItem('is_staff', response.data.is_staff); sessionStorage.setItem('token', response.data.token); + //Дублируем всё, потому что страницы будут переползать постепенно + localStorage.setItem('access_token', response.data.access); + localStorage.setItem('username', username.value); + localStorage.setItem('user_id', response.data.id); + localStorage.setItem('is_staff', response.data.is_staff); + localStorage.setItem('token', response.data.token); + location.reload(); // Refresh page } catch (error) { if (error.response) { @@ -61,6 +75,13 @@ const logout = () => { sessionStorage.removeItem('user_id'); sessionStorage.setItem('is_staff', false); sessionStorage.removeItem('token'); + //и тут тоже не забываем продублировать + localStorage.removeItem('access_token'); + localStorage.removeItem('username'); // Also clear the username from sessionStorage + localStorage.removeItem('user_id'); + localStorage.setItem('is_staff', false); + localStorage.removeItem('token'); + location.reload(); // Refresh page after logout };