update css and authform - stealtech, add register js and fix register backend
This commit is contained in:
parent
f39d1cdbf8
commit
d1dc1b4bf0
4 changed files with 225 additions and 147 deletions
|
@ -73,9 +73,13 @@ async function handler(
|
|||
?.count,
|
||||
) === 0;
|
||||
|
||||
let inviteValid: boolean = true;
|
||||
if (!firstUser && invite) {
|
||||
const inviteValidation: { valid: boolean; error?: string } =
|
||||
isValidInvite(invite);
|
||||
|
||||
inviteValid = inviteValidation.valid;
|
||||
|
||||
if (!inviteValidation.valid && inviteValidation.error) {
|
||||
errors.push(inviteValidation.error);
|
||||
}
|
||||
|
@ -103,7 +107,7 @@ async function handler(
|
|||
errors.push("Username or email already exists");
|
||||
}
|
||||
|
||||
if (invite && !firstUser) {
|
||||
if (invite && inviteValid && !firstUser) {
|
||||
[inviteData] =
|
||||
await reservation`SELECT * FROM invites WHERE id = ${invite};`;
|
||||
|
||||
|
|
|
@ -1,49 +1,60 @@
|
|||
<div class="auth-form">
|
||||
<div class="error-message" id="error-message">
|
||||
<%= pageType === "register" ? "Registration failed. Please try again." : "Invalid email or password. Please try again." %>
|
||||
</div>
|
||||
<div class="error-message" id="error-message">
|
||||
<%= pageType==="register" ? "Registration failed. Please try again."
|
||||
: "Invalid email or password. Please try again." %>
|
||||
</div>
|
||||
|
||||
<form id="<%= pageType === "register" ? "register-form" : "login-form" %>" class="form">
|
||||
<% if (pageType === "register") { %>
|
||||
<div class="form-group">
|
||||
<label for="username">Username</label>
|
||||
<input type="text" name="username" id="username" required placeholder="Enter your username">
|
||||
</div>
|
||||
<% } %>
|
||||
<form id="<%= pageType === "register" ? "register-form" : "login-form" %>" class="form">
|
||||
<% if (pageType==="register") { %>
|
||||
<div class="form-group">
|
||||
<label for="username">Username</label>
|
||||
<input type="text" name="username" id="username" required placeholder="Enter your username">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="email">Email</label>
|
||||
<input type="email" name="email" id="email" required placeholder="Enter your email">
|
||||
</div>
|
||||
<% if (requires_invite === true) { %>
|
||||
<div class="form-group">
|
||||
<label for="invite">Invite Code</label>
|
||||
<input type="text" name="invite" id="invite-code" required placeholder="Enter your invite code">
|
||||
</div>
|
||||
<% } %>
|
||||
<% } %>
|
||||
|
||||
<div class="form-group password-group">
|
||||
<label for="password">Password</label>
|
||||
<div class="password-wrapper">
|
||||
<input type="password" name="password" id="password" required placeholder="Enter your password">
|
||||
<svg id="toggle-password" class="toggle-password" viewBox="0 0 24 24">
|
||||
<path d="M12 4.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5zm0 13c-3.03 0-5.5-2.47-5.5-5.5s2.47-5.5 5.5-5.5 5.5 2.47 5.5 5.5-2.47 5.5-5.5 5.5zm0-9a3.5 3.5 0 100 7 3.5 3.5 0 000-7z"/>
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="email">Email</label>
|
||||
<input type="email" name="email" id="email" required placeholder="Enter your email">
|
||||
</div>
|
||||
|
||||
<% if (pageType !== "register") { %>
|
||||
<div class="form-footer">
|
||||
<label>
|
||||
<input type="checkbox" name="remember" id="remember-me">Remember me
|
||||
</label>
|
||||
<a href="/auth/forgot-password">Forgot password?</a>
|
||||
</div>
|
||||
<% } %>
|
||||
<div class="form-group password-group">
|
||||
<label for="password">Password</label>
|
||||
<div class="password-wrapper">
|
||||
<input type="password" name="password" id="password" required placeholder="Enter your password">
|
||||
<svg id="toggle-password" class="toggle-password" viewBox="0 0 24 24">
|
||||
<path
|
||||
d="M12 4.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5zm0 13c-3.03 0-5.5-2.47-5.5-5.5s2.47-5.5 5.5-5.5 5.5 2.47 5.5 5.5-2.47 5.5-5.5 5.5zm0-9a3.5 3.5 0 100 7 3.5 3.5 0 000-7z" />
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button type="submit"><%= pageType === "register" ? "Register" : "Login" %></button>
|
||||
</form>
|
||||
<% if (pageType !=="register" ) { %>
|
||||
<div class="form-footer">
|
||||
<label>
|
||||
<input type="checkbox" name="remember" id="remember-me">Remember me
|
||||
</label>
|
||||
<a href="/auth/forgot-password">Forgot password?</a>
|
||||
</div>
|
||||
<% } %>
|
||||
|
||||
<div class="auth-toggle">
|
||||
<p>
|
||||
<%= pageType === "register" ? "Already have an account?" : "Don't have an account?" %>
|
||||
<a href="<%= pageType === 'register' ? '/auth/login' : '/auth/register' %>" class="auth-link">
|
||||
<%= pageType === "register" ? "Login" : "Register" %>
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
<button type="submit">
|
||||
<%= pageType==="register" ? "Register" : "Login" %>
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<div class="auth-toggle">
|
||||
<p>
|
||||
<%= pageType==="register" ? "Already have an account?" : "Don't have an account?" %>
|
||||
<a href="<%= pageType === 'register' ? '/auth/login' : '/auth/register' %>" class="auth-link">
|
||||
<%= pageType==="register" ? "Login" : "Register" %>
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue