Quality of life improvements with client login

This commit is contained in:
Bryce Covert
2020-07-30 08:44:44 -07:00
parent 6df080cc3f
commit 98f0d40313
13 changed files with 210 additions and 115 deletions

View File

@@ -6,7 +6,7 @@
[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.components.layouts :refer [side-bar-layout]]
[auto-ap.views.components.layouts :refer [side-bar-layout loading-layout]]
[auto-ap.views.pages.unpaid-invoices :refer [unpaid-invoices-page]]
[auto-ap.views.pages.import-invoices :refer [import-invoices-page]]
[auto-ap.views.pages.needs-activation :refer [needs-activation-page]]
@@ -111,8 +111,44 @@
(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])]
[:div
^{:key @ap} [page @ap]]))
(let [ap (re-frame/subscribe [::subs/active-page])
is-loading? @(re-frame/subscribe [::subs/is-initial-loading?])]
(if is-loading?
[loading-layout]
[:div
^{:key @ap} [page @ap]])))