Skip to content
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

Fix #619 fix login #629

Merged
merged 3 commits into from
Jan 29, 2025
+18 −16
Merged

Fix #619 fix login #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bd266a
change bg and display logo, version and copy rights
Anchel123 Jan 23, 2025
e509ef4
adjust the bg better and fix interaction with the dropzone
Anchel123 Jan 23, 2025
25c6b30
Merge branch 'staging' into fix-login
gkorland Jan 28, 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
2 changes: 1 addition & 1 deletion app/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export default function Header({ onSetGraphName }: Props) {
</NavigationMenu>
</div>
</div>
<div className="h-2 Top" />
<div className="h-2 Gradient" />
</div>
)
}
2 changes: 1 addition & 1 deletion app/components/ui/Dropzone.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function Dropzone({ filesCount = false, className = "", withTable = false, disab
<ArrowDownToLine color='#57577B' />
<span>Or <span className='text-[#7167F6]'>Browse</span></span>
</div>
: <p className={cn('underline underline-offset-2 text-[#99E4E5]', disabled && "opacity-30")}>Upload Certificate</p>
: <p className={cn('underline underline-offset-2 text-[#99E4E5]', disabled ? "opacity-30 cursor-text" : "cursor-pointer")}>Upload Certificate</p>
}
</div>
{
Expand Down
6 changes: 1 addition & 5 deletions app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,7 @@
@apply h-full w-full flex flex-col bg-background;
}

.LandingPage {
background: linear-gradient(180deg, #EC806C 0%, #B66EBD 43.41%, #7568F2 100%);
}

.Top {
.Gradient {
background: linear-gradient(90deg, #EC806C 0%, #B66EBD 43.41%, #7568F2 100%);
}

Expand Down
2 changes: 1 addition & 1 deletion app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default function RootLayout({
// caused by mismatched client/server content caused by next-themes
return (
<html className="w-screen h-screen" lang="en" suppressHydrationWarning>
<body className={`h-full LandingPage ${inter.className}`}>
<body className={`h-full bg-foreground ${inter.className}`}>
<GTM />
<NextAuthProvider>{children}</NextAuthProvider>
<Toaster />
Expand Down
8 changes: 3 additions & 5 deletions app/login/LoginForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,10 @@ export default function LoginForm() {
}

return (
<div className="relative h-full w-full bg-foreground flex flex-col">
<div className="relative h-full w-full flex flex-col">
<div className="grow flex items-center justify-center">
<div className="flex flex-col gap-8 items-center">
<div className="bg-foreground">
<Image priority src="/BrowserLogo.svg" alt="Loading..." width={500} height={1} />
</div>
<Image priority src="/BrowserLogo.svg" alt="Loading..." width={500} height={1} />
<FormComponent
fields={fields}
handleSubmit={onSubmit}
Expand All @@ -144,7 +142,7 @@ export default function LoginForm() {
</FormComponent>
</div>
</div>
<div className="h-5 Top" />
<div className="h-5 Gradient" />
</div>
);
}
14 changes: 11 additions & 3 deletions app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
"use client";

import Spinning from "@/app/components/ui/spinning";
import Image from "next/image";
import pkg from '@/package.json';

export default function Home() {
return (
<div className="h-full LandingPage">
<main className="h-full flex items-center justify-center">
<Spinning/>
<div className="h-full bg-foreground flex flex-col gap-4">
<main className="grow flex flex-col gap-8 items-center justify-center">
<Image priority src="/BrowserLogo.svg" alt="FalkorDB Logo" width={400} height={100} />
<Spinning />
</main>
<div className="flex flex-col gap-8 justify-center items-center">
<p>Version: {`{${pkg.version}}`}</p>
<p className="text-sm">All Rights Reserved © 2024 - {new Date().getFullYear()} falkordb.com</p>
</div>
<div className="h-5 Gradient" />
</div>
)
}
Loading