♻️ Refactor profile registration flow.

frontend/resources/styles/main/layouts/login.scss

@@ -54,6 +54,20 @@
   justify-content: center;
   position: relative;
 
+  input {
+    margin-bottom: 0px;
+  }
+
+  .buttons-stack {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+
+    *:not(:last-child) {
+      margin-bottom: $medium;
+    }
+  }
+
   .form-container {
     width: 412px;
 
@@ -83,15 +97,47 @@
   }
 
   .btn-github-auth {
-      margin-bottom: $medium;
-      text-decoration: none;
+    margin-bottom: $medium;
+    text-decoration: none;
 
-      .logo {
-        width: 20px;
-        height: 20px;
-        margin-right: 1rem;
+    .logo {
+      width: 20px;
+      height: 20px;
+      margin-right: 1rem;
+    }
+  }
+
+  .separator {
+    display: flex;
+    justify-content: center;
+    width: 100%;
+    text-transform: uppercase;
+  }
+
+  .links {
+    display: flex;
+    font-size: $fs14;
+    flex-direction: column;
+    justify-content: space-between;
+    margin-top: $medium;
+    margin-bottom: $medium;
+
+
+    &.demo {
+      justify-content: center;
+      margin-top: $big;
+    }
+
+    .link-entry {
+      font-size: $fs14;
+      color: $color-gray-40;
+      margin-bottom: 10px;
+      a {
+        font-size: $fs14;
+        color: $color-primary-dark;
       }
     }
+  }
 }
 
 .terms-login {

frontend/resources/styles/main/partials/forms.scss

@@ -109,30 +109,6 @@ textarea {
   hr {
     border-color: $color-gray-20;
   }
-
-  .links {
-    display: flex;
-    font-size: $fs14;
-    flex-direction: column;
-    justify-content: space-between;
-    margin-bottom: $medium;
-
-    &.demo {
-      justify-content: center;
-      margin-top: $big;
-    }
-  }
-
-  .link-entry {
-    font-size: $fs14;
-    color: $color-gray-40;
-    margin-bottom: 10px;
-  }
-
-  .link-entry a {
-    font-size: $fs14;
-    color: $color-primary-dark;
-  }
 }
 
 .custom-input {

frontend/src/app/config.cljs

@@ -54,6 +54,11 @@
     :browser
     :webworker))
 
+(defn- parse-flags
+  [global]
+  (let [flags (obj/get global "penpotFlags" "")]
+    (into #{} (map keyword) (str/words flags))))
+
 (defn- parse-version
   [global]
   (-> (obj/get global "penpotVersion")
@@ -78,6 +83,8 @@
 (def themes               (obj/get global "penpotThemes"))
 (def analytics            (obj/get global "penpotAnalyticsEnabled" false))
 
+(def flags                (delay (parse-flags global)))
+
 (def version              (delay (parse-version global)))
 (def target               (delay (parse-target global)))
 (def browser              (delay (parse-browser)))

frontend/src/app/main/data/users.cljs

@@ -221,6 +221,7 @@
 
 ;; --- EVENT: register
 
+;; TODO: remove
 (s/def ::invitation-token ::us/not-empty-string)
 
 (s/def ::register

frontend/src/app/main/ui.cljs

@@ -62,6 +62,8 @@
     ["/login"            :auth-login]
     (when cfg/registration-enabled
       ["/register"         :auth-register])
+    (when cfg/registration-enabled
+      ["/register/validate" :auth-register-validate])
     (when cfg/registration-enabled
       ["/register/success" :auth-register-success])
     ["/recovery/request" :auth-recovery-request]
@@ -112,6 +114,7 @@
      (case (:name data)
        (:auth-login
         :auth-register
+        :auth-register-validate
         :auth-register-success
         :auth-recovery-request
         :auth-recovery)

frontend/src/app/main/ui/auth.cljs

@@ -14,7 +14,7 @@
    [app.main.ui.auth.login :refer [login-page]]
    [app.main.ui.auth.recovery :refer [recovery-page]]
    [app.main.ui.auth.recovery-request :refer [recovery-request-page]]
-   [app.main.ui.auth.register :refer [register-page register-success-page]]
+   [app.main.ui.auth.register :refer [register-page register-success-page register-validate-page]]
    [app.main.ui.icons :as i]
    [app.util.dom :as dom]
    [app.util.forms :as fm]
@@ -36,13 +36,16 @@
 
     [:div.auth
      [:section.auth-sidebar
-      [:a.logo {:href "https://penpot.app"} i/logo]
+      [:a.logo {:href "#/"} i/logo]
       [:span.tagline (t locale "auth.sidebar-tagline")]]
 
      [:section.auth-content
       (case section
         :auth-register
-        [:& register-page {:locale locale :params params}]
+        [:& register-page {:params params}]
+
+        :auth-register-validate
+        [:& register-validate-page {:params params}]
 
         :auth-register-success
         [:& register-success-page {:params params}]
@@ -55,6 +58,7 @@
 
         :auth-recovery
         [:& recovery-page {:locale locale :params params}])
+
       [:div.terms-login
        [:a {:href "https://penpot.app/terms.html" :target "_blank"} "Terms of service"]
        [:span "and"]

frontend/src/app/main/ui/auth/login.cljs

@@ -23,6 +23,12 @@
    [cljs.spec.alpha :as s]
    [rumext.alpha :as mf]))
 
+(def show-alt-login-buttons?
+  (or cfg/google-client-id
+      cfg/gitlab-client-id
+      cfg/github-client-id
+      cfg/oidc-client-id))
+
 (s/def ::email ::us/email)
 (s/def ::password ::us/not-empty-string)
 
@@ -103,13 +109,15 @@
          :tab-index "3"
          :help-icon i/eye
          :label (tr "auth.password")}]]
-      [:& fm/submit-button
-       {:label (tr "auth.login-submit")}]
 
-      (when cfg/login-with-ldap
-        [:& fm/submit-button
-         {:label (tr "auth.login-with-ldap-submit")
-          :on-click on-submit-ldap}])]]))
+      [:div.buttons-stack
+       [:& fm/submit-button
+        {:label (tr "auth.login-submit")}]
+
+       (when cfg/login-with-ldap
+         [:& fm/submit-button
+          {:label (tr "auth.login-with-ldap-submit")
+           :on-click on-submit-ldap}])]]]))
 
 (mf/defc login-buttons
   [{:keys [params] :as props}]
@@ -147,6 +155,13 @@
 
     [:& login-form {:params params}]
 
+    (when show-alt-login-buttons?
+      [:*
+       [:span.separator (tr "labels.or")]
+
+       [:div.buttons
+        [:& login-buttons {:params params}]]])
+
     [:div.links
      [:div.link-entry
       [:a {:on-click #(st/emit! (rt/nav :auth-recovery-request))}
@@ -158,7 +173,6 @@
         [:a {:on-click #(st/emit! (rt/nav :auth-register {} params))}
          (tr "auth.register-submit")]])]
 
-    [:& login-buttons {:params params}]
 
     (when cfg/allow-demo-users
       [:div.links.demo

frontend/src/app/main/ui/auth/recovery_request.cljs

@@ -86,4 +86,4 @@
     [:div.links
      [:div.link-entry
       [:a {:on-click #(st/emit! (rt/nav :auth-login))}
-       (tr "auth.go-back-to-login")]]]]])
+       (tr "labels.go-back")]]]]])

