mirror of
https://github.com/khoaliber/khoj.git
synced 2026-03-09 21:29:11 +00:00
Update the styling to align with Google branding via the sign in button
- Disable the gsi client side code since it's being finnicky and inconsistent
This commit is contained in:
@@ -0,0 +1,115 @@
|
|||||||
|
.gsiMaterialButton {
|
||||||
|
-moz-user-select: none;
|
||||||
|
-webkit-user-select: none;
|
||||||
|
-ms-user-select: none;
|
||||||
|
-webkit-appearance: none;
|
||||||
|
background-color: WHITE;
|
||||||
|
background-image: none;
|
||||||
|
/* border: 1px solid #747775; */
|
||||||
|
-webkit-border-radius: 20px;
|
||||||
|
border-radius: 20px;
|
||||||
|
-webkit-box-sizing: border-box;
|
||||||
|
box-sizing: border-box;
|
||||||
|
color: #1f1f1f;
|
||||||
|
cursor: pointer;
|
||||||
|
font-family: "Roboto", arial, sans-serif;
|
||||||
|
font-size: 14px;
|
||||||
|
height: 40px;
|
||||||
|
letter-spacing: 0.25px;
|
||||||
|
outline: none;
|
||||||
|
overflow: hidden;
|
||||||
|
padding: 0;
|
||||||
|
position: relative;
|
||||||
|
text-align: center;
|
||||||
|
-webkit-transition:
|
||||||
|
background-color 0.218s,
|
||||||
|
border-color 0.218s,
|
||||||
|
box-shadow 0.218s;
|
||||||
|
transition:
|
||||||
|
background-color 0.218s,
|
||||||
|
border-color 0.218s,
|
||||||
|
box-shadow 0.218s;
|
||||||
|
vertical-align: middle;
|
||||||
|
white-space: nowrap;
|
||||||
|
width: 40px;
|
||||||
|
max-width: 400px;
|
||||||
|
min-width: min-content;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gsiMaterialButton .gsiMaterialButtonIcon {
|
||||||
|
height: 100%;
|
||||||
|
margin-right: 12px;
|
||||||
|
min-width: 20px;
|
||||||
|
width: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 9px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gsiMaterialButton .gsiMaterialButtonContentWrapper {
|
||||||
|
-webkit-align-items: center;
|
||||||
|
align-items: center;
|
||||||
|
display: flex;
|
||||||
|
-webkit-flex-direction: row;
|
||||||
|
flex-direction: row;
|
||||||
|
-webkit-flex-wrap: nowrap;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
height: 100%;
|
||||||
|
justify-content: space-between;
|
||||||
|
position: relative;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gsiMaterialButton .gsiMaterialButtonContents {
|
||||||
|
-webkit-flex-grow: 1;
|
||||||
|
flex-grow: 1;
|
||||||
|
font-family: "Roboto", arial, sans-serif;
|
||||||
|
font-weight: 500;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
vertical-align: top;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gsiMaterialButton .gsiMaterialButtonState {
|
||||||
|
-webkit-transition: opacity 0.218s;
|
||||||
|
transition: opacity 0.218s;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
opacity: 0;
|
||||||
|
position: absolute;
|
||||||
|
right: 0;
|
||||||
|
top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gsiMaterialButton:disabled {
|
||||||
|
cursor: default;
|
||||||
|
background-color: #ffffff61;
|
||||||
|
border-color: #1f1f1f1f;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gsiMaterialButton:disabled .gsiMaterialButtonContents {
|
||||||
|
opacity: 38%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gsiMaterialButton:disabled .gsiMaterialButtonIcon {
|
||||||
|
opacity: 38%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gsiMaterialButton:not(:disabled):active .gsiMaterialButton-State,
|
||||||
|
.gsiMaterialButton:not(:disabled):focus .gsiMaterialButtonState {
|
||||||
|
background-color: #303030;
|
||||||
|
opacity: 12%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gsiMaterialButton:not(:disabled):hover {
|
||||||
|
-webkit-box-shadow:
|
||||||
|
0 1px 2px 0 rgba(60, 64, 67, 0.3),
|
||||||
|
0 1px 3px 1px rgba(60, 64, 67, 0.15);
|
||||||
|
box-shadow:
|
||||||
|
0 1px 2px 0 rgba(60, 64, 67, 0.3),
|
||||||
|
0 1px 3px 1px rgba(60, 64, 67, 0.15);
|
||||||
|
}
|
||||||
|
|
||||||
|
.gsiMaterialButton:not(:disabled):hover .gsiMaterialButtonState {
|
||||||
|
background-color: #303030;
|
||||||
|
opacity: 8%;
|
||||||
|
}
|
||||||
@@ -1,3 +1,6 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import styles from "./loginPrompt.module.css";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import {
|
import {
|
||||||
Dialog,
|
Dialog,
|
||||||
@@ -64,6 +67,29 @@ export default function LoginPrompt(props: LoginPromptProps) {
|
|||||||
setAutoRotate(false);
|
setAutoRotate(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const google = (window as any).google;
|
||||||
|
|
||||||
|
console.log(data, isLoading, error);
|
||||||
|
|
||||||
|
if (!google) return;
|
||||||
|
|
||||||
|
// Initialize Google Sign In after script loads
|
||||||
|
google.accounts.id.initialize({
|
||||||
|
client_id: data?.google?.client_id,
|
||||||
|
callback: handleGoogleSignIn,
|
||||||
|
auto_select: false,
|
||||||
|
login_uri: data?.google?.redirect_uri,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Render the button
|
||||||
|
google.accounts.id.renderButton(document.getElementById("g_id_signin")!, {
|
||||||
|
theme: "outline",
|
||||||
|
size: "large",
|
||||||
|
width: "100%",
|
||||||
|
});
|
||||||
|
}, [data]);
|
||||||
|
|
||||||
const handleGoogleSignIn = () => {
|
const handleGoogleSignIn = () => {
|
||||||
if (!data?.google?.client_id || !data?.google?.redirect_uri) return;
|
if (!data?.google?.client_id || !data?.google?.redirect_uri) return;
|
||||||
|
|
||||||
@@ -85,16 +111,22 @@ export default function LoginPrompt(props: LoginPromptProps) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleGoogleScriptLoad = () => {
|
const handleGoogleScriptLoad = () => {
|
||||||
|
const google = (window as any).google;
|
||||||
|
|
||||||
|
console.log(data, isLoading, error);
|
||||||
|
|
||||||
|
if (!data?.google?.client_id || !data?.google?.redirect_uri) return;
|
||||||
|
|
||||||
// Initialize Google Sign In after script loads
|
// Initialize Google Sign In after script loads
|
||||||
window.google.accounts.id.initialize({
|
google.accounts.id.initialize({
|
||||||
client_id: "blahblahblah.apps.googleusercontent.com",
|
client_id: data?.google?.client_id,
|
||||||
callback: handleGoogleSignIn,
|
callback: handleGoogleSignIn,
|
||||||
auto_select: false,
|
auto_select: false,
|
||||||
login_uri: "http://localhost:42110/auth/redirect",
|
login_uri: data?.google?.redirect_uri,
|
||||||
});
|
});
|
||||||
|
|
||||||
// Render the button
|
// Render the button
|
||||||
window.google.accounts.id.renderButton(document.getElementById("g_id_signin")!, {
|
google.accounts.id.renderButton(document.getElementById("g_id_signin")!, {
|
||||||
theme: "outline",
|
theme: "outline",
|
||||||
size: "large",
|
size: "large",
|
||||||
width: "100%",
|
width: "100%",
|
||||||
@@ -172,6 +204,7 @@ export default function LoginPrompt(props: LoginPromptProps) {
|
|||||||
isLoading={isLoading}
|
isLoading={isLoading}
|
||||||
data={data}
|
data={data}
|
||||||
setUseEmailSignIn={setUseEmailSignIn}
|
setUseEmailSignIn={setUseEmailSignIn}
|
||||||
|
isMobileWidth={props.isMobileWidth}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@@ -209,6 +242,7 @@ export default function LoginPrompt(props: LoginPromptProps) {
|
|||||||
isLoading={isLoading}
|
isLoading={isLoading}
|
||||||
data={data}
|
data={data}
|
||||||
setUseEmailSignIn={setUseEmailSignIn}
|
setUseEmailSignIn={setUseEmailSignIn}
|
||||||
|
isMobileWidth={props.isMobileWidth ?? false}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@@ -314,6 +348,7 @@ function MainSignInContext({
|
|||||||
isLoading,
|
isLoading,
|
||||||
data,
|
data,
|
||||||
setUseEmailSignIn,
|
setUseEmailSignIn,
|
||||||
|
isMobileWidth,
|
||||||
}: {
|
}: {
|
||||||
tips: { src: string; alt: string }[];
|
tips: { src: string; alt: string }[];
|
||||||
currentTip: number;
|
currentTip: number;
|
||||||
@@ -324,35 +359,40 @@ function MainSignInContext({
|
|||||||
isLoading: boolean;
|
isLoading: boolean;
|
||||||
data: CredentialsData | undefined;
|
data: CredentialsData | undefined;
|
||||||
setUseEmailSignIn: (useEmailSignIn: boolean) => void;
|
setUseEmailSignIn: (useEmailSignIn: boolean) => void;
|
||||||
|
isMobileWidth: boolean;
|
||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col gap-4 p-4">
|
<div className="flex flex-col gap-4 p-4">
|
||||||
<div className="relative w-full h-80 overflow-hidden rounded-t-lg">
|
{!isMobileWidth && (
|
||||||
{tips.map((tip, index) => (
|
<div className="relative w-full h-80 overflow-hidden rounded-t-lg">
|
||||||
<img
|
{tips.map((tip, index) => (
|
||||||
key={tip.src}
|
<img
|
||||||
src={tip.src}
|
key={tip.src}
|
||||||
alt={tip.alt}
|
src={tip.src}
|
||||||
className={`absolute w-full h-full object-cover transition-all duration-500 ease-in-out ${
|
alt={tip.alt}
|
||||||
index === currentTip
|
className={`absolute w-full h-full object-cover transition-all duration-500 ease-in-out ${
|
||||||
? "opacity-100 translate-x-0"
|
index === currentTip
|
||||||
: "opacity-0 translate-x-full"
|
? "opacity-100 translate-x-0"
|
||||||
}`}
|
: index < currentTip
|
||||||
/>
|
? "opacity-0 -translate-x-full"
|
||||||
))}
|
: "opacity-0 translate-x-full"
|
||||||
<Button
|
}`}
|
||||||
onClick={prevSlide}
|
/>
|
||||||
className="absolute left-2 top-1/2 -translate-y-1/2 bg-white/80 hover:bg-white/90 rounded-full p-2 shadow-lg"
|
))}
|
||||||
>
|
<Button
|
||||||
<CaretLeft className="text-black h-6 w-6" />
|
onClick={prevSlide}
|
||||||
</Button>
|
className="absolute left-2 top-1/2 -translate-y-1/2 bg-white/80 hover:bg-white/90 rounded-full p-2 shadow-lg"
|
||||||
<Button
|
>
|
||||||
onClick={nextSlide}
|
<CaretLeft className="text-black h-6 w-6" />
|
||||||
className="absolute right-2 top-1/2 -translate-y-1/2 bg-white/80 hover:bg-white/90 rounded-full p-2 shadow-lg"
|
</Button>
|
||||||
>
|
<Button
|
||||||
<CaretRight className="text-black h-6 w-6" />
|
onClick={nextSlide}
|
||||||
</Button>
|
className="absolute right-2 top-1/2 -translate-y-1/2 bg-white/80 hover:bg-white/90 rounded-full p-2 shadow-lg"
|
||||||
</div>
|
>
|
||||||
|
<CaretRight className="text-black h-6 w-6" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
<div className="flex flex-col gap-4 text-center p-4">
|
<div className="flex flex-col gap-4 text-center p-4">
|
||||||
<div className="text-center font-bold text-lg">
|
<div className="text-center font-bold text-lg">
|
||||||
Sign In for free to start using Khoj: Your AI-powered second brain
|
Sign In for free to start using Khoj: Your AI-powered second brain
|
||||||
@@ -360,7 +400,7 @@ function MainSignInContext({
|
|||||||
</div>
|
</div>
|
||||||
<div className="flex flex-col gap-4 py-4 text-center align-middle items-center">
|
<div className="flex flex-col gap-4 py-4 text-center align-middle items-center">
|
||||||
<GoogleSignIn onLoad={handleGoogleScriptLoad} />
|
<GoogleSignIn onLoad={handleGoogleScriptLoad} />
|
||||||
<div id="g_id_signin" />
|
{/* <div id="g_id_signin" /> */}
|
||||||
<Button
|
<Button
|
||||||
variant="outline"
|
variant="outline"
|
||||||
className="w-[300px] p-6 flex gap-2 items-center justify-center"
|
className="w-[300px] p-6 flex gap-2 items-center justify-center"
|
||||||
@@ -370,7 +410,37 @@ function MainSignInContext({
|
|||||||
{isLoading ? (
|
{isLoading ? (
|
||||||
<Spinner className="h-6 w-6" />
|
<Spinner className="h-6 w-6" />
|
||||||
) : (
|
) : (
|
||||||
<GoogleLogo className="h-6 w-6" />
|
<button className={`${styles.gsiMaterialButton}`}>
|
||||||
|
<div className={styles.gsiMaterialButtonState}></div>
|
||||||
|
<div className={styles.gsiMaterialButtonContentWrapper}>
|
||||||
|
<div className={styles.gsiMaterialButtonIcon}>
|
||||||
|
<svg
|
||||||
|
version="1.1"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
xmlnsXlink="http://www.w3.org/1999/xlink"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
fill="#EA4335"
|
||||||
|
d="M24 9.5c3.54 0 6.71 1.22 9.21 3.6l6.85-6.85C35.9 2.38 30.47 0 24 0 14.62 0 6.51 5.38 2.56 13.22l7.98 6.19C12.43 13.72 17.74 9.5 24 9.5z"
|
||||||
|
></path>
|
||||||
|
<path
|
||||||
|
fill="#4285F4"
|
||||||
|
d="M46.98 24.55c0-1.57-.15-3.09-.38-4.55H24v9.02h12.94c-.58 2.96-2.26 5.48-4.78 7.18l7.73 6c4.51-4.18 7.09-10.36 7.09-17.65z"
|
||||||
|
></path>
|
||||||
|
<path
|
||||||
|
fill="#FBBC05"
|
||||||
|
d="M10.53 28.59c-.48-1.45-.76-2.99-.76-4.59s.27-3.14.76-4.59l-7.98-6.19C.92 16.46 0 20.12 0 24c0 3.88.92 7.54 2.56 10.78l7.97-6.19z"
|
||||||
|
></path>
|
||||||
|
<path
|
||||||
|
fill="#34A853"
|
||||||
|
d="M24 48c6.48 0 11.93-2.13 15.89-5.81l-7.73-6c-2.15 1.45-4.92 2.3-8.16 2.3-6.26 0-11.57-4.22-13.47-9.91l-7.98 6.19C6.51 42.62 14.62 48 24 48z"
|
||||||
|
></path>
|
||||||
|
<path fill="none" d="M0 0h48v48H0z"></path>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</button>
|
||||||
)}
|
)}
|
||||||
Continue with Google
|
Continue with Google
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
Reference in New Issue
Block a user