github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-10-28 21:40:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ Show trial end date on subscription page (#12342)

Browse Source
This commit is contained in:
Marina López 2026-10-15 12:26:16 +02:00 committed by GitHub
parent c74d415ddd
commit dacc65a37b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/resources/images/icons/hourglass.svg Normal file
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke-width="1.333" stroke-linecap="round" stroke-linejoin="round">
<path d="M3.333 14.667h9.334"/>
<path d="M3.333 1.333h9.334"/>
<path d="M11.333 14.667v-2.781c0-.354-.14-.693-.39-.943L8 8l-2.943 2.943c-.25.25-.39.589-.39.943v2.781"/>
<path d="M4.667 1.333v2.781c0 .354.14.693.39.943L8 8l2.943-2.943c.25-.25.39-.589.39-.943V1.333"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 423 B

1
frontend/src/app/main/ui/ds/foundations/assets/icon.cljs
View File

@ -168,6 +168,7 @@
(def ^:icon-id help "help")
(def ^:icon-id hide "hide")
(def ^:icon-id history "history")
(def ^:icon-id hourglass "hourglass")
(def ^:icon-id hsva "hsva")
(def ^:icon-id hug-content "hug-content")
(def ^:icon-id icon "icon")

1
frontend/src/app/main/ui/icons.cljs
View File

@ -150,6 +150,7 @@
(def ^:icon help (icon-xref :help))
(def ^:icon hide (icon-xref :hide))
(def ^:icon history (icon-xref :history))
(def ^:icon hourglass (icon-xref :hourglass))
(def ^:icon hsva (icon-xref :hsva))
(def ^:icon hug-content (icon-xref :hug-content))
(def ^:icon icon (icon-xref :icon))

28
frontend/src/app/main/ui/settings/subscription.cljs
View File

@ -469,7 +469,14 @@
(= subscription-type "enterprise") (tr "subscription.settings.enterprise"))
subscription-is-trial?
(= (:status subscription) "trialing")
(if nitrate?
(= (:status nitrate-license) "trialing")
(= (:status subscription) "trialing"))
trial-end-date
(if nitrate?
(ct/format-inst (:trial-end nitrate-license) "d MMMM, yyyy")
(ct/format-inst (:trial-end subscription) "d MMMM, yyyy"))
member-since
(ct/format-inst (:created-at profile) "d MMMM, yyyy")
@ -699,12 +706,19 @@
[:div {:class (stl/css :membership-container)}
(when (or nitrate?
(and subscribed-since (not= subscription-type "professional")))
[:div {:class (stl/css :membership)}
[:> icon* {:class (stl/css :subscription-member)
:icon-id "crown"
:size "m"}]
[:span {:class (stl/css :membership-date)}
(tr "subscription.settings.subscribed-since" subscription-name subscribed-since)]])
(if subscription-is-trial?
[:div {:class (stl/css :membership)}
[:> icon* {:class (stl/css :subscription-member)
:icon-id "hourglass"
:size "m"}]
[:span {:class (stl/css :membership-date)}
(tr "subscription.settings.trial-ends-on" trial-end-date)]]
[:div {:class (stl/css :membership)}
[:> icon* {:class (stl/css :subscription-member)
:icon-id "crown"
:size "m"}]
[:span {:class (stl/css :membership-date)}
(tr "subscription.settings.subscribed-since" subscription-name subscribed-since)]]))
[:div {:class (stl/css :membership)}
[:> icon* {:class (stl/css :penpot-member)

5
frontend/translations/en.po
View File

@ -5786,7 +5786,7 @@ msgstr ""
#: src/app/main/ui/settings/subscription.cljs:714
msgid "subscription.settings.member-since"
msgstr "Penpot member since: %s"
msgstr "Penpot member since: %s."
#: src/app/main/ui/settings/subscription.cljs:736, src/app/main/ui/settings/subscription.cljs:751, src/app/main/ui/settings/subscription.cljs:767, src/app/main/ui/settings/subscription.cljs:787
msgid "subscription.settings.more-information"
@ -5856,6 +5856,9 @@ msgstr "Subscribe"
msgid "subscription.settings.subscribed-since"
msgstr "You've been on the %s plan since %s."
msgid "subscription.settings.trial-ends-on"
msgstr "Your free trial ends on %s."
#: src/app/main/ui/settings/subscription.cljs:399
msgid "subscription.settings.success.dialog.description"
msgstr ""

5
frontend/translations/es.po
View File

@ -5848,7 +5848,7 @@ msgstr ""
#: src/app/main/ui/settings/subscription.cljs:714
msgid "subscription.settings.member-since"
msgstr "Miembro de penpot desde: %s"
msgstr "Miembro de penpot desde: %s."
#: src/app/main/ui/settings/subscription.cljs:736, src/app/main/ui/settings/subscription.cljs:751, src/app/main/ui/settings/subscription.cljs:767, src/app/main/ui/settings/subscription.cljs:787
msgid "subscription.settings.more-information"
@ -5920,6 +5920,9 @@ msgstr "Suscríbete"
msgid "subscription.settings.subscribed-since"
msgstr "Llevas en el plan %s desde %s."
msgid "subscription.settings.trial-ends-on"
msgstr "Tu prueba gratuita acaba el %s."
#: src/app/main/ui/settings/subscription.cljs:399
msgid "subscription.settings.success.dialog.description"
msgstr ""