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

Jump to bottom

update: routes #42

Merged
merged 1 commit into from
Nov 26, 2023
Merged

update: routes #42

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
90 changes: 45 additions & 45 deletions src/components/NotFoundPageContainer/NotFoundPageContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
import {Container, Image, SimpleGrid, Text, Title} from "@mantine/core";
import {ButtonGetStarted} from "../ButtonGetStarted/ButtonGetStarted";
import image from "../../images/picture-background-404.png";
import { Container, Image, SimpleGrid, Text, Title } from '@mantine/core';
import image from '../../images/picture-background-404.png';
import { ButtonGetStarted } from '../ButtonGetStarted/ButtonGetStarted';
import './NotFoundPageContainer.scss';

export function NotFoundPageContainer() {
// function handleClick(event) {
// // event.preventDefault();
// if (localStorage.getItem('valueNameTaken')) {
// location.href = '/main-page';
// }
// }
// function handleClick(event) {
// // event.preventDefault();
// if (localStorage.getItem('valueNameTaken')) {
// location.href = '/main-page';
// }
// }

return (
<div>
<Container className="NotFoundPageContainer">
<SimpleGrid
spacing={80}
cols={2}
breakpoints={[{ maxWidth: 'sm', cols: 1, spacing: 40 }]}
>
<div>
<Title
className='NotFoundPageContainer__title'
>
return (
<div>
<Container className="NotFoundPageContainer">
<SimpleGrid
spacing={80}
cols={2}
breakpoints={[{ maxWidth: 'sm', cols: 1, spacing: 40 }]}
>
<div>
<Title
className="NotFoundPageContainer__title"
>
Something is not right...
</Title>
<Text
color="dimmed"
size="lg"
>
</Title>
<Text
color="dimmed"
size="lg"
>
Page you are trying to open does not exist. You may have mistyped the address,
or the page has been moved to another URL.
</Text>
<ButtonGetStarted
linkTo={'/BTApp'}
mb={'2.5rem'}
mt={'1.5rem'}
size={'md'}
label={'Get back to main page'}
// onClick={handleClick}
/>
</div>
<Image
src={image}
className="NotFoundPageContainer__img"
/>
</SimpleGrid>
</Container>
</div>
)
}
</Text>
<ButtonGetStarted
linkTo="/main-page"
mb="2.5rem"
mt="1.5rem"
size="md"
label="Get back to main page"
// onClick={handleClick}
/>
</div>
<Image
src={image}
className="NotFoundPageContainer__img"
/>
</SimpleGrid>
</Container>
</div>
);
}
26 changes: 14 additions & 12 deletions src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import React from 'react'
import ReactDOM from 'react-dom/client'
import App from './App.js'
import { BudgetsProvider } from "./contexts/BudgetContext.jsx";
import './index.scss'
import { StrictMode } from 'react';
import { createRoot } from 'react-dom/client';
import App from './App.js';
import { BudgetsProvider } from './contexts/BudgetContext.jsx';
import './index.scss';

ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
<React.StrictMode>
<BudgetsProvider>
<App />
</BudgetsProvider>
</React.StrictMode>
)
const container = document.getElementById('root') as HTMLElement;
const root = createRoot(container);
root.render(
<StrictMode>
<BudgetsProvider>
<App />
</BudgetsProvider>
</StrictMode>,
);
65 changes: 36 additions & 29 deletions src/router/router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,43 @@
import { Navigate, createBrowserRouter } from 'react-router-dom';
import { Layout } from '$/components/Layout/Layout';
import { Suspense } from 'react';
import { Navigate, Outlet, createBrowserRouter } from 'react-router-dom';
import { NotFoundPage } from '$/views/404Page';
import { AddExpense } from '$/views/AddExpense';
import { ExpensesTable } from '$/views/ExpensesTable';
import { ExpensesTableCategory } from '$/views/ExpensesTableCategory';
import { Home } from '$/views/HeroPage';
import { LogIn } from '$/views/LogIn';
import { MainPage } from '$/views/MainPage';

export const router = createBrowserRouter([{
export const router = createBrowserRouter(([{
path: '/error',
element: <NotFoundPage />,
}, {
path: '/login',
element: <LogIn />,
}, {
path: '/',
element: <Home />,
}, {
path: '/layout',
errorElement: <Navigate to="/error" />,
element: <Layout />,
children: [
{ path: 'main-page', element: <MainPage /> },
{ path: 'add-expense', element: <AddExpense /> },
{
path: 'expenses-table,',
children: [
{ element: <ExpensesTable />, index: true },
{ path: 'categories', element: <ExpensesTableCategory /> },
],
},
],
},
]);
element: (
<Suspense>
<Outlet />
</Suspense>
),
}]));

// export const router = createBrowserRouter([{
// path: '/error',
// element: <NotFoundPage />,
// }, {
// path: '/login',
// element: <LogIn />,
// }, {
// path: '/',
// errorElement: <Navigate to="/error" />,
// element: <Home />,
// }, {
// path: '/layout',
// element: <Layout />,
// children: [
// { path: '/main-page', element: <MainPage /> },
// { path: 'add-expense', element: <AddExpense /> },
// {
// path: 'expenses-table,',
// children: [
// { element: <ExpensesTable />, index: true },
// { path: 'categories', element: <ExpensesTableCategory /> },
// ],
// },
// ],
// },
// ]);