Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Changed signup flow - no more modal.

Matt Robertseae6ed3fd3da
diff --git a/app/actions/tenant.go b/app/actions/tenant.go
index f9aeec544..9ecb47c03 100644
--- a/app/actions/tenant.go
+++ b/app/actions/tenant.go
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
"time"
-
+
"github.com/getfider/fider/app/models/query"
"github.com/getfider/fider/app/pkg/bus"
@@ -163,21 +163,14 @@ func (action *ResendSignUpEmail) Validate(ctx context.Context, user *entity.User
return validate.Error(err)
}
- // Check if last resend was within 5 minutes (rate limiting)
+ // Check if last resend was within 1 minutes (rate limiting)
if pendingVerification.Result != nil {
timeSinceLastSend := time.Since(pendingVerification.Result.CreatedAt)
- if timeSinceLastSend < 5*time.Minute {
- remainingTime := 5*time.Minute - timeSinceLastSend
- remainingMinutes := int(remainingTime.Minutes())
+ if timeSinceLastSend < 1*time.Minute {
+ remainingTime := 1*time.Minute - timeSinceLastSend
remainingSeconds := int(remainingTime.Seconds()) % 60
-
- var message string
- if remainingMinutes > 0 {
- message = fmt.Sprintf("Please wait %d minute(s) and %d second(s) before requesting another verification email.", remainingMinutes, remainingSeconds)
- } else {
- message = fmt.Sprintf("Please wait %d second(s) before requesting another verification email.", remainingSeconds)
- }
-
+
+ message := fmt.Sprintf("Please wait %d seconds to resend the verification email.", remainingSeconds)
result.AddFieldFailure("", message)
}
}
diff --git a/public/pages/SignUp/SignUp.page.tsx b/public/pages/SignUp/SignUp.page.tsx
index f9851527e..e0521bb36 100644
--- a/public/pages/SignUp/SignUp.page.tsx
+++ b/public/pages/SignUp/SignUp.page.tsx
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react"
-import { SignInControl, Modal, Button, DisplayError, Form, Input, Message, LegalAgreement } from "@fider/components"
+import { SignInControl, Button, DisplayError, Form, Input, Message, LegalAgreement } from "@fider/components"
import { jwt, actions, Failure, querystring, Fider } from "@fider/services"
import { Divider } from "@fider/components/layout"
import { useFider } from "@fider/hooks"
@@ -19,7 +19,6 @@ interface SubdomainState {
const SignUpPage = () => {
const fider = useFider()
- const [isSubmitted, setIsSubmitted] = useState(false)
const [isLegalAgreed, setIsLegalAgreed] = useState(false)
const [tenantName, setTenantName] = useState("")
const [userName, setUserName] = useState("")
@@ -51,23 +50,18 @@ const SignUpPage = () => {
})
if (result.ok) {
- if (user) {
- if (fider.isSingleHostMode()) {
- location.reload()
- } else {
- let baseURL = `${location.protocol}//${subdomain.name}${fider.settings.domain}`
- if (location.port) {
- baseURL = `${baseURL}:${location.port}`
- }
-
- location.href = baseURL
- }
+ if (fider.isSingleHostMode()) {
+ location.reload()
} else {
- setIsSubmitted(true)
+ let baseURL = `${location.protocol}//${subdomain.name}${fider.settings.domain}`
+ if (location.port) {
+ baseURL = `${baseURL}:${location.port}`
+ }
+
+ location.href = baseURL
}
} else if (result.error) {
setError(result.error)
- setIsSubmitted(false)
}
}
@@ -103,25 +97,8 @@ const SignUpPage = () => {
}
}, [subdomain.name])
- const noop = () => {
- // do nothing
- }
-
- const modal = (
- <Modal.Window canClose={false} isOpen={isSubmitted} onClose={noop}>
- <Modal.Header>Thank you for registering!</Modal.Header>
- <Modal.Content>
- <p>
- We have just sent a confirmation link to <b>{userEmail}</b>.
- </p>
- <p>Click the link to complete the registration.</p>
- </Modal.Content>
- </Modal.Window>
- )
-
return (
<div id="p-signup" className="page container w-max-6xl">
- {modal}
<div className="h-20 text-center mb-4">
<img className="logo" alt="Logo" src="https://fider.io/images/logo-100x100.png" />
</div>