Open platform to collect and prioritize feedback
Fixing issues with login code
Matt Roberts3a0aee6cf216
diff --git a/app/cmd/routes.go b/app/cmd/routes.goindex 0e35a4222..3de105b38 100644--- a/app/cmd/routes.go+++ b/app/cmd/routes.go@@ -117,6 +117,7 @@ func routes(r *web.Engine) *web.Engine {r.Use(middlewares.BlockPendingTenants())r.Get("/signin", handlers.SignInPage())+ r.Get("/signin/complete", handlers.CompleteSignInProfilePage())r.Get("/loginemailsent", handlers.LoginEmailSentPage())r.Get("/not-invited", handlers.NotInvitedPage())r.Get("/signin/verify", handlers.VerifySignInKey(enum.EmailVerificationKindSignIn))diff --git a/app/handlers/signin.go b/app/handlers/signin.goindex 1c55ba916..cf7a88368 100644--- a/app/handlers/signin.go+++ b/app/handlers/signin.go@@ -46,6 +46,20 @@ func LoginEmailSentPage() web.HandlerFunc {}}+// CompleteSignInProfilePage renders the complete profile page for code flow+func CompleteSignInProfilePage() web.HandlerFunc {+ return func(c *web.Context) error {+ return c.Page(http.StatusOK, web.Props{+ Page: "SignIn/CompleteSignInProfile.page",+ Title: "Complete your profile",+ Data: web.Map{+ "kind": enum.EmailVerificationKindSignIn,+ "k": c.QueryParam("code"),+ },+ })+ }+}+// NotInvitedPage renders the not invited pagefunc NotInvitedPage() web.HandlerFunc {return func(c *web.Context) error {diff --git a/locale/ar/client.json b/locale/ar/client.jsonindex 74f2fb2d0..e5d712839 100644--- a/locale/ar/client.json+++ b/locale/ar/client.json@@ -96,6 +96,15 @@"legal.notice": "من خلال تسجيل الدخول، أنت توافق على <2/><0/> و <1/>.","legal.privacypolicy": "سياسة الخصوصية","legal.termsofservice": "شروط الخدمة",+ "linkmodal.insert": "إدراج الرابط",+ "linkmodal.text.label": "النص المراد عرضه",+ "linkmodal.text.placeholder": "أدخل نص الرابط",+ "linkmodal.text.required": "النص مطلوب",+ "linkmodal.title": "إدراج الرابط",+ "linkmodal.url.invalid": "الرجاء إدخال عنوان URL صالح",+ "linkmodal.url.label": "عنوان URL",+ "linkmodal.url.placeholder": "",+ "linkmodal.url.required": "مطلوب عنوان URL","menu.administration": "آلإدارة","menu.mysettings": "إعداداتي","menu.signout": "تسجيل الخروج",@@ -192,6 +201,12 @@"showpost.responseform.text.placeholder": "ما الذي يجري مع هذا المنشور؟ أخبر المستخدمين ما هي خططك...","showpost.votespanel.more": "+{extraVotesCount} أكثر","showpost.votespanel.seedetails": "عرض التفاصيل",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "البريد الإلكتروني","signin.message.email": "متابعة بالبريد الإلكتروني","signin.message.emaildisabled": "تم تعطيل مصادقة البريد الإلكتروني من قبل المسؤول. إذا كان لديك حساب مسؤول وتحتاج إلى تجاوز هذا التقييد، الرجاء <0>انقر هنا </0>.",@@ -204,13 +219,5 @@"signin.message.socialbutton.intro": "تسجيل الدخول بواسطة","validation.custom.maxattachments": "يُسمح بحد أقصى {number} من المرفقات.","validation.custom.maximagesize": "يجب أن يكون حجم الصورة أصغر من {kilobytes}KB.",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, zero {}one {# وسم} two {# وسوم} few {# وسوم} many {# وسوم} other {# وسوم}}",- "linkmodal.insert": "إدراج الرابط",- "linkmodal.text.label": "النص المراد عرضه",- "linkmodal.text.placeholder": "أدخل نص الرابط",- "linkmodal.text.required": "النص مطلوب",- "linkmodal.title": "إدراج الرابط",- "linkmodal.url.invalid": "الرجاء إدخال عنوان URL صالح",- "linkmodal.url.label": "عنوان URL",- "linkmodal.url.required": "مطلوب عنوان URL"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, zero {}one {# وسم} two {# وسوم} few {# وسوم} many {# وسوم} other {# وسوم}}"}\ No newline at end of filediff --git a/locale/de/client.json b/locale/de/client.jsonindex 5c3cb12f4..2270c769a 100644--- a/locale/de/client.json+++ b/locale/de/client.json@@ -96,6 +96,15 @@"legal.notice": "Mit der Anmeldung stimmst du den <2/><0/> und <1/> zu.","legal.privacypolicy": "Datenschutzerklärung","legal.termsofservice": "Nutzungsbedingungen",+ "linkmodal.insert": "Link einfügen",+ "linkmodal.text.label": "Anzuzeigender Text",+ "linkmodal.text.placeholder": "Linktext eingeben",+ "linkmodal.text.required": "Text ist erforderlich",+ "linkmodal.title": "Link einfügen",+ "linkmodal.url.invalid": "Bitte geben Sie eine gültige URL ein",+ "linkmodal.url.label": "",+ "linkmodal.url.placeholder": "",+ "linkmodal.url.required": "URL ist erforderlich","menu.administration": "Verwaltung","menu.mysettings": "Meine Einstellungen","menu.signout": "Abmelden",@@ -192,6 +201,12 @@"showpost.responseform.text.placeholder": "Was passiert in diesem Beitrag? Lass deine Benutzer wissen, was deine Pläne sind...","showpost.votespanel.more": "+{extraVotesCount} mehr","showpost.votespanel.seedetails": "Details anschauen",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "E-Mail-Adresse","signin.message.email": "Mit E-Mail fortfahren","signin.message.emaildisabled": "Die E-Mail-Authentifizierung wurde von einem Administrator deaktiviert. Wenn du ein Administrator-Konto hast und diese Einschränkung umgehen musst, klicke bitte <0>hier</0>.",@@ -204,12 +219,5 @@"signin.message.socialbutton.intro": "Einloggen mit","validation.custom.maxattachments": "Es sind maximal {number} Anhänge zulässig.","validation.custom.maximagesize": "Die Bildgröße muss kleiner als {kilobytes}KB sein.",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# Tag} other {# Tags}}",- "linkmodal.insert": "Link einfügen",- "linkmodal.text.label": "Anzuzeigender Text",- "linkmodal.text.placeholder": "Linktext eingeben",- "linkmodal.text.required": "Text ist erforderlich",- "linkmodal.title": "Link einfügen",- "linkmodal.url.invalid": "Bitte geben Sie eine gültige URL ein",- "linkmodal.url.required": "URL ist erforderlich"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# Tag} other {# Tags}}"}\ No newline at end of filediff --git a/locale/el/client.json b/locale/el/client.jsonindex c239e8227..6cd91acc6 100644--- a/locale/el/client.json+++ b/locale/el/client.json@@ -96,6 +96,15 @@"legal.notice": "Με την είσοδο, συμφωνείτε με το <2/><0/> και <1/>.","legal.privacypolicy": "Πολιτική Απορρήτου","legal.termsofservice": "Όροι χρήσης",+ "linkmodal.insert": "Εισαγωγή συνδέσμου",+ "linkmodal.text.label": "Κείμενο προς εμφάνιση",+ "linkmodal.text.placeholder": "Εισαγάγετε κείμενο συνδέσμου",+ "linkmodal.text.required": "Απαιτείται κείμενο",+ "linkmodal.title": "Εισαγωγή συνδέσμου",+ "linkmodal.url.invalid": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση URL",+ "linkmodal.url.label": "",+ "linkmodal.url.placeholder": "",+ "linkmodal.url.required": "Απαιτείται διεύθυνση URL","menu.administration": "Διαχείριση","menu.mysettings": "Οι Ρυθμίσεις Μου","menu.signout": "Αποσύνδεση",@@ -192,6 +201,12 @@"showpost.responseform.text.placeholder": "Τι συμβαίνει με αυτή την ανάρτηση; Αφήστε τους χρήστες σας να γνωρίζουν ποια είναι τα σχέδιά σας...","showpost.votespanel.more": "+{extraVotesCount} περισσότερα","showpost.votespanel.seedetails": "δείτε λεπτομέρειες",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "Διεύθυνση ηλεκτρονικού ταχυδρομείου","signin.message.email": "Συνέχεια με email","signin.message.emaildisabled": "Ο έλεγχος ταυτότητας email έχει απενεργοποιηθεί από τον διαχειριστή. Εάν έχετε λογαριασμό διαχειριστή και πρέπει να παρακάμψετε αυτόν τον περιορισμό, παρακαλώ <0>κάντε κλικ εδώ</0>.",@@ -204,12 +219,5 @@"signin.message.socialbutton.intro": "Συνδεθείτε με","validation.custom.maxattachments": "Επιτρέπονται έως {number} συνημμένα.","validation.custom.maximagesize": "Το μέγεθος της εικόνας πρέπει να είναι μικρότερο από {kilobytes}KB.",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# ετικέτα} other {# ετικέτες}}",- "linkmodal.insert": "Εισαγωγή συνδέσμου",- "linkmodal.text.label": "Κείμενο προς εμφάνιση",- "linkmodal.text.placeholder": "Εισαγάγετε κείμενο συνδέσμου",- "linkmodal.text.required": "Απαιτείται κείμενο",- "linkmodal.title": "Εισαγωγή συνδέσμου",- "linkmodal.url.invalid": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση URL",- "linkmodal.url.required": "Απαιτείται διεύθυνση URL"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# ετικέτα} other {# ετικέτες}}"}\ No newline at end of filediff --git a/locale/en/client.json b/locale/en/client.jsonindex ec03a924a..ca81b5b7c 100644--- a/locale/en/client.json+++ b/locale/en/client.json@@ -201,7 +201,7 @@"showpost.votespanel.more": "+{extraVotesCount} more","showpost.votespanel.seedetails": "see details","signin.code.edit": "Edit",- "signin.code.expired": "This code has expired. Please request a new one.",+ "signin.code.expired": "This code has expired or already been used. Please request a new one.","signin.code.getnew": "Get a new code","signin.code.instruction": "Please type in the code we just sent to <0>{email}</0>","signin.code.invalid": "The code you entered is invalid. Please try again.",diff --git a/locale/en/server.json b/locale/en/server.jsonindex 885983422..7bdb0afd7 100644--- a/locale/en/server.json+++ b/locale/en/server.json@@ -53,10 +53,13 @@"email.new_comment.text": "<strong>{userName}</strong> left a comment on <strong>{title} ({postLink})</strong>.","email.new_post.text": "<strong>{userName}</strong> created a new post <strong>{title} ({postLink})</strong>.","email.signin_email.subject": "Sign in to {siteName}",- "email.signin_email.text": "You asked us to send you a sign-in link and here it is.",- "email.signin_email.confirmation": "Click the link below to sign in to <strong>{siteName}</strong>.",+ "email.signin_email.text": "Here is your sign-in code.",+ "email.signin_email.confirmation": "Use the one-time code below to sign in to <strong>{siteName}</strong>.","email.signup_email.subject": "Your new Fider site","email.signup_email.text": "You are one step away from activating your Fider site.",+ "email.signin_email.your_code": "Your sign-in code is:",+ "email.signin_email.code_expires": "This code will expire in 15 minutes.",+ "email.signin_email.alternative": "Alternatively, you can click the link below to sign in directly:","email.signup_email.confirmation": "Through the link below you can verify your email address and complete the activation process.","email.footer.subscription_notice": "You are receiving this email because you are subscribed to this post. You can {view}, {unsubscribe} or {change}.","email.footer.subscription_notice2": "You are receiving this email because you are subscribed to this post. You can {change}.",diff --git a/locale/es-ES/client.json b/locale/es-ES/client.jsonindex 12adde04b..f67c46996 100644--- a/locale/es-ES/client.json+++ b/locale/es-ES/client.json@@ -92,6 +92,10 @@"label.voters": "Votantes","labels.notagsavailable": "No hay etiquetas disponibles","labels.notagsselected": "No hay etiquetas seleccionadas",+ "legal.agreement": "He leído y acepto los <0/> y <1/>.",+ "legal.notice": "Al iniciar sesión, aceptas los <2/><0/> y <1/>.",+ "legal.privacypolicy": "Política de Privacidad",+ "legal.termsofservice": "Términos del servicio","linkmodal.insert": "Insertar un enlace","linkmodal.text.label": "Texto a mostrar","linkmodal.text.placeholder": "Ingresa el texto del enlace",@@ -101,10 +105,6 @@"linkmodal.url.label": "URL","linkmodal.url.placeholder": "https://example.com","linkmodal.url.required": "La URL es requerida",- "legal.agreement": "He leído y acepto los <0/> y <1/>.",- "legal.notice": "Al iniciar sesión, aceptas los <2/><0/> y <1/>.",- "legal.privacypolicy": "Política de Privacidad",- "legal.termsofservice": "Términos del servicio","menu.administration": "Administración","menu.mysettings": "Mis ajustes","menu.signout": "Cerrar sesión",@@ -201,6 +201,12 @@"showpost.responseform.text.placeholder": "¿Qué está pasando con esta publicación? Dile a tus usuarios cuáles son tus planes...","showpost.votespanel.more": "+{extraVotesCount} más","showpost.votespanel.seedetails": "ver detalles",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "Dirección de correo electrónico","signin.message.email": "Continuar con el correo electrónico","signin.message.emaildisabled": "La autenticación de correo electrónico ha sido deshabilitada por un administrador. Si tiene una cuenta de administrador y necesita eludir esta restricción, por favor <0>haga clic aquí</0>.",diff --git a/locale/fa/client.json b/locale/fa/client.jsonindex c819e501f..cd32c55fb 100644--- a/locale/fa/client.json+++ b/locale/fa/client.json@@ -96,6 +96,15 @@"legal.notice": "با ورود، شما با <2/><0/> و <1/> موافقید.","legal.privacypolicy": "سیاست حفظ حریم خصوصی","legal.termsofservice": "شرایط خدمات",+ "linkmodal.insert": "درج لینک",+ "linkmodal.text.label": "متن برای نمایش",+ "linkmodal.text.placeholder": "متن لینک را وارد کنید",+ "linkmodal.text.required": "متن الزامی است",+ "linkmodal.title": "درج لینک",+ "linkmodal.url.invalid": "لطفا یک URL معتبر وارد کنید",+ "linkmodal.url.label": "آدرس اینترنتی",+ "linkmodal.url.placeholder": "",+ "linkmodal.url.required": "آدرس اینترنتی (URL) الزامی است","menu.administration": "مدیریت","menu.mysettings": "تنظیمات من","menu.signout": "خروج",@@ -156,6 +165,7 @@"mysettings.notification.title": "رویدادهایی را که میخواهید اعلان دریافت کنید انتخاب کنید","mysettings.page.subtitle": "تنظیمات پروفایل خود را مدیریت کنید","mysettings.page.title": "تنظیمات",+ "newpost.modal.addimage": "اضافه کردن تصاویر","newpost.modal.description.placeholder": "در موردش به ما بگو. کامل توضیح بده، دریغ نکن، هر چه اطلاعات بیشتر، بهتر.","newpost.modal.submit": "ایده خود را ثبت کنید","newpost.modal.title": "ایده خود را به اشتراک بگذارید...",@@ -191,6 +201,12 @@"showpost.responseform.text.placeholder": "برنامهٔ خود را دربارهٔ این پست با کاربران در میان بگذارید...","showpost.votespanel.more": "+{extraVotesCount} بیشتر","showpost.votespanel.seedetails": "مشاهدهٔ جزئیات",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "آدرس ایمیل","signin.message.email": "ادامه با ایمیل","signin.message.emaildisabled": "ورود با ایمیل توسط مدیر غیرفعال شده است. اگر مدیر هستید و نیاز به دسترسی دارید <0>اینجا کلیک کنید</0>.",@@ -203,14 +219,5 @@"signin.message.socialbutton.intro": "ورود با","validation.custom.maxattachments": "حداکثر تعداد {number} پیوست مجاز است.","validation.custom.maximagesize": "حجم تصویر باید کمتر از {kilobytes}KB باشد.",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# برچسب} other {# برچسب}}",- "linkmodal.insert": "درج لینک",- "linkmodal.text.label": "متن برای نمایش",- "linkmodal.text.placeholder": "متن لینک را وارد کنید",- "linkmodal.text.required": "متن الزامی است",- "linkmodal.title": "درج لینک",- "linkmodal.url.invalid": "لطفا یک URL معتبر وارد کنید",- "linkmodal.url.label": "آدرس اینترنتی",- "linkmodal.url.required": "آدرس اینترنتی (URL) الزامی است",- "newpost.modal.addimage": "اضافه کردن تصاویر"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# برچسب} other {# برچسب}}"}\ No newline at end of filediff --git a/locale/fr/client.json b/locale/fr/client.jsonindex a7664d9af..4485c5d6d 100644--- a/locale/fr/client.json+++ b/locale/fr/client.json@@ -96,6 +96,15 @@"legal.notice": "En vous connectant, vous acceptez les <2/><0/> et <1/>.","legal.privacypolicy": "Politique de confidentialité","legal.termsofservice": "Conditions générales d’utilisation",+ "linkmodal.insert": "Insérer un lien",+ "linkmodal.text.label": "Texte à afficher",+ "linkmodal.text.placeholder": "Entrez le texte du lien",+ "linkmodal.text.required": "Le texte est obligatoire",+ "linkmodal.title": "Insérer un lien",+ "linkmodal.url.invalid": "Veuillez saisir une URL valide",+ "linkmodal.url.label": "",+ "linkmodal.url.placeholder": "https://exemple.com",+ "linkmodal.url.required": "L'URL est requise","menu.administration": "Administration","menu.mysettings": "Mes paramètres","menu.signout": "Se déconnecter",@@ -192,6 +201,12 @@"showpost.responseform.text.placeholder": "Que se passe-t-il avec ce message ? Faites savoir à vos utilisateurs quels sont vos plans...","showpost.votespanel.more": "+{extraVotesCount} de plus","showpost.votespanel.seedetails": "voir les détails",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "Adresse email","signin.message.email": "Continuer avec une addresse email","signin.message.emaildisabled": "L'authentification par e-mail a été désactivée par un administrateur. Si vous avez un compte administrateur, <0>cliquez ici</0> pour vous connecter.",@@ -204,13 +219,5 @@"signin.message.socialbutton.intro": "Se connecter avec","validation.custom.maxattachments": "Un maximum de {number} pièces jointes est autorisé.","validation.custom.maximagesize": "La taille de l'image doit être inférieure à {kilobytes}KB.",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",- "linkmodal.insert": "Insérer un lien",- "linkmodal.text.label": "Texte à afficher",- "linkmodal.text.placeholder": "Entrez le texte du lien",- "linkmodal.text.required": "Le texte est obligatoire",- "linkmodal.title": "Insérer un lien",- "linkmodal.url.invalid": "Veuillez saisir une URL valide",- "linkmodal.url.placeholder": "https://exemple.com",- "linkmodal.url.required": "L'URL est requise"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}\ No newline at end of filediff --git a/locale/it/client.json b/locale/it/client.jsonindex 6a5178133..a625e586b 100644--- a/locale/it/client.json+++ b/locale/it/client.json@@ -96,6 +96,15 @@"legal.notice": "Accedendo, accetti i <2/><0/> e <1/>.","legal.privacypolicy": "Informativa sulla privacy","legal.termsofservice": "Termini di servizio",+ "linkmodal.insert": "Inserisci collegamento",+ "linkmodal.text.label": "Testo da visualizzare",+ "linkmodal.text.placeholder": "Inserisci il testo del collegamento",+ "linkmodal.text.required": "Il testo è obbligatorio",+ "linkmodal.title": "Inserisci collegamento",+ "linkmodal.url.invalid": "Inserisci un URL valido",+ "linkmodal.url.label": "",+ "linkmodal.url.placeholder": "https://esempio.com",+ "linkmodal.url.required": "L'URL è obbligatorio","menu.administration": "Amministrazione","menu.mysettings": "Le mie preferenze","menu.signout": "Disconnettersi",@@ -192,6 +201,12 @@"showpost.responseform.text.placeholder": "Cosa succede con questo post? Fate sapere ai vostri utenti quali sono i vostri piani...","showpost.votespanel.more": "+{extraVotesCount} di più","showpost.votespanel.seedetails": "vedi dettagli",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "Indirizzo e-mail","signin.message.email": "Continua con l'email","signin.message.emaildisabled": "L'autenticazione email è stata disabilitata da un amministratore. Se hai un account amministratore e hai bisogno di bypassare questa restrizione, per favore <0>clicca qui</0>.",@@ -204,13 +219,5 @@"signin.message.socialbutton.intro": "Accedi con","validation.custom.maxattachments": "Sono consentiti al massimo {number} allegati.","validation.custom.maximagesize": "La dimensione dell'immagine deve essere inferiore a {kilobytes}KB.",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",- "linkmodal.insert": "Inserisci collegamento",- "linkmodal.text.label": "Testo da visualizzare",- "linkmodal.text.placeholder": "Inserisci il testo del collegamento",- "linkmodal.text.required": "Il testo è obbligatorio",- "linkmodal.title": "Inserisci collegamento",- "linkmodal.url.invalid": "Inserisci un URL valido",- "linkmodal.url.placeholder": "https://esempio.com",- "linkmodal.url.required": "L'URL è obbligatorio"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}\ No newline at end of filediff --git a/locale/ja/client.json b/locale/ja/client.jsonindex 46b3089d1..91bc31451 100644--- a/locale/ja/client.json+++ b/locale/ja/client.json@@ -96,6 +96,15 @@"legal.notice": "サインインすると、<2/><0/> および <1/> に同意したことになります。","legal.privacypolicy": "プライバシーポリシー","legal.termsofservice": "サービス利用規約",+ "linkmodal.insert": "リンクを挿入",+ "linkmodal.text.label": "表示するテキスト",+ "linkmodal.text.placeholder": "リンクテキストを入力",+ "linkmodal.text.required": "テキストは必須です",+ "linkmodal.title": "リンクを挿入",+ "linkmodal.url.invalid": "有効なURLを入力してください",+ "linkmodal.url.label": "",+ "linkmodal.url.placeholder": "",+ "linkmodal.url.required": "URLは必須です","menu.administration": "管理","menu.mysettings": "ユーザー設定","menu.signout": "ログアウト",@@ -192,6 +201,12 @@"showpost.responseform.text.placeholder": "この記事はどうなっていますか? あなたのプランをユーザーに知らせてください...","showpost.votespanel.more": "+{extraVotesCount} 以上","showpost.votespanel.seedetails": "詳細を表示",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "電子メールアドレス","signin.message.email": "メールで続行","signin.message.emaildisabled": "メール認証は管理者によって無効にされています。管理者アカウントを持っていて、この制限を回避する必要がある場合は、<0>ここをクリック</0>してください。",@@ -204,12 +219,5 @@"signin.message.socialbutton.intro": "ログイン","validation.custom.maxattachments": "最大 {number} 個の添付ファイルが許可されます。","validation.custom.maximagesize": "画像サイズは{kilobytes}KB未満である必要があります。",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",- "linkmodal.insert": "リンクを挿入",- "linkmodal.text.label": "表示するテキスト",- "linkmodal.text.placeholder": "リンクテキストを入力",- "linkmodal.text.required": "テキストは必須です",- "linkmodal.title": "リンクを挿入",- "linkmodal.url.invalid": "有効なURLを入力してください",- "linkmodal.url.required": "URLは必須です"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}\ No newline at end of filediff --git a/locale/nl/client.json b/locale/nl/client.jsonindex 4d93764bc..4b0852a88 100644--- a/locale/nl/client.json+++ b/locale/nl/client.json@@ -96,6 +96,15 @@"legal.notice": "Door in te loggen, ga je akkoord met de <2/><0/> en <1/>.","legal.privacypolicy": "Privacybeleid","legal.termsofservice": "Algemene voorwaarden",+ "linkmodal.insert": "Link invoegen",+ "linkmodal.text.label": "Weer te geven tekst",+ "linkmodal.text.placeholder": "Voer linktekst in",+ "linkmodal.text.required": "Tekst is vereist",+ "linkmodal.title": "Link invoegen",+ "linkmodal.url.invalid": "Voer een geldige URL in",+ "linkmodal.url.label": "",+ "linkmodal.url.placeholder": "https://voorbeeld.com",+ "linkmodal.url.required": "URL is vereist","menu.administration": "Beheer","menu.mysettings": "Mijn instellingen","menu.signout": "Uitloggen",@@ -192,6 +201,12 @@"showpost.responseform.text.placeholder": "Wat gebeurt er met dit bericht? Laat je gebruikers weten wat je plannen zijn...","showpost.votespanel.more": "+{extraVotesCount} meer","showpost.votespanel.seedetails": "details bekijken",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "E-mailadres","signin.message.email": "Doorgaan met e-mail","signin.message.emaildisabled": "Inloggen met e-mail is uitgeschakeld door een beheerder. Als u een beheerder account heeft en deze beperking moet omzeilen, <0>klik dan hier</0>.",@@ -204,13 +219,5 @@"signin.message.socialbutton.intro": "Inloggen met","validation.custom.maxattachments": "Er zijn maximaal {number} bijlagen toegestaan.","validation.custom.maximagesize": "De afbeeldingsgrootte moet kleiner zijn dan {kilobytes}KB.",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",- "linkmodal.insert": "Link invoegen",- "linkmodal.text.label": "Weer te geven tekst",- "linkmodal.text.placeholder": "Voer linktekst in",- "linkmodal.text.required": "Tekst is vereist",- "linkmodal.title": "Link invoegen",- "linkmodal.url.invalid": "Voer een geldige URL in",- "linkmodal.url.placeholder": "https://voorbeeld.com",- "linkmodal.url.required": "URL is vereist"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}\ No newline at end of filediff --git a/locale/pl/client.json b/locale/pl/client.jsonindex 2de7df8c2..e27c791a7 100644--- a/locale/pl/client.json+++ b/locale/pl/client.json@@ -96,6 +96,15 @@"legal.notice": "Logując się, akceptujesz <2/><0/> i <1/>.","legal.privacypolicy": "Polityka Prywatności","legal.termsofservice": "Warunki Świadczenia Usług",+ "linkmodal.insert": "Wstaw link",+ "linkmodal.text.label": "Tekst do wyświetlenia",+ "linkmodal.text.placeholder": "Wprowadź tekst linku",+ "linkmodal.text.required": "Tekst jest wymagany",+ "linkmodal.title": "Wstaw link",+ "linkmodal.url.invalid": "Proszę podać prawidłowy adres URL",+ "linkmodal.url.label": "Adres URL",+ "linkmodal.url.placeholder": "",+ "linkmodal.url.required": "Adres URL jest wymagany","menu.administration": "Administracja","menu.mysettings": "Moje Ustawienia","menu.signout": "Wyloguj się",@@ -192,6 +201,12 @@"showpost.responseform.text.placeholder": "Co się dzieje w temacie tego posta? Daj swoim użytkownikom znać o swoich planach...","showpost.votespanel.more": "+{extraVotesCount} więcej","showpost.votespanel.seedetails": "pokaż szczegóły",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "Adres e-mail","signin.message.email": "Kontynuuj z e-mailem","signin.message.emaildisabled": "Autoryzacja za pomocą adresu email została wyłączona przez administratora. Jeśli posiadasz konto administratora i chcesz obejść to ograniczenie <0>kliknij tutaj</0>.",@@ -204,13 +219,5 @@"signin.message.socialbutton.intro": "Zaloguj się za pomocą","validation.custom.maxattachments": "Maksymalna liczba załączników to {number}.","validation.custom.maximagesize": "Rozmiar obrazu musi być mniejszy niż {kilobytes}KB.",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} few {# tagów} many {# tagów} other {# tagi}}",- "linkmodal.insert": "Wstaw link",- "linkmodal.text.label": "Tekst do wyświetlenia",- "linkmodal.text.placeholder": "Wprowadź tekst linku",- "linkmodal.text.required": "Tekst jest wymagany",- "linkmodal.title": "Wstaw link",- "linkmodal.url.invalid": "Proszę podać prawidłowy adres URL",- "linkmodal.url.label": "Adres URL",- "linkmodal.url.required": "Adres URL jest wymagany"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} few {# tagów} many {# tagów} other {# tagi}}"}\ No newline at end of filediff --git a/locale/pt-BR/client.json b/locale/pt-BR/client.jsonindex 3b317e1d2..dd70260b9 100644--- a/locale/pt-BR/client.json+++ b/locale/pt-BR/client.json@@ -96,6 +96,15 @@"legal.notice": "Ao fazer o login, você concorda com os <2/><0/> e <1/>.","legal.privacypolicy": "Política de Privacidade","legal.termsofservice": "Termos do Serviço",+ "linkmodal.insert": "Inserir link",+ "linkmodal.text.label": "Texto para exibir",+ "linkmodal.text.placeholder": "Insira o texto do link",+ "linkmodal.text.required": "Texto é obrigatório",+ "linkmodal.title": "Inserir link",+ "linkmodal.url.invalid": "Por favor, insira um URL válido",+ "linkmodal.url.label": "",+ "linkmodal.url.placeholder": "",+ "linkmodal.url.required": "URL é obrigatório","menu.administration": "Administração","menu.mysettings": "Minhas Configurações","menu.signout": "Finalizar sessão",@@ -192,6 +201,12 @@"showpost.responseform.text.placeholder": "O que está acontecendo com esta postagem? Informe seus usuários quais são os seus planos...","showpost.votespanel.more": "+{extraVotesCount} mais","showpost.votespanel.seedetails": "ver detalhes",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "Endereço de e-mail","signin.message.email": "Entrar com email","signin.message.emaildisabled": "A autenticação por e-mail foi desativada por um administrador. Se você tem uma conta de administrador e precisa ignorar esta restrição, <0>clique aqui</0>.",@@ -204,12 +219,5 @@"signin.message.socialbutton.intro": "Fazer login com","validation.custom.maxattachments": "São permitidos no máximo {number} anexos.","validation.custom.maximagesize": "O tamanho da imagem deve ser menor que {kilobytes}KB.",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",- "linkmodal.insert": "Inserir link",- "linkmodal.text.label": "Texto para exibir",- "linkmodal.text.placeholder": "Insira o texto do link",- "linkmodal.text.required": "Texto é obrigatório",- "linkmodal.title": "Inserir link",- "linkmodal.url.invalid": "Por favor, insira um URL válido",- "linkmodal.url.required": "URL é obrigatório"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}\ No newline at end of filediff --git a/locale/ru/client.json b/locale/ru/client.jsonindex 9bc4bcf3e..383718415 100644--- a/locale/ru/client.json+++ b/locale/ru/client.json@@ -96,6 +96,15 @@"legal.notice": "Войдя в систему, вы соглашаетесь с <2/><0/> и <1/>.","legal.privacypolicy": "Политика Конфиденциальности","legal.termsofservice": "Условия Использования",+ "linkmodal.insert": "Вставить ссылку",+ "linkmodal.text.label": "Текст для отображения",+ "linkmodal.text.placeholder": "Введите текст ссылки",+ "linkmodal.text.required": "Текст обязателен",+ "linkmodal.title": "Вставить ссылку",+ "linkmodal.url.invalid": "Пожалуйста, введите действительный URL-адрес",+ "linkmodal.url.label": "",+ "linkmodal.url.placeholder": "",+ "linkmodal.url.required": "URL-адрес обязателен","menu.administration": "Администрирование","menu.mysettings": "Мой аккаунт","menu.signout": "Выйти",@@ -192,6 +201,12 @@"showpost.responseform.text.placeholder": "Что произойдёт с этим предложением? Дайте людям знать о ваших планах...","showpost.votespanel.more": "и ещё {extraVotesCount}","showpost.votespanel.seedetails": "подробнее",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "Адрес электронной почты","signin.message.email": "Продолжить с электронной почтой","signin.message.emaildisabled": "Аутентификация по адресу электронной почты отключена. <0>Я администратор и мне нужно обойти это ограничение</0>.",@@ -204,12 +219,5 @@"signin.message.socialbutton.intro": "Войти с помощью","validation.custom.maxattachments": "Разрешено максимум {number} вложений.","validation.custom.maximagesize": "Размер изображения должен быть меньше {kilobytes}КБ.",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",- "linkmodal.insert": "Вставить ссылку",- "linkmodal.text.label": "Текст для отображения",- "linkmodal.text.placeholder": "Введите текст ссылки",- "linkmodal.text.required": "Текст обязателен",- "linkmodal.title": "Вставить ссылку",- "linkmodal.url.invalid": "Пожалуйста, введите действительный URL-адрес",- "linkmodal.url.required": "URL-адрес обязателен"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}\ No newline at end of filediff --git a/locale/sk/client.json b/locale/sk/client.jsonindex 4af08fec9..1ad731433 100644--- a/locale/sk/client.json+++ b/locale/sk/client.json@@ -96,6 +96,15 @@"legal.notice": "Prihlásením súhlasíte s <2/><0/> a <1/>.","legal.privacypolicy": "Zásady ochrany osobných údajov","legal.termsofservice": "Podmienky služby",+ "linkmodal.insert": "Vložiť odkaz",+ "linkmodal.text.label": "Text na zobrazenie",+ "linkmodal.text.placeholder": "Zadajte text odkazu",+ "linkmodal.text.required": "Vyžaduje sa text",+ "linkmodal.title": "Vložiť odkaz",+ "linkmodal.url.invalid": "Zadajte platnú URL adresu",+ "linkmodal.url.label": "",+ "linkmodal.url.placeholder": "",+ "linkmodal.url.required": "URL adresa je povinná","menu.administration": "Administrácia","menu.mysettings": "Moje nastavenia","menu.signout": "Odhlásiť sa",@@ -192,6 +201,12 @@"showpost.responseform.text.placeholder": "Čo sa deje s týmto príspevkom? Dajte svojim používateľom vedieť, aké máte plány...","showpost.votespanel.more": "+{extraVotesCount} viac","showpost.votespanel.seedetails": "pozri detaily",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "Emailová adresa","signin.message.email": "Pokračovať pomocou e-mailu","signin.message.emaildisabled": "Správca zakázal overovanie emailu. Ak máte účet správcu a potrebujete obísť toto obmedzenie, <0>kliknite sem</0>.",@@ -204,12 +219,5 @@"signin.message.socialbutton.intro": "Prihlásiť sa pomocou","validation.custom.maxattachments": "Maximálny počet príloh je {number}.","validation.custom.maximagesize": "Veľkosť obrázka musí byť menšia ako {kilobytes}KB.",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",- "linkmodal.insert": "Vložiť odkaz",- "linkmodal.text.label": "Text na zobrazenie",- "linkmodal.text.placeholder": "Zadajte text odkazu",- "linkmodal.text.required": "Vyžaduje sa text",- "linkmodal.title": "Vložiť odkaz",- "linkmodal.url.invalid": "Zadajte platnú URL adresu",- "linkmodal.url.required": "URL adresa je povinná"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}\ No newline at end of filediff --git a/locale/sv-SE/client.json b/locale/sv-SE/client.jsonindex afd19a2e7..bb30c2c8d 100644--- a/locale/sv-SE/client.json+++ b/locale/sv-SE/client.json@@ -96,6 +96,15 @@"legal.notice": "Genom att logga in godkänner du <2/><0/> och <1/>.","legal.privacypolicy": "Integritetspolicy","legal.termsofservice": "Användarvillkor",+ "linkmodal.insert": "Infoga länk",+ "linkmodal.text.label": "Text att visa",+ "linkmodal.text.placeholder": "Ange länktext",+ "linkmodal.text.required": "Text krävs",+ "linkmodal.title": "Infoga länk",+ "linkmodal.url.invalid": "Ange en giltig URL",+ "linkmodal.url.label": "",+ "linkmodal.url.placeholder": "",+ "linkmodal.url.required": "URL krävs","menu.administration": "Administration","menu.mysettings": "Mina Inställningar","menu.signout": "Logga ut",@@ -192,6 +201,12 @@"showpost.responseform.text.placeholder": "Vad händer med det här inlägget? Låt dina användare veta vad du planerar...","showpost.votespanel.more": "+{extraVotesCount} ytterligare","showpost.votespanel.seedetails": "visa detaljer",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "E-postadress","signin.message.email": "Fortsätt med e-post","signin.message.emaildisabled": "E-postautentisering har inaktiverats av en administratör. Om du har ett administratörskonto och behöver kringgå denna begränsning, <0>klicka här</0>.",@@ -204,12 +219,5 @@"signin.message.socialbutton.intro": "Logga in med","validation.custom.maxattachments": "Maximalt {number} bilagor är tillåtna.","validation.custom.maximagesize": "Bildstorleken måste vara mindre än {kilobytes}KB.",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, =1 {# etikett} other {# etiketter}}",- "linkmodal.insert": "Infoga länk",- "linkmodal.text.label": "Text att visa",- "linkmodal.text.placeholder": "Ange länktext",- "linkmodal.text.required": "Text krävs",- "linkmodal.title": "Infoga länk",- "linkmodal.url.invalid": "Ange en giltig URL",- "linkmodal.url.required": "URL krävs"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, =1 {# etikett} other {# etiketter}}"}\ No newline at end of filediff --git a/locale/tr/client.json b/locale/tr/client.jsonindex 25ffe8345..e7a18cbf6 100644--- a/locale/tr/client.json+++ b/locale/tr/client.json@@ -96,6 +96,15 @@"legal.notice": "Giriş yaparak <2/><0/> ve <1/> maddelerini kabul etmiş olursunuz.","legal.privacypolicy": "Gizlilik Politikası","legal.termsofservice": "Hizmet Koşulları",+ "linkmodal.insert": "Bağlantı Ekle",+ "linkmodal.text.label": "Görüntülenecek metin",+ "linkmodal.text.placeholder": "Bağlantı metnini girin",+ "linkmodal.text.required": "Metin gereklidir",+ "linkmodal.title": "Bağlantı Ekle",+ "linkmodal.url.invalid": "Lütfen geçerli bir URL girin",+ "linkmodal.url.label": "",+ "linkmodal.url.placeholder": "",+ "linkmodal.url.required": "URL gerekli","menu.administration": "Yönetim","menu.mysettings": "Ayarlarım","menu.signout": "Çıkış yap",@@ -192,6 +201,12 @@"showpost.responseform.text.placeholder": "Bu öneriye neler oluyor? Kullanıcılara planlarınız hakkında bilgi verin...","showpost.votespanel.more": "+{extraVotesCount} daha","showpost.votespanel.seedetails": "ayrıntıları gör",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "E-posta adresi","signin.message.email": "E-postayla devam et","signin.message.emaildisabled": "E-posta doğrulaması bir yönetici tarafından devre dışı bırakıldı. Eğer bir yönetici hesabınız varsa ve bu kısıtı kaldırmak istiyorsanız <0>buraya tıklayın</0>.",@@ -204,12 +219,5 @@"signin.message.socialbutton.intro": "İle giriş yapın","validation.custom.maxattachments": "En fazla {number} ek dosyaya izin verilir.","validation.custom.maximagesize": "Resim boyutu {kilobytes}KB'den küçük olmalıdır.",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# etiket} other {# etiket}}",- "linkmodal.insert": "Bağlantı Ekle",- "linkmodal.text.label": "Görüntülenecek metin",- "linkmodal.text.placeholder": "Bağlantı metnini girin",- "linkmodal.text.required": "Metin gereklidir",- "linkmodal.title": "Bağlantı Ekle",- "linkmodal.url.invalid": "Lütfen geçerli bir URL girin",- "linkmodal.url.required": "URL gerekli"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# etiket} other {# etiket}}"}\ No newline at end of filediff --git a/locale/zh-CN/client.json b/locale/zh-CN/client.jsonindex 263649983..712c9bc23 100644--- a/locale/zh-CN/client.json+++ b/locale/zh-CN/client.json@@ -96,6 +96,15 @@"legal.notice": "在签署时,您同意<2/><0/>和<1/>。","legal.privacypolicy": "隐私政策","legal.termsofservice": "服务条款",+ "linkmodal.insert": "插入链接",+ "linkmodal.text.label": "要显示的文本",+ "linkmodal.text.placeholder": "输入链接文本",+ "linkmodal.text.required": "文本为必填项",+ "linkmodal.title": "插入链接",+ "linkmodal.url.invalid": "请输入有效的 URL",+ "linkmodal.url.label": "网址",+ "linkmodal.url.placeholder": "",+ "linkmodal.url.required": "需要 URL","menu.administration": "管理","menu.mysettings": "我的设置","menu.signout": "退出",@@ -192,6 +201,12 @@"showpost.responseform.text.placeholder": "这篇文章怎么了?让你的用户知道你的计划是什么...","showpost.votespanel.more": "+{extraVotesCount} 更多","showpost.votespanel.seedetails": "查看详细信息",+ "signin.code.edit": "",+ "signin.code.getnew": "",+ "signin.code.instruction": "",+ "signin.code.placeholder": "",+ "signin.code.sent": "",+ "signin.code.submit": "","signin.email.placeholder": "电子邮件","signin.message.email": "通过电子邮件继续","signin.message.emaildisabled": "管理员已禁用电子邮件身份验证。如果您有管理员帐户并且需要绕过此限制,请 <0>点击这里</0>.",@@ -204,13 +219,5 @@"signin.message.socialbutton.intro": "使用以下方式登录","validation.custom.maxattachments": "最多允许 {number} 个附件。","validation.custom.maximagesize": "图像大小必须小于{kilobytes}KB。",- "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",- "linkmodal.insert": "插入链接",- "linkmodal.text.label": "要显示的文本",- "linkmodal.text.placeholder": "输入链接文本",- "linkmodal.text.required": "文本为必填项",- "linkmodal.title": "插入链接",- "linkmodal.url.invalid": "请输入有效的 URL",- "linkmodal.url.label": "网址",- "linkmodal.url.required": "需要 URL"+ "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}\ No newline at end of filediff --git a/public/components/SignInModal.tsx b/public/components/SignInModal.tsxindex 137f6c39a..31aec720c 100644--- a/public/components/SignInModal.tsx+++ b/public/components/SignInModal.tsx@@ -1,6 +1,6 @@-import React, { useState, useEffect } from "react"+import React from "react"import { Modal, SignInControl, LegalFooter, TenantLogo } from "@fider/components"-import { Button, CloseIcon } from "./common"+import { CloseIcon } from "./common"import { Trans } from "@lingui/react/macro"import { HStack, VStack } from "./layout"@@ -10,54 +10,33 @@ interface SignInModalProps {}export const SignInModal: React.FC<SignInModalProps> = (props) => {- const [email, setEmail] = useState("")-- useEffect(() => {- if (email) {- setTimeout(() => setEmail(""), 5000)+ const onCodeVerified = (result: { showProfileCompletion?: boolean; code?: string }): void => {+ if (result.showProfileCompletion && result.code) {+ // User needs to complete profile - redirect to profile completion page+ location.href = `/signin/complete?code=${encodeURIComponent(result.code)}`+ } else {+ // User is authenticated - close modal and reload to refresh the page+ props.onClose()+ location.reload()}- }, [email])-- const onEmailSent = (value: string): void => {- setEmail(value)- }-- const closeModal = () => {- setEmail("")- props.onClose()}- const content = email ? (- <>- <p>- <Trans id="signin.message.emailsent">- We have just sent a confirmation link to <b>{email}</b>. Click the link and you’ll be signed in.- </Trans>- </p>- <p>- <Button variant="tertiary" onClick={closeModal}>- <Trans id="action.ok">OK</Trans>- </Button>- </p>- </>- ) : (- <SignInControl useEmail={true} onEmailSent={onEmailSent} />- )-return (- <Modal.Window isOpen={props.isOpen} onClose={closeModal}>+ <Modal.Window isOpen={props.isOpen} onClose={props.onClose}><Modal.Header><VStack spacing={8}><HStack justify="between"><TenantLogo size={24} useFiderIfEmpty={true} />- <CloseIcon closeModal={closeModal} />+ <CloseIcon closeModal={props.onClose} /></HStack><p><Trans id="modal.signin.header">Join the conversation</Trans></p></VStack></Modal.Header>- <Modal.Content>{content}</Modal.Content>+ <Modal.Content>+ <SignInControl useEmail={true} onCodeVerified={onCodeVerified} />+ </Modal.Content><LegalFooter /></Modal.Window>)diff --git a/public/components/common/SignInControl.tsx b/public/components/common/SignInControl.tsxindex 4d417320c..ead9ae109 100644--- a/public/components/common/SignInControl.tsx+++ b/public/components/common/SignInControl.tsx@@ -14,6 +14,7 @@ interface SignInControlProps {onSubmit?: () => voidonEmailSent?: (email: string) => voidsignInButtonText?: string+ onCodeVerified?: (result: { showProfileCompletion?: boolean; code?: string }) => void}export const SignInControl: React.FunctionComponent<SignInControlProps> = (props) => {@@ -65,15 +66,26 @@ export const SignInControl: React.FunctionComponent<SignInControlProps> = (propsconst result = await actions.verifySignInCode(email, code)if (result.ok) {const data = result.data as { showProfileCompletion?: boolean } | undefined- if (data && data.showProfileCompletion) {- // User needs to complete profile - reload to show profile completion- location.reload()+ if (props.onCodeVerified) {+ // Let the parent component decide what to do, pass the code along+ props.onCodeVerified({ ...data, code })} else {- // User is authenticated - reload to refresh the page+ // Default behavior: reload the pagelocation.reload()}- } else if (result.error) {- setError(result.error)+ } else {+ // Handle validation errors - convert data object to Failure format+ const data = result.data as Record<string, string> | undefined+ if (data && typeof data === "object") {+ const errors = Object.entries(data).map(([field, message]) => ({+ field,+ message,+ }))+ setError({ errors })+ } else if (result.error) {+ // Display the error from the server+ setError(result.error)+ }}}@@ -143,7 +155,14 @@ export const SignInControl: React.FunctionComponent<SignInControlProps> = (props<Trans id="signin.code.instruction">Please type in the code we just sent to <strong>{email}</strong></Trans>{" "}- <a href="#" className="text-link" onClick={(e) => { e.preventDefault(); editEmail(); }}>+ <a+ href="#"+ className="text-link"+ onClick={(e) => {+ e.preventDefault()+ editEmail()+ }}+ ><Trans id="signin.code.edit">Edit</Trans></a></p>@@ -161,11 +180,16 @@ export const SignInControl: React.FunctionComponent<SignInControlProps> = (props<Trans id="signin.code.submit">Submit</Trans></Button></Form>- {resendMessage && (- <p className="text-green-700 mt-2">{resendMessage}</p>- )}+ {resendMessage && <p className="text-green-700 mt-2">{resendMessage}</p>}<p className="text-center mt-2">- <a href="#" className="text-link" onClick={(e) => { e.preventDefault(); resendCode(); }}>+ <a+ href="#"+ className="text-link"+ onClick={(e) => {+ e.preventDefault()+ resendCode()+ }}+ ><Trans id="signin.code.getnew">Get a new code</Trans></a></p>diff --git a/public/pages/Home/components/ShareFeedback.tsx b/public/pages/Home/components/ShareFeedback.tsxindex 7b453e532..37e11c186 100644--- a/public/pages/Home/components/ShareFeedback.tsx+++ b/public/pages/Home/components/ShareFeedback.tsx@@ -200,8 +200,15 @@ export const ShareFeedback: React.FC<ShareFeedbackProps> = (props) => {}}- const onEmailSent = (email: string) => {- window.location.href = "/loginemailsent?email=" + encodeURIComponent(email)+ const onCodeVerified = (result: { showProfileCompletion?: boolean; code?: string }): void => {+ if (result.showProfileCompletion && result.code) {+ // User needs to complete profile - redirect to profile completion page+ // The cached feedback will be preserved for after profile setup+ location.href = `/signin/complete?code=${encodeURIComponent(result.code)}`+ } else {+ // User is authenticated - finalize the feedback submission+ finaliseFeedback()+ }}const handleEditorFocus = () => {@@ -274,7 +281,7 @@ export const ShareFeedback: React.FC<ShareFeedbackProps> = (props) => {</h2><SignInControlonSubmit={onSubmitFeedback}- onEmailSent={onEmailSent}+ onCodeVerified={onCodeVerified}signInButtonText={i18n._({ id: "signin.message.email", message: "Continue with Email" })}useEmail={true}redirectTo={fider.settings.baseURL}diff --git a/public/pages/SignIn/SignIn.page.tsx b/public/pages/SignIn/SignIn.page.tsxindex ac5392d8e..e13fdc711 100644--- a/public/pages/SignIn/SignIn.page.tsx+++ b/public/pages/SignIn/SignIn.page.tsx@@ -1,6 +1,5 @@import React from "react"import { SignInControl, TenantLogo, LegalNotice } from "@fider/components"-import { notify } from "@fider/services"import { Trans } from "@lingui/react/macro"import { useFider } from "@fider/hooks"@@ -35,14 +34,19 @@ const Private = (): JSX.Element => {export const SignInPage = () => {const fider = useFider()- const onEmailSent = (email: string) => {- notify.success(- <span>- <Trans id="signin.message.emailsent">- We have just sent a confirmation link to <b>{email}</b>. Click the link and you’ll be signed in.- </Trans>- </span>- )+ const onCodeVerified = (result: { showProfileCompletion?: boolean; code?: string }) => {+ if (result.showProfileCompletion && result.code) {+ // User needs to complete profile - redirect to profile completion page+ location.href = `/signin/complete?code=${encodeURIComponent(result.code)}`+ } else {+ // User is authenticated - redirect to the appropriate URL+ const redirect = new URLSearchParams(window.location.search).get("redirect")+ if (redirect && redirect.startsWith("/")) {+ location.href = fider.settings.baseURL + redirect+ } else {+ location.href = fider.settings.baseURL+ }+ }}const getRedirectToUrl = () => {@@ -63,7 +67,7 @@ export const SignInPage = () => {</div><div className="text-center w-max-4xl mx-auto mb-4">{fider.session.tenant.isPrivate ? <Private /> : <Locked />}</div>- <SignInControl onEmailSent={onEmailSent} useEmail={true} redirectTo={getRedirectToUrl()} />+ <SignInControl onCodeVerified={onCodeVerified} useEmail={true} redirectTo={getRedirectToUrl()} /><LegalNotice /></div>)