diff --git a/src/uxbox/router.cljs b/src/uxbox/router.cljs index a677a9c96..d7fc22eaa 100644 --- a/src/uxbox/router.cljs +++ b/src/uxbox/router.cljs @@ -62,6 +62,7 @@ ["auth/recover" :auth/recover-password] ["dashboard/" [["projects" :dashboard/projects] ["elements" :dashboard/elements] + ["user-settings" :dashboard/user-settings] ["icons" :dashboard/icons] ["colors" :dashboard/colors]]] ["workspace/" [[page-route :workspace/page]]]]]) diff --git a/src/uxbox/ui.cljs b/src/uxbox/ui.cljs index f700bede4..17a644903 100644 --- a/src/uxbox/ui.cljs +++ b/src/uxbox/ui.cljs @@ -46,6 +46,7 @@ :dashboard/elements (ui-dashboard/elements-page) :dashboard/icons (ui-dashboard/icons-page) :dashboard/colors (ui-dashboard/colors-page) + :dashboard/user-settings (ui-dashboard/user-settings-page) :workspace/page (let [projectid (:project-uuid params) pageid (:page-uuid params)] (workspace projectid pageid)) diff --git a/src/uxbox/ui/dashboard.cljs b/src/uxbox/ui/dashboard.cljs index eec1e0953..517bb6ca5 100644 --- a/src/uxbox/ui/dashboard.cljs +++ b/src/uxbox/ui/dashboard.cljs @@ -139,3 +139,36 @@ :transfer-state colors-page-transfer-state :name "colors" :mixins [mx/static]})) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Page: User settings +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(defn user-settings-page-render + [own] + (html + [:main.dashboard-main + (header) + [:section.dashboard-content + (ui.library-bar/library-bar) + [:section.dashboard-grid.library + (elements/page-title) + (elements/grid)]]])) + +(defn user-settings-page-will-mount + [own] + (rs/emit! (dd/initialize :dashboard/user-settings)) + own) + +(defn user-settings-page-transfer-state + [old-state state] + (rs/emit! (dd/initialize :dashboard/user-settings)) + state) + +(def ^:static user-settings-page + (mx/component + {:render user-settings-page-render + :will-mount user-settings-page-will-mount + :transfer-state user-settings-page-transfer-state + :name "user-settings-page" + :mixins [mx/static]})) diff --git a/src/uxbox/ui/users.cljs b/src/uxbox/ui/users.cljs index be33f7b0b..5567ac77c 100644 --- a/src/uxbox/ui/users.cljs +++ b/src/uxbox/ui/users.cljs @@ -17,7 +17,9 @@ (defn menu-render [own open?] - (let [open-settings-dialog #(lightbox/open! :settings)] + (let [open-settings-dialog #(lightbox/open! :settings) + ;;open-user-settings #(dashboard/user-settings-page/open! :user-settings) + ] (html [:ul.dropdown {:class (when-not open? "hide")}