changed up the uiHEADmaster

2 files changed, 20 insertions, 7 deletions

diff --git a/src/bitgloo_web/content.clj b/src/bitgloo_web/content.clj
index 00a8e2a..948edf4 100644
--- a/src/bitgloo_web/content.clj
+++ b/src/bitgloo_web/content.clj
@@ -6,12 +6,19 @@
   (:require [markdown.core :refer [md-to-html-string]]))
 
 (def page-header
-  [:div#title-container
-   [:a {:href "/"}
+  [:div#header
+   [:div#title
     [:img#logo {:src "/logo.jpg" :alt "bitgloo logo"}]
-    [:h1 "bitgloo"]]])
+    [:a {:href "/"}
+     [:h1 "bitgloo"]]]])
+   ;[:div#subtitle "Electronics design services"]])
 
-(def page-footer [:div#footer [:span "© Clyne Sullivan 2023"]])
+(def page-menu
+  [:div#menu
+   [:a.menu-item {:href "/"} "Home"]
+   [:a.menu-item {:href "/projects"} "Projects"]])
+
+(def page-footer [:div#footer "© Clyne Sullivan 2023"])
 
 (defn md-file? [path] (str/ends-with? path ".md"))
 
@@ -19,12 +26,12 @@
 
 (defn parse-md-file [file] (-> file slurp md-to-html-string))
 
-(defn render-md-files [file-list] (for [f file-list] [:div.block (parse-md-file f)]))
+(defn render-md-files [file-list] (for [f file-list] [:div.content (parse-md-file f)]))
 
 (defn load-page [path]
   (let [file-list (filter md-file? (get-file-list path))]
     (when-not (empty? file-list)
       (page/html5
         [:head [:title "bitgloo"] (page/include-css "/main.css")]
-        [:body page-header [:div#posts (render-md-files file-list)] page-footer]))))
+        [:body [:div#container page-header page-menu (render-md-files file-list) page-footer]]))))
 
diff --git a/src/bitgloo_web/core.clj b/src/bitgloo_web/core.clj
index bd4ba6b..133afac 100644
--- a/src/bitgloo_web/core.clj
+++ b/src/bitgloo_web/core.clj
@@ -15,7 +15,8 @@
 
 (defn image? [path] (some (partial str/ends-with? path) image-extensions))
 
-(defn home-redirect [uri] (if (= "/" uri) "/home" uri))
+;(defn home-redirect [uri] (if (= "/" uri) "/home" uri))
+(defn home-redirect [uri] uri)
 
 (defn request-handler [content-path request]
   (let [path (str content-path (home-redirect (:uri request)))]
@@ -31,6 +32,10 @@
         (when (.exists (io/file path)) (resp/file-response path))
         (handler request)))))
 
+(defn wrap-no-params [handler]
+  (fn [request]
+    (when (nil? (:query-string request)) (handler request))))
+
 (defn wrap-only-gets [handler]
   (fn [request]
     (when (= :get (:request-method request)) (handler request))))
@@ -61,6 +66,7 @@
           (wrap-resource "public")
           (wrap-content-type)
           (wrap-not-modified)
+          (wrap-no-params)
           (wrap-only-gets)
           (wrap-not-found)
           (wrap-log-transactions)