frontend/src/app/main/ui/auth/register.cljs

@@ -7,10 +7,11 @@
 (ns app.main.ui.auth.register
   (:require
    [app.common.spec :as us]
-   [app.config :as cfg]
+   [app.config :as cf]
    [app.main.data.users :as du]
    [app.main.data.messages :as dm]
    [app.main.store :as st]
+   [app.main.repo :as rp]
    [app.main.ui.components.forms :as fm]
    [app.main.ui.icons :as i]
    [app.main.ui.messages :as msgs]
@@ -30,6 +31,8 @@
    {:type :warning
     :content (tr "auth.demo-warning")}])
 
+;; --- PAGE: Register
+
 (defn- validate
   [data]
   (let [password (:password data)
@@ -48,9 +51,29 @@
 (s/def ::terms-privacy ::us/boolean)
 
 (s/def ::register-form
-  (s/keys :req-un [::password ::fullname ::email ::terms-privacy]
+  (s/keys :req-un [::password ::email]
           :opt-un [::invitation-token]))
 
+(defn- handle-prepare-register-error
+  [form error]
+  (case (:code error)
+    :registration-disabled
+    (st/emit! (dm/error (tr "errors.registration-disabled")))
+
+    :email-has-permanent-bounces
+    (let [email (get @form [:data :email])]
+      (st/emit! (dm/error (tr "errors.email-has-permanent-bounces" email))))
+
+    :email-already-exists
+    (swap! form assoc-in [:errors :email]
+           {:message "errors.email-already-exists"})
+
+    (st/emit! (dm/error (tr "errors.generic")))))
+
+(defn- handle-prepare-register-success
+  [form {:keys [token] :as result}]
+  (st/emit! (rt/nav :auth-register-validate {} {:token token})))
+
 (mf/defc register-form
   [{:keys [params] :as props}]
   (let [initial (mf/use-memo (mf/deps params) (constantly params))
@@ -59,49 +82,20 @@
                              :initial initial)
         submitted? (mf/use-state false)
 
-        on-error
-        (mf/use-callback
-         (fn [form error]
-           (reset! submitted? false)
-           (case (:code error)
-             :registration-disabled
-             (rx/of (dm/error (tr "errors.registration-disabled")))
-
-             :email-has-permanent-bounces
-             (let [email (get @form [:data :email])]
-               (rx/of (dm/error (tr "errors.email-has-permanent-bounces" email))))
-
-             :email-already-exists
-             (swap! form assoc-in [:errors :email]
-                    {:message "errors.email-already-exists"})
-
-             (rx/throw error))))
-
-        on-success
-        (mf/use-callback
-         (fn [form data]
-           (reset! submitted? false)
-           (if-let [token (:invitation-token data)]
-             (st/emit! (rt/nav :auth-verify-token {} {:token token}))
-             (st/emit! (rt/nav :auth-register-success {} {:email (:email data)})))))
-
         on-submit
         (mf/use-callback
          (fn [form event]
            (reset! submitted? true)
-           (let [data (with-meta (:clean-data @form)
-                        {:on-error (partial on-error form)
-                         :on-success (partial on-success form)})]
-             (st/emit! (du/register data)))))]
+           (let [params (:clean-data @form)]
+             (->> (rp/mutation :prepare-register-profile params)
+                  (rx/finalize #(reset! submitted? false))
+                  (rx/subs (partial handle-prepare-register-success form)
+                           (partial handle-prepare-register-error form))))))
+        ]
 
 
     [:& fm/form {:on-submit on-submit
                  :form form}
-     [:div.fields-row
-      [:& fm/input {:name :fullname
-                    :tab-index "1"
-                    :label (tr "auth.fullname")
-                    :type "text"}]]
      [:div.fields-row
       [:& fm/input {:type "email"
                     :name :email
@@ -115,18 +109,145 @@
                     :label (tr "auth.password")
                     :type "password"}]]
 
+     [:& fm/submit-button
+      {:label (tr "auth.register-submit")
+       :disabled @submitted?}]]))
+
+(mf/defc register-page
+  [{:keys [params] :as props}]
+  [:div.form-container
+   [:h1 (tr "auth.register-title")]
+   [:div.subtitle (tr "auth.register-subtitle")]
+
+   (when cf/demo-warning
+     [:& demo-warning])
+
+   [:& register-form {:params params}]
+
+    (when login/show-alt-login-buttons?
+      [:*
+       [:span.separator (tr "labels.or")]
+
+       [:div.buttons
+        [:& login/login-buttons {:params params}]]])
+
+   [:div.links
+    [:div.link-entry
+     [:span (tr "auth.already-have-account") " "]
+     [:a {:on-click #(st/emit! (rt/nav :auth-login {} params))
+          :tab-index "4"}
+      (tr "auth.login-here")]]
+
+    (when cf/allow-demo-users
+      [:div.link-entry
+       [:span (tr "auth.create-demo-profile") " "]
+       [:a {:on-click #(st/emit! (du/create-demo-profile))
+            :tab-index "5"}
+        (tr "auth.create-demo-account")]])]])
+
+;; --- PAGE: register validation
+
+(defn- handle-register-error
+  [form error]
+  (case (:code error)
+    :registration-disabled
+    (st/emit! (dm/error (tr "errors.registration-disabled")))
+
+    :email-has-permanent-bounces
+    (let [email (get @form [:data :email])]
+      (st/emit! (dm/error (tr "errors.email-has-permanent-bounces" email))))
+
+    :email-already-exists
+    (swap! form assoc-in [:errors :email]
+           {:message "errors.email-already-exists"})
+
+    (do
+      (println (:explain error))
+      (st/emit! (dm/error (tr "errors.generic"))))))
+
+(defn- handle-register-success
+  [form data]
+  (cond
+    (some? (:invitation-token data))
+    (let [token (:invitation-token data)]
+      (st/emit! (rt/nav :auth-verify-token {} {:token token})))
+
+
+    (not= "penpot" (:auth-backend data))
+    (st/emit!
+     (du/fetch-profile)
+     (rt/nav :dashboard-projects {:team-id (:default-team-id data)}))
+
+    :else
+    (st/emit! (rt/nav :auth-register-success {} {:email (:email data)}))))
+
+(s/def ::accept-terms-and-privacy ::us/boolean)
+(s/def ::accept-newsletter-subscription ::us/boolean)
+
+(s/def ::register-validate-form
+  (s/keys :req-un [::token ::fullname ::accept-terms-and-privacy]
+          :opt-un [::accept-newsletter-subscription]))
+
+(mf/defc register-validate-form
+  [{:keys [params] :as props}]
+  (let [initial (mf/use-memo
+                 (mf/deps params)
+                 (fn []
+                   (assoc params :accept-newsletter-subscription false)))
+        form    (fm/use-form :spec ::register-validate-form
+                             :initial initial)
+        submitted? (mf/use-state false)
+
+        on-submit
+        (mf/use-callback
+         (fn [form event]
+           (reset! submitted? true)
+           (let [params (:clean-data @form)]
+             (->> (rp/mutation :register-profile params)
+                  (rx/finalize #(reset! submitted? false))
+                  (rx/subs (partial handle-register-success form)
+                           (partial handle-register-error form))))))
+        ]
+
+    [:& fm/form {:on-submit on-submit
+                 :form form}
      [:div.fields-row
-      [:& fm/input {:name :terms-privacy
+      [:& fm/input {:name :fullname
+                    :tab-index "1"
+                    :label (tr "auth.fullname")
+                    :type "text"}]]
+     [:div.fields-row
+      [:& fm/input {:name :accept-terms-and-privacy
                     :class "check-primary"
-                    :tab-index "4"
                     :label (tr "auth.terms-privacy-agreement")
                     :type "checkbox"}]]
 
+     (when (contains? @cf/flags :show-newsletter-check-on-register-validation)
+       [:div.fields-row
+        [:& fm/input {:name :accept-newsletter-subscription
+                      :class "check-primary"
+                      :label (tr "auth.terms-privacy-agreement")
+                      :type "checkbox"}]])
+
      [:& fm/submit-button
       {:label (tr "auth.register-submit")
        :disabled @submitted?}]]))
 
-;; --- Register Page
+
+(mf/defc register-validate-page
+  [{:keys [params] :as props}]
+  (prn "register-validate-page" params)
+  [:div.form-container
+   [:h1 (tr "auth.register-title")]
+   [:div.subtitle (tr "auth.register-subtitle")]
+
+   [:& register-validate-form {:params params}]
+
+   [:div.links
+    [:div.link-entry
+     [:a {:on-click #(st/emit! (rt/nav :auth-register {} {}))
+          :tab-index "4"}
+      (tr "labels.go-back")]]]])
 
 (mf/defc register-success-page
   [{:keys [params] :as props}]
@@ -136,32 +257,3 @@
    [:div.notification-text-email (:email params "")]
    [:div.notification-text (tr "auth.check-your-email")]])
 
-(mf/defc register-page
-  [{:keys [params] :as props}]
-  [:div.form-container
-   [:h1 (tr "auth.register-title")]
-   [:div.subtitle (tr "auth.register-subtitle")]
-
-   (when cfg/demo-warning
-     [:& demo-warning])
-
-   [:& register-form {:params params}]
-
-   [:div.links
-    [:div.link-entry
-     [:span (tr "auth.already-have-account") " "]
-     [:a {:on-click #(st/emit! (rt/nav :auth-login {} params))
-          :tab-index "4"}
-      (tr "auth.login-here")]]
-
-    (when cfg/allow-demo-users
-      [:div.link-entry
-       [:span (tr "auth.create-demo-profile") " "]
-       [:a {:on-click #(st/emit! (du/create-demo-profile))
-            :tab-index "5"}
-        (tr "auth.create-demo-account")]])
-
-    [:& login/login-buttons {:params params}]]])
-
-
-

frontend/translations/ar.po

@@ -48,10 +48,6 @@ msgstr "هل نسيت كلمة السر؟"
 msgid "auth.fullname"
 msgstr "الاسم بالكامل"
 
-#: src/app/main/ui/auth/recovery_request.cljs
-msgid "auth.go-back-to-login"
-msgstr "الرجوع للخلف!"
-
 #: src/app/main/ui/auth/register.cljs
 msgid "auth.login-here"
 msgstr "تسجيل الدخول هنا"
@@ -190,6 +186,9 @@ msgstr "نمط"
 msgid "labels.fonts"
 msgstr "الخطوط"
 
+msgid "labels.go-back"
+msgstr "الرجوع للخلف"
+
 msgid "labels.images"
 msgstr "الصور"
 

frontend/translations/ca.po

@@ -46,10 +46,6 @@ msgstr "Has oblidat la contrasenya?"
 msgid "auth.fullname"
 msgstr "Nom complet"
 
-#: src/app/main/ui/auth/recovery_request.cljs
-msgid "auth.go-back-to-login"
-msgstr "Tornar"
-
 #: src/app/main/ui/auth/register.cljs
 msgid "auth.login-here"
 msgstr "Inicia sessió aquí"
@@ -467,6 +463,9 @@ msgstr "S'ha produït un error"
 msgid "labels.accept"
 msgstr "Acceptar"
 
+msgid "labels.go-back"
+msgstr "Tornar"
+
 msgid "labels.recent"
 msgstr "Recent"
 

frontend/translations/da.po

@@ -51,10 +51,6 @@ msgstr "Glemt adgangskode?"
 msgid "auth.fullname"
 msgstr "Fulde Navn"
 
-#: src/app/main/ui/auth/recovery_request.cljs
-msgid "auth.go-back-to-login"
-msgstr "Gå tilbage!"
-
 #: src/app/main/ui/auth/register.cljs
 msgid "auth.login-here"
 msgstr "Log på her"
@@ -452,6 +448,9 @@ msgstr "Stil"
 msgid "labels.fonts"
 msgstr "Skrifttyper"
 
+msgid "labels.go-back"
+msgstr "Gå tilbage!"
+
 msgid "labels.installed-fonts"
 msgstr "Installeret skrifttyper"
 

frontend/translations/de.po

@@ -51,10 +51,6 @@ msgstr "Passwort vergessen?"
 msgid "auth.fullname"
 msgstr "Vollständiger Name"
 
-#: src/app/main/ui/auth/recovery_request.cljs
-msgid "auth.go-back-to-login"
-msgstr "Zurück!"
-
 #: src/app/main/ui/auth/register.cljs
 msgid "auth.login-here"
 msgstr "Hier einloggen"
@@ -823,6 +819,9 @@ msgstr "Feedback gesendet"
 msgid "labels.give-feedback"
 msgstr "Feedback geben"
 
+msgid "labels.go-back"
+msgstr "Zurück!"
+
 #: src/app/main/ui/workspace/comments.cljs, src/app/main/ui/viewer/header.cljs
 msgid "labels.hide-resolved-comments"
 msgstr "Erledigte Kommentare ausblenden"
@@ -1306,6 +1305,10 @@ msgstr "Seite bearbeiten"
 msgid "viewer.header.fullscreen"
 msgstr "Vollbildmodus"
 
+#: src/app/main/ui/viewer/header.cljs
+msgid "viewer.header.interactions"
+msgstr "Interaktionen"
+
 #: src/app/main/ui/viewer/header.cljs
 msgid "viewer.header.share.copy-link"
 msgstr "Link kopieren"
@@ -1330,10 +1333,6 @@ msgstr "Jeder mit dem Link hat Zugriff"
 msgid "viewer.header.share.title"
 msgstr "Prototyp teilen"
 
-#: src/app/main/ui/viewer/header.cljs
-msgid "viewer.header.interactions"
-msgstr "Interaktionen"
-
 #: src/app/main/ui/viewer/header.cljs
 msgid "viewer.header.show-interactions"
 msgstr "Interaktionen anzeigen"

frontend/translations/el.po

@@ -46,10 +46,6 @@ msgstr "Ξεχάσατε τον κωδικό;"
 msgid "auth.fullname"
 msgstr "Πλήρες όνομα"
 
-#: src/app/main/ui/auth/recovery_request.cljs
-msgid "auth.go-back-to-login"
-msgstr "Πίσω"
-
 #: src/app/main/ui/auth/register.cljs
 msgid "auth.login-here"
 msgstr "Συνδεθείτε εδώ"
@@ -823,6 +819,9 @@ msgstr "Εστάλη γνώμη"
 msgid "labels.give-feedback"
 msgstr "Δώστε μας τη γνώμη σας"
 
+msgid "labels.go-back"
+msgstr "Πίσω"
+
 #: src/app/main/ui/workspace/comments.cljs, src/app/main/ui/viewer/header.cljs
 msgid "labels.hide-resolved-comments"
 msgstr "Απόκρυψη επιλυμένων σχολίων"

frontend/translations/en.po

@@ -49,10 +49,6 @@ msgstr "Forgot password?"
 msgid "auth.fullname"
 msgstr "Full Name"
 
-#: src/app/main/ui/auth/recovery_request.cljs
-msgid "auth.go-back-to-login"
-msgstr "Go back!"
-
 #: src/app/main/ui/auth/register.cljs
 msgid "auth.login-here"
 msgstr "Login here"
@@ -206,6 +202,12 @@ msgstr "Duplicate %s files"
 msgid "dashboard.empty-files"
 msgstr "You still have no files here"
 
+msgid "dashboard.export-multi"
+msgstr "Export %s files"
+
+msgid "dashboard.export-single"
+msgstr "Export file"
+
 msgid "dashboard.fonts.deleted-placeholder"
 msgstr "Font deleted"
 
@@ -229,6 +231,9 @@ msgstr ""
 "Service](https://penpot.app/terms.html). You also might want to read about "
 "[font licensing](https://www.typography.com/faq)."
 
+msgid "dashboard.import"
+msgstr "Import files"
+
 #: src/app/main/ui/dashboard/team.cljs
 msgid "dashboard.invite-profile"
 msgstr "Invite to team"
@@ -304,6 +309,9 @@ msgstr "%s members"
 msgid "dashboard.open-in-new-tab"
 msgstr "Open file in a new tab"
 
+msgid "dashboard.options"
+msgstr "Options"
+
 #: src/app/main/ui/settings/password.cljs
 msgid "dashboard.password-change"
 msgstr "Change password"
@@ -913,6 +921,9 @@ msgstr "Fonts"
 msgid "labels.give-feedback"
 msgstr "Give feedback"
 
+msgid "labels.go-back"
+msgstr "Go back"
+
 #: src/app/main/ui/workspace/comments.cljs, src/app/main/ui/viewer/header.cljs
 msgid "labels.hide-resolved-comments"
 msgstr "Hide resolved comments"
@@ -1000,6 +1011,9 @@ msgstr "Old password"
 msgid "labels.only-yours"
 msgstr "Only yours"
 
+msgid "labels.or"
+msgstr "or"
+
 #: src/app/main/ui/dashboard/team.cljs, src/app/main/ui/dashboard/team.cljs
 msgid "labels.owner"
 msgstr "Owner"
@@ -1461,6 +1475,10 @@ msgstr "Edit file"
 msgid "viewer.header.fullscreen"
 msgstr "Full Screen"
 
+#: src/app/main/ui/viewer/header.cljs
+msgid "viewer.header.interactions"
+msgstr "Interactions"
+
 #: src/app/main/ui/viewer/header.cljs
 msgid "viewer.header.share.copy-link"
 msgstr "Copy link"
@@ -1485,10 +1503,6 @@ msgstr "Anyone with the link will have access"
 msgid "viewer.header.share.title"
 msgstr "Share prototype"
 
-#: src/app/main/ui/viewer/header.cljs
-msgid "viewer.header.interactions"
-msgstr "Interactions"
-
 #: src/app/main/ui/viewer/header.cljs
 msgid "viewer.header.show-interactions"
 msgstr "Show interactions"
@@ -1889,20 +1903,28 @@ msgid "workspace.options.constraints"
 msgstr "Constraints"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
-msgid "workspace.options.constraints.left"
-msgstr "Left"
+msgid "workspace.options.constraints.bottom"
+msgstr "Bottom"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
-msgid "workspace.options.constraints.right"
-msgstr "Right"
+msgid "workspace.options.constraints.center"
+msgstr "Center"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
+msgid "workspace.options.constraints.fix-when-scrolling"
+msgstr "Fix when scrolling"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
+msgid "workspace.options.constraints.left"
+msgstr "Left"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
 msgid "workspace.options.constraints.leftright"
 msgstr "Left & Right"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
-msgid "workspace.options.constraints.center"
-msgstr "Center"
+msgid "workspace.options.constraints.right"
+msgstr "Right"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
 msgid "workspace.options.constraints.scale"
@@ -1912,26 +1934,10 @@ msgstr "Scale"
 msgid "workspace.options.constraints.top"
 msgstr "Top"
 
-#: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
-msgid "workspace.options.constraints.bottom"
-msgstr "Bottom"
-
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
 msgid "workspace.options.constraints.topbottom"
 msgstr "Top & Bottom"
 
-#: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
-msgid "workspace.options.constraints.center"
-msgstr "Center"
-
-#: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
-msgid "workspace.options.constraints.scale"
-msgstr "Scale"
-
-#: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
-msgid "workspace.options.constraints.fix-when-scrolling"
-msgstr "Fix when scrolling"
-
 #: src/app/main/ui/workspace/sidebar/options.cljs
 msgid "workspace.options.design"
 msgstr "Design"
@@ -2686,16 +2692,4 @@ msgid "workspace.updates.update"
 msgstr "Update"
 
 msgid "workspace.viewport.click-to-close-path"
-msgstr "Click to close the path"
-
-msgid "dashboard.export-single"
-msgstr "Export file"
-
-msgid "dashboard.export-multi"
-msgstr "Export %s files"
-
-msgid "dashboard.import"
-msgstr "Import files"
-
-msgid "dashboard.options"
-msgstr "Options"
+msgstr "Click to close the path"

frontend/translations/es.po

@@ -51,10 +51,6 @@ msgstr "¿Olvidaste tu contraseña?"
 msgid "auth.fullname"
 msgstr "Nombre completo"
 
-#: src/app/main/ui/auth/recovery_request.cljs
-msgid "auth.go-back-to-login"
-msgstr "Volver"
-
 #: src/app/main/ui/auth/register.cljs
 msgid "auth.login-here"
 msgstr "Entra aquí"
@@ -915,6 +911,9 @@ msgstr "Fuentes"
 msgid "labels.give-feedback"
 msgstr "Danos tu opinión"
 
+msgid "labels.go-back"
+msgstr "Volver"
+
 #: src/app/main/ui/workspace/comments.cljs, src/app/main/ui/viewer/header.cljs
 msgid "labels.hide-resolved-comments"
 msgstr "Ocultar comentarios resueltos"
@@ -1002,6 +1001,9 @@ msgstr "Contraseña anterior"
 msgid "labels.only-yours"
 msgstr "Sólo los tuyos"
 
+msgid "labels.or"
+msgstr "o"
+
 #: src/app/main/ui/dashboard/team.cljs, src/app/main/ui/dashboard/team.cljs
 msgid "labels.owner"
 msgstr "Dueño"
@@ -1451,6 +1453,10 @@ msgstr "Editar archivo"
 msgid "viewer.header.fullscreen"
 msgstr "Pantalla completa"
 
+#: src/app/main/ui/viewer/header.cljs
+msgid "viewer.header.interactions"
+msgstr "Interacciones"
+
 #: src/app/main/ui/viewer/header.cljs
 msgid "viewer.header.share.copy-link"
 msgstr "Copiar enlace"
@@ -1475,10 +1481,6 @@ msgstr "Cualquiera con el enlace podrá acceder"
 msgid "viewer.header.share.title"
 msgstr "Compartir prototipo"
 
-#: src/app/main/ui/viewer/header.cljs
-msgid "viewer.header.interactions"
-msgstr "Interacciones"
-
 #: src/app/main/ui/viewer/header.cljs
 msgid "viewer.header.show-interactions"
 msgstr "Mostrar interacciones"
@@ -1881,20 +1883,28 @@ msgid "workspace.options.constraints"
 msgstr "Restricciones"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
-msgid "workspace.options.constraints.left"
-msgstr "Izquierda"
+msgid "workspace.options.constraints.bottom"
+msgstr "Abajo"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
-msgid "workspace.options.constraints.right"
-msgstr "Derecha"
+msgid "workspace.options.constraints.center"
+msgstr "Centro"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
+msgid "workspace.options.constraints.fix-when-scrolling"
+msgstr "Fijo al desplazar"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
+msgid "workspace.options.constraints.left"
+msgstr "Izquierda"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
 msgid "workspace.options.constraints.leftright"
 msgstr "Izq. y Der."
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
-msgid "workspace.options.constraints.center"
-msgstr "Centro"
+msgid "workspace.options.constraints.right"
+msgstr "Derecha"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
 msgid "workspace.options.constraints.scale"
@@ -1904,26 +1914,10 @@ msgstr "Escalar"
 msgid "workspace.options.constraints.top"
 msgstr "Arriba"
 
-#: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
-msgid "workspace.options.constraints.bottom"
-msgstr "Abajo"
-
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
 msgid "workspace.options.constraints.topbottom"
 msgstr "Arriba y Abajo"
 
-#: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
-msgid "workspace.options.constraints.center"
-msgstr "Centro"
-
-#: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
-msgid "workspace.options.constraints.scale"
-msgstr "Escalar"
-
-#: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
-msgid "workspace.options.constraints.fix-when-scrolling"
-msgstr "Fijo al desplazar"
-
 #: src/app/main/ui/workspace/sidebar/options.cljs
 msgid "workspace.options.design"
 msgstr "Diseño"
@@ -2680,4 +2674,4 @@ msgid "workspace.updates.update"
 msgstr "Actualizar"
 
 msgid "workspace.viewport.click-to-close-path"
-msgstr "Pulsar para cerrar la ruta"
+msgstr "Pulsar para cerrar la ruta"

frontend/translations/fr.po

@@ -51,10 +51,6 @@ msgstr "Mot de passe oublié ?"
 msgid "auth.fullname"
 msgstr "Nom complet"
 
-#: src/app/main/ui/auth/recovery_request.cljs
-msgid "auth.go-back-to-login"
-msgstr "Retour !"
-
 #: src/app/main/ui/auth/register.cljs
 msgid "auth.login-here"
 msgstr "Se connecter ici"
@@ -737,6 +733,9 @@ msgstr "Adresse e‑mail"
 msgid "labels.give-feedback"
 msgstr "Donnez votre avis"
 
+msgid "labels.go-back"
+msgstr "Retour"
+
 #: src/app/main/ui/workspace/comments.cljs, src/app/main/ui/viewer/header.cljs
 msgid "labels.hide-resolved-comments"
 msgstr "Masquer les commentaires résolus"
@@ -1202,6 +1201,10 @@ msgstr "Modifier la page"
 msgid "viewer.header.fullscreen"
 msgstr "Plein écran"
 
+#: src/app/main/ui/viewer/header.cljs
+msgid "viewer.header.interactions"
+msgstr "Interactions"
+
 #: src/app/main/ui/viewer/header.cljs
 msgid "viewer.header.share.copy-link"
 msgstr "Copier le lien"
@@ -1226,10 +1229,6 @@ msgstr "Toute personne disposant du lien aura accès"
 msgid "viewer.header.share.title"
 msgstr "Partager le prototype"
 
-#: src/app/main/ui/viewer/header.cljs
-msgid "viewer.header.interactions"
-msgstr "Interactions"
-
 #: src/app/main/ui/viewer/header.cljs
 msgid "viewer.header.show-interactions"
 msgstr "Afficher les interactions"

frontend/translations/pt_BR.po

@@ -51,10 +51,6 @@ msgstr "Esqueceu a senha?"
 msgid "auth.fullname"
 msgstr "Nome completo"
 
-#: src/app/main/ui/auth/recovery_request.cljs
-msgid "auth.go-back-to-login"
-msgstr "Voltar!"
-
 #: src/app/main/ui/auth/register.cljs
 msgid "auth.login-here"
 msgstr "Entrar aqui"
@@ -697,6 +693,9 @@ msgstr "Fontes"
 msgid "labels.give-feedback"
 msgstr "Enviar feedback"
 
+msgid "labels.go-back"
+msgstr "Voltar"
+
 msgid "labels.icons"
 msgstr "Ícones"
 

frontend/translations/ro.po

@@ -52,10 +52,6 @@ msgstr "Ai uitat parola?"
 msgid "auth.fullname"
 msgstr "Numele complet"
 
-#: src/app/main/ui/auth/recovery_request.cljs
-msgid "auth.go-back-to-login"
-msgstr "Întoarce-te!"
-
 #: src/app/main/ui/auth/register.cljs
 msgid "auth.login-here"
 msgstr "Conectează-te"
@@ -907,6 +903,9 @@ msgstr "Fonturi"
 msgid "labels.give-feedback"
 msgstr "Lasă un feedback"
 
+msgid "labels.go-back"
+msgstr "Întoarce-te"
+
 #: src/app/main/ui/workspace/comments.cljs, src/app/main/ui/viewer/header.cljs
 msgid "labels.hide-resolved-comments"
 msgstr "Ascunde comentariile rezolvate"
@@ -1441,6 +1440,10 @@ msgstr "Editează pagina"
 msgid "viewer.header.fullscreen"
 msgstr "Ecran complet"
 
+#: src/app/main/ui/viewer/header.cljs
+msgid "viewer.header.interactions"
+msgstr "Interacţiunile"
+
 #: src/app/main/ui/viewer/header.cljs
 msgid "viewer.header.share.copy-link"
 msgstr "Copiază link"
@@ -1469,10 +1472,6 @@ msgstr "Distribuie link"
 msgid "viewer.header.show-interactions"
 msgstr "Afişează interacţiunile"
 
-#: src/app/main/ui/viewer/header.cljs
-msgid "viewer.header.interactions"
-msgstr "Interacţiunile"
-
 #: src/app/main/ui/viewer/header.cljs
 msgid "viewer.header.show-interactions-on-click"
 msgstr "Afişează interacţiunile la click"

frontend/translations/ru.po

@@ -40,10 +40,6 @@ msgstr "Забыли пароль?"
 msgid "auth.fullname"
 msgstr "Полное имя"
 
-#: src/app/main/ui/auth/recovery_request.cljs
-msgid "auth.go-back-to-login"
-msgstr "Назад!"
-
 #: src/app/main/ui/auth/register.cljs
 msgid "auth.login-here"
 msgstr "Войти здесь"
@@ -359,6 +355,9 @@ msgstr "Email"
 msgid "labels.give-feedback"
 msgstr "Дать обратную связь"
 
+msgid "labels.go-back"
+msgstr "Назад"
+
 msgid "labels.icons"
 msgstr "Иконки"
 
@@ -563,6 +562,10 @@ msgstr "На странице не найдено ни одного кадра"
 msgid "viewer.frame-not-found"
 msgstr "Кадры не найдены."
 
+#: src/app/main/ui/viewer/header.cljs
+msgid "viewer.header-interactions"
+msgstr "взаимодействия"
+
 #: src/app/main/ui/viewer/header.cljs
 msgid "viewer.header.dont-show-interactions"
 msgstr "Не показывать взаимодействия"
@@ -599,10 +602,6 @@ msgstr "Любой, у кого есть ссылка будет иметь до
 msgid "viewer.header.share.title"
 msgstr "Поделиться ссылкой"
 
-#: src/app/main/ui/viewer/header.cljs
-msgid "viewer.header-interactions"
-msgstr "взаимодействия"
-
 #: src/app/main/ui/viewer/header.cljs
 msgid "viewer.header.show-interactions"
 msgstr "Показывать взаимодействия"

frontend/translations/tr.po

@@ -51,10 +51,6 @@ msgstr "Parolanı mı unuttun?"
 msgid "auth.fullname"
 msgstr "Tam Adın"
 
-#: src/app/main/ui/auth/recovery_request.cljs
-msgid "auth.go-back-to-login"
-msgstr "Geri dön!"
-
 #: src/app/main/ui/auth/register.cljs
 msgid "auth.login-here"
 msgstr "Buradan giriş yap"
@@ -739,6 +735,9 @@ msgstr "Fontlar"
 msgid "labels.give-feedback"
 msgstr "Geri bildirimde bulun"
 
+msgid "labels.go-back"
+msgstr "Geri dön"
+
 #: src/app/main/ui/workspace/comments.cljs, src/app/main/ui/viewer/header.cljs
 msgid "labels.hide-resolved-comments"
 msgstr "Çözülmüş yorumları gizle"

frontend/translations/zh_CN.po

@@ -42,10 +42,6 @@ msgstr "忘记密码？"
 msgid "auth.fullname"
 msgstr "全名"
 
-#: src/app/main/ui/auth/recovery_request.cljs
-msgid "auth.go-back-to-login"
-msgstr "返回！"
-
 #: src/app/main/ui/auth/register.cljs
 msgid "auth.login-here"
 msgstr "在这里登录"
@@ -751,6 +747,9 @@ msgstr "反馈已发出"
 msgid "labels.give-feedback"
 msgstr "提交反馈"
 
+msgid "labels.go-back"
+msgstr "返回"
+
 #: src/app/main/ui/workspace/comments.cljs, src/app/main/ui/viewer/header.cljs
 msgid "labels.hide-resolved-comments"
 msgstr "隐藏已决定的评论"