From 8c421c4f4d20e12ce567d6727c19d09a6a11c802 Mon Sep 17 00:00:00 2001
From: BC <bryce@brofessional.lan>
Date: Thu, 24 Jan 2019 22:39:54 -0800
Subject: [PATCH] reorgi.

---
 src/cljs/auto_ap/views/components/layouts.cljs   | 13 +++++++++----
 src/cljs/auto_ap/views/components/paginator.cljs |  8 ++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/cljs/auto_ap/views/components/layouts.cljs b/src/cljs/auto_ap/views/components/layouts.cljs
index 11762b16..fd57dfdf 100644
--- a/src/cljs/auto_ap/views/components/layouts.cljs
+++ b/src/cljs/auto_ap/views/components/layouts.cljs
@@ -57,13 +57,17 @@
                                                                                                                                "All")]
           [:div {:class "navbar-dropdown"}
            [:a {:class "navbar-item"
-                :on-click (fn [] (re-frame/dispatch [::events/swap-client nil]))
+                :on-click (fn []
+                            (re-frame/dispatch [::events/toggle-menu :client])
+                            (re-frame/dispatch [::events/swap-client nil]))
                 } "All"]
            [:hr {:class "navbar-divider"}]
            (for [{:keys [name id] :as client} @clients]
              ^{:key id }
              [:a {:class "navbar-item"
-                  :on-click (fn [] (re-frame/dispatch [::events/swap-client client]))
+                  :on-click (fn []
+                              (re-frame/dispatch [::events/toggle-menu :client])
+                              (re-frame/dispatch [::events/swap-client client]))
                   } name])]]]]
        [login-dropdown]]]))
 
@@ -78,7 +82,8 @@
        [:i {:class "fa fa-github"}]]]]]])
 
 (defn side-bar-layout [{:keys [side-bar main ap bottom]}]
-  (let [ap @(re-frame/subscribe [::subs/active-page])]
+  (let [ap @(re-frame/subscribe [::subs/active-page])
+        client @(re-frame/subscribe [::subs/client])]
     [:div 
      [navbar ap]
      [:div {:class "columns ", :id "mail-app"}
@@ -86,7 +91,7 @@
        [:div.main.left-nav
         side-bar]]
       [:div {:class "column messages hero is-fullheight", :id "message-feed"}
-       ^{:key (str "active-page-")}
+       ^{:key (str "active-page-" (:name client))}
        [:div.inbox-messages main]]]
      [footer]
      bottom
diff --git a/src/cljs/auto_ap/views/components/paginator.cljs b/src/cljs/auto_ap/views/components/paginator.cljs
index 1ce18fda..84607b00 100644
--- a/src/cljs/auto_ap/views/components/paginator.cljs
+++ b/src/cljs/auto_ap/views/components/paginator.cljs
@@ -38,13 +38,13 @@
 
         extended-last-page-button (when (not= last-page-button total-pages)
                                     (list
-                                     [:li [:span.pagination-ellipsis "…"]]
-                                     (last all-buttons)))
+                                     ^ {:key 1} [:li [:span.pagination-ellipsis "…"]]
+                                     ^ {:key 2} (last all-buttons)))
 
         extended-first-page-button (when (not= first-page-button 0)
                                      (list
-                                      (first all-buttons)
-                                      [:li [:span.pagination-ellipsis "…"]]))]
+                                      ^{:key 1} (first all-buttons)
+                                      ^{:key 2} [:li [:span.pagination-ellipsis "…"]]))]
     
 
     [:nav.pagination {:role "pagination"}