Skip to content

Commit 7150b5e

Browse files
committed
Merge branch 'main' into header
2 parents 873c61b + a58b5d4 commit 7150b5e

34 files changed

+1226
-277
lines changed

package-lock.json

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "0.0.0",
55
"type": "module",
66
"scripts": {
7-
"dev": "vite",
7+
"dev": "vite --open",
88
"build": "vite build",
99
"lint": "eslint .",
1010
"preview": "vite preview"
@@ -22,6 +22,7 @@
2222
"react-responsive": "^10.0.1",
2323
"react-router-dom": "^7.4.0",
2424
"redux-persist": "^6.0.0",
25+
"sweetalert2": "^11.17.2",
2526
"yet-another-react-lightbox": "^3.21.8",
2627
"yup": "^1.6.1"
2728
},

public/bg.jpg

44.5 KB
Loading

public/bg@2x.jpg

158 KB
Loading

public/sprite.svg

Lines changed: 215 additions & 10 deletions
Loading

public/user_placeholder.png

1.22 KB
Loading

src/App.jsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { Navigate, Route, Routes } from "react-router-dom";
22
import "./index.css";
33
import Layout from "./Layout";
44
import { lazy } from "react";
5+
import UsersManagementPage from "./pages/UsersManagement/UsersManagementPage.jsx";
56

67
export default function App() {
78
const MainPage = lazy(() => import("./pages/main/MainPage.jsx"));
@@ -12,6 +13,7 @@ export default function App() {
1213
<Route path="/" element={<Navigate to="/posts" replace />} />
1314
<Route path="/posts" element={<MainPage />} />
1415
<Route path="/my-profile" element={<ProfilePage />} />
16+
<Route path="/admin/users" element={<UsersManagementPage />} />
1517
</Routes>
1618
</Layout>
1719
);

src/Layout.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Suspense } from "react";
22
import Header from "./components/Header/Header";
33
import Footer from "./components/Footer/Footer";
4+
import SignUpPage from "./pages/SignUpPage/SignUpPage";
45

56
const Layout = ({ children }) => {
67
return (

src/assets/images/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)