From 3b39345fa66ac4748a400e9e80e032ec9ae9697b Mon Sep 17 00:00:00 2001
From: joe fleming <joe.fleming@gmail.com>
Date: Thu, 13 Sep 2018 19:56:44 -0700
Subject: [PATCH] feat: basic routing and fav nav

---
 packages/search-site/poi.config.js            |   6 +-
 .../search-site/src/components/AppNav.vue     |  14 ++
 .../search-site/src/components/SearchForm.vue | 130 +++++++--------
 .../search-site/src/components/StrainList.vue |   2 +-
 packages/search-site/src/index.mjs            |  15 +-
 packages/search-site/src/pages/Favorites.vue  |  15 ++
 packages/search-site/src/pages/Home.vue       | 153 +++---------------
 packages/search-site/src/pages/Search.vue     | 151 +++++++++++++++++
 8 files changed, 283 insertions(+), 203 deletions(-)
 create mode 100644 packages/search-site/src/components/AppNav.vue
 create mode 100644 packages/search-site/src/pages/Favorites.vue
 create mode 100644 packages/search-site/src/pages/Search.vue

diff --git a/packages/search-site/poi.config.js b/packages/search-site/poi.config.js
index add3b1e..e352441 100644
--- a/packages/search-site/poi.config.js
+++ b/packages/search-site/poi.config.js
@@ -4,5 +4,9 @@ const path = require('path');
 module.exports = {
   entry: path.resolve(__dirname, 'src/index.mjs'),
   outDir: 'dist',
-  plugins: [require('@poi/plugin-vue-static')()],
+  plugins: [
+    require('@poi/plugin-vue-static')({
+      routes: ['/', '/home', '/favorites'],
+    }),
+  ],
 };
diff --git a/packages/search-site/src/components/AppNav.vue b/packages/search-site/src/components/AppNav.vue
new file mode 100644
index 0000000..6607b69
--- /dev/null
+++ b/packages/search-site/src/components/AppNav.vue
@@ -0,0 +1,14 @@
+<template>
+  <div id="app-nav" class="tabs">
+    <ul>
+      <li class="is-active"><a>Search</a></li>
+      <li><a>Favorites</a></li>
+    </ul>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AppNav',
+}
+</script>
diff --git a/packages/search-site/src/components/SearchForm.vue b/packages/search-site/src/components/SearchForm.vue
index 569a45d..3ebb932 100644
--- a/packages/search-site/src/components/SearchForm.vue
+++ b/packages/search-site/src/components/SearchForm.vue
@@ -1,84 +1,78 @@
 <template>
   <form @submit.prevent="handleSubmit">
-      <div class="container">
-        <h1 class="title">
-          Strain Search
-        </h1>
+    <!-- Name Search Input -->
+    <div class="field">
+      <label class="label">Search By Name</label>
+      <div class="control">
+        <input ref="name" class="input" type="text" placeholder="Text input">
+        <p v-if="error.length" class="help is-danger">{{error}}</p>
+      </div>
+    </div>
 
-        <!-- Name Search Input -->
-        <div class="field">
-          <label class="label">Search By Name</label>
-          <div class="control">
-            <input ref="name" class="input" type="text" placeholder="Text input">
-            <p v-if="error.length" class="help is-danger">{{error}}</p>
-          </div>
-        </div>
-
-        <!-- Multi-Selects -->
-        <div class="columns filters">
+    <!-- Multi-Selects -->
+    <div class="columns filters">
+      <div class="column is-half">
+        <div class="columns is-mobile">
           <div class="column is-half">
-            <div class="columns is-mobile">
-              <div class="column is-half">
-                <div class="field">
-                  <label class="label">Desired Effects</label>
-                  <div class="select is-multiple">
-                    <select ref="effects" multiple size="6">
-                      <option v-for="effect in effects" :key="effect" :value="effect">{{effect | capitalize}}</option>
-                    </select>
-                  </div>
-                </div>
-              </div>
-              <div class="column is-half">
-                <div class="field">
-                  <label class="label">Medical Use</label>
-                  <div class="select is-multiple">
-                    <select ref="uses" multiple size="6">
-                      <option v-for="use in uses" :key="use" :value="use">{{use | capitalize}}</option>
-                    </select>
-                  </div>
-                </div>
+            <div class="field">
+              <label class="label">Desired Effects</label>
+              <div class="select is-multiple">
+                <select ref="effects" multiple size="6">
+                  <option v-for="effect in effects" :key="effect" :value="effect">{{effect | capitalize}}</option>
+                </select>
               </div>
             </div>
           </div>
-
           <div class="column is-half">
