added partials : header, footer, htmlHead;

added main.hbs (not final); edited routes in controllers/index.js; began results.js Relates #11, #12, #13, #14, #15, 30
FAC-11 · Aug 16, 2017 · 9885fa2 · 9885fa2
1 parent 15ec9a3
commit 9885fa2
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 2 deletions.
diff --git a/src/controllers/index.js b/src/controllers/index.js
@@ -9,7 +9,8 @@ const review = require('./add-review');
 const error = require('./error');
 
 router.get('/', home);
-router.get('/results', results.get);
+// router.get('/results/all', results.get);     //can piggyback on /results/:distance   (?)
+router.get('/results/:distance', results.get);
 router.get('/planets/:planet', planet.get);
 router.post('/add-review', review.post);
 router.use(error.client);

diff --git a/src/controllers/results.js b/src/controllers/results.js
@@ -1,4 +1,18 @@
-searchResults.get = (req, res) => {
+const searchResults = {}
+
+listOfPlanets = ({querydetails}) => {
+  if (querydetails.searchAll)
+    const dbQuerySelectCriterion = {query: "", params: null};
+  else {
+    const dbQuerySelectCriterion = {query: "WHERE distance <= {$1}", params: [querydetails.distance]};
+  }       ///creates the SECOND HALF of a SELECT query, prepared in pg's parameterising format
+  /// do a db query on details, or on
+
+}
+
+
+searchResults.get = (req, res) => {    ///can this take a thrid argument which would be :distance ?
+  /// do a db query on details, or on /all , using listOfPlanets({distance:x})
 
 };
 

diff --git a/src/views/partials/footer.hbs b/src/views/partials/footer.hbs
@@ -0,0 +1,7 @@
+
+  <footer class="footer">
+    <div class="footer__container">
+      <p>© 2017 Not Murdoch</p>
+      <p><a href="#">@dontbuythesun</a></p>
+    </div>
+  </footer>
diff --git a/src/views/partials/header.hbs b/src/views/partials/header.hbs
@@ -0,0 +1,17 @@
+
+  <header class="navbar">
+    <div class="navbar__container">
+      <nav class="navbar__nav" role="navigation">
+        <ul class="navbar__list">
+          <li class="navbar__item">
+            <a class="navbar__link
+             {{#if currentPage.home}} navbar__link--active {{/if}} " href="/">Search</a>
+          </li>
+          <li class="navbar__item">
+            <a class="navbar__link
+             {{#if currentPage.showAll}} navbar__link--active {{/if}} " href="/results/all"> Show All</a>
+          </li>
+        </ul>
+      </nav>
+    </div>
+  </header>
diff --git a/src/views/partials/htmlHead.hbs b/src/views/partials/htmlHead.hbs
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <link rel="stylesheet" href="/css/styles.css">
+  <title>My Space. It's Mine.</title>
+</head>