move header stuff into separate ns

core · Jun 2, 2016 · 9ca5716 · 9ca5716
1 parent 1db979a
commit 9ca5716
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/src/cljs/ulysses/components/misc.cljs → src/cljs/ulysses/components/header.cljs b/src/cljs/ulysses/components/misc.cljs → src/cljs/ulysses/components/header.cljs
@@ -1,8 +1,12 @@
-(ns ulysses.components.misc
+(ns ulysses.components.header
   (:require [ulysses.components.basic :refer [link fa]]
             [ulysses.config :as config]
             [re-frame.core :as re-frame :refer [subscribe]]))
 
+;; ----------------------------------------------------------------------------
+;; sub-components
+;; ----------------------------------------------------------------------------
+
 (defn progress []
   (let [is-loading (subscribe [:is-loading])
         scroll-y (subscribe [:scroll-y])]
@@ -37,3 +41,12 @@
       [:ul.nav.navbar-nav.red-button-menu.pull-right
         [uconn-banner-right-menu-item "http://uconn.edu/search" :search]
         [uconn-banner-right-menu-item "http://uconn.edu/az/" :sort-alpha-asc]]]))
+
+;; ----------------------------------------------------------------------------
+;; main
+;; ----------------------------------------------------------------------------
+
+(defn header []
+  [:header.header
+    [uconn-banner]
+    [main-logo]])
diff --git a/src/cljs/ulysses/components/layout.cljs b/src/cljs/ulysses/components/layout.cljs
@@ -1,6 +1,6 @@
 (ns ulysses.components.layout
   (:require [reagent.core :as r]
-            [ulysses.components.misc :refer [uconn-banner main-logo progress]]
+            [ulysses.components.header :refer [header]]
             [ulysses.components.basic :refer [css-transition-group-standard]]
             [ulysses.lib.moment :as m]))
 
@@ -10,8 +10,7 @@
 
 (defn shell [page-name page]
   [:div.shell
-    [uconn-banner]
-    [main-logo]
+    [header]
     ; page
     [css-transition-group-standard
       [^{:key (name page-name)} [:div.page page]]]

diff --git a/src/cljs/ulysses/handlers.cljs b/src/cljs/ulysses/handlers.cljs
@@ -262,7 +262,7 @@
     (assoc-in db [:builder-filters :faculty-years-uconn]
       (or (str->int years-uconn) 0))))
 
-;; builder faculty workspace hover
+;; builder faculty workspace hover ----
 
 (register-handler
   :builder-faculties-workspace-hover

diff --git a/src/cljs/ulysses/pages/builder.cljs b/src/cljs/ulysses/pages/builder.cljs
@@ -124,7 +124,7 @@
           (map-subels pool-row faculties-and-metrics)]]]))
 
 (defn builder-panel
-  [grant faculties faculty-titles
+  [op faculties faculty-titles
    faculties-pool faculties-workspace
    faculties-workspace-hover
    builder-filters]
@@ -146,6 +146,11 @@
         [:div.inner
           [:h3 "Word Cloud"]]]]])
 
+(defn builder-header
+  [op]
+  [:div.builder-header
+    [:h3.text-xs-center.mb-15 (:title op)]])
+
 ;; ----------------------------------------------------------------------------
 ;; main
 ;; ----------------------------------------------------------------------------
@@ -193,8 +198,8 @@
               _  @page-with-args]
           (if op
             [:div
-              [:h3.text-xs-center.mb-15 (:title op)]
-              [:div [builder-panel op fa ft fp fw fh bf]]]
+              [builder-header op]
+              [builder-panel op fa ft fp fw fh bf]]
             [loading-or-no-results
               :not-found-message
               "The requested grant opportunity was not found."])))})))