Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-08 07:50:43 -05:00
Code Issues Activity

Merge remote-tracking branch 'penpot/develop' into token-studio-develop

Browse source
This commit is contained in:
Florian Schroedl 2024-08-07 16:21:08 +02:00
commit c9673ca828
5 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/deps.edn
View file

@ -15,8 +15,8 @@
:exclusions [funcool/beicon2]} :exclusions [funcool/beicon2]}
funcool/beicon2 funcool/beicon2
{:git/tag "v2.1" {:git/tag "v2.2"
:git/sha "7d648e1" :git/sha "8744c66"
:git/url "https://github.com/funcool/beicon.git"} :git/url "https://github.com/funcool/beicon.git"}
funcool/rumext funcool/rumext

2
frontend/resources/templates/preview-head.mustache
View file

@ -1,4 +1,4 @@
<link href="/css/ds.css?ts={{& ts}}" rel="stylesheet" type="text/css" /> <link href="./css/ds.css?ts={{& ts}}" rel="stylesheet" type="text/css" />
<style> <style>
body { body {
overflow-y: scroll; overflow-y: scroll;

4
frontend/src/app/main/data/changes.cljs
View file

@ -56,6 +56,10 @@
(uw/ask! {:cmd :update-page-index (uw/ask! {:cmd :update-page-index
:page-id page-id :page-id page-id
:changes changes}))) :changes changes})))
(rx/catch (fn [cause]
(log/warn :hint "unable to update index"
:cause cause)
(rx/empty)))
(rx/ignore)))))) (rx/ignore))))))
(defn- get-pending-commits (defn- get-pending-commits

18
frontend/test/frontend_tests/helpers/state.cljs
View file

@ -42,21 +42,25 @@
([store done events completed-cb] ([store done events completed-cb]
(run-store store done events completed-cb nil)) (run-store store done events completed-cb nil))
([store done events completed-cb stopper] ([store done events completed-cb stopper]
(let [stream (ptk/input-stream store)] (let [stream (ptk/input-stream store)
stopper-s (if (fn? stopper)
(stopper stream)
(rx/filter #(= :the/end %) stream))]
(->> stream (->> stream
(rx/take-until (if stopper (rx/take-until stopper-s)
(stopper stream)
(rx/filter #(= :the/end %) stream)))
(rx/last) (rx/last)
(rx/tap (fn [] (rx/tap (fn [_]
(completed-cb @store))) (completed-cb @store)))
(rx/subs! (fn [_] (done)) (rx/subs! (fn [_] (done))
(fn [cause] (fn [cause]
(js/console.log "[error]:" cause)) (js/console.log "[error]:" cause))
(fn [_] (fn [_]
(js/console.log "[complete]")))) (js/console.log "[complete]"))))
(doall (for [event events]
(ptk/emit! store event))) (doseq [event events]
(ptk/emit! store event))
(ptk/emit! store :the/end)))) (ptk/emit! store :the/end))))
(defn get-file-from-store (defn get-file-from-store

1
manage.sh
View file

@ -112,6 +112,7 @@ function build {
--mount source=${DEVENV_PNAME}_user_data,type=volume,target=/home/penpot/ \ --mount source=${DEVENV_PNAME}_user_data,type=volume,target=/home/penpot/ \
--mount source=`pwd`,type=bind,target=/home/penpot/penpot \ --mount source=`pwd`,type=bind,target=/home/penpot/penpot \
-e EXTERNAL_UID=$CURRENT_USER_ID \ -e EXTERNAL_UID=$CURRENT_USER_ID \
-e BUILD_STORYBOOK=$BUILD_STORYBOOK \
-e SHADOWCLJS_EXTRA_PARAMS=$SHADOWCLJS_EXTRA_PARAMS \ -e SHADOWCLJS_EXTRA_PARAMS=$SHADOWCLJS_EXTRA_PARAMS \
-w /home/penpot/penpot/$1 \ -w /home/penpot/penpot/$1 \
$DEVENV_IMGNAME:latest sudo -EH -u penpot ./scripts/build $version $DEVENV_IMGNAME:latest sudo -EH -u penpot ./scripts/build $version