From 96f3dda1723645ea57ef17cfbb2ee5a4657f3d94 Mon Sep 17 00:00:00 2001
From: Joe Wroten <joe.wroten@q2ebanking.com>
Date: Tue, 16 May 2017 07:07:31 -0500
Subject: [PATCH] Refactored to use routes and App.vue

---
 src/App.vue                        |  76 ++++++++++--
 src/components/Footer.vue          |  43 +++++++
 src/components/Headerprimary.vue   |  47 ++++++++
 src/components/Headersecondary.vue |  61 ++++++++++
 src/components/Index.vue           | 180 ++---------------------------
 src/components/Myspells.vue        |  35 ++++++
 src/components/Spelllist.vue       |  29 ++---
 src/router.js                      |   1 +
 src/store.js                       |  14 ++-
 9 files changed, 280 insertions(+), 206 deletions(-)
 create mode 100644 src/components/Footer.vue
 create mode 100644 src/components/Headerprimary.vue
 create mode 100644 src/components/Headersecondary.vue
 create mode 100644 src/components/Myspells.vue

diff --git a/src/App.vue b/src/App.vue
index 326d3f9..f250163 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,15 +1,75 @@
 <template>
-  <!-- Don't drop "q-app" class -->
   <div id="q-app">
-    <router-view></router-view>
+    <q-layout>
+      <nav-header-primary
+        slot="header"
+        class="toolbar dark"
+      ></nav-header-primary>
+
+      <nav-header-secondary
+        slot="header"
+        class="toolbar dark"
+      ></nav-header-secondary>
+
+      <div class="layout-view">
+        <router-view></router-view>
+      </div>
+
+      <nav-footer
+        slot="footer"
+        class="toolbar pink"
+      ></nav-footer>
+    </q-layout>
   </div>
 </template>
 
 <script>
-/*
- * Root component
- */
-export default {}
-</script>
+import { Loading, Dialog } from 'quasar'
+import Vue from 'vue'
+import 'whatwg-fetch'
+import { state, dispatch } from './store'
+import HeaderPrimary from './components/Headerprimary'
+import HeaderSecondary from './components/Headersecondary'
+import Footer from './components/Footer'
 
-<style></style>
+Vue.component('nav-header-primary', HeaderPrimary)
+Vue.component('nav-header-secondary', HeaderSecondary)
+Vue.component('nav-footer', Footer)
+
+function fetchSuccess (data) {
+  dispatch({
+    type: 'SPELLS_RESOLVED',
+    data: {
+      data,
+      loaded: true
+    }
+  })
+}
+
+function fetchFailure (reason) {
+  let message = 'Unable to retrieve spells list'
+  Dialog.create({
+    title: 'Error',
+    message,
+    nobuttons: true
+  })
+  console.error(message, reason)
+}
+
+export default {
+  data () {
+    return { state }
+  },
+  mounted () {
+    if (!this.state.spells.loaded) {
+      Loading.show()
+
+      fetch('./statics/dnd5e.json')
+      .then(response => response.json())
+      .then(fetchSuccess)
+      .catch(fetchFailure)
+      .then(() => { Loading.hide() })
+    }
+  }
+}
+</script>
diff --git a/src/components/Footer.vue b/src/components/Footer.vue
new file mode 100644
index 0000000..e5cb42a
--- /dev/null
+++ b/src/components/Footer.vue
@@ -0,0 +1,43 @@
+<template>
+  <footer>
+    <q-tabs
+      class="pink justified"
+      :refs="$refs"
+      default-tab="tab-all"
+    >
+      <q-tab
+        icon="local_library"
+        route="/"
+        exact
+      >
+        All Spells
+      </q-tab>
+      <q-tab
+        icon="bookmark"
+        route="/my"
+        exact
+      >
+        My Spells
+        <span
+          class="label pointing-left bg-yellow text-dark"
+          v-show="state.chosen.length"
+        >{{state.chosen.length}}</span>
+      </q-tab>
+    </q-tabs>
+  </footer>
+</template>
+
+<script>
+import { state } from '../store'
+
+export default {
+  data () {
+    return { state }
+  }
+}
+</script>
+
+<style scoped lang="stylus">
+  footer .q-tabs
+    width: 100%
+</style>
diff --git a/src/components/Headerprimary.vue b/src/components/Headerprimary.vue
new file mode 100644
index 0000000..853e19d
--- /dev/null
+++ b/src/components/Headerprimary.vue
@@ -0,0 +1,47 @@
+<template>
+  <div>
+    <q-toolbar-title :padding="0">
+      My Spells v2.0 
+    </q-toolbar-title>
+
+    <button v-on:click="copy">
+      <i>file_download</i>
+      <q-tooltip
+        anchor="bottom right"
+        self="top right"
+      >
+        Export Selected Spells
+      </q-tooltip>
+    </button>
+
+    <button v-on:click="paste">
+      <i>cloud_upload</i>
+      <q-tooltip
+        anchor="bottom right"
+        self="top right"
+      >
+        Import Selected Spells
+      </q-tooltip>
+    </button>
+  </div>
+</template>
+
+<script>
+import { state } from '../store'
+
+export default {
+  data () {
+    return {
+      state
+    }
+  },
+  methods: {
+    copy () {
+      console.log('Copy Chosen!', this.state.chosen)
+    },
+    paste () {
+      console.log('Load Chosen!')
+    }
+  }
+}
+</script>
diff --git a/src/components/Headersecondary.vue b/src/components/Headersecondary.vue
new file mode 100644
index 0000000..98b734d
--- /dev/null
+++ b/src/components/Headersecondary.vue
@@ -0,0 +1,61 @@
+<template>
+  <div>
+    <q-select
+      type="list"
+      v-model="state.sortBy"
+      :options="sortByOptions"
+    ></q-select>
+
+    <q-search
+      class="dark"
+      v-model="state.search"
+      @input="searchChanged"
+    ></q-search>
+  </div>
+</template>
+
+<script>
+import { state, dispatch } from '../store'
+
+export default {
+  data () {
+    return {
+      state,
+      sortByOptions: [
+        {
+          label: 'Relevance',
+          value: 'sortScore'
+        },
+        {
+          label: 'Name',
+          value: 'name'
+        },
+        {
+          label: 'Level',
+          value: 'level'
+        },
+        {
+          label: 'School',
+          value: 'school'
+        }
+      ]
+    }
+  },
+  methods: {
+    searchChanged (newSearch) {
+      if (newSearch.length >= 3) {
+        this.state.previousSortBy = this.state.sortBy
+        this.state.sortBy = 'sortScore'
+      }
+      else {
+        this.state.sortBy = this.state.previousSortBy
+      }
+
+      dispatch({ type: 'SEARCH_CHANGED' })
+    }
+  }
+}
+</script>
+
+<style>
+</style>
diff --git a/src/components/Index.vue b/src/components/Index.vue
index cef9f9b..d516d4a 100644
--- a/src/components/Index.vue
+++ b/src/components/Index.vue
@@ -1,187 +1,21 @@
 <template>
