3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-13 01:01:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

🎉 Set files as shared libraries

Browse source
This commit is contained in:
Andrés Moya 2020-08-04 12:05:54 +02:00
parent 69ae893bd0
commit 9fb821d6e0
19 changed files with 322 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

18
frontend/src/uxbox/main/data/dashboard.cljs
View file

@ -333,11 +333,25 @@
ptk/WatchEvent
(watch [_ state stream]
(let [local (:dashboard-local state)
params {:id id :name name}]
(let [params {:id id :name name}]
(->> (rp/mutation :rename-file params)
(rx/ignore))))))
;; --- Set File shared
(defn set-file-shared
[id is-shared]
{:pre [(uuid? id) (boolean? is-shared)]}
(ptk/reify ::set-file-shared
ptk/UpdateEvent
(update [_ state]
(assoc-in state [:files id :is-shared] is-shared))
ptk/WatchEvent
(watch [_ state stream]
(let [params {:id id :is-shared is-shared}]
(->> (rp/mutation :set-file-shared params)
(rx/ignore))))))
;; --- Create File

1
frontend/src/uxbox/main/data/workspace.cljs
View file

@ -1436,6 +1436,7 @@
;; Persistence
(def set-file-shared dwp/set-file-shared)
(def fetch-images dwp/fetch-images)
(def add-image-from-url dwp/add-image-from-url)
(def upload-image dwp/upload-image)

16
frontend/src/uxbox/main/data/workspace/persistence.cljs
View file

@ -182,6 +182,22 @@
:workspace-project project)
(reduce assoc-page $$ pages))))))
;; --- Set File shared
(defn set-file-shared
[id is-shared]
{:pre [(uuid? id) (boolean? is-shared)]}
(ptk/reify ::set-file-shared
ptk/UpdateEvent
(update [_ state]
(assoc-in state [:workspace-file :is-shared] is-shared))
ptk/WatchEvent
(watch [_ state stream]
(let [params {:id id :is-shared is-shared}]
(->> (rp/mutation :set-file-shared params)
(rx/ignore))))))
;; --- Fetch Pages
(declare page-fetched)

5
frontend/src/uxbox/main/ui/confirm.cljs
View file

@ -11,10 +11,11 @@
[rumext.alpha :as mf]
[uxbox.main.ui.modal :as modal]
[uxbox.util.i18n :refer (tr)]
[uxbox.util.data :refer [classnames]]
[uxbox.util.dom :as dom]))
(mf/defc confirm-dialog
[{:keys [message on-accept on-cancel hint cancel-text accept-text] :as ctx}]
[{:keys [message on-accept on-cancel hint cancel-text accept-text not-danger?] :as ctx}]
(let [message (or message (tr "ds.confirm-title"))
cancel-text (or cancel-text (tr "ds.confirm-cancel"))
accept-text (or accept-text (tr "ds.confirm-ok"))
@ -45,5 +46,7 @@
[:input.dialog-accept-button
{:type "button"
:class (classnames :not-danger not-danger?)
:value accept-text
:on-click accept}]]]]]))

30
frontend/src/uxbox/main/ui/dashboard/grid.cljs
View file

@ -60,6 +60,28 @@
(dom/stop-propagation %)
(modal/show! confirm-dialog {:on-accept delete-fn}))
add-shared-fn #(st/emit! nil (dsh/set-file-shared (:id file) true))
on-add-shared
#(do
(dom/stop-propagation %)
(modal/show! confirm-dialog
{:message (t locale "dashboard.grid.add-shared-message" (:name file))
:hint (t locale "dashboard.grid.add-shared-hint")
:accept-text (t locale "dashboard.grid.add-shared-accept")
:not-danger? true
:on-accept add-shared-fn}))
remove-shared-fn #(st/emit! nil (dsh/set-file-shared (:id file) false))
on-remove-shared
#(do
(dom/stop-propagation %)
(modal/show! confirm-dialog
{:message (t locale "dashboard.grid.remove-shared-message" (:name file))
:hint (t locale "dashboard.grid.remove-shared-hint")
:accept-text (t locale "dashboard.grid.remove-shared-accept")
:not-danger? false
:on-accept remove-shared-fn}))
on-blur #(let [name (-> % dom/get-target dom/get-value)]
(st/emit! (dsh/rename-file (:id file) name))
(swap! local assoc :edition false))
@ -77,6 +99,9 @@
[:div.grid-item.project-th {:on-click on-navigate}
[:div.overlay]
[:& grid-item-thumbnail {:file file}]
(when (:is-shared file)
[:div.item-badge
i/library])
[:div.item-info
(if (:edition @local)
[:input.element-name {:type "text"
@ -100,7 +125,10 @@
[:& context-menu {:on-close on-menu-close
:show (:menu-open @local)
:options [[(t locale "dashboard.grid.rename") on-edit]
[(t locale "dashboard.grid.delete") on-delete]]}]]]))
[(t locale "dashboard.grid.delete") on-delete]
(if (:is-shared file)
[(t locale "dashboard.grid.remove-shared") on-remove-shared]
[(t locale "dashboard.grid.add-shared") on-add-shared])]}]]]))
;; --- Grid

