add routing

8 years ago · 4fe6439ade
8 changed files with 50 additions and 31 deletions
--- a/src/scripts/aboutview.tag
+++ b/src/scripts/aboutview.tag
@ -0,0 +1,3 @@
+<aboutview>
+  <h3>wat</h3>
+</aboutview>
--- a/src/scripts/app.tag
+++ b/src/scripts/app.tag
@ -0,0 +1,10 @@
+<app>
+  <router>
+    <route path="/search">
+      <searchview></searchview>
+    </route>
+    <route path="/about">
+      <aboutview></aboutview>
+    </route>
+  </router>
+</app>
--- a/src/scripts/results.tag
+++ b/src/scripts/results.tag
@ -18,6 +18,7 @@ clicker() {
 }
 this.rows = [];
 var self = this;
+self.opts = this.parent.parent.parent.parent.opts;

 this.opts.resultsEv.on("loading",
  function() {
--- a/src/scripts/search.js
+++ b/src/scripts/search.js
@ -1,18 +1,22 @@
 import riot from 'riot';
+import router from 'riot-route/lib/tag';
 import './book.tag';
 import './class.tag';
 import './results.tag';
 import './row.tag';
 import './search.tag';
+import './searchview.tag';
+import './aboutview.tag';
+import './app.tag';

 var resultsEv = riot.observable();

 function mount() {
-  riot.mount("search", {
+  riot.mount("app", {
                      booksLoading : false,
-                      resultsEv :  resultsEv
+                      resultsEv :  resultsEv,
+                      notLoading: true
                     });
-  riot.mount("results", {notLoading : true, resultsEv : resultsEv});
 }

 mount();
--- a/src/scripts/search.tag
+++ b/src/scripts/search.tag
@ -45,6 +45,7 @@ import {filterCourses, groupsof} from './helpers.js';
 import 'whatwg-fetch';

 var self = this;
+self.opts = this.parent.parent.parent.parent.opts;

 submit(ev) {
    ev.preventDefault();
--- a/src/scripts/searchview.tag
+++ b/src/scripts/searchview.tag
@ -0,0 +1,24 @@
+<searchview>
+  <section class="page-top navbar-section">
+    <div class="container">
+      <div class="columns">
+        <div class="column">
+          <h1 class="title inline-block">TextBook Commons</h1>
+          <figure class="inline-block avatar-icon avatar avatar-xl">
+            <img class="logo" src="/goal.png" />
+          </figure>
+        </div>
+      </div>
+      <div class="columns">
+        <div class="title column col-sm-12 col-md-12 col-lg-12">
+          <h4>Search for a course and find your books</h4>
+          <h6>Currently indexes courses for McMaster University.
+              <span>Created By <a href="https://twitter.com/weskerfoot">@weskerfoot</a></span>
+          </h6>
+        </div>
+      </div>
+      <search></search>
+    </div>
+  </section>
+  <results></results>
+</searchview>
--- a/src/styles/search.scss
+++ b/src/styles/search.scss
@ -1,6 +1,6 @@
 $blue: #1c75bc;

-header {
+.app {
  color: $blue;
 }

--- a/src/templates/search.html
+++ b/src/templates/search.html
@ -5,35 +5,11 @@
  <link rel="stylesheet" href="/styles/spectre.min.css">
  <link rel="stylesheet" href="/styles/search.min.css">
 </head>
-<header class="text-center nav">
-  <section class="page-top navbar-section">
-    <div class="container">
-      <div class="columns">
-        <div class="column">
-          <h1 class="title inline-block">TextBook Commons</h1>
-          <figure class="inline-block avatar-icon avatar avatar-xl">
-            <img class="logo" src="/goal.png" />
-          </figure>
-        </div>
-      </div>
-      <div class="columns">
-        <div class="title column col-sm-12 col-md-12 col-lg-12">
-          <h4>Search for a course and find your books</h4>
-          <h6>Currently indexes courses for McMaster University.
-              <span>Created By <a href="https://twitter.com/weskerfoot">@weskerfoot</a></span>
-          </h6>
-        </div>
-      </div>
-    <search></search>
-    </div>
-  </section>
-</header>
 <html>
 <body>
-    <results></results>
-
-    <footer class="footer">
-    </footer>
+  <app class="app text-center"></app>
+  <footer class="footer">
+  </footer>

 <script type="text/javascript" src="/scripts/search.min.js"></script>