mirror of
https://github.com/penpot/penpot.git
synced 2025-06-22 12:16:59 +02:00
Merge remote-tracking branch 'origin/staging' into develop
This commit is contained in:
commit
496afb0f25
11 changed files with 40 additions and 63 deletions
|
@ -37,7 +37,7 @@
|
|||
(log/setup! {:app :info})
|
||||
|
||||
(when (= :browser cf/target)
|
||||
(log/info :message "Hey!,Welcome to penpot"
|
||||
(log/info :message "Welcome to penpot"
|
||||
:version (:full cf/version)
|
||||
:asserts *assert*
|
||||
:build-date cf/build-date
|
||||
|
|
|
@ -518,29 +518,6 @@
|
|||
(->> (rp/cmd! :get-access-tokens)
|
||||
(rx/map access-tokens-fetched)))))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
(defn heyhey-fetched
|
||||
[value]
|
||||
(ptk/reify ::heyhey-fetched
|
||||
ptk/UpdateEvent
|
||||
(update [_ state]
|
||||
(assoc state :hey-value value))))
|
||||
|
||||
|
||||
|
||||
(defn fetch-heyhey
|
||||
[]
|
||||
(ptk/reify ::fetch-heyhey
|
||||
ptk/WatchEvent
|
||||
(watch [_ _ _]
|
||||
(->> (rp/cmd! :hey)
|
||||
(rx/map heyhey-fetched)))))
|
||||
|
||||
|
||||
|
||||
;; --- EVENT: create-access-token
|
||||
|
||||
(defn access-token-created
|
||||
|
|
|
@ -260,21 +260,16 @@
|
|||
[:& access-token-actions
|
||||
{:on-delete on-delete}]]]))
|
||||
|
||||
(def hey-ref
|
||||
(l/derived :hey-value st/state))
|
||||
|
||||
(mf/defc access-tokens-page
|
||||
[]
|
||||
(mf/with-effect []
|
||||
(dom/set-html-title (tr "title.settings.access-tokens"))
|
||||
(st/emit! (du/fetch-access-tokens))
|
||||
(st/emit! (du/fetch-heyhey)))
|
||||
(st/emit! (du/fetch-access-tokens)))
|
||||
|
||||
(let [tokens (mf/deref tokens-ref)
|
||||
hey (mf/deref hey-ref)]
|
||||
[:div.dashboard-access-tokens {:style {:background "pink"}}
|
||||
(let [tokens (mf/deref tokens-ref)]
|
||||
[:div.dashboard-access-tokens
|
||||
[:div
|
||||
[:div {:on-click #(st/emit! (du/fetch-heyhey))} hey]
|
||||
[:& access-tokens-hero]
|
||||
(if (empty? tokens)
|
||||
[:div.access-tokens-empty
|
||||
[:div (tr "dashboard.access-tokens.empty.no-access-tokens")]
|
||||
|
|
|
@ -97,11 +97,12 @@
|
|||
(defn- svg-update-image!
|
||||
"Updates an image in an SVG to a Data URI."
|
||||
[image]
|
||||
(when-let [href (dom/get-attribute image "href")]
|
||||
(if-let [href (dom/get-attribute image "href")]
|
||||
(->> (fetch-as-data-uri href)
|
||||
(rx/map (fn [url]
|
||||
(dom/set-attribute! image "href" url)
|
||||
image)))))
|
||||
image)))
|
||||
(rx/empty)))
|
||||
|
||||
(defn- svg-resolve-images!
|
||||
"Resolves all images in an SVG to Data URIs."
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue