progress on bugs

This commit is contained in:
Bryce Covert
2020-08-19 18:25:27 -07:00
parent 2716b6e2ba
commit a08c197159
8 changed files with 26 additions and 47 deletions

View File

@@ -116,44 +116,13 @@
(defmethod page :admin-excel-import [_]
[admin-excel-import-page])
;;
;; ;; <div id="app">
;; <nav class="navbar has-shadow">
;; <div class="container">
;; <div class="navbar-brand">
;; <a class="navbar-item" href="../">
;; <img src="/img/logo.png" />
;; </a>
;; </div>
;; </div>
;; </nav>
;; <div class="has-text-centered hero is-fullheight is-vertically-centered" id="mail-app">
;; <div class="is-vertically-centered">
;; <h1 class="title"><i class="fa fa-spin fa-spinner"></i></h1>
;; </div>
;; </div>
;; <footer class="footer">
;; <div class="container">
;; <div class="content has-text-centered">
;; <p>
;; <strong>Integreat</strong>
;; by <a href="https://github.com/">Integreat</a>.
;; </p>
;; <p>
;; <a class="icon" href="https://github.com/dansup/bulma-templates">
;; <i class="fa fa-github"></i>
;; </a>
;; </p>
;; </div>
;; </div>
;; </footer>
;; </div>
(defn active-page []
(let [ap (re-frame/subscribe [::subs/active-page])
current-client @(re-frame/subscribe [::subs/client])
is-loading? @(re-frame/subscribe [::subs/is-initial-loading?])]
(if is-loading?
[loading-layout]
[:div
^{:key @ap} [page @ap]])))
^{:key (str @ap "-" current-client)} [page @ap]])))