Skip to content

Commit f9b4f5c

Browse files
spanwallaspanwalla
authored
Merge pull request #92 from moevm/frontend_fix
Мелкие исправления на сайте
2 parents 167735f + e0f081f commit f9b4f5c

File tree

10 files changed

+50
-739
lines changed

10 files changed

+50
-739
lines changed

‎frontend/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<meta name="theme-color" content="#000000" />
88
<meta
99
name="description"
10-
content="Web site created using create-tsrouter-app"
10+
content="Writer - платформа для фрилансеров"
1111
/>
1212
<link rel="apple-touch-icon" href="/logo192.png" />
1313
<link rel="manifest" href="/manifest.json" />
14-
<title>Create TanStack App - .</title>
14+
<title>Writer</title>
1515
</head>
1616
<body>
1717
<div id="app"></div>

‎frontend/src/components/Header.tsx‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,6 @@ export default function Header() {
2525
return (
2626
<header className="p-2 flex gap-2 bg-white text-black justify-between items-center fixed top-0 left-0 right-0 z-10 h-16">
2727
<nav className="flex flex-row">
28-
<div className="px-2 font-bold">
29-
<Link to="/">Home</Link>
30-
</div>
31-
32-
<div className="px-2 font-bold">
33-
<Link to="/demo/form/simple">Simple Form</Link>
34-
</div>
35-
36-
<div className="px-2 font-bold">
37-
<Link to="/demo/form/address">Address Form</Link>
38-
</div>
39-
40-
<div className="px-2 font-bold">
41-
<Link to="/demo/table">TanStack Table</Link>
42-
</div>
43-
44-
<div className="px-2 font-bold">
45-
<Link to="/demo/tanstack-query">TanStack Query</Link>
46-
</div>
47-
4828
<div className="px-2 font-bold">
4929
<Link to="/orders">Заказы</Link>
5030
</div>
@@ -56,13 +36,22 @@ export default function Header() {
5636
)}
5737
</nav>
5838
<div className="flex items-center gap-2">
59-
{auth && (
39+
{auth ? (
6040
<>
6141
<Link to="/profile">
6242
<Button type="primary">Профиль</Button>
6343
</Link>
6444
<LogoutButton />
6545
</>
46+
) : (
47+
<>
48+
<Link to="/login">
49+
<Button type="primary">Войти</Button>
50+
</Link>
51+
<Link to="/register">
52+
<Button>Регистрация</Button>
53+
</Link>
54+
</>
6655
)}
6756
</div>
6857
</header>

‎frontend/src/main.tsx‎

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ import {
88
createRoute,
99
createRouter
1010
} from '@tanstack/react-router'
11-
import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
12-
import DemoFormAddress from './routes/demo.form.address'
13-
import DemoFormSimple from './routes/demo.form.simple'
14-
import DemoTable from './routes/demo.table'
15-
import DemoTanstackQuery from './routes/demo.tanstack-query'
11+
import { Typography } from 'antd'
1612
import AuthRoute from './routes/auth.route'
1713
import RegisterRoute from './routes/register.route'
1814
import { createOrdersRoute } from './routes/orders.route'
@@ -23,16 +19,11 @@ import { createUserOrdersRoute } from './routes/user-orders.route'
2319
import { createUserResponsesRoute } from './routes/user-responses.route'
2420
import { createEditProfileRoute } from './routes/edit-profile.route.tsx'
2521
import AdminLayout from './routes/AdminLayout'
26-
import { createAdminUsersRoute } from './routes/AdminUsers'
27-
import { createAdminImportRoute } from './routes/admin.import.route'
28-
import { createAdminExportRoute } from './routes/admin.export.route'
2922
import ProfilePage from './components/ProfilePage'
3023
import ProtectedRoute from './components/ProtectedRoute'
3124

3225
import Header from './components/Header'
3326

34-
import TanstackQueryLayout from './integrations/tanstack-query/layout'
35-
3627
import * as TanstackQuery from './integrations/tanstack-query/root-provider'
3728

3829
import 'antd/dist/reset.css'
@@ -42,30 +33,56 @@ import reportWebVitals from './reportWebVitals.ts'
4233

4334
import { AuthProvider } from './context/AuthContext'
4435
import { createUserProfileRoute } from './routes/user-profile.route'
36+
import { UsersList } from '@/components/admin/UsersList'
37+
import { ImportDatabase } from '@/components/admin/ImportDatabase'
38+
import { ExportDatabase } from '@/components/admin/ExportDatabase'
39+
40+
const { Title } = Typography;
4541

4642
const rootRoute = createRootRoute({
4743
component: () => (
4844
<>
4945
<Header />
5046
<Outlet />
51-
<TanStackRouterDevtools />
52-
<TanstackQueryLayout />
5347
</>
5448
),
5549
})
5650

5751
const indexRoute = createRoute({
5852
getParentRoute: () => rootRoute,
5953
path: '/',
60-
component: () => <Navigate to="/orders" />,
54+
component: () => <Navigate to="/orders" search={{}} />,
6155
})
6256

6357
const adminRoute = createRoute({
6458
getParentRoute: () => rootRoute,
65-
path: '/admin',
59+
path: 'admin',
6660
component: AdminLayout,
6761
})
6862

63+
const adminUsersRoute = createRoute({
64+
getParentRoute: () => adminRoute,
65+
path: 'users',
66+
component: () => (
67+
<div className="admin-users">
68+
<Title level={2}>Управление пользователями</Title>
69+
<UsersList />
70+
</div>
71+
),
72+
})
73+
74+
const adminImportRoute = createRoute({
75+
getParentRoute: () => adminRoute,
76+
path: 'import',
77+
component: () => <ImportDatabase />,
78+
})
79+
80+
const adminExportRoute = createRoute({
81+
getParentRoute: () => adminRoute,
82+
path: 'export',
83+
component: () => <ExportDatabase />,
84+
})
85+
6986
const profileRoute = createRoute({
7087
getParentRoute: () => rootRoute,
7188
path: '/profile',
@@ -79,14 +96,10 @@ const profileRoute = createRoute({
7996
const routeTree = rootRoute.addChildren([
8097
indexRoute,
8198
adminRoute.addChildren([
82-
createAdminUsersRoute(adminRoute),
83-
createAdminImportRoute(adminRoute),
84-
createAdminExportRoute(adminRoute),
99+
adminUsersRoute,
100+
adminImportRoute,
101+
adminExportRoute,
85102
]),
86-
DemoFormAddress(rootRoute),
87-
DemoFormSimple(rootRoute),
88-
DemoTable(rootRoute),
89-
DemoTanstackQuery(rootRoute),
90103
AuthRoute(rootRoute),
91104
RegisterRoute(rootRoute),
92105
createOrdersRoute(rootRoute),

‎frontend/src/routes/AdminUsers.tsx‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎frontend/src/routes/admin.export.route.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { Route } from '@tanstack/react-router';
44

55
export const createAdminExportRoute = (parentRoute: Route) =>
66
createRoute({
7-
path: '/export',
8-
component: () => <ExportDatabase />,
97
getParentRoute: () => parentRoute,
8+
path: 'export',
9+
component: () => <ExportDatabase />,
1010
});

‎frontend/src/routes/admin.import.route.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { Route } from '@tanstack/react-router';
44

55
export const createAdminImportRoute = (parentRoute: Route) =>
66
createRoute({
7-
path: '/import',
8-
component: () => <ImportDatabase />,
97
getParentRoute: () => parentRoute,
8+
path: 'import',
9+
component: () => <ImportDatabase />,
1010
});

0 commit comments

Comments
 (0)