3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-22 02:56:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

🚧 More work on dashboard integration.

Browse source
This commit is contained in:
Andrey Antukh 2020-03-09 20:34:52 +01:00
parent 13215d7f5d
commit f4a15e6db7
6 changed files with 224 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/uxbox/main/ui/dashboard.cljs
View file

@ -47,7 +47,7 @@
{:keys [team-id project-id]} (parse-params route profile)]
[:main.dashboard-main
[:& messages-widget]
[:& header {}]
[:& header {:profile profile}]
[:section.dashboard-content
[:& sidebar {:team-id team-id
:project-id project-id

101
frontend/src/uxbox/main/ui/dashboard/header.cljs
View file

@ -17,73 +17,15 @@
[uxbox.main.data.auth :as da]
[uxbox.main.data.projects :as dp]
[uxbox.main.store :as st]
[uxbox.main.refs :as refs]
[uxbox.main.ui.navigation :as nav]
[uxbox.util.dom :as dom]
[uxbox.util.i18n :as i18n :refer [t]]
[uxbox.util.router :as rt]))
(declare user)
;; --- Component: User Menu
(mf/defc header-link
[{:keys [section content] :as props}]
(let [on-click #(st/emit! (rt/nav section))]
[:a {:on-click on-click} content]))
(mf/defc header
[{:keys [section] :as props}]
(let [locale (i18n/use-locale)
projects? (= section :dashboard-projects)
icons? (= section :dashboard-icons)
images? (= section :dashboard-images)
colors? (= section :dashboard-colors)]
[:header#main-bar.main-bar
[:div.main-logo
[:& header-link {:section :dashboard-projects
:content i/logo-icon}]]
[:& user]
[:h1.dashboard-title "Personal"]
[:a.btn-dashboard "+ New project"]]))
; [:ul.main-nav
; [:li {:class (when projects? "current")}
; [:& header-link {:section :dashboard-projects
; :content (t locale "dashboard.header.projects")}]]
; [:& header-link {:section :dashboard-icons
; [:li {:class (when icons? "current")}
; :content (t locale "dashboard.header.icons")}]]
; [:li {:class (when images? "current")}
; [:& header-link {:section :dashboard-images
; :content (t locale "dashboard.header.images")}]]
; [:li {:class (when colors? "current")}
; [:& header-link {:section :dashboard-colors
; :content (t locale "dashboard.header.colors")}]]]]))
;; --- User Widget
(declare user-menu)
(def profile-ref
(-> (l/key :profile)
(l/derive st/state)))
(mf/defc user
[props]
(let [open (mf/use-state false)
profile (mf/deref profile-ref)
photo (:photo-uri profile "")
photo (if (str/empty? photo)
"/images/avatar.jpg"
photo)]
[:div.user-zone {:on-click #(st/emit! (rt/nav :settings-profile))
:on-mouse-enter #(reset! open true)
:on-mouse-leave #(reset! open false)}
[:img {:src photo}]
[:span (:fullname profile)]
(when @open
[:& user-menu])]))
;; --- User Menu
(mf/defc user-menu
(mf/defc profile-menu
[props]
(let [locale (i18n/use-locale)
on-click
@ -95,11 +37,42 @@
[:ul.dropdown
[:li {:on-click #(on-click % :settings-profile)}
i/user
[:span (t locale "dashboard.header.user-menu.profile")]]
[:span (t locale "dashboard.header.profile-menu.profile")]]
[:li {:on-click #(on-click % :settings-password)}
i/lock
[:span (t locale "dashboard.header.user-menu.password")]]
[:span (t locale "dashboard.header.profile-menu.password")]]
[:li {:on-click #(on-click % da/logout)}
i/exit
[:span (t locale "dashboard.header.user-menu.logout")]]]))
[:span (t locale "dashboard.header.profile-menu.logout")]]]))
;; --- Component: Profile
(mf/defc profile-section
[{:keys [profile] :as props}]
(let [open (mf/use-state false)
photo (:photo-uri profile "")
photo (if (str/empty? photo)
"/images/avatar.jpg"
photo)]
[:div.user-zone {:on-click #(st/emit! (rt/nav :settings-profile))
:on-mouse-enter #(reset! open true)
:on-mouse-leave #(reset! open false)}
[:img {:src photo}]
[:span (:fullname profile)]
(when @open
[:& profile-menu])]))
;; --- Component: Header
(mf/defc header
[{:keys [profile] :as props}]
(let [locale (i18n/use-locale)]
[:header#main-bar.main-bar
[:div.main-logo i/logo-icon]
[:& profile-section {:profile profile}]
[:h1.dashboard-title "Personal"]
[:a.btn-dashboard "+ New project"]]))

9
frontend/src/uxbox/main/ui/dashboard/sidebar.cljs
View file

@ -94,25 +94,26 @@
(= selected-team-id (:default-team-id profile)))
drafts? (and (= selected-section :dashboard-project)
(= selected-team-id (:default-team-id profile))
(= selected-project-id (:default-project-id profile)))]
(= selected-project-id (:default-project-id profile)))
locale (i18n/use-locale)]
[:ul.library-elements
[:li.recent-projects
{:on-click #(st/emit! (rt/nav :dashboard-team {:team-id team-id}))
:class-name (when home? "current")}
i/user
[:span.element-title "Personal"]]
[:span.element-title (t locale "dashboard.sidebar.personal")]]
[:li
{:on-click #(st/emit! (rt/nav :dashboard-project {:team-id team-id
:project-id "drafts"}))
:class-name (when drafts? "current")}
i/file-html
[:span.element-title "Drafts"]]
[:span.element-title (t locale "dashboard.sidebar.drafts")]]
[:li
i/icon-set
[:span.element-title "Libraries"]]
[:span.element-title (t locale "dashboard.sidebar.libraries")]]
[:div.projects-row
[:span "PROJECTS"]

2
frontend/src/uxbox/main/ui/dashboard/team.cljs
View file

@ -49,5 +49,5 @@
{:fn #(st/emit! (dsh/initialize-team team-id))
:deps (mf/deps team-id)})
[:section.dashboard-grid.library
[:section
[:p "TODO"]])

3
frontend/src/uxbox/main/ui/settings/header.cljs
View file

@ -13,7 +13,6 @@
[uxbox.main.data.auth :as da]
[uxbox.main.data.projects :as dp]
[uxbox.main.store :as st]
[uxbox.main.ui.dashboard.header :refer [user]]
[uxbox.util.i18n :as i18n :refer [tr t]]
[uxbox.util.router :as rt]))
@ -37,5 +36,5 @@
[:li {:class (when password? "current")}
[:& header-link {:section :settings-password
:content (tr "settings.password")}]]]
[:& user]]))
#_[:& user]]))