-  <q-layout>
-    <div slot="header" class="toolbar dark">
-      <q-toolbar-title :padding="0">
-        My Spells v2.0 
-      </q-toolbar-title>
-
-      <button v-on:click="copy">
-        <i>file_download</i>
-        <q-tooltip
-          anchor="bottom right"
-          self="top right"
-        >
-          Export Selected Spells
-        </q-tooltip>
-      </button>
-
-      <button v-on:click="paste">
-        <i>cloud_upload</i>
-        <q-tooltip
-          anchor="bottom right"
-          self="top right"
-        >
-          Import Selected Spells
-        </q-tooltip>
-      </button>
-    </div>
-
-    <div slot="header" class="toolbar dark">
-      <q-select
-        type="list"
-        v-model="sortBy"
-        :options="sortByOptions"
-      ></q-select>
-
-      <q-search
-        class="dark"
-        v-model="search"
-        @input="searchChanged"
-      ></q-search>
-    </div>
-
-    <div class="layout-view">
-      <section ref="tab-all">
-        <spell-list
-          :spells="state.spells.data"
-          :search="search"
-          :sortBy="sortBy"
-        ></spell-list>
-      </section>
-
-      <section ref="tab-my">
-        <spell-list
-          v-if="mySpells.length"
-          :spells="mySpells"
-          :search="search"
-          :sortBy="sortBy"
-        ></spell-list>
-        <div v-else>None :D</div>
-      </section>
-    </div>
-
-    <footer slot="footer" class="toolbar pink">
-      <q-tabs
-        class="pink justified"
-        :refs="$refs"
-        default-tab="tab-all"
-      >
-        <q-tab name="tab-all" icon="local_library">
-          All Spells
-        </q-tab>
-        <q-tab name="tab-my" icon="bookmark">
-          My Spells
-          <span
-            class="label pointing-left bg-yellow text-dark"
-            v-show="mySpells.length"
-          >{{mySpells.length}}</span>
-        </q-tab>
-      </q-tabs>
-    </footer>
-  </q-layout>
+  <main>
+    <spell-list
+      :spells="state.spells.data"
+    ></spell-list>
+  </main>
 </template>
 
 <script>
-import { Loading, Dialog } from 'quasar'
 import Vue from 'vue'
-import 'whatwg-fetch'
-import { state, dispatch } from '../store'
 import SpellList from './Spelllist'
+import { state } from '../store'
 
 Vue.component('spell-list', SpellList)
 
