Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
6a95472
Initialize project using Create React App
allakoloskova Jan 30, 2024
b5aab20
initial commit
allakoloskova Jan 30, 2024
461a597
Started developing
allakoloskova Jan 30, 2024
6fa419a
Resolved conflicts
allakoloskova Jan 30, 2024
33b1e21
Merge pull request #1 from KoloskovaAlla/start
KoloskovaAlla Jan 30, 2024
594ecb7
Added routing
KoloskovaAlla Jan 30, 2024
ae3c453
Merge pull request #2 from KoloskovaAlla/routing
KoloskovaAlla Jan 30, 2024
91fc6a3
Started to develop CatsPage
KoloskovaAlla Jan 30, 2024
0943e15
Made routing
allakoloskova Jan 31, 2024
eb73474
Merge pull request #3 from KoloskovaAlla/routing
KoloskovaAlla Jan 31, 2024
b819c3c
Developed CatsPage
allakoloskova Jan 31, 2024
7611d89
Added packages for SASS
allakoloskova Jan 31, 2024
70b085a
Started to make styles for CatsPage
KoloskovaAlla Jan 31, 2024
85857ae
Added styles for CatsPage
allakoloskova Feb 1, 2024
7d9b63b
Merge pull request #4 from KoloskovaAlla/catsPage
KoloskovaAlla Feb 1, 2024
c955dc4
Started to develop the Header
allakoloskova Feb 1, 2024
03b75f3
Added styles for the Header
allakoloskova Feb 1, 2024
6d02839
Added styles for the Header
allakoloskova Feb 2, 2024
15de25d
Merge pull request #5 from KoloskovaAlla/header
KoloskovaAlla Feb 2, 2024
73fe557
Added cat to favorites
allakoloskova Feb 2, 2024
994a4e9
Added handleCatClick
KoloskovaAlla Feb 3, 2024
ddc569a
Merge pull request #6 from KoloskovaAlla/cat
KoloskovaAlla Feb 3, 2024
704568d
Added logic with a heart
KoloskovaAlla Feb 4, 2024
f43d67d
Merge pull request #7 from KoloskovaAlla/cat
KoloskovaAlla Feb 4, 2024
6004f87
Developed faviroteCatsPage
allakoloskova Feb 5, 2024
900013a
Merge pull request #8 from KoloskovaAlla/favoriteCatsPage
KoloskovaAlla Feb 5, 2024
8c5b5b7
Refactored headerStyles (and a little bit change getCatsImages)
allakoloskova Feb 5, 2024
81635ba
Merge pull request #9 from KoloskovaAlla/headerStyles
KoloskovaAlla Feb 5, 2024
29df1e3
Changed like state
allakoloskova Feb 5, 2024
b4f5f6f
WIP catsPageSlice
allakoloskova Feb 5, 2024
f6a00bf
Made catsPageSlice
KoloskovaAlla Feb 5, 2024
11b523e
Fixed bugs
KoloskovaAlla Feb 6, 2024
1897f56
Merge pull request #10 from KoloskovaAlla/favoriteCats
KoloskovaAlla Feb 6, 2024
42118a9
Made a common Cat component for all pages
KoloskovaAlla Feb 6, 2024
a4430da
Merge pull request #11 from KoloskovaAlla/favoriteCats
KoloskovaAlla Feb 6, 2024
702aab9
WIP currentPage
KoloskovaAlla Feb 6, 2024
73fb8c3
Added state currentPage
allakoloskova Feb 6, 2024
b684cca
Merge pull request #12 from KoloskovaAlla/currentPage
KoloskovaAlla Feb 6, 2024
6e3f526
Refactor
allakoloskova Feb 6, 2024
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
13 changes: 13 additions & 0 deletions _temp/fetch.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// const getCatsImages = () => {
// fetch("https://api.thecatapi.com/v1/images/search?limit=10") // Используем параметр limit=10 для получения 10 фотографий
// .then(response => response.json())
// .then(data => {
// setCatsPage(data);
// localStorage.setItem('catsData', JSON.stringify(data));
// })
// .catch(error => console.log('error', error));
// };

// useEffect(() => {
// getCatsImages();
// }, []);
34,409 changes: 34,409 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

45 changes: 45 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"name": "frontend-challenge",
"version": "0.1.0",
"private": true,
"dependencies": {
"@reduxjs/toolkit": "^2.1.0",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"node-sass": "^7.0.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-redux": "^9.1.0",
"react-router-dom": "^6.21.3",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"sass": "^1.70.0"
}
}
Binary file added public/favicon.ico
Binary file not shown.
43 changes: 43 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
Binary file added public/logo192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/logo512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
3 changes: 3 additions & 0 deletions public/robots.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# https://www.robotstxt.org/robotstxt.html
User-agent: *
Disallow:
19 changes: 19 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// import { Routes, Route } from 'react-router-dom';
import './scss/settings/index.scss';
import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
import { CatsPage, FavoriteCatsPage } from './pages';
import { Header } from './components';