-            <div class="columns is-mobile">
-              <div class="column is-half">
-                <div class="field">
-                  <label class="label">Condition</label>
-                  <div class="select is-multiple">
-                    <select ref="conditions" multiple size="6">
-                      <option v-for="condition in conditions" :key="condition" :value="condition">{{condition | capitalize}}</option>
-                    </select>
-                  </div>
-                </div>
-              </div>
-
-              <div class="column is-half">
-                <div class="field">
-                  <label class="label">Flavor</label>
-                  <div class="select is-multiple">
-                    <select ref="flavors" multiple size="6">
-                      <option v-for="flavor in flavors" :key="flavor" :value="flavor">{{flavor | capitalize}}</option>
-                    </select>
-                  </div>
-                </div>
+            <div class="field">
+              <label class="label">Medical Use</label>
+              <div class="select is-multiple">
+                <select ref="uses" multiple size="6">
+                  <option v-for="use in uses" :key="use" :value="use">{{use | capitalize}}</option>
+                </select>
               </div>
             </div>
           </div>
         </div>
-
-        <!-- Form Submits  -->
-        <div class="field is-grouped">
-          <div class="control">
-            <button type="submit" class="button is-link">Submit</button>
-          </div>
-          <div class="control">
-            <button type="button" class="button is-text" @click.prevent="resetForm">Clear</button>
-          </div>
-        </div>
       </div>
-    </form>
+
+      <div class="column is-half">
+        <div class="columns is-mobile">
+          <div class="column is-half">
+            <div class="field">
+              <label class="label">Condition</label>
+              <div class="select is-multiple">
+                <select ref="conditions" multiple size="6">
+                  <option v-for="condition in conditions" :key="condition" :value="condition">{{condition | capitalize}}</option>
+                </select>
+              </div>
+            </div>
+          </div>
+
+          <div class="column is-half">
+            <div class="field">
+              <label class="label">Flavor</label>
+              <div class="select is-multiple">
+                <select ref="flavors" multiple size="6">
+                  <option v-for="flavor in flavors" :key="flavor" :value="flavor">{{flavor | capitalize}}</option>
+                </select>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- Form Submits  -->
+    <div class="field is-grouped">
+      <div class="control">
+        <button type="submit" class="button is-link">Submit</button>
+      </div>
+      <div class="control">
+        <button type="button" class="button is-text" @click.prevent="resetForm">Clear</button>
+      </div>
+    </div>
+  </form>
 </template>
 
 <script>
diff --git a/packages/search-site/src/components/StrainList.vue b/packages/search-site/src/components/StrainList.vue
index ee3c97c..baf797e 100644
--- a/packages/search-site/src/components/StrainList.vue
+++ b/packages/search-site/src/components/StrainList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container">
+  <div>
     <div>
       <h3 v-if="strains.length === 0" class="title is-3">No Matching Strains :(</h3>
       <h3 v-if="strains.length > 0" class="title is-3">Found {{strains.length}} Strains</h3>
diff --git a/packages/search-site/src/index.mjs b/packages/search-site/src/index.mjs
index 25b5822..9271fa3 100644
--- a/packages/search-site/src/index.mjs
+++ b/packages/search-site/src/index.mjs
@@ -19,8 +19,19 @@ const router = new Router({
   routes: [
     {
       path: '/',
-      name: 'home',
-      component: () => import(/* webpackChunkName: "homeapp" */ './pages/Home.vue'),
+      component: () => import(/* webpackChunkName: "Home" */ './pages/Home.vue'),
+      children: [
+        {
+          path: '',
+          name: 'search',
+          component: () => import(/* webpackChunkName: "Search" */ './pages/Search.vue'),
+        },
+        {
+          path: 'favorites',
+          name: 'favorites',
+          component: () => import(/* webpackChunkName: "Favorites" */ './pages/Favorites.vue'),
+        },
+      ],
     },
   ],
 });
diff --git a/packages/search-site/src/pages/Favorites.vue b/packages/search-site/src/pages/Favorites.vue
new file mode 100644
index 0000000..b640a0a
--- /dev/null
+++ b/packages/search-site/src/pages/Favorites.vue
@@ -0,0 +1,15 @@
+<template>
+  <div id="favorites-page">
+    <div class="container">
+      <h1 class="title">
+        Favorites
+      </h1>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FavoritesPage',
+}
+</script>
diff --git a/packages/search-site/src/pages/Home.vue b/packages/search-site/src/pages/Home.vue
index f1b5004..81d73ce 100644
--- a/packages/search-site/src/pages/Home.vue
+++ b/packages/search-site/src/pages/Home.vue
@@ -1,27 +1,31 @@
 <template>
