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.

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

OV-44: Add Not found page #58

Merged
merged 24 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
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
62 changes: 62 additions & 0 deletions frontend/src/bundles/common/components/animated404/animated404.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import { motion } from 'framer-motion';

import {
CIRCLE_TRANSITION,
CIRCLE_VARIANTS,
} from './libs/constants/animation-config.js';

const Animated404: React.FC = () => (
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const Animated404: React.FC = () => (
const NotFoundAnimation: React.FC = () => (

<motion.svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 200 82.7"
width="500"
height="400"
aria-hidden="true"
>
<g>
<text
transform="matrix(1.2187 0 0 1 13 75.6393)"
fill="white"
fontSize="83"
fontFamily="FootlightMTLight"
aria-hidden="true"
>
4
</text>
<text
transform="matrix(1.2187 0 0 1 133 73.6393)"
fill="white"
fontSize="83"
fontFamily="FootlightMTLight"
aria-hidden="true"
>
4
</text>
</g>
<g>
<motion.path
d="M81.8,29.2c4.1-5.7,10.7-9.4,18.3-9.4c6.3,0,12.1,2.7,16.1,6.9c0.6-0.4,1.1-0.7,1.7-1.1
c-4.4-4.8-10.8-7.9-17.8-7.9c-8.3,0-15.6,4.2-20,10.6C80.7,28.5,81.3,28.8,81.8,29.2z"
fill="white"
aria-hidden="true"
/>
<motion.path
d="M118.1,53.7c-4,5.7-10.7,9.5-18.2,9.5c-6.3,0-12.1-2.6-16.2-6.8c-0.6,0.4-1.1,0.7-1.7,1.1
c4.4,4.8,10.8,7.8,17.9,7.8c8.3,0,15.6-4.3,19.9-10.7C119.2,54.5,118.6,54.1,118.1,53.7z"
fill="white"
aria-hidden="true"
/>
<motion.circle
cx="100"
cy="41"
r="1"
fill="white"
variants={CIRCLE_VARIANTS}
animate="animate"
transition={CIRCLE_TRANSITION}
/>
</g>
</motion.svg>
);

export { Animated404 };
XCODE89 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
const CIRCLE_VARIANTS = {
animate: {
r: [1, 5, 10, 15, 20],
opacity: [0.9, 0.3, 0.2, 0.1, 0],
},
};

const CIRCLE_TRANSITION = {
repeat: Number.POSITIVE_INFINITY,
ease: 'easeOut',
duration: 2,
};

export { CIRCLE_TRANSITION, CIRCLE_VARIANTS };
4 changes: 3 additions & 1 deletion frontend/src/bundles/common/components/components.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
export { Animated404 } from './animated404/animated404.js';
export { Button } from './button/button.js';
export { Header } from './header/header.js';
export { Input } from './input/input.js';
export { Link } from './link/link.js';
export { Loader } from './loader/loader.js';
export { Overlay } from './overlay/overlay.js';
export { Player } from './player/player.js';
export { ProtectedRoute } from './protected-route/protected-route.js';
export { RouterProvider } from './router-provider/router-provider.js';
export { VideoModal } from './video-modal/video-modal.js';
export { DownloadIcon } from '@chakra-ui/icons';
Expand All @@ -30,4 +32,4 @@ export {
} from '@chakra-ui/react';
export { FormikProvider as FormProvider } from 'formik';
export { Provider as StoreProvider } from 'react-redux';
export { Outlet as RouterOutlet } from 'react-router-dom';
export { Navigate, Outlet as RouterOutlet } from 'react-router-dom';
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you did this in the other pull request so I guess this is not needed here

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { Navigate } from '~/bundles/common/components/components.js';
import { AppRoute } from '~/bundles/common/enums/enums.js';

interface Properties {
children: React.ReactNode;
}

const ProtectedRoute: React.FC<Properties> = ({ children }) => {
XCODE89 marked this conversation as resolved.
Show resolved Hide resolved
// TODO: When persistence is implemented, the user will be taken from the store. The following line is temporary
const user = true;
return user ? children : <Navigate to={AppRoute.SIGN_IN} replace />;
};

export { ProtectedRoute };
22 changes: 22 additions & 0 deletions frontend/src/bundles/common/pages/not-found/not-found.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import {
Box,
Center,
Heading,
} from '~/bundles/common/components/components.js';

import { Animated404 } from '../../components/animated404/animated404.js';

const NotFound: React.FC = () => {
return (
<Center height="100vh" bg="background.900">
<Box textAlign="center">
<Animated404 />
<Heading variant="H3" mt={4} as="span">
Page not found
</Heading>
</Box>
</Center>
);
};

export { NotFound };
20 changes: 0 additions & 20 deletions frontend/src/router/components/protected-route.tsx
XCODE89 marked this conversation as resolved.
Outdated
Show resolved Hide resolved

This file was deleted.

32 changes: 27 additions & 5 deletions frontend/src/router/routes.tsx
XCODE89 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,14 +1,36 @@
import { App } from '~/app/app.js';
import { AppRoute } from '~/bundles/common/enums/app-route.enum.js';

import { protectedRoutes } from './routes/protected-routes.js';
import { publicRoutes } from './routes/public-routes.js';
import { Auth } from '~/bundles/auth/pages/auth.js';
import { ProtectedRoute } from '~/bundles/common/components/components.js';
import { AppRoute } from '~/bundles/common/enums/enums.js';
import { NotFound } from '~/bundles/common/pages/not-found/not-found.js';
import { Studio } from '~/bundles/studio/pages/studio.js';

const routes = [
{
path: AppRoute.ROOT,
element: <App />,
children: [protectedRoutes, ...publicRoutes],
children: [
XCODE89 marked this conversation as resolved.
Show resolved Hide resolved
{
path: AppRoute.SIGN_IN,
element: <Auth />,
},
{
path: AppRoute.SIGN_UP,
element: <Auth />,
},
{
path: AppRoute.STUDIO,
element: (
<ProtectedRoute>
<Studio />,
</ProtectedRoute>
),
},
{
path: AppRoute.ANY,
element: <NotFound />,
},
],
},
];

Expand Down
29 changes: 0 additions & 29 deletions frontend/src/router/routes/protected-routes.tsx

This file was deleted.

15 changes: 0 additions & 15 deletions frontend/src/router/routes/public-routes.tsx

This file was deleted.

Loading