From 090dbfda101a1dc59bfd82c0381bc799478b302d Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 12 Jan 2022 09:56:54 +0100 Subject: [PATCH] :sparkles: Upload/dismiss all custom fonts at once --- .../styles/main/partials/dashboard-fonts.scss | 5 ++++- frontend/src/app/main/ui/dashboard/fonts.cljs | 21 ++++++++++++++++++- frontend/translations/en.po | 14 +++++++++++++ frontend/translations/es.po | 14 +++++++++++++ 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/frontend/resources/styles/main/partials/dashboard-fonts.scss b/frontend/resources/styles/main/partials/dashboard-fonts.scss index e1ea817eb..9b186fdc5 100644 --- a/frontend/resources/styles/main/partials/dashboard-fonts.scss +++ b/frontend/resources/styles/main/partials/dashboard-fonts.scss @@ -56,7 +56,6 @@ } .font-item { - margin-top: $size-5; color: $color-gray-40; font-size: $fs14; background-color: $color-white; @@ -164,6 +163,10 @@ .upload-button { width: 100px; } + + .btn-secondary { + margin-left: 10px; + } } .dashboard-fonts-hero { diff --git a/frontend/src/app/main/ui/dashboard/fonts.cljs b/frontend/src/app/main/ui/dashboard/fonts.cljs index dd35cd446..0199f4213 100644 --- a/frontend/src/app/main/ui/dashboard/fonts.cljs +++ b/frontend/src/app/main/ui/dashboard/fonts.cljs @@ -103,6 +103,10 @@ (fn [error] (js/console.log "error" error)))))) + on-upload-all + (fn [items] + (run! on-upload items)) + on-blur-name (fn [id event] (let [name (dom/get-target-val event)] @@ -112,7 +116,11 @@ (mf/use-callback (mf/deps team) (fn [{:keys [id] :as item}] - (swap! fonts dissoc id)))] + (swap! fonts dissoc id))) + + on-dismiss-all + (fn [items] + (run! on-delete items))] [:div.dashboard-fonts-upload [:div.dashboard-fonts-hero @@ -136,6 +144,17 @@ :on-selected on-selected}]]] [:* + (when (some? (vals @fonts)) + [:div.font-item.table-row + [:span (tr "dashboard.fonts.fonts-added" (i18n/c (count (vals @fonts))))] + [:div.table-field.options + [:div.btn-primary + {:on-click #(on-upload-all (vals @fonts))} + [:span (tr "dashboard.fonts.upload-all")]] + [:div.btn-secondary + {:on-click #(on-dismiss-all (vals @fonts))} + [:span (tr "dashboard.fonts.dismiss-all")]]]]) + (for [item (sort-by :font-family (vals @fonts))] (let [uploading? (contains? @uploading (:id item))] [:div.font-item.table-row {:key (:id item)} diff --git a/frontend/translations/en.po b/frontend/translations/en.po index 95db5764e..18ac987f7 100644 --- a/frontend/translations/en.po +++ b/frontend/translations/en.po @@ -311,6 +311,20 @@ msgstr "Font deleted" msgid "dashboard.fonts.empty-placeholder" msgstr "You still have no custom fonts installed." +#: src/app/main/ui/dashboard/fonts.cljs +msgid "dashboard.fonts.fonts-added" +msgid_plural "dashboard.fonts.fonts-added" +msgstr[0] "1 font added" +msgstr[1] "%s fonts added" + +#: src/app/main/ui/dashboard/fonts.cljs +msgid "dashboard.fonts.upload-all" +msgstr "Upload all" + +#: src/app/main/ui/dashboard/fonts.cljs +msgid "dashboard.fonts.dismiss-all" +msgstr "Dismiss all" + #, markdown msgid "dashboard.fonts.hero-text1" msgstr "" diff --git a/frontend/translations/es.po b/frontend/translations/es.po index a0e06cc48..2059f19a0 100644 --- a/frontend/translations/es.po +++ b/frontend/translations/es.po @@ -315,6 +315,20 @@ msgstr "Fuente eliminada." msgid "dashboard.fonts.empty-placeholder" msgstr "Aun no tienes fuentes personalizadas." +#: src/app/main/ui/dashboard/fonts.cljs +msgid "dashboard.fonts.fonts-added" +msgid_plural "dashboard.fonts.fonts-added" +msgstr[0] "1 fuente añadida" +msgstr[1] "%s fuentes añadidas" + +#: src/app/main/ui/dashboard/fonts.cljs +msgid "dashboard.fonts.upload-all" +msgstr "Cargar todas" + +#: src/app/main/ui/dashboard/fonts.cljs +msgid "dashboard.fonts.dismiss-all" +msgstr "Ignorar todas" + #, markdown msgid "dashboard.fonts.hero-text1" msgstr ""