Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
8 changes: 8 additions & 0 deletions client/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,11 @@
"bg-muted",
"bg-popover",
"bg-success",
"bg-surface-brand-primary",
"bg-surface-brand-primary-hover",
"bg-surface-brand-primary-pressed",
"border-accent",
"border-content-neutral-tertiary",
"border-input",
"border-muted",
"border-primary",
Expand Down Expand Up @@ -116,7 +120,11 @@
"nowheel",
"pl-property-input-position",
"right-data-pill-panel-placement",
"rounded-xs",
"text-accent-foreground",
"text-content-neutral-primary",
"text-content-neutral-secondary",
"text-content-neutral-tertiary",
"text-destructive",
"text-muted-foreground",
"text-success",
Expand Down
18 changes: 1 addition & 17 deletions client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
ZapIcon,
} from 'lucide-react';
import {useEffect, useState} from 'react';
import {Outlet, useLocation, useNavigate} from 'react-router-dom';
import {Outlet, useLocation} from 'react-router-dom';

const user = {
email: 'emily.selman@example.com',
Expand Down Expand Up @@ -108,7 +108,6 @@ function App() {
getAccount,
reset: resetAuthentication,
sessionHasBeenFetched,
showLogin,
} = useAuthenticationStore();

const {copilotPanelOpen} = useCopilotStore();
Expand All @@ -119,8 +118,6 @@ function App() {

const location = useLocation();

const navigate = useNavigate();

const queryClient = useQueryClient();

const ff_1023 = useFeatureFlagsStore()('ff-1023');
Expand Down Expand Up @@ -176,19 +173,6 @@ function App() {
getApplicationInfo();
}, [getApplicationInfo]);

useEffect(() => {
if (showLogin) {
navigate('/login');
}
}, [showLogin, navigate]);

useEffect(() => {
if (sessionHasBeenFetched && !authenticated) {
navigate('/login');
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [authenticated, sessionHasBeenFetched]);

useEffect(() => {
if (!authenticated) {
analytics.reset();
Expand Down
10 changes: 10 additions & 0 deletions client/src/pages/account/images/github-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions client/src/pages/account/images/google-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions client/src/pages/account/public/AccountErrorPage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import {Button} from '@/components/ui/button';
import {Card, CardDescription, CardHeader, CardTitle} from '@/components/ui/card';
import PublicLayoutContainer from '@/shared/layout/PublicLayoutContainer';
import {XCircleIcon} from 'lucide-react';
import {Link, useLocation} from 'react-router-dom';

const AccountErrorPage = () => {
const location = useLocation();

return (
<PublicLayoutContainer>
<Card className="mx-auto flex max-w-sm flex-col gap-6 rounded-xl p-6 text-center shadow-none">
<XCircleIcon className="mx-auto size-12 text-destructive" />

<CardHeader className="p-0">
<CardTitle className="self-center text-xl font-bold text-content-neutral-primary">Error</CardTitle>

<CardDescription className="self-center text-center text-content-neutral-secondary">
{location.state.error ? `${location.state.error}` : 'Something went wrong. Try again.'}
</CardDescription>
</CardHeader>

<Link to="/">
<Button className="h-10 w-fit space-x-2 bg-surface-brand-primary hover:bg-surface-brand-primary-hover active:bg-surface-brand-primary-pressed">
Go back
</Button>
</Link>
</Card>
</PublicLayoutContainer>
);
};

export default AccountErrorPage;
66 changes: 0 additions & 66 deletions client/src/pages/account/public/Activate.tsx

This file was deleted.

Loading
Loading