]> git.armaanb.net Git - bettersearch.git/commitdiff
projects / bettersearch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a0536c3)
Update HTML templates
authorArmaan Bhojwani <me@armaanb.net>
Sun, 28 Nov 2021 04:24:21 +0000 (23:24 -0500)
committerArmaan Bhojwani <me@armaanb.net>
Sun, 28 Nov 2021 04:24:21 +0000 (23:24 -0500)
index.html [deleted file] patch | blob | history
search.html [deleted file] patch | blob | history
server.rkt patch | blob | history
templates/footer.html [new file with mode: 0644] patch | blob
templates/head.html [new file with mode: 0644] patch | blob
templates/index.html [new file with mode: 0644] patch | blob
templates/search.html [new file with mode: 0644] patch | blob

diff --git a/index.html b/index.html
deleted file mode 100644 (file)
index 0d401e9..0000000
--- a/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head>
-       <link rel="stylesheet" type="text/css" href="/styles.css">
-</head>
-<body>
-<h1>Search</h1>
-       <form action="/search">
-               <label for="q">Search Query</label>
-               <input type="text" name="q" id="q">
-               <input type="submit">
-       </form>
-<body>
-</html>
diff --git a/search.html b/search.html
deleted file mode 100644 (file)
index 2662d28..0000000
--- a/search.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-<head>
-       <link rel="stylesheet" type="text/css" href="/styles.css">
-</head>
-<body>
-<h1>Search results</h1>
-       <form action="/search">
-               <label for="q">Search Query</label>
-               <input type="text" name="q" id="q">
-               <input type="submit">
-       </form>
-<dl>
-@in[r results]{
-       <div class="result">
-               <dt>@(hash-ref r "title")</dt>
-               <dd>
-                       <a href="@(hash-ref r "url")">@(hash-ref r "url")</a>
-                       <br>
-                       @(hash-ref r "content")
-               </dd>
-       </div>
-}
-</dl>
-<body>
-</html>
diff --git a/server.rkt b/server.rkt
index 81abf7cb1b0cbdd5fe3edf0bcf9260dea6f7b530..42da28635db7c462026ea9d7e36b0516f858f056 100644 (file)
--- a/server.rkt
+++ b/server.rkt
@@ -14,12 +14,21 @@
 
 (define-values (dispatch generate-url)
   (dispatch-rules
-    [("index") do-index]
+    [("") do-index]
     [("search") do-search]
     ))
 
+(define (do-head title)
+  (include-template "templates/head.html"))
+
+(define (do-footer)
+  (include-template "templates/footer.html"))
+
 (define (do-index req)
-      (http-response (include-template "index.html")))
+  (http-response (string-append
+                  (do-head "Web Search")
+                  (include-template "templates/index.html")
+                  (do-footer))))
 
 (define (search query)
   (define engine (string->url
@@ -36,7 +45,7 @@
     #"OK"                ; HTTP response message.
     (current-seconds)    ; Timestamp.
     TEXT/HTML-MIME-TYPE  ; MIME type for content.
-    '()                  ; Additional HTTP headers.
+    '()                  ; Additional HTTP heads.
     (list                ; Content (in bytes) to send to the browser.
       (string->bytes/utf-8 content))))
 
@@ -68,8 +77,11 @@
                          ht
                      ))
                    (hash-ref (search query) 'results)))))
-      (http-response (include-template "search.html")))
-    (do-index req)))
+      (http-response (string-append
+                      (do-head (string-append query " | Web Search"))
+                      (include-template "templates/search.html")
+                      (do-footer))))
+    (redirect-to "/")))
 
 (serve/servlet dispatch
               #:command-line? #t
diff --git a/templates/footer.html b/templates/footer.html
new file mode 100644 (file)
index 0000000..9185fab
--- /dev/null
+++ b/templates/footer.html
@@ -0,0 +1,6 @@
+<hr>
+<p>This search provided via the Better Search Engine.
+<br>
+<a href="https://git.armaanb.net/bettersearch">Source code</a>
+<body>
+</html>
diff --git a/templates/head.html b/templates/head.html
new file mode 100644 (file)
index 0000000..67556c5
--- /dev/null
+++ b/templates/head.html
@@ -0,0 +1,6 @@
+<html>
+<head>
+       <link rel="stylesheet" type="text/css" href="/styles.css">
+       <title> @title </title>
+</head>
+<body>
diff --git a/templates/index.html b/templates/index.html
new file mode 100644 (file)
index 0000000..3c014ec
--- /dev/null
+++ b/templates/index.html
@@ -0,0 +1,6 @@
+<h1>Web Search</h1>
+<form action="/search">
+       <label for="q">Search Query</label>
+       <input type="text" name="q" id="q">
+       <input type="submit">
+</form>
diff --git a/templates/search.html b/templates/search.html
new file mode 100644 (file)
index 0000000..58bf146
--- /dev/null
+++ b/templates/search.html
@@ -0,0 +1,18 @@
+<h1>Search Results</h1>
+       <form action="/search">
+               <label for="q">Search Query</label>
+               <input type="text" name="q" id="q" value="@query">
+               <input type="submit">
+       </form>
+<dl>
+@in[r results]{
+       <div class="result">
+               <dt>@(hash-ref r "title")</dt>
+               <dd>
+                       <a href="@(hash-ref r "url")">@(hash-ref r "url")</a>
+                       <br>
+                       @(hash-ref r "content")
+               </dd>
+       </div>
+}
+</dl>
Unnamed repository; edit this file 'description' to name the repository.