fixing layout stuff.

src/cljs/auto_ap/views/main.cljs

@@ -6,6 +6,8 @@
    [auto-ap.subs :as subs]
    [auto-ap.events :as events]
    [auto-ap.views.utils :refer [active-when active-when= login-url dispatch-event]]
+   [auto-ap.views.pages.unpaid-invoices :refer [unpaid-invoices-page]]
+   [auto-ap.views.pages.paid-invoices :refer [paid-invoices-page]]
    [auto-ap.entities.clients :as clients]
    [auto-ap.views.pages :as pages]
    [auto-ap.views.components.vendor-dialog :refer [vendor-dialog]]))
@@ -36,7 +38,6 @@
         menu (re-frame/subscribe [::subs/menu])]
     (if @user
       [:div {:class (str "navbar-item has-dropdown " (when (get-in @menu [:account :active?]) "is-active"))}
-       
        [:a {:class "navbar-link login" :on-click (fn [e] (re-frame/dispatch [::events/toggle-menu :account]))} (:user/name @user)]
        [:div {:class "navbar-dropdown"}
         [:a {:class "navbar-item"} "My profile"]
@@ -98,22 +99,19 @@
        [:i {:class "fa fa-github"}]]]]]])
 
 (defn side-bar-layout [{:keys [side-bar main ap bottom]}]
-  [:div 
-   [navbar ap]
-   [:div {:class "columns ", :id "mail-app"}
-    [:aside {:class "column is-narrow aside menu hero is-fullheight"}
-     [:div.main.left-nav
-      side-bar
-      
-      ]]
-    [:div {:class "column messages hero is-fullheight", :id "message-feed"}
-     ^{:key (str "active-page-")}
-     [:div.inbox-messages
-      main]]]
-   [footer]
-   
-   bottom
-   [:div#dz-hidden]])
+  (let [ap @(re-frame/subscribe [::subs/active-page])]
+    [:div 
+     [navbar ap]
+     [:div {:class "columns ", :id "mail-app"}
+      [:aside {:class "column is-narrow aside menu hero is-fullheight"}
+       [:div.main.left-nav
+        side-bar]]
+      [:div {:class "column messages hero is-fullheight", :id "message-feed"}
+       ^{:key (str "active-page-")}
+       [:div.inbox-messages main]]]
+     [footer]
+     bottom
+     [:div#dz-hidden]]))
 
 (defmulti layout page->layout)
 
@@ -205,10 +203,18 @@
                        :ap ap}])
 
 (defmethod layout :blank [ap]
-  [:div  
+  [:div
    ^{:key ap} [pages/active-page ap]])
 
-(defn page []
+(defmulti page (fn [active-page] active-page))
+(defmethod page :unpaid-invoices [_]
+  (unpaid-invoices-page))
+
+(defmethod page :paid-invoices [_]
+  (paid-invoices-page))
+
+
+(defn active-page []
   (let [ap (re-frame/subscribe [::subs/active-page])]
-    [:div  
-     ^{:key @ap} [layout @ap]]))
+    [:div
+     ^{:key @ap} [page @ap]]))