Skip to content

Public Release #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AnthonyRonning merged 6 commits into from
Jan 28, 2025
Merged

Public Release #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c74b204
Remove invite code on signup
AnthonyRonning Jan 27, 2025
a6fb73d
Remove waitlist
AnthonyRonning Jan 27, 2025
8106954
Rephrase marketing text
AnthonyRonning Jan 27, 2025
9a946e2
Contact us button
AnthonyRonning Jan 27, 2025
e0cd117
Chats left this week
AnthonyRonning Jan 27, 2025
5a41212
New PCRs
AnthonyRonning Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions frontend/src/routes/auth.$provider.callback.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,16 @@ function OAuthCallback() {
const urlParams = new URLSearchParams(window.location.search);
const code = urlParams.get("code");
const state = urlParams.get("state");
const inviteCode = window.localStorage.getItem(`${provider}_invite_code`) || "";

if (code && state) {
try {
if (provider === "github") {
await handleGitHubCallback(code, state, inviteCode);
await handleGitHubCallback(code, state, "");
} else if (provider === "google") {
await handleGoogleCallback(code, state, inviteCode);
await handleGoogleCallback(code, state, "");
} else {
throw new Error("Unsupported provider");
}
window.localStorage.removeItem(`${provider}_invite_code`); // Clean up
// If successful, redirect to home page after a short delay
setTimeout(() => navigate({ to: "/" }), 2000);
} catch (error) {
Expand Down
103 changes: 8 additions & 95 deletions frontend/src/routes/signup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@ function SignupPage() {
const formData = new FormData(e.currentTarget);
const email = formData.get("email") as string;
const password = formData.get("password") as string;
const inviteCode = formData.get("inviteCode") as string;

try {
await os.signUp(email, password, inviteCode, "ANON");
await os.signUp(email, password, "", "ANON");
setTimeout(() => {
navigate({ to: next || "/" });
window.scrollTo(0, 0);
Expand All @@ -66,41 +65,21 @@ function SignupPage() {

const handleGitHubSignup = async () => {
try {
const inviteCode = (document.getElementById("inviteCode") as HTMLInputElement)?.value;
if (!inviteCode) {
setError("Invite code is required");
return;
}
const { auth_url } = await os.initiateGitHubAuth(inviteCode);
window.localStorage.setItem("github_invite_code", inviteCode);
const { auth_url } = await os.initiateGitHubAuth("");
window.location.href = auth_url;
} catch (error) {
console.error("Failed to initiate GitHub signup:", error);
if (error instanceof Error && error.message.includes("Invalid invite code")) {
setError("Invalid invite code. Please check and try again.");
} else {
setError("Failed to initiate GitHub signup. Please try again.");
}
setError("Failed to initiate GitHub signup. Please try again.");
}
};

const handleGoogleSignup = async () => {
try {
const inviteCode = (document.getElementById("inviteCode") as HTMLInputElement)?.value;
if (!inviteCode) {
setError("Invite code is required");
return;
}
const { auth_url } = await os.initiateGoogleAuth(inviteCode);
window.localStorage.setItem("google_invite_code", inviteCode);
const { auth_url } = await os.initiateGoogleAuth("");
window.location.href = auth_url;
} catch (error) {
console.error("Failed to initiate Google signup:", error);
if (error instanceof Error && error.message.includes("Invalid invite code")) {
setError("Invalid invite code. Please check and try again.");
} else {
setError("Failed to initiate Google signup. Please try again.");
}
setError("Failed to initiate Google signup. Please try again.");
}
};

Expand All @@ -111,11 +90,11 @@ function SignupPage() {
<Mail className="mr-2 h-4 w-4" />
Sign up with Email
</Button>
<Button onClick={() => setSignUpMethod("github")} className="w-full">
<Button onClick={handleGitHubSignup} className="w-full">
<Github className="mr-2 h-4 w-4" />
Sign up with GitHub
</Button>
<Button onClick={() => setSignUpMethod("google")} className="w-full">
<Button onClick={handleGoogleSignup} className="w-full">
<Google className="mr-2 h-4 w-4" />
Sign up with Google
</Button>
Expand All @@ -129,71 +108,9 @@ function SignupPage() {
);
}

if (signUpMethod === "github") {
return (
<form
onSubmit={(e) => {
e.preventDefault();
handleGitHubSignup();
}}
>
<AuthMain title="Sign Up with GitHub" description="Invite code required for beta access.">
{error && <AlertDestructive title="Error" description={error} />}
<div className="grid gap-2">
<Label htmlFor="inviteCode">Invite Code</Label>
<Input id="inviteCode" name="inviteCode" type="text" required />
</div>
<Button type="submit" className="w-full">
<Github className="mr-2 h-4 w-4" />
Continue with GitHub
</Button>
<Button
type="button"
variant="outline"
onClick={() => setSignUpMethod(null)}
className="w-full"
>
Back
</Button>
</AuthMain>
</form>
);
}

if (signUpMethod === "google") {
return (
<form
onSubmit={(e) => {
e.preventDefault();
handleGoogleSignup();
}}
>
<AuthMain title="Sign Up with Google" description="Invite code required for beta access.">
{error && <AlertDestructive title="Error" description={error} />}
<div className="grid gap-2">
<Label htmlFor="inviteCode">Invite Code</Label>
<Input id="inviteCode" name="inviteCode" type="text" required />
</div>
<Button type="submit" className="w-full">
<Google className="mr-2 h-4 w-4" />
Continue with Google
</Button>
<Button
type="button"
variant="outline"
onClick={() => setSignUpMethod(null)}
className="w-full"
>
Back
</Button>
</AuthMain>
</form>
);
}

return (
<form onSubmit={handleSubmit}>
<AuthMain title="Sign Up with Email" description="Invite code required for beta access.">
<AuthMain title="Sign Up with Email">
{error && <AlertDestructive title="Error" description={error} />}
<div className="grid gap-2">
<Label htmlFor="email">Email</Label>
Expand All @@ -217,10 +134,6 @@ function SignupPage() {
autoComplete="new-password"
/>
</div>
<div className="grid gap-2">
<Label htmlFor="inviteCode">Invite Code</Label>
<Input id="inviteCode" name="inviteCode" type="text" required />
</div>
<Button type="submit" className="w-full" disabled={isLoading}>
{isLoading ? (
<>
Expand Down