github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-08-01 19:06:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3996 from penpot/niwinz-staging-bugfix-4

Browse Source 
🐛 Bugfixes related to rumext update
This commit is contained in:
Eva Marco 2024-01-10 14:42:43 +01:00 committed by GitHub
commit 08d7f5d8a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/app/http/debug.clj
View File

@ -412,13 +412,13 @@
:code :invalid-version :code :invalid-version
:hint "provided invalid version")) :hint "provided invalid version"))
(srepl/update-file! cfg (binding [srepl/*system* cfg]
:id file-id (srepl/update-file! :id file-id
:update-fn (fn [file] :update-fn (fn [file]
(update file :data assoc :version version)) (update file :data assoc :version version))
:migrate? false :migrate? false
:inc-revn? false :inc-revn? false
:save? true) :save? true))
{::rres/status 200 {::rres/status 200
::rres/headers {"content-type" "text/plain"} ::rres/headers {"content-type" "text/plain"}
::rres/body "OK"})) ::rres/body "OK"}))

2
backend/src/app/srepl/helpers.clj
View File

@ -154,7 +154,7 @@
(dissoc file :data)))] (dissoc file :data)))]
(db/tx-run! main/system (db/tx-run! (or *system* main/system)
(fn [system] (fn [system]
(binding [*system* system] (binding [*system* system]
(try (try

4
frontend/deps.edn
View File

@ -19,8 +19,8 @@
:git/url "https://github.com/funcool/beicon.git"} :git/url "https://github.com/funcool/beicon.git"}
funcool/rumext funcool/rumext
{:git/tag "v2.9.2" {:git/tag "v2.9.3"
:git/sha "faa6e6c" :git/sha "9047337"
:git/url "https://github.com/funcool/rumext.git"} :git/url "https://github.com/funcool/rumext.git"}
instaparse/instaparse {:mvn/version "1.4.12"} instaparse/instaparse {:mvn/version "1.4.12"}

2
frontend/src/app/main/ui/components/forms.cljs
View File

@ -268,7 +268,7 @@
(let [image? (some? image) (let [image? (some? image)
value' (encode-fn value) value' (encode-fn value)
checked? (= value current-value) checked? (= value current-value)
key (str/ffmt "%-%" name value')] key (str/ffmt "%-%" (d/name name) (d/name value'))]
[:label {:for key [:label {:for key
:key key :key key
:style {:background-image (when image? (str/ffmt "url(%)" image))} :style {:background-image (when image? (str/ffmt "url(%)" image))}

41
frontend/src/app/main/ui/onboarding/questions.cljs
View File

@ -47,19 +47,38 @@
[:h1 {:class (stl/css :modal-title)} (tr "questions.lets-get-started")] [:h1 {:class (stl/css :modal-title)} (tr "questions.lets-get-started")]
[:p {:class (stl/css :modal-text)} (tr "questions.your-feedback-will-help-us")] [:p {:class (stl/css :modal-text)} (tr "questions.your-feedback-will-help-us")]
[:h3 {:class (stl/css :modal-subtitle)} (tr "questions.questions-how-are-you-planning-to-use-penpot")] [:h3 {:class (stl/css :modal-subtitle)} (tr "questions.questions-how-are-you-planning-to-use-penpot")]
[:& fm/select {:options [{:label (tr "questions.select-option") :value "" :key "questions-how-are-you-planning-to-use-penpot" :disabled true} [:& fm/select
{:label (tr "questions.discover-more-about-penpot") :value "discover-more-about-penpot" :key "discover-more-about-penpot"} {:options [{:label (tr "questions.select-option")
{:label (tr "questions.test-penpot-to-see-if-its-a-fit-for-team") :value "test-penpot-to-see-if-its-a-fit-for-team" :key "test-penpot-to-see-if-its-a-fit-for-team"} :value "" :key "questions-how-are-you-planning-to-use-penpot"
{:label (tr "questions.start-to-work-on-my-project") :value "start-to-work-on-my-project" :key "start-to-work-on-my-project"} :disabled true}
{:label (tr "questions.get-the-code-from-my-team-project") :value "get-the-code-from-my-team-project" :key "get-the-code-from-my-team-project"} {:label (tr "questions.discover-more-about-penpot")
{:label (tr "questions.leave-feedback-for-my-team-project") :value "leave-feedback-for-my-team-project" :key "leave-feedback-for-my-team-project"} :value "discover-more-about-penpot"
{:label (tr "questions.work-in-concept-ideas") :value "work-in-concept-ideas" :key "work-in-concept-ideas"} :key "discover-more-about-penpot"}
{:label (tr "questions.try-out-before-using-penpot-on-premise") :value "try-out-before-using-penpot-on-premise" :key "try-out-before-using-penpot-on-premise"}] {:label (tr "questions.test-penpot-to-see-if-its-a-fit-for-team")
:default "" :value "test-penpot-to-see-if-its-a-fit-for-team"
:name :planning}]]) :key "test-penpot-to-see-if-its-a-fit-for-team"}
{:label (tr "questions.start-to-work-on-my-project")
:value "start-to-work-on-my-project"
:key "start-to-work-on-my-project"}
{:label (tr "questions.get-the-code-from-my-team-project")
:value "get-the-code-from-my-team-project"
:key "get-the-code-from-my-team-project"}
{:label (tr "questions.leave-feedback-for-my-team-project")
:value "leave-feedback-for-my-team-project"
:key "leave-feedback-for-my-team-project"}
{:label (tr "questions.work-in-concept-ideas")
:value "work-in-concept-ideas"
:key "work-in-concept-ideas"}
{:label (tr "questions.try-out-before-using-penpot-on-premise")
:value "try-out-before-using-penpot-on-premise"
:key "try-out-before-using-penpot-on-premise"}]
:default ""
:name :planning}]])
(s/def ::questions-form-step-2 (s/def ::questions-form-step-2
(s/keys :req-un [::experience-branding-illustrations-marketing-pieces ::experience-interface-design-visual-assets-design-systems ::experience-interface-wireframes-user-journeys-flows-navigation-trees])) (s/keys :req-un [::experience-branding-illustrations-marketing-pieces
::experience-interface-design-visual-assets-design-systems
::experience-interface-wireframes-user-journeys-flows-navigation-trees]))
(mf/defc step-2 (mf/defc step-2
[{:keys [on-next on-prev form] :as props}] [{:keys [on-next on-prev form] :as props}]