Compare commits

...

6 Commits

20 changed files with 3405 additions and 3218 deletions
+3242 -3184
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -14,6 +14,7 @@
"react": "^19.1.0", "react": "^19.1.0",
"react-dom": "^19.1.0", "react-dom": "^19.1.0",
"react-icons": "^5.5.0", "react-icons": "^5.5.0",
"react-router-dom": "^7.15.1",
"sass-embedded": "^1.89.2" "sass-embedded": "^1.89.2"
}, },
"devDependencies": { "devDependencies": {
-15
View File
@@ -1,15 +0,0 @@
import styles from './App.module.scss'
import Header from './components/header'
import ProductList from './components/list'
const App = () => {
return (
<div className={styles.container}>
<Header />
<ProductList />
</div>
)
}
export default App
+6 -2
View File
@@ -1,9 +1,11 @@
import styles from './index.module.scss' import styles from './index.module.scss'
import WishIcon from '../../assets/icons/wish.svg' import WishIcon from '../../assets/icons/wish.svg'
import { Link } from 'react-router-dom'
const ProductCard = ({ name, price, imageUrl }) => { const ProductCard = ({ id, name, price, imageUrl }) => {
return ( return (
<div className={styles.product}> <div className={styles.product}>
<div className={styles.image}> <div className={styles.image}>
<img src={imageUrl} alt='' /> <img src={imageUrl} alt='' />
@@ -14,7 +16,9 @@ const ProductCard = ({ name, price, imageUrl }) => {
</div> </div>
</div> </div>
<div className={styles.content}> <div className={styles.content}>
<h4>{name}</h4> <Link to={{ pathname: `/catalog/${id}` }} state={ name, price}>
<h4>{name}</h4>
</Link>
<div className={styles.stats}> <div className={styles.stats}>
<span>${price}</span> <span>${price}</span>
</div> </div>
+22 -7
View File
@@ -4,6 +4,7 @@ import CartIcon from '../../assets/icons/cart.svg'
import UserIcon from '../../assets/icons/user.svg' import UserIcon from '../../assets/icons/user.svg'
import WishlistIcon from '../../assets/icons/wishlist.svg' import WishlistIcon from '../../assets/icons/wishlist.svg'
import LoopIcon from '../../assets/icons/loop.svg' import LoopIcon from '../../assets/icons/loop.svg'
import { Link, NavLink } from 'react-router-dom'
const Header = () => { const Header = () => {
return ( return (
@@ -12,16 +13,22 @@ const Header = () => {
<nav> <nav>
<ul> <ul>
<li> <li>
<a href='#'>Home</a> <NavLink to={{ pathname: '/' }}
className={ ({ isActive }) => (isActive ? styles.active : '')}>
Главная
</NavLink>
</li> </li>
<li> <li>
<a href='#'>Contact</a> <Link to={{ pathname: '/contact' }}>Контакты</Link>
</li> </li>
<li> <li>
<a href='#'>About</a> <NavLink to={{ pathname: '/about' }}
className={ ({ isActive }) => (isActive ? styles.active : '')}>
О нас
</NavLink>
</li> </li>
<li> <li>
<a href='#'>Sign Up</a> <Link to={{ pathname: '/login' }}>Sign Up</Link>
</li> </li>
</ul> </ul>
</nav> </nav>
@@ -31,13 +38,21 @@ const Header = () => {
</div> </div>
<div className={styles.buttons}> <div className={styles.buttons}>
<button> <button>
<img src={WishlistIcon} alt='' /> <Link to={{ pathname: '/wishlist' }}>
<img src={WishlistIcon} alt='' />
</Link>
</button> </button>
<button> <button>
<img src={CartIcon} alt='' /> <NavLink to={{ pathname: '/cart', search: '?category=electronic', state: {id: 44} }}
className={ ({ isActive }) => (isActive ? styles.active : '')}>
<img src={CartIcon} alt='' />
</NavLink>
</button> </button>
<button> <button>
<img src={UserIcon} alt='' /> <NavLink to={{ pathname: '/profile/111' }}
className={ ({ isActive }) => (isActive ? styles.active : '')}>
<img src={UserIcon} alt='' />
</NavLink>
</button> </button>
</div> </div>
</header> </header>
+3
View File
@@ -53,3 +53,6 @@
} }
} }
} }
.active {
border-bottom: 1px solid red;
}
+4 -3
View File
@@ -7,10 +7,11 @@ const ProductList = () => {
const [products, setProducts] = React.useState([]) const [products, setProducts] = React.useState([])
const [loading, setLoading] = React.useState(true) const [loading, setLoading] = React.useState(true)
const [error, setError] = React.useState(null) const [error, setError] = React.useState(null)
console.log("rendred");
React.useEffect(() => { React.useEffect(() => {
let cancelled = false let cancelled = false
console.log("useEffect");
const getProducts = async () => { const getProducts = async () => {
try { try {
setLoading(true) setLoading(true)
@@ -44,7 +45,7 @@ const ProductList = () => {
return () => { return () => {
cancelled = true cancelled = true
} }
}, []) },[])
if (loading) { if (loading) {
return <div className={styles.loading}>Загрузка продуктов...</div> return <div className={styles.loading}>Загрузка продуктов...</div>
+25 -5
View File
@@ -1,9 +1,29 @@
import { StrictMode } from 'react'
import { createRoot } from 'react-dom/client' import { createRoot } from 'react-dom/client'
import App from './App.jsx' import {
BrowserRouter as Router,
Routes,
Route,
Navigate, // 1. Импортируем компонент для редиректа
} from 'react-router-dom'
import Catalog from './pages/catalog'
import Cart from './pages/cart'
import About from './pages/about'
import Login from './pages/login'
import UserProfile from './pages/profile'
import Item from './pages/item'
createRoot(document.getElementById('root')).render( createRoot(document.getElementById('root')).render(
<StrictMode> <Router>
<App /> <Routes>
</StrictMode> {/* 2. Добавляем редирект с корневого пути */}
<Route path='/' element={<Navigate to='/catalog' replace />} />
<Route path='/catalog' element={<Catalog />} />
<Route path='/catalog/:id' element={<Item />} />
<Route path='/cart' element={<Cart />} />
<Route path='/about' element={<About />} />
<Route path='/login' element={<Login />} />
<Route path='/profile/:id' element={<UserProfile name='Alex' />} />
</Routes>
</Router>
) )
+13
View File
@@ -0,0 +1,13 @@
import styles from './index.module.scss'
import Header from '../../components/header/index'
const About = () => {
return (
<div className={styles.container}>
<Header />
</div>
)
}
export default About
+4
View File
@@ -0,0 +1,4 @@
.container {
max-width: 1170px;
margin: 0 auto;
}
+13
View File
@@ -0,0 +1,13 @@
import styles from './index.module.scss'
import Header from '../../components/header/index'
const Cart = () => {
return (
<div className={styles.container}>
<Header />
</div>
)
}
export default Cart
+4
View File
@@ -0,0 +1,4 @@
.container {
max-width: 1170px;
margin: 0 auto;
}
+15
View File
@@ -0,0 +1,15 @@
import styles from './index.module.scss'
import Header from '../../components/header/index'
import ProductList from '../../components/list/index'
const Catalog = () => {
return (
<div className={styles.container}>
<Header />
<ProductList />
</div>
)
}
export default Catalog
@@ -1,5 +1,3 @@
@use './assets/styles/variables' as *;
.container { .container {
max-width: 1170px; max-width: 1170px;
margin: 0 auto; margin: 0 auto;
+12
View File
@@ -0,0 +1,12 @@
import styles from './index.module.scss'
import { useParams } from 'react-router-dom'
const Product = ({ name, price }) => {
const { id } = useParams();
return (
<>
<h2>Товар {id}. {name} по цене {price }</h2>
</>
)
}
export default Product
View File
+22
View File
@@ -0,0 +1,22 @@
import styles from './index.module.scss'
import { useNavigate } from 'react-router-dom'
const Login = () => {
const navigate = useNavigate();
const handleSubmit = formData => {
//Какая то логика проверки авторизации
navigate('/catalog')
}
return (
<>
<h2>Страница авторизации</h2>
<form onSubmit={handleSubmit}>
<button type="submit">Войти</button>
</form>
</>
)
}
export default Login
View File
+15
View File
@@ -0,0 +1,15 @@
import styles from './index.module.scss'
import Header from '../../components/header/index'
import { useParams } from 'react-router-dom'
const UserProfile = ({ name }) => {
const { id } = useParams();
return (
<div className={styles.container}>
<Header />
<h2>Профиль пользователя {id} {name}</h2>
</div>
)
}
export default UserProfile
+4
View File
@@ -0,0 +1,4 @@
.container {
max-width: 1170px;
margin: 0 auto;
}