-function fetchSuccess (data) {
-  dispatch({
-    type: 'SPELLS_RESOLVED',
-    data: {
-      data,
-      loaded: true
-    }
-  })
-}
-
-function fetchFailure (reason) {
-  let message = 'Unable to retrieve spells list'
-  Dialog.create({
-    title: 'Error',
-    message,
-    nobuttons: true
-  })
-  console.error(message, reason)
-}
-
 export default {
   data () {
-    return {
-      state,
-      search: '',
-      sortBy: 'name',
-      previousSortBy: 'name',
-      sortByOptions: [
-        {
-          label: 'Relevance',
-          value: 'sortScore'
-        },
-        {
-          label: 'Name',
-          value: 'name'
-        },
-        {
-          label: 'Level',
-          value: 'level'
-        },
-        {
-          label: 'School',
-          value: 'school'
-        }
-      ]
-    }
-  },
-  computed: {
-    mySpells () {
-      if (!this.state.spells.loaded || this.state.chosen.length === 0) {
-        return []
-      }
-
-      return this.state.chosen.map(chosen => {
-        return this.state.spells.data.find(spell => {
-          return spell.name === chosen
-        })
-      })
-    }
-  },
-  mounted () {
-    if (!this.state.spells.loaded) {
-      Loading.show()
-
-      fetch('./statics/dnd5e.json')
-      .then(response => response.json())
-      .then(fetchSuccess)
-      .catch(fetchFailure)
-      .then(() => { Loading.hide() })
-    }
-  },
-  methods: {
-    copy () {
-      console.log('Copy Chosen!', this.state.chosen)
-    },
-    paste () {
-      console.log('Load Chosen!')
-    },
-    searchChanged (newSearch) {
-      if (newSearch.length >= 3) {
-        this.previousSortBy = this.sortBy
-        this.sortBy = 'sortScore'
-      }
-      else {
-        this.sortBy = this.previousSortBy
-      }
-    }
+    return { state }
   }
 }
 </script>
-
-<style scoped lang="stylus">
-  footer .q-tabs
-    width: 100%
-</style>
diff --git a/src/components/Myspells.vue b/src/components/Myspells.vue
new file mode 100644
index 0000000..d34b39f
--- /dev/null
+++ b/src/components/Myspells.vue
@@ -0,0 +1,35 @@
+<template>
+  <main>
+    <spell-list
+      v-if="mySpells.length"
+      :spells="mySpells"
+    ></spell-list>
+  </main>
+</template>
+
+<script>
+import Vue from 'vue'
+import SpellList from './Spelllist'
+import { state } from '../store'
+
+Vue.component('spell-list', SpellList)
+
+export default {
+  data () {
+    return { state }
+  },
+  computed: {
+    mySpells () {
+      if (!this.state.spells.loaded || this.state.chosen.length === 0) {
+        return []
+      }
+
+      return this.state.chosen.map(chosen => {
+        return this.state.spells.data.find(spell => {
+          return spell.name === chosen
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/components/Spelllist.vue b/src/components/Spelllist.vue
index 988714a..49ec066 100644
--- a/src/components/Spelllist.vue
+++ b/src/components/Spelllist.vue
@@ -18,42 +18,31 @@
 import Vue from 'vue'
 import Query from '../query'
 import SpellItem from './Spellitem'
+import { state } from '../store'
 
 Vue.component('spell-item', SpellItem)
 
 export default {
-  props: [
-    'spells',
-    'search',
-    'sortBy'
-  ],
   data () {
-    return {
-      loadedPage: 1
-    }
+    return { state }
   },
+  props: [
+    'spells'
+  ],
   computed: {
     filteredSpells () {
       return new Query(this.spells)
-      .search('name', this.search)
-      .sort(this.sortBy)
-      .paginate(1, this.loadedPage * 20)
+      .search('name', this.state.search)
+      .sort(this.state.sortBy)
+      .paginate(1, this.state.loadedPagination * 20)
       .results
     }
   },
   methods: {
     loadMore (index, done) {
-      this.loadedPage += 1
+      this.state.loadedPagination += 1
       done()
     }
-  },
-  watch: {
-    sortBy (newSort) {
-      console.log(newSort)
-    },
-    search () {
-      this.loadedPage = 1
-    }
   }
 }
 </script>
diff --git a/src/router.js b/src/router.js
index 4676518..947bce2 100644
--- a/src/router.js
+++ b/src/router.js
@@ -22,6 +22,7 @@ export default new VueRouter({
 
   routes: [
     { path: '/', component: load('Index') }, // Default
+    { path: '/my', component: load('Myspells') },
     { path: '*', component: load('Error404') } // Not found
   ]
 })
diff --git a/src/store.js b/src/store.js
index ae5bdf8..63d4388 100644
--- a/src/store.js
+++ b/src/store.js
@@ -3,7 +3,11 @@ export let state = {
     loaded: false,
     data: []
   },
-  chosen: []
+  chosen: [],
+  search: '',
+  sortBy: 'name',
+  previousSortBy: 'name',
+  loadedPagination: 1
 }
 
 export function dispatch (action) {
@@ -20,10 +24,10 @@ export function dispatch (action) {
         if (index >= 0) state.chosen.splice(index, 1)
       }
       break
+    case 'SEARCH_CHANGED':
+      state.loadedPagination = 1
+      break
   }
 }
 
-export default {
-  state,
-  dispatch
-}
+export default { state, dispatch }