-  <div>
-    <section class="section">
-      <SearchForm :effects="effects" :uses="uses" :conditions="conditions" :flavors="flavors" />
-    </section>
-    <section class="section">
-      <StrainList :strains="matches" />
-    </section>
+  <div id="home-page">
+    <div id="app-nav" class="tabs is-centered">
+      <ul>
+        <li :class="{'is-active': activeTab === 'search'}" @click="setActive('search')">
+          <router-link :to="{name: 'search'}">Search</router-link>
+        </li>
+        <li :class="{'is-active': activeTab === 'favorites'}" @click="setActive('favorites')">
+          <router-link :to="{name: 'favorites'}">Favorites</router-link>
+        </li>
+      </ul>
+    </div>
+    <router-view></router-view>
   </div>
 </template>
 
 <script>
-import lunr from 'lunr';
-import SearchForm from '../components/SearchForm.vue';
-import StrainList from '../components/StrainList.vue';
-import data from '../../../scraper/db.json';
-import emitter from '../lib/emitter.mjs';
-import store from '../lib/store.mjs';
-
 export default {
-  name: 'Home',
-  components: {
-    SearchForm,
-    StrainList,
+  name: 'HomePage',
+  data() {
+    return {
+      activeTab: 'search',
+    };
+  },
+  methods: {
+    setActive(name) {
+      this.activeTab = name;
+    },
   },
   head: {
     title: 'Strain Search',
@@ -32,118 +36,5 @@ export default {
       },
     ],
   },
-  data() {
-    return {
-      ...data,
-      matches: [],
-      requirements: {
-        name: '',
-        effects: [],
-        uses: [],
-        conditions: [],
-        flavors: [],
-      },
-    };
-  },
-  computed: {
-    hasName() {
-      return this.requirements.name.length > 0;
-    },
-    hasFilters() {
-      return (
-        this.requirements.effects.length > 0 ||
-        this.requirements.uses.length > 0 ||
-        this.requirements.conditions.length > 0 ||
-        this.requirements.flavors.length > 0
-      );
-    },
-    searchParams() {
-      const searchParts = [this.requirements.name];
-      this.requirements.effects.forEach(t => searchParts.push(`+effects:${t}`));
-      this.requirements.uses.forEach(t => searchParts.push(`+uses:${t}`));
-      this.requirements.conditions.forEach(t => searchParts.push(`+conditions:${t}`));
-      this.requirements.flavors.forEach(t => searchParts.push(`+flavors:${t}`));
-
-      return searchParts.join(' ');
-    },
-  },
-  methods: {
-    showDefaults(limit = 40) {
-      // const favs = store.get('favorites') || [];
-      // const favStrains = this.strains.filter(({ id }) => favs.indexOf(id) !== -1);
-      // this.matches = favStrains.concat(this.strains.slice(0, limit - favStrains.length));
-
-      this.matches = this.strains.slice(0, limit);
-    },
-    updateMatches(limit = 40) {
-      if (!this.hasName && !this.hasFilters) {
-        this.showDefaults(limit);
-        return;
-      }
-
-      try {
-        const hits = this.idx.search(this.searchParams);
-        // .slice(0, limit);
-        const refs = hits.map(({ ref }) => parseInt(ref, 10));
-
-        this.matches = this.strains
-          .map(strain => {
-            const idx = refs.indexOf(strain.id);
-            if (idx < 0) return null;
-            return Object.assign({ score: hits[idx].score }, strain);
-          })
-          .filter(Boolean)
-          .sort((a, b) => {
-            if (a.score === b.score) {
-              // sort matching search score by adjusted rating
-              if (a.rating_adjusted === b.rating_adjusted) return 0;
-              return a.rating_adjusted > b.rating_adjusted ? -1 : 1;
-            }
-            return a.score > b.score ? -1 : 1;
-          });
-      } catch (err) {
-        this.matches = [];
-        emitter.emit('error', err.message);
-      }
-    },
-  },
-  created() {
-    // lunr setup
-    this.idx = lunr(function lunrSetup() {
-      this.ref('id');
-      this.field('name');
-      this.field('effects');
-      this.field('uses');
-      this.field('conditions');
-      this.field('flavors');
-      data.strains.forEach(doc => this.add(doc));
-    });
-
-    // function to handle search form submissions
-    this.searchListener = reqs => {
-      this.requirements = reqs;
-      this.updateMatches();
-    };
-
-    // listen for search form submissions
-    emitter.on('search', r => this.searchListener(r));
-
-    // listen for favorite changes
-    emitter.on('favorite', ({ id, isFav }) => {
-      const favs = store.get('favorites') || [];
-      const idx = favs.indexOf(id);
-
-      // remove previously favorited strain
-      if (idx >= 0 && !isFav) {
-        store.set('favorites', favs.filter(f => f !== id));
-      } else if (idx === -1 && isFav) {
-        store.set('favorites', favs.concat(id));
-      }
-    });
-    this.updateMatches(); // set initial match list
-  },
-  beforeDestroy() {
-    emitter.off('search', r => this.searchListener(r));
-  },
 };
 </script>
