From 0cd122660d51b20b1bae0596a027feb3f6075f8e Mon Sep 17 00:00:00 2001
From: wes <wjak56@gmail.com>
Date: Sat, 28 Jan 2017 18:20:39 -0500
Subject: [PATCH] switch to using fetch instead of jquery

---
 src/scripts/search.tag    | 72 +++++++++++++++++++--------------------
 src/templates/search.html |  5 +--
 2 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/src/scripts/search.tag b/src/scripts/search.tag
index 61f0e60..3067480 100644
--- a/src/scripts/search.tag
+++ b/src/scripts/search.tag
@@ -1,18 +1,9 @@
 <search>
-  <form class="form-horizontal search-form" onsubmit={ submit } type="submit"method="get">
-
+  <form class="form-horizontal search-form" onsubmit={ submit } type="submit" method="get">
     <div class="form-group">
       <div class="container">
-        <div class="columns">
-          <div if={ false }
-             class="help-toast toast toast-primary">
-          <button onclick={ clearhelp }
-                  class="btn btn-clear float-right">
-          </button>
-          Type keywords of your course's name or the course code (e.g. PSYCH 2B03)
-        </div>
-      </div>
           <div class="columns">
+
             <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
               <input onfocus={ showhelp }
                      class="form-input search"
@@ -21,26 +12,29 @@
                      name="title">
               </input>
             </div>
+
           </div>
 
-            <div class="columns">
-              <div class="col-sm-6 col-md-6 col-lg-6">
-                <select class="semester form-select float-right" aria-labelledby="dLabel" name="sem">
-                  <option value="Fall" selected>Fall</option>
-                  <option value="Winter">Winter</option>
-                  <option value="Spring/Summer">Spring/Summer</option>
-                </select>
-              </div>
-              <div class="col-sm-6 col-md-6 col-lg-6">
-                <button
-                  class="search-btn btn btn-primary float-left tooltip tooltip-bottom"
-                  data-tooltip="Search by keywords"
-                  type="submit">
+          <div class="columns">
+            <div class="col-sm-6 col-md-6 col-lg-6">
+              <select class="semester form-select float-right" aria-labelledby="dLabel" name="sem">
+                <option value="Fall" selected>Fall</option>
+                <option value="Winter">Winter</option>
+                <option value="Spring/Summer">Spring/Summer</option>
+              </select>
+            </div>
+            <div class="col-sm-6 col-md-6 col-lg-6">
+
+              <button
+                class="search-btn btn btn-primary float-left tooltip tooltip-bottom"
+                data-tooltip="Search by keywords"
+                type="submit">
                   Search
-                </button>
-              </div>
+              </button>
+
             </div>
-        </div>
+          </div>
+      </div>
     </div>
   </form>
 
@@ -48,6 +42,7 @@
   </div>
 
 <script>
+var self = this;
 this.showedHelp = false;
 this.waiting = false;
 
@@ -85,15 +80,20 @@ submit(ev) {
     this.opts.booksLoading = true;
     this.update();
     results_passer.trigger("loading");
-    var params = $(ev.currentTarget).serialize();
-    $.getJSON("/search/fc?"+params,
-        (function(courses) {
-            var fcourses = filterCourses(courses);
-            var cgroups = groupsof(3, fcourses);
-            results_passer.trigger("new_results", cgroups);
-            this.opts.booksLoading = false;
-            this.update();
-    }).bind(this));
+    console.log(ev);
+    fetch("/search/fc?title="+this.title.value+"&sem="+this.sem.value).then(
+      function(response) {
+        if (response.ok) {
+          response.json().then(
+            function(courses) {
+              var fcourses = filterCourses(courses);
+              var cgroups = groupsof(3, fcourses);
+              results_passer.trigger("new_results", cgroups);
+              self.opts.booksLoading = false;
+              self.update();
+          });
+        }
+    });
 }
 </script>
 
diff --git a/src/templates/search.html b/src/templates/search.html
index cf96a4d..9186761 100644
--- a/src/templates/search.html
+++ b/src/templates/search.html
@@ -33,12 +33,9 @@
 
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/riot/2.6.7/riot+compiler.min.js"></script>
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/ramda/0.22.1/ramda.min.js"></script>
+<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/fetch/2.0.2/fetch.min.js"></script>
 <script type="text/javascript" src="/scripts/tags.min.js"></script>
 <script type="text/javascript" src="/scripts/search.min.js"></script>
-<script src="https://code.jquery.com/jquery-2.2.4.min.js"
-			  integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44="
-			  crossorigin="anonymous">
-</script>
 
 </body>
 </html>