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

🐛 Do not show team-up modal for users already on a team

Browse source
This commit is contained in:
Pablo Alba 2022-05-05 13:45:55 +02:00 • committed by Alonso Torres
parent fe6e62482a
commit 1d39bbaa3c
2 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -48,6 +48,7 @@
### :bug: Bugs fixed ### :bug: Bugs fixed
- Do not show team-up modal for users already on a team [Taiga #3311](https://tree.taiga.io/project/penpot/issue/3311)
- Constraints are not well assigned when default and multiselection [Taiga #3069](https://tree.taiga.io/project/penpot/issue/3069) - Constraints are not well assigned when default and multiselection [Taiga #3069](https://tree.taiga.io/project/penpot/issue/3069)
- Duplicate artboards create new flows if needed [Taiga #2221](https://tree.taiga.io/project/penpot/issue/2221) - Duplicate artboards create new flows if needed [Taiga #2221](https://tree.taiga.io/project/penpot/issue/2221)
- Round the size values on handoff to two decimals [Taiga #3227](https://tree.taiga.io/project/penpot/issue/3227) - Round the size values on handoff to two decimals [Taiga #3227](https://tree.taiga.io/project/penpot/issue/3227)

39
frontend/src/app/main/ui/onboarding/team_choice.cljs
View file

@ -10,6 +10,7 @@
[app.main.data.dashboard :as dd] [app.main.data.dashboard :as dd]
[app.main.data.messages :as dm] [app.main.data.messages :as dm]
[app.main.data.modal :as modal] [app.main.data.modal :as modal]
[app.main.refs :as refs]
[app.main.store :as st] [app.main.store :as st]
[app.main.ui.components.forms :as fm] [app.main.ui.components.forms :as fm]
[app.util.i18n :as i18n :refer [tr]] [app.util.i18n :as i18n :refer [tr]]
@ -37,25 +38,27 @@
on-team-up on-team-up
(fn [] (fn []
(st/emit! (modal/show {:type :onboarding-team}))) (st/emit! (modal/show {:type :onboarding-team})))
] teams (mf/deref refs/teams)]
[:div.modal-overlay (if (< (count teams) 2)
[:div.modal-container.onboarding.final.animated.fadeInUp [:div.modal-overlay
[:div.modal-top [:div.modal-container.onboarding.final.animated.fadeInUp
[:h1 {:data-test "onboarding-welcome-title"} (tr "onboarding.welcome.title")] [:div.modal-top
[:p (tr "onboarding.welcome.desc3")]] [:h1 {:data-test "onboarding-welcome-title"} (tr "onboarding.welcome.title")]
[:div.modal-columns [:p (tr "onboarding.welcome.desc3")]]
[:div.modal-left [:div.modal-columns
[:div.content-button {:on-click on-fly-solo [:div.modal-left
:data-test "fly-solo-op"} [:div.content-button {:on-click on-fly-solo
[:h2 (tr "onboarding.choice.fly-solo")] :data-test "fly-solo-op"}
[:p (tr "onboarding.choice.fly-solo-desc")]]] [:h2 (tr "onboarding.choice.fly-solo")]
[:div.modal-right [:p (tr "onboarding.choice.fly-solo-desc")]]]
[:div.content-button {:on-click on-team-up :data-test "team-up-button"} [:div.modal-right
[:h2 (tr "onboarding.choice.team-up")] [:div.content-button {:on-click on-team-up :data-test "team-up-button"}
[:p (tr "onboarding.choice.team-up-desc")]]]] [:h2 (tr "onboarding.choice.team-up")]
[:img.deco {:src "images/deco-left.png" :border "0"}] [:p (tr "onboarding.choice.team-up-desc")]]]]
[:img.deco.right {:src "images/deco-right.png" :border "0"}]]])) [:img.deco {:src "images/deco-left.png" :border "0"}]
[:img.deco.right {:src "images/deco-right.png" :border "0"}]]]
[:div {:on-load on-fly-solo}])))
(mf/defc onboarding-team-modal (mf/defc onboarding-team-modal
{::mf/register modal/components {::mf/register modal/components