Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion apps/web/app/(org)/dashboard/_components/Navbar/Items.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,8 @@ const AdminNavItems = ({ toggleMobileNav }: Props) => {
className="duration-200 size-3 text-gray-10"
/>
<p className="w-full text-[11px] flex-1 duration-200 truncate leading-0 text-gray-11">
{activeOrg?.organization.customDomain
{activeOrg?.organization.customDomain &&
activeOrg?.organization.domainVerified
? activeOrg?.organization.customDomain
: "No custom domain set"}
</p>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/(org)/login/form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ const NormalLogin = ({
</motion.div>
<motion.p
layout="position"
className="mt-3 text-xs text-center text-gray-9"
className="mt-3 mb-2 text-xs text-center text-gray-9"
>
Don't have an account?{" "}
<Link
Expand Down
27 changes: 27 additions & 0 deletions apps/web/app/s/[videoId]/_components/AuthOverlay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@ import { Button, Dialog, DialogContent, Input, LogoBadge } from "@cap/ui";
import { faArrowLeft, faEnvelope } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { AnimatePresence } from "framer-motion";
import Image from "next/image";
import Link from "next/link";
import { useParams } from "next/navigation";
import { signIn } from "next-auth/react";
import { useId, useState } from "react";
import { toast } from "sonner";
import { trackEvent } from "@/app/utils/analytics";
import OtpForm from "./OtpForm";

interface AuthOverlayProps {
Expand Down Expand Up @@ -133,6 +136,7 @@ const StepOne = ({
setLastResendTime: (time: number | null) => void;
emailId: string;
}) => {
const videoId = useParams().videoId;
return (
<form
onSubmit={async (e) => {
Expand Down Expand Up @@ -192,6 +196,29 @@ const StepOne = ({
: "Email sent to your inbox"
: "Continue with Email"}
</Button>
<div className="flex gap-4 items-center">
<span className="flex-1 h-px bg-gray-5" />
<p className="text-sm text-center text-gray-10">OR</p>
<span className="flex-1 h-px bg-gray-5" />
</div>
<Button
variant="gray"
type="button"
className="flex gap-2 justify-center items-center my-1 w-full text-sm"
onClick={() => {
trackEvent("auth_started", { method: "google", is_signup: true });
setLoading(true);
signIn("google", {
redirect: false,
callbackUrl: `${window.location.origin}/s/${videoId}`,
});
setLoading(false);
}}
disabled={loading}
>
<Image src="/google.svg" alt="Google" width={16} height={16} />
Login with Google
</Button>
</form>
);
};
Loading