1
frontend/src/uxbox/main/ui/icons.cljs
View file

@ -55,6 +55,7 @@
(def interaction (icon-xref :interaction))
(def layers (icon-xref :layers))
(def letter-spacing (icon-xref :letter-spacing))
(def library (icon-xref :library))
(def line (icon-xref :line))
(def line-height (icon-xref :line-height))
(def loader (icon-xref :loader))

30
frontend/src/uxbox/main/ui/workspace/header.cljs
View file

@ -18,6 +18,8 @@
[uxbox.main.refs :as refs]
[uxbox.main.store :as st]
[uxbox.main.ui.components.dropdown :refer [dropdown]]
[uxbox.main.ui.modal :as modal]
[uxbox.main.ui.confirm :refer [confirm-dialog]]
[uxbox.main.ui.workspace.presence :as presence]
[uxbox.util.i18n :as i18n :refer [t]]
[uxbox.util.data :refer [classnames]]
@ -58,13 +60,33 @@
(mf/defc menu
[{:keys [layout project file] :as props}]
(let [show-menu? (mf/use-state false)
locale (i18n/use-locale)]
locale (i18n/use-locale)
add-shared-fn #(st/emit! nil (dw/set-file-shared (:id file) true))
on-add-shared
#(modal/show! confirm-dialog
{:message (t locale "dashboard.grid.add-shared-message" (:name file))
:hint (t locale "dashboard.grid.add-shared-hint")
:accept-text (t locale "dashboard.grid.add-shared-accept")
:not-danger? true
:on-accept add-shared-fn})
remove-shared-fn #(st/emit! nil (dw/set-file-shared (:id file) false))
on-remove-shared
#(modal/show! confirm-dialog
{:message (t locale "dashboard.grid.remove-shared-message" (:name file))
:hint (t locale "dashboard.grid.remove-shared-hint")
:accept-text (t locale "dashboard.grid.remove-shared-accept")
:not-danger? false
:on-accept remove-shared-fn})]
[:div.menu-section
[:div.btn-icon-dark.btn-small {:on-click #(reset! show-menu? true)} i/actions]
[:div.project-tree {:alt (t locale "header.sitemap")}
[:span.project-name (:name project) " /"]
[:span (:name file)]]
(when (:is-shared file)
[:div.shared-badge i/library])
[:& dropdown {:show @show-menu?
:on-close #(reset! show-menu? false)}
@ -117,6 +139,12 @@
(t locale "workspace.header.menu.disable-dynamic-alignment")
(t locale "workspace.header.menu.enable-dynamic-alignment"))]
[:span.shortcut "Ctrl+a"]]
(if (:is-shared file)
[:li {:on-click on-remove-shared}
[:span (t locale "dashboard.grid.remove-shared")]]
[:li {:on-click on-add-shared}
[:span (t locale "dashboard.grid.add-shared")]])
]]]))
;; --- Header Component

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

@ -255,6 +255,7 @@
(mf/defc library-toolbox
[{:keys [library-id
shared?
images
colors
initial-open?
@ -268,7 +269,9 @@
{:class (classnames :open @open?)
:on-click toggle-open}
i/arrow-slide]
[:span (tr "workspace.assets.file-library")]]
[:span (tr "workspace.assets.file-library")]
(when shared?
[:span.tool-badge (tr "workspace.assets.shared")])]
(when @open?
(let [show-graphics (and (or (= box-filter :all) (= box-filter :graphics))
(or (> (count images) 0) (str/empty? search-term)))
@ -286,7 +289,8 @@
(mf/defc assets-toolbox
[]
(let [team-id (-> refs/workspace-project mf/deref :team-id)
file-id (-> refs/workspace-file mf/deref :id)
file (mf/deref refs/workspace-file)
file-id (:id file)
file-images (mf/deref refs/workspace-images)
file-colors (mf/deref refs/workspace-colors)
@ -347,6 +351,7 @@
]]
[:& library-toolbox {:library-id file-id
:shared? (:is-shared file)
:images filtered-images
:colors filtered-colors
:initial-open? true