From daa8d11c4db74e50a6491748495b6589f214e172 Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Sun, 2 Feb 2020 13:03:33 +0100 Subject: [PATCH] breadcrumb --- resources/public/css/public.css | 10 +++ src/wanijo/public/db.clj | 10 +++ src/wanijo/public/routes.clj | 8 +-- src/wanijo/public/view.clj | 104 +++++++++++++++++--------------- 4 files changed, 78 insertions(+), 54 deletions(-) diff --git a/resources/public/css/public.css b/resources/public/css/public.css index 0fb8760..342617d 100644 --- a/resources/public/css/public.css +++ b/resources/public/css/public.css @@ -81,6 +81,16 @@ body { padding-left: 2rem; } +.content { + grid-column: 2; +} + +.breadcrumb { + margin-left: 4vw; + margin-right: 4vw; + margin-top: 1.5rem; +} + .landing-container, .main { grid-column: 2; padding: 3rem; diff --git a/src/wanijo/public/db.clj b/src/wanijo/public/db.clj index e84880b..c997ace 100644 --- a/src/wanijo/public/db.clj +++ b/src/wanijo/public/db.clj @@ -24,3 +24,13 @@ (neo4j/exec-query! roles-of-coc {:coc_uuid (get coc-instance-uuids coc-key) :roleschema_uuid (:role schema-uuids)}))) + +(neo4j/defquery coc + "MATCH (coc:instance {uuid:{uuid}}) + RETURN coc") +(defn coc! [coc-key] + (-> (neo4j/exec-query! coc + {:uuid (get coc-instance-uuids coc-key)}) + first + :coc + (assoc :key coc-key))) diff --git a/src/wanijo/public/routes.clj b/src/wanijo/public/routes.clj index 5cebdc0..bd178fd 100644 --- a/src/wanijo/public/routes.clj +++ b/src/wanijo/public/routes.clj @@ -7,10 +7,10 @@ (defn index [] (view-public/index)) -(defn show-coc [coc] - (view-public/show-coc coc - (db-public/roles-of-coc! coc))) +(defn show-roles [coc-key] + (view-public/show-coc (db-public/coc! coc-key) + (db-public/roles-of-coc! coc-key))) (defroutes routes (GET (register! :public-index "/public") [] (index)) - (GET (register! :public-coc "/public/:coc") [coc] (show-coc coc))) + (GET (register! :public-coc "/public/:coc") [coc] (show-roles coc))) diff --git a/src/wanijo/public/view.clj b/src/wanijo/public/view.clj index 0ac9e40..431e26a 100644 --- a/src/wanijo/public/view.clj +++ b/src/wanijo/public/view.clj @@ -5,59 +5,63 @@ (defn layout [content] (html5 - [:head - [:meta {:charset "utf-8"}] - [:meta {:name "viewport" - :content "width=device-width,initial-scale=1,shrink-to-fit=no"}] - [:title "Moxie!"] - (include-css "/css/bootstrap.min.css" - "/css/public.css") - (include-js "/js/bootstrap.min.js")] - [:body - [:nav.navbar.navbar-expand-lg.sticky-top - [:a.navbar-brand {:href (path :public-index)} - [:img.navbar__logo {:src "/img/trio-logo.svg" - :alt "logo"}]] - [:button.navbar-toggler {:type "button" - :data-toggle "collapse" - :data-target "#navbar-content"} - [:span.navbar-toggler-icon]] - [:div#navbar-content.collapse.navbar-collapse.text-right - [:div#navbar-nav.ml-auto - [:a {:href (path :auth-login)} - "Login"]]]] - [:div.container-fluid.super-container - [:menu.global-nav - [:ol.global-nav__card-nav - [:li.global-nav__card-nav-item - [:a.global-nav__link {:href (path :public-coc {:coc "dev"})} - "Development"]] - [:li.global-nav__card-nav-item - [:a.global-nav__link {:href (path :public-coc {:coc "prk"})} - "Projekte"]] - [:li.global-nav__card-nav-item - [:a.global-nav__link {:href (path :public-coc {:coc "req"})} - "Req. Eng."]]]] - (into [:main.main] content)]])) + [:head + [:meta {:charset "utf-8"}] + [:meta {:name "viewport" + :content "width=device-width,initial-scale=1,shrink-to-fit=no"}] + [:title "Moxie!"] + (include-css "/css/bootstrap.min.css" + "/css/public.css") + (include-js "/js/bootstrap.min.js")] + [:body + [:nav.navbar.navbar-expand-lg.sticky-top + [:a.navbar-brand {:href (path :public-index)} + [:img.navbar__logo {:src "/img/trio-logo.svg" + :alt "logo"}]] + [:button.navbar-toggler {:type "button" + :data-toggle "collapse" + :data-target "#navbar-content"} + [:span.navbar-toggler-icon]] + [:div#navbar-content.collapse.navbar-collapse.text-right + [:div#navbar-nav.ml-auto + [:a {:href (path :auth-login)} + "Login"]]]] + [:div.container-fluid.super-container + [:menu.global-nav + [:ol.global-nav__card-nav + [:li.global-nav__card-nav-item + [:a.global-nav__link {:href (path :public-coc {:coc "dev"})} + "Development"]] + [:li.global-nav__card-nav-item + [:a.global-nav__link {:href (path :public-coc {:coc "prk"})} + "Projekte"]] + [:li.global-nav__card-nav-item + [:a.global-nav__link {:href (path :public-coc {:coc "req"})} + "Req. Eng."]]]] + (into [:div.content] content)]])) (defn index [] (layout - [[:h1 "Schön, dass du da bist!"] - [:h2 "Willkommen auf der TRIO-Wissensplattform"] - [:p "Hier findest du das gesammelte Wissen unserer Kollegen."] - [:p "Schau dich um. Vermisst du etwas? Dann sprich mit deinem CoC!"] - [:p "Du möchtest dich weiterentwickeln?" - "Dann gestalte selbst deinen Weg bei der TRIO und sprich" - "deinen Vorgesetzten an"]])) + [[:h1 "Schön, dass du da bist!"] + [:h2 "Willkommen auf der TRIO-Wissensplattform"] + [:p "Hier findest du das gesammelte Wissen unserer Kollegen."] + [:p "Schau dich um. Vermisst du etwas? Dann sprich mit deinem CoC!"] + [:p "Du möchtest dich weiterentwickeln?" + "Dann gestalte selbst deinen Weg bei der TRIO und sprich" + "deinen Vorgesetzten an"]])) (defn show-coc [coc roles] (layout - [[:h1 "CoC " coc] - [:table.table - [:thead - [:tr - [:th "Name"]]] - [:tbody - (for [role roles] - [:tr - [:td (h (:name role))]])]]])) + [[:main.main + [:h1 "CoC " (h (:name coc))] + [:table.table + [:thead + [:tr + [:th "Name"]]] + [:tbody + (for [role roles] + [:tr + [:td (h (:name role))]])]]] + [:nav + [:ol.breadcrumb + [:li.breadcrumb-item.active (h (:name coc))]]]]))