diff --git a/packages/search-site/src/pages/Search.vue b/packages/search-site/src/pages/Search.vue
new file mode 100644
index 0000000..a5d71e1
--- /dev/null
+++ b/packages/search-site/src/pages/Search.vue
@@ -0,0 +1,151 @@
+<template>
+  <div id="search-page">
+    <div class="container">
+      <h1 class="title">
+        Strain Search
+      </h1>
+    </div>
+
+    <section class="section">
+      <div class="container">
+        <SearchForm :effects="effects" :uses="uses" :conditions="conditions" :flavors="flavors" />
+      </div>
+    </section>
+
+    <section class="section">
+      <div class="container">
+        <StrainList :strains="matches" />
+      </div>
+    </section>
+  </div>
+</template>
+
+<script>
+import lunr from 'lunr';
+import SearchForm from '../components/SearchForm.vue';
+import StrainList from '../components/StrainList.vue';
+import data from '../../../scraper/db.json';
+import emitter from '../lib/emitter.mjs';
+import store from '../lib/store.mjs';
+
+export default {
+  name: 'SearchPage',
+  components: {
+    SearchForm,
+    StrainList,
+  },
+  data() {
+    return {
+      ...data,
+      matches: [],
+      requirements: {
+        name: '',
+        effects: [],
+        uses: [],
+        conditions: [],
+        flavors: [],
+      },
+    };
+  },
+  computed: {
+    hasName() {
+      return this.requirements.name.length > 0;
+    },
+    hasFilters() {
+      return (
+        this.requirements.effects.length > 0 ||
+        this.requirements.uses.length > 0 ||
+        this.requirements.conditions.length > 0 ||
+        this.requirements.flavors.length > 0
+      );
+    },
+    searchParams() {
+      const searchParts = [this.requirements.name];
+      this.requirements.effects.forEach(t => searchParts.push(`+effects:${t}`));
+      this.requirements.uses.forEach(t => searchParts.push(`+uses:${t}`));
+      this.requirements.conditions.forEach(t => searchParts.push(`+conditions:${t}`));
+      this.requirements.flavors.forEach(t => searchParts.push(`+flavors:${t}`));
+
+      return searchParts.join(' ');
+    },
+  },
+  methods: {
+    showDefaults(limit = 40) {
+      // const favs = store.get('favorites') || [];
+      // const favStrains = this.strains.filter(({ id }) => favs.indexOf(id) !== -1);
+      // this.matches = favStrains.concat(this.strains.slice(0, limit - favStrains.length));
+
+      this.matches = this.strains.slice(0, limit);
+    },
+    updateMatches(limit = 40) {
+      if (!this.hasName && !this.hasFilters) {
+        this.showDefaults(limit);
+        return;
+      }
+
+      try {
+        const hits = this.idx.search(this.searchParams);
+        // .slice(0, limit);
+        const refs = hits.map(({ ref }) => parseInt(ref, 10));
+
+        this.matches = this.strains
+          .map(strain => {
+            const idx = refs.indexOf(strain.id);
+            if (idx < 0) return null;
+            return Object.assign({ score: hits[idx].score }, strain);
+          })
+          .filter(Boolean)
+          .sort((a, b) => {
+            if (a.score === b.score) {
+              // sort matching search score by adjusted rating
+              if (a.rating_adjusted === b.rating_adjusted) return 0;
+              return a.rating_adjusted > b.rating_adjusted ? -1 : 1;
+            }
+            return a.score > b.score ? -1 : 1;
+          });
+      } catch (err) {
+        this.matches = [];
+        emitter.emit('error', err.message);
+      }
+    },
+  },
+  created() {
+    // lunr setup
+    this.idx = lunr(function lunrSetup() {
+      this.ref('id');
+      this.field('name');
+      this.field('effects');
+      this.field('uses');
+      this.field('conditions');
+      this.field('flavors');
+      data.strains.forEach(doc => this.add(doc));
+    });
+
+    // function to handle search form submissions
+    this.searchListener = reqs => {
+      this.requirements = reqs;
+      this.updateMatches();
+    };
+
+    // listen for search form submissions
+    emitter.on('search', r => this.searchListener(r));
+
+    // listen for favorite changes
+    emitter.on('favorite', ({ id, isFav }) => {
+      const favs = store.get('favorites') || [];
+      const idx = favs.indexOf(id);
+
+      // remove previously favorited strain
+      if (idx >= 0 && !isFav) {
+        store.set('favorites', favs.filter(f => f !== id));
+      } else if (idx === -1 && isFav) {
+        store.set('favorites', favs.concat(id));
+      }
+    });
+    this.updateMatches(); // set initial match list
+  },
+  beforeDestroy() {
+    emitter.off('search', r => this.searchListener(r));
+  },
+};
+</script>