From d1134c35cfdc011b0f6fdb89a94dbf627d64e3f1 Mon Sep 17 00:00:00 2001 From: Julien Calixte Date: Sun, 12 Dec 2021 00:47:42 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20(app)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{Authorize.vue => AuthorizeUser.vue} | 12 +- src/components/FluxNote.vue | 8 +- src/router/router.ts | 10 +- src/views/{About.vue => AboutApp.vue} | 0 src/views/{Home.vue => HomeApp.vue} | 8 +- src/views/Login.vue | 120 ------------------ src/views/RepoList.vue | 16 +-- 7 files changed, 23 insertions(+), 151 deletions(-) rename src/components/{Authorize.vue => AuthorizeUser.vue} (79%) rename src/views/{About.vue => AboutApp.vue} (100%) rename src/views/{Home.vue => HomeApp.vue} (90%) delete mode 100644 src/views/Login.vue diff --git a/src/components/Authorize.vue b/src/components/AuthorizeUser.vue similarity index 79% rename from src/components/Authorize.vue rename to src/components/AuthorizeUser.vue index 7ac0131..e92abed 100644 --- a/src/components/Authorize.vue +++ b/src/components/AuthorizeUser.vue @@ -1,5 +1,5 @@ @@ -11,7 +11,7 @@ import { useRoute, useRouter } from 'vue-router' import { signIn } from '@/modules/user/service/signIn' export default defineComponent({ - name: 'Authorize', + name: 'AuthorizeUser', setup() { const route = useRoute() const router = useRouter() @@ -22,13 +22,13 @@ export default defineComponent({ onBeforeMount(async () => { if (code) { - const body = await signIn(code.toString()) + const token = await signIn(code.toString()) - if ('error' in body) { + if ('error' in token) { hasError.value = true } else { - body.access_token - saveCredentials(body) + token.access_token + saveCredentials(token) } router.replace({ name: 'Home' }) diff --git a/src/components/FluxNote.vue b/src/components/FluxNote.vue index 6748bf8..69e72cb 100644 --- a/src/components/FluxNote.vue +++ b/src/components/FluxNote.vue @@ -105,10 +105,10 @@ export default defineComponent({ watch( renderedContent, - () => - nextTick(() => { - listenToClick() - }), + async () => { + await nextTick() + listenToClick() + }, { immediate: true } ) diff --git a/src/router/router.ts b/src/router/router.ts index 8b2744e..40de12c 100644 --- a/src/router/router.ts +++ b/src/router/router.ts @@ -1,13 +1,8 @@ import { RouteRecordRaw, createRouter, createWebHistory } from 'vue-router' -import Home from '@/views/Home.vue' +import Home from '@/views/HomeApp.vue' const routes: Array = [ - { - path: '/login', - name: 'Login', - component: () => import(/* webpackChunkName: "login" */ '@/views/Login.vue') - }, { path: '/repo-list', name: 'RepoList', @@ -62,7 +57,8 @@ const routes: Array = [ { path: '/about', name: 'About', - component: () => import(/* webpackChunkName: "about" */ '@/views/About.vue') + component: () => + import(/* webpackChunkName: "about" */ '@/views/AboutApp.vue') }, { path: '/:catchAll(.*)', diff --git a/src/views/About.vue b/src/views/AboutApp.vue similarity index 100% rename from src/views/About.vue rename to src/views/AboutApp.vue diff --git a/src/views/Home.vue b/src/views/HomeApp.vue similarity index 90% rename from src/views/Home.vue rename to src/views/HomeApp.vue index 6cce364..6e2ee0c 100644 --- a/src/views/Home.vue +++ b/src/views/HomeApp.vue @@ -1,6 +1,6 @@