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

Update styles #1659

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Update styles #1659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 13 additions & 26 deletions deepfence_frontend/apps/dashboard/src/components/error/404.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useLocation, useRouteError } from 'react-router-dom';
import { useRouteError } from 'react-router-dom';

const SVG404 = () => {
return (
Expand Down Expand Up @@ -406,49 +406,36 @@ const SVG404 = () => {

const PageNotFoundComponent = () => {
return (
<div className="flex flex-col h-full items-center pt-20">
<h1 className="text-[140px] text-chart-orange dark:text-chart-orange font-black leading-[190px]">
<div className="flex flex-col h-full items-center sm:pt-10 2xl:pt-20">
<h1 className="sm:text-[80px] 2xl:text-[100px] text-chart-orange dark:text-chart-orange font-black leading-none">
404
</h1>
<h4 className="text-3xl font-semibold text-text-text-and-icon dark:text-text-text-and-icon flex flex-col text-center">
Page not found.
</h4>
<div className="mt-6 w-[455px]">
<SVG404 />
<div className="mt-6 flex flex-col gap-y-14 items-center">
<h4 className="sm:text-base 2xl:text-xl font-semibold text-text-text-and-icon dark:text-text-text-and-icon flex flex-col text-center">
Page not found.
</h4>
<div className="sm:w-[375px] 2xl:w-[455px]">
<SVG404 />
</div>
</div>
</div>
);
};

export const FourZeroFourAuthenticated = () => {
const location = useLocation();
const error = useRouteError();
console.error(error);

if (location.pathname.startsWith('/onboard')) {
return (
<div className="pt-[64px] h-screen">
<PageNotFoundComponent />
</div>
);
}

return (
<main className="pt-[64px] h-screen">
<PageNotFoundComponent />
</main>
);
return <PageNotFoundComponent />;
};

export const FourZeroFourPublic = () => {
const error = useRouteError();
console.error(error);

return (
<div className="fixed inset-0 dark:bg-bg-page">
<div className="h-screen">
<PageNotFoundComponent />
</div>
<div className="fixed inset-0 dark:bg-bg-page py-20">
<PageNotFoundComponent />
</div>
);
};
48 changes: 29 additions & 19 deletions deepfence_frontend/apps/dashboard/src/components/error/500.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,39 @@ import storage from '@/utils/storage';

const ErrorComponent = ({ maintenance }: { maintenance: boolean }) => {
return (
<div className="flex flex-col h-full items-center pt-20">
<div className="flex flex-col h-full items-center sm:pt-10 2xl:pt-20">
{!maintenance ? (
<h1 className="text-[140px] text-chart-orange dark:text-chart-orange font-black leading-[190px]">
<h1 className="sm:text-[80px] 2xl:text-[100px] text-chart-orange dark:text-chart-orange font-black leading-none">
ERROR
</h1>
) : null}
<h4 className="text-3xl font-semibold text-text-text-and-icon dark:text-text-text-and-icon flex flex-col text-center">
<span>
{maintenance
? 'Maintenance in progress...'
: 'An error has occurred, please refresh the page.'}
</span>
<span>
{maintenance
? 'Please try again after some time.'
: 'If problem persists, please contact deepfence.'}
</span>
</h4>
{!maintenance ? (
<div className="mt-12 w-[455px]">
<SVG500 />
</div>
) : null}
<div className="mt-6 flex flex-col gap-y-14 items-center">
<h4
className={cn(
'font-semibold text-text-text-and-icon dark:text-text-text-and-icon flex flex-col text-center',
{
'sm:text-base 2xl:text-xl': !maintenance,
'sm:text-xl 2xl:text-2xl': maintenance,
},
)}
>
<span>
{maintenance
? 'Maintenance in progress...'
: 'An error has occurred, please refresh the page.'}
</span>
<span>
{maintenance
? 'Please try again after some time.'
: 'If problem persists, please contact deepfence.'}
</span>
</h4>
{!maintenance ? (
<div className="sm:w-[375px] 2xl:w-[455px]">
<SVG500 />
</div>
) : null}
</div>
</div>
);
};
Expand Down
Loading