notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

reorgi.

Browse Source
This commit is contained in:
BC
2019-01-24 22:39:54 -08:00
parent 0bc35b63ad
commit 8c421c4f4d
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/cljs/auto_ap/views/components/layouts.cljs
View File

@@ -57,13 +57,17 @@
"All")] "All")]
[:div {:class "navbar-dropdown"} [:div {:class "navbar-dropdown"}
[:a {:class "navbar-item" [: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"] } "All"]
[:hr {:class "navbar-divider"}] [:hr {:class "navbar-divider"}]
(for [{:keys [name id] :as client} @clients] (for [{:keys [name id] :as client} @clients]
^{:key id } ^{:key id }
[:a {:class "navbar-item" [: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])]]]] } name])]]]]
[login-dropdown]]])) [login-dropdown]]]))
@@ -78,7 +82,8 @@
[:i {:class "fa fa-github"}]]]]]]) [:i {:class "fa fa-github"}]]]]]])
(defn side-bar-layout [{:keys [side-bar main ap bottom]}] (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 [:div
[navbar ap] [navbar ap]
[:div {:class "columns ", :id "mail-app"} [:div {:class "columns ", :id "mail-app"}
@@ -86,7 +91,7 @@
[:div.main.left-nav [:div.main.left-nav
side-bar]] side-bar]]
[:div {:class "column messages hero is-fullheight", :id "message-feed"} [:div {:class "column messages hero is-fullheight", :id "message-feed"}
^{:key (str "active-page-")} ^{:key (str "active-page-" (:name client))}
[:div.inbox-messages main]]] [:div.inbox-messages main]]]
[footer] [footer]
bottom bottom

8
src/cljs/auto_ap/views/components/paginator.cljs
View File

@@ -38,13 +38,13 @@
extended-last-page-button (when (not= last-page-button total-pages) extended-last-page-button (when (not= last-page-button total-pages)
(list (list
[:li [:span.pagination-ellipsis "…"]] ^ {:key 1} [:li [:span.pagination-ellipsis "…"]]
(last all-buttons))) ^ {:key 2} (last all-buttons)))
extended-first-page-button (when (not= first-page-button 0) extended-first-page-button (when (not= first-page-button 0)
(list (list
(first all-buttons) ^{:key 1} (first all-buttons)
[:li [:span.pagination-ellipsis "…"]]))] ^{:key 2} [:li [:span.pagination-ellipsis "…"]]))]
[:nav.pagination {:role "pagination"} [:nav.pagination {:role "pagination"}