export const App = () => {
return (
<div className='app'>
<Router>
<Header />
<Routes>
<Route path='/' element={<CatsPage />} />
<Route path='/favoriteCats' element={<FavoriteCatsPage />} />
</Routes>
</Router>
</div>
);
};
99 changes: 99 additions & 0 deletions src/components/Cat/Cat.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
import classes from './Cat.module.scss';
import { useState, useRef } from 'react';
import { useEffect } from 'react';
import { ReactComponent as IconEmptyLike } from './assets/favorite_border.svg'
import { ReactComponent as IconClickedLike } from './assets/favorite.svg'
import { useFavoriteCats } from '../../hooks';
import { useDispatch } from 'react-redux';

export const Cat = ({ cat }) => {
const [isHover, setIsHover] = useState(false);
const [isLikeVisible, setIsLikeVisible] = useState(false);
const [isLikeClicked, setIsLikeClicked] = useState(false);
const [isHeartHovered, setIsHeartHovered] = useState(false);

const dispatch = useDispatch();
const likeButtonRef = useRef(null);
const catRef = useRef(null);
const { favoriteCats, setFavoriteCats } = useFavoriteCats();


const handleCatMouseEnter = () => {
setIsHover(true);
setIsLikeVisible(true);
// catRef.current.style.transform = 'scale(1.2)';
catRef.current.style.scale = '1.2';
catRef.current.style.transitionProperty = 'all';
catRef.current.style.transitionDuration = '1s';
};

const handleCatMouseLeave = () => {
setIsHover(false);
setIsLikeVisible(false);
catRef.current.style.scale = '1';
catRef.current.style.transitionProperty = 'all';
};

const handleLikeMouseEnter = () => {
setIsHeartHovered(true);
};
const handleLikeMouseLeave = () => {
setIsHeartHovered(false);
};

const addToFavoriteCats = (cat) => {
const newFavoriteCats = [...favoriteCats, cat];
dispatch(setFavoriteCats(newFavoriteCats));
};

const removeFromFavoriteCats = (catToRemove) => {
const updatedFavoriteCats = favoriteCats.filter(cat => cat !== catToRemove);
dispatch(setFavoriteCats(updatedFavoriteCats));
};

const handleLikeClick = () => {
if (favoriteCats.includes(cat)) {
setIsLikeClicked(false);
removeFromFavoriteCats(cat);
}
else {
addToFavoriteCats(cat);
setIsLikeClicked(true);
}
};

return (
<div
ref={catRef}
className={classes.cat}
onMouseEnter={handleCatMouseEnter}
onMouseLeave={handleCatMouseLeave}
>
<div className={classes.image}>
<img

src={cat?.url && cat.url}
alt={'здесь был кот'}
/>
</div>
{isHover && isLikeVisible && !isLikeClicked && (
<IconEmptyLike
className={classes.like}
ref={likeButtonRef}
onClick={handleLikeClick}
onMouseEnter={handleLikeMouseEnter}
onMouseLeave={handleLikeMouseLeave}
/>
)}
{isLikeVisible && (isLikeClicked || isHeartHovered) && (
<IconClickedLike
className={classes.like}
// ref={likeButtonRef}
onClick={handleLikeClick}
onMouseEnter={handleLikeMouseEnter}
onMouseLeave={handleLikeMouseLeave}
/>
)}
</div>
);
};
28 changes: 28 additions & 0 deletions src/components/Cat/Cat.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
@import '../../scss/settings/vars';

.cat {
position: relative;
}

.image {
position: relative;
overflow: hidden;
width: 100%;
aspect-ratio: 10/6;

img {
object-fit: cover;
height: 100%;
width: 100%;
transition: transform 1s ease;
}
}

.like {
position: absolute;
height: 40px;
width: 40px;
bottom: 15px;
/* Перемещаем вниз до нижнего края .image */
right: 10px;
}
10 changes: 10 additions & 0 deletions src/components/Cat/assets/favorite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/components/Cat/assets/favorite_border.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/Cat/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { Cat } from './Cat';
57 changes: 57 additions & 0 deletions src/components/Header/Header.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import classes from './Header.module.scss';
import { NavLink } from 'react-router-dom';

export const Header = () => {
// const handleAllCatsClick = () => { };

// const handleFavoriteCatsClick = () => { };

return (
// <header id={data.name} className={classNameHeader}>
<header className={classes.header}>
{/* <ul className={menuClassNames}> */}
<ul className={classes.menu}>
<li
className={classes.item}
key={1}
>
<NavLink
// className={classes.button}
// onClick={handleAllCatsClick}
to={`/`}
>
все котики
</NavLink>
</li>
<li
className={classes.item}
key={2}
>
<NavLink
// className={classes.button}
// onClick={handleFavoriteCatsClick}
to={`/favoriteCats`}
>
любимые котики
</NavLink>
</li>
</ul>
{/* <div className={classes.wrapper}>
<NavLink
className={classes.button}
// onClick={handleAllCatsClick}
to={`/`}
>
все котики
</NavLink>
<NavLink
className={classes.button}
// onClick={handleFavoriteCatsClick}
to={`/favoriteCats`}
>
любимые котики
</NavLink>
</div> */}
</header>
);
};
Loading