From 2515bb598e385c45c14f5fb1cbf7bf723ac5c421 Mon Sep 17 00:00:00 2001
From: Paolo Arena <paolo.arena77@gmail.com>
Date: Wed, 30 Jan 2019 01:05:31 +0100
Subject: [PATCH] - fix: starting the app it doesn't loaded the SingleTodo
 correctly...   the problem was:   import { SingleTodo } from '@components' 
 // doesn't work:   Resolve  :   import { SingleTodo } from '../../SingleTodo'
  // correct!

---
 quasar.conf.js                                 |  4 ++--
 src/components/Header.vue                      |  7 +++++++
 src/components/categories/category/category.ts |  2 +-
 src/components/todos/SingleTodo/SingleTodo.ts  |  2 +-
 src/components/todos/todo/todo.ts              |  8 +++++++-
 src/model/GlobalStore.ts                       |  1 +
 src/model/UserStore.ts                         |  1 +
 src/root/home/home.ts                          |  2 +-
 src/router/route-config.ts                     |  9 ++-------
 src/store/Modules/GlobalStore.ts               | 14 +++++++++++++-
 src/store/Modules/UserStore.ts                 |  7 ++++++-
 src/store/Modules/rescodes.ts                  |  1 +
 src/views/login/signin/signin.ts               |  2 +-
 src/views/login/signup/signup.ts               |  2 +-
 14 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/quasar.conf.js b/quasar.conf.js
index 560c8cb..3e42cce 100644
--- a/quasar.conf.js
+++ b/quasar.conf.js
@@ -13,9 +13,9 @@ const extendTypescriptToWebpack = (config) => {
   config.resolve
     .alias
     .set('@components', path.resolve(__dirname, 'src/components/index.ts'))
-    .set('@components', path.resolve(__dirname, 'src/components'))
+    // .set('@components', path.resolve(__dirname, 'src/components'))
     .set('@views', path.resolve(__dirname, 'src/components/views/index.ts'))
-    .set('@views', path.resolve(__dirname, 'src/components/views'))
+    // .set('@views', path.resolve(__dirname, 'src/components/views'))
     .set('@src', path.resolve(__dirname, 'src'))
     .set('@icons', path.resolve(__dirname, 'src/assets/icons'))
     .set('@images', path.resolve(__dirname, 'src/assets/images'))
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 579ae73..db65f37 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -1,6 +1,13 @@
 <template>
     <div>
 
+<!--
+        <router-link :to="'/'" v-if="$router.currentRoute.meta.backButton">
+            <button>
+                <i>arrow_back</i>
+            </button>
+        </router-link>
+-->
         <q-layout-header>
             <q-toolbar
                     color="primary"
diff --git a/src/components/categories/category/category.ts b/src/components/categories/category/category.ts
index fa2f45e..0cbfb38 100644
--- a/src/components/categories/category/category.ts
+++ b/src/components/categories/category/category.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { Component, Watch } from 'vue-property-decorator'
 
-import { SingleCat } from '@components'
+import { SingleCat } from '../SingleCat'
 import { ICategory } from '@src/model'
 
 
diff --git a/src/components/todos/SingleTodo/SingleTodo.ts b/src/components/todos/SingleTodo/SingleTodo.ts
index f3e29b2..63bbee3 100644
--- a/src/components/todos/SingleTodo/SingleTodo.ts
+++ b/src/components/todos/SingleTodo/SingleTodo.ts
@@ -6,7 +6,7 @@ import { UserStore } from '@modules'
 
 import { ITodo } from '../../../model/index'
 
-import { SubMenus } from '@components'
+import { SubMenus } from '../SubMenus'
 
 
 import $ from 'jquery'
diff --git a/src/components/todos/todo/todo.ts b/src/components/todos/todo/todo.ts
index af939b1..8389b06 100644
--- a/src/components/todos/todo/todo.ts
+++ b/src/components/todos/todo/todo.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { Component, Prop, Watch } from 'vue-property-decorator'
 
-import { SingleTodo } from '@components'
+import { SingleTodo } from '../SingleTodo'
 import { ITodo } from '@src/model'
 
 import { rescodes } from '../../../store/Modules/rescodes'
@@ -34,6 +34,8 @@ export default class Todo extends Vue {
   itemDragEnd: any = null
   selrowid: number = 0
 
+  // @Prop({ required: false }) category: string
+
   $refs: {
     single: SingleTodo[]
   }
@@ -49,6 +51,7 @@ export default class Todo extends Vue {
 
   getCategory() {
     return this.$route.params.category
+    // return this.category
   }
 
   change(param) {
@@ -242,6 +245,9 @@ export default class Todo extends Vue {
 
 
   async load() {
+    // Set last category selected
+    localStorage.setItem(rescodes.localStorage.categorySel, this.getCategory())
+
     for (let todosKey in rescodes.Todos) {
       this.listPriorityLabel.push(rescodes.Todos[todosKey])
     }
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 48a784f..b2bb2a3 100644
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -9,6 +9,7 @@ export interface IGlobalState {
   mobileMode: boolean
   menuCollapse: boolean
   leftDrawerOpen: boolean
+  category: string
   posts: IPost[]
   listatodo: ITodoList[]
 }
diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts
index 92655b5..f7f11c3 100644
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -22,6 +22,7 @@ export interface IUserState {
   tokens?: IToken[]
 
   verifiedEmail?: boolean
+  categorySel?: string
 
   tokenforgot?: string
 
diff --git a/src/root/home/home.ts b/src/root/home/home.ts
index 7655392..c9b58c6 100644
--- a/src/root/home/home.ts
+++ b/src/root/home/home.ts
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import { Component } from 'vue-property-decorator'
 import { GlobalStore } from '@store'
 
-import { Logo } from '@components'
+import { Logo } from '../../components/logo'
 
 @Component({
   components: { Logo }
diff --git a/src/router/route-config.ts b/src/router/route-config.ts
index c2cccc0..cdd182e 100644
--- a/src/router/route-config.ts
+++ b/src/router/route-config.ts
@@ -27,13 +27,8 @@ export const RouteConfig: VueRouteConfig[] = [
   {
     path: '/todo/:category',
     component: () => import('@/components/todos/todo/todo.vue'),
-    meta: { name: 'Todos' },
-    children: [
-      {
-        path: '',
-        component: () => import('@/components/todos/SingleTodo/SingleTodo.vue')
-      }
-    ]
+    // props: { category: 'personal' },
+    meta: { name: 'Todos' }
   },
   {
     path: '/category',
diff --git a/src/store/Modules/GlobalStore.ts b/src/store/Modules/GlobalStore.ts
index 8f5d78b..2929c7e 100644
--- a/src/store/Modules/GlobalStore.ts
+++ b/src/store/Modules/GlobalStore.ts
@@ -9,6 +9,7 @@ const state: IGlobalState = {
   mobileMode: false,
   menuCollapse: true,
   leftDrawerOpen: true,
+  category: 'personal',
   posts: [],
   listatodo: [
     {namecat: 'personal', description: 'personal'},
@@ -24,6 +25,7 @@ namespace Getters {
 
   const conta = b.read(state => state.conta, 'conta')
   const listatodo = b.read(state => state.listatodo, 'listatodo')
+  const category = b.read(state => state.category, 'category')
 
   export const getters = {
     get conta() {
@@ -32,6 +34,10 @@ namespace Getters {
 
     get listaTodo() {
       return listatodo()
+    },
+
+    get category() {
+      return category()
     }
   }
 }
@@ -46,9 +52,15 @@ namespace Mutations {
     state.leftDrawerOpen = bool
   }
 
+  function setCategorySel(state: IGlobalState, cat: string) {
+    state.category = cat
+  }
+
+
   export const mutations = {
     setConta: b.commit(setConta),
-    setleftDrawerOpen: b.commit(setleftDrawerOpen)
+    setleftDrawerOpen: b.commit(setleftDrawerOpen),
+    setCategorySel: b.commit(setCategorySel)
   }
 
 }
diff --git a/src/store/Modules/UserStore.ts b/src/store/Modules/UserStore.ts
index 1cf8186..d728707 100644
--- a/src/store/Modules/UserStore.ts
+++ b/src/store/Modules/UserStore.ts
@@ -22,7 +22,8 @@ const state: IUserState = {
   repeatPassword: '',
   idToken: '',
   tokens: [],
-  verifiedEmail: false
+  verifiedEmail: false,
+  categorySel: 'personal'
 }
 
 
@@ -69,6 +70,7 @@ namespace Mutations {
     state.username = data.username
     state.idToken = data.idToken
     state.verifiedEmail = data.verifiedEmail
+    state.category = data.categorySel
     // @ts-ignore
     state.tokens = [
       { access: 'auth', token: data.idToken }
@@ -106,6 +108,7 @@ namespace Mutations {
     state.tokens = []
     state.idToken = ''
     state.verifiedEmail = false
+    state.categorySel = 'personal'
   }
 
   export const mutations = {
@@ -484,12 +487,14 @@ namespace Actions {
     localStorage.removeItem(rescodes.localStorage.isLogged)
     // localStorage.removeItem(rescodes.localStorage.leftDrawerOpen)
     localStorage.removeItem(rescodes.localStorage.verifiedEmail)
+    localStorage.removeItem(rescodes.localStorage.categorySel)
 
     router.push('/signin')
   }
 
   function setGlobal() {
     GlobalStore.mutations.setleftDrawerOpen(localStorage.getItem(rescodes.localStorage.leftDrawerOpen) === 'true')
+    GlobalStore.mutations.setCategorySel(localStorage.getItem(rescodes.localStorage.categorySel))
   }
 
   async function autologin (context) {
diff --git a/src/store/Modules/rescodes.ts b/src/store/Modules/rescodes.ts
index 85abf4c..9c7672f 100644
--- a/src/store/Modules/rescodes.ts
+++ b/src/store/Modules/rescodes.ts
@@ -10,6 +10,7 @@ export const rescodes = {
 
   localStorage: {
     verifiedEmail: 'vf',
+    categorySel: 'cs',
     isLogged: 'ilog',
     expirationDate: 'expdate',
     leftDrawerOpen: 'ldo',
diff --git a/src/views/login/signin/signin.ts b/src/views/login/signin/signin.ts
index 429bc02..c49a9c2 100644
--- a/src/views/login/signin/signin.ts
+++ b/src/views/login/signin/signin.ts
@@ -10,7 +10,7 @@ import { validations, TSignin } from './signin-validate'
 
 import { validationMixin } from 'vuelidate'
 
-import { Logo } from '@components'
+import { Logo } from '../../../components/logo'
 
 import router from '@router'
 
diff --git a/src/views/login/signup/signup.ts b/src/views/login/signup/signup.ts
index 407bb21..93e2aff 100644
--- a/src/views/login/signup/signup.ts
+++ b/src/views/login/signup/signup.ts
@@ -8,7 +8,7 @@ import { validations, TSignup } from './signup-validate'
 
 import { validationMixin } from 'vuelidate'
 
-import { Logo } from '@components'
+import { Logo } from '../../../components/logo'
 
 // import {Loading, QSpinnerFacebook, QSpinnerGears} from 'quasar'