ALmost done on UI improvements.

This commit is contained in:
2022-07-23 07:18:52 -07:00
parent 6773af6442
commit 30f3909ee9
14 changed files with 114 additions and 509 deletions

View File

@@ -2,7 +2,6 @@
(:require
[auto-ap.db :as db]
[auto-ap.routes :as routes]
[auto-ap.subs :as subs]
[auto-ap.utils :refer [by]]
[auto-ap.views.utils :refer [with-user parse-jwt]]
[bidi.bidi :as bidi]
@@ -143,12 +142,12 @@
(re-frame/reg-event-fx
::set-active-route
(fn [{:keys [db]} [_ handler params route-params]]
(println (:user/role (parse-jwt (:user db))))
(cond
(and (not= :login handler) (not (:user db)))
{:redirect (bidi/path-for routes/routes :login)
:db (assoc db :active-route :login
:active-page :login
:menu nil
:page-failure nil)}
(and (not= "admin" (:user/role (parse-jwt (:user db))))
@@ -156,11 +155,13 @@
{:redirect (bidi/path-for routes/routes :index)
:db (assoc db :active-route :index
:active-page :index
:menu nil
:page-failure nil)}
:else
{:db (-> db
(assoc :active-route handler
:page-failure nil
:menu nil
:query-params params
:route-params route-params)
(auto-ap.views.pages.data-page/dispose-all))})))