developpp

mate-academy · Jul 27, 2023 · 1d83974 · 1d83974
1 parent cec9cd5
commit 1d83974
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 42 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,7 +1,7 @@
 import { Route, Routes, useLocation } from 'react-router-dom';
 import './App.scss';
 import { useEffect } from 'react';
-import { FavoriteContextProvider } from './FavoriteContext';
+import { FavoriteContextProvider } from './core/context/FavoriteContext/FavoriteContext';
 import { HomePage } from './Components/Pages/HomePage';
 import { Header } from './Components/Header';
 import { NotFoundPage } from './Components/Pages/NotFoundPage';

diff --git a/src/Components/Footer/Footer.scss b/src/Components/Footer/Footer.scss
@@ -96,8 +96,6 @@ html {
   background-repeat: no-repeat;
   transition: 0.3s;
   &:hover {
-    height: 32px;
-    width: 48px;
     cursor: pointer;
   }
 }

diff --git a/src/Components/Header/Header.scss b/src/Components/Header/Header.scss
@@ -201,15 +201,12 @@
   transition: .3s;
 
   &:hover {
-    height: 32px;
-    width: 48px;
     cursor: pointer;
   }
 }
 
 .color-toggle {
   background-color: blue;
-  /* Цвет по умолчанию */
   color: white;
   padding: 10px;
   border: none;
@@ -218,7 +215,6 @@
 
 .color-toggle.gray {
   background-color: gray;
-  /* Цвет при выбранном состоянии */
 }
 
 .search-input {

diff --git a/src/Components/Header/Header.tsx b/src/Components/Header/Header.tsx
@@ -4,7 +4,8 @@ import { HeaderSearch } from './HeaderSearch';
 import HeartImage from './HeaderImage/heart.svg';
 import BasketImage from './HeaderImage/basket.svg';
 import LogoImage from './HeaderImage/LOGO.svg';
-import { useFavoriteContext } from '../../FavoriteContext';
+import { useFavoriteContext }
+  from '../../core/context/FavoriteContext/FavoriteContext';
 
 interface HeaderProps {
   searchValue: string;
@@ -21,7 +22,6 @@ export const Header = ({ searchValue, setSearchValue }: HeaderProps) => {
   const accessories = location.pathname === '/accessories';
   const basket = location.pathname === '/cart';
   const favorite = location.pathname === '/favorites';
-  // const [showSearch, setShowSearch] = useState(!isHomePage);
 
   let search = '';
 

diff --git a/src/Components/Header/HeaderImage/LOGOGray.svg b/src/Components/Header/HeaderImage/LOGOGray.svg
diff --git a/src/Components/Pages/Basket/Basket.tsx b/src/Components/Pages/Basket/Basket.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { useFavoriteContext } from '../../../FavoriteContext';
+import { useFavoriteContext } from '../../../core/context/FavoriteContext/FavoriteContext';
 import products from '../../../new/products.json';
 import { NotFoundPage } from '../NotFoundPage/NotFoundPage';
 import './Basket.scss';

diff --git a/src/Components/Pages/Basket/BlockBasket.tsx b/src/Components/Pages/Basket/BlockBasket.tsx
@@ -5,7 +5,7 @@ import { Product } from '../../ProductCards/Product';
 import Plus from './BasketImage/Plus.svg';
 import Minus from './BasketImage/Minus.svg';
 import CLose from './BasketImage/Close.svg';
-import { useBasketContext } from '../../../FavoriteContext';
+import { useBasketContext } from '../../../core/context/FavoriteContext/FavoriteContext';
 
 interface ProductCardsProps {
   product: Product,

diff --git a/src/Components/Pages/Contacts/Contacts.tsx b/src/Components/Pages/Contacts/Contacts.tsx
@@ -8,7 +8,6 @@ import github from './ContactsImage/github.svg';
 import gmail from './ContactsImage/gmail.svg';
 import Linkdn from './ContactsImage/Linkdn.svg';
 import phone from './ContactsImage/phone.svg';
-import slack from './ContactsImage/slack.svg';
 import telegram from './ContactsImage/telegram.svg';
 import instagram from './ContactsImage/instagram.svg';
 
@@ -39,11 +38,6 @@ const contactData = [
     text: '+380 999 580 209',
     linkImage: 'tel:+380999580209',
   },
-  {
-    image: slack,
-    text: 'Nazar Medushevskyi',
-    linkImage: 'https://github.com/nazar-medushevskyi',
-  },
   {
     image: telegram,
     text: 'MedushevskiyN',

diff --git a/src/Components/Pages/Favorite/BlockFavorite.tsx b/src/Components/Pages/Favorite/BlockFavorite.tsx
@@ -1,7 +1,7 @@
 import { ProductCards } from '../../ProductCards/ProductCards';
 import './Favorite.scss';
 import products from '../../../new/products.json';
-import { useFavoriteContext } from '../../../FavoriteContext';
+import { useFavoriteContext } from '../../../core/context/FavoriteContext/FavoriteContext';
 
 export const BlockFavorite = () => {
   const { favorites } = useFavoriteContext();

diff --git a/src/Components/Pages/Favorite/Favorite.tsx b/src/Components/Pages/Favorite/Favorite.tsx
@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
 import { BlockFavorite } from './BlockFavorite';
 import HomeImage from './FavoriteImage/Home.svg';
 import Arrowimage from './FavoriteImage/Arrow.svg';
-import { useFavoriteContext } from '../../../FavoriteContext';
+import { useFavoriteContext } from '../../../core/context/FavoriteContext/FavoriteContext';
 import { NotFoundPage } from '../NotFoundPage/NotFoundPage';
 
 export const Favorite = () => {

diff --git a/src/Components/PhonesPageInfo/PhonesPageInfoButton/PhonesPageInfoButton.tsx b/src/Components/PhonesPageInfo/PhonesPageInfoButton/PhonesPageInfoButton.tsx
@@ -1,4 +1,4 @@
-import { useBasketContext } from '../../../FavoriteContext';
+import { useBasketContext } from '../../../core/context/FavoriteContext/FavoriteContext';
 import './PhonesPageInfoButton.scss';
 
 interface Info {

diff --git a/src/Components/PhonesPageInfo/PhonesPageInfoFovorite/PhonesPageInfoFovorite.tsx b/src/Components/PhonesPageInfo/PhonesPageInfoFovorite/PhonesPageInfoFovorite.tsx
@@ -1,4 +1,4 @@
-import { useFavoriteContext } from '../../../FavoriteContext';
+import { useFavoriteContext } from '../../../core/context/FavoriteContext/FavoriteContext';
 import heartImage from './PhonesPageInfoFavoriteImages/heart.svg';
 import './PhonesPageInfoFovorite.scss';
 

diff --git a/src/Components/ProductCards/ProductsCardsButton/ProductsCardsButton.tsx b/src/Components/ProductCards/ProductsCardsButton/ProductsCardsButton.tsx
@@ -1,4 +1,4 @@
-import { useFavoriteContext } from '../../../FavoriteContext';
+import { useFavoriteContext } from '../../../core/context/FavoriteContext/FavoriteContext';
 import { Product } from '../Product';
 import './ProductsCardsButton.scss';
 

diff --git a/src/Components/ProductCards/ProductsCardsFavorite/ProductsCardsFavorite.tsx b/src/Components/ProductCards/ProductsCardsFavorite/ProductsCardsFavorite.tsx
@@ -1,7 +1,7 @@
 import heartImage from './ProductsCardsFavoriteImage/heart.svg';
 import './ProductsCardsFavorite.scss';
 import { Product } from '../Product';
-import { useFavoriteContext } from '../../../FavoriteContext'; // Укажите правильный путь к FavoriteContext
+import { useFavoriteContext } from '../../../core/context/FavoriteContext/FavoriteContext'; // Укажите правильный путь к FavoriteContext
 
 interface ProductFavoriteProps {
   product: Product;

diff --git a/src/FavoriteContext.tsx → ...ntext/FavoriteContext/FavoriteContext.tsx b/src/FavoriteContext.tsx → ...ntext/FavoriteContext/FavoriteContext.tsx
@@ -2,27 +2,31 @@ import React, {
   createContext, useContext, useEffect, useState,
 } from 'react';
 
-interface FavoriteContextValue {
-  basket: { id: string; price: number; quantity: number }[];
-  favorites: string[];
-  addToFavorites: (productId: string) => void;
-  removeFromFavorites: (productId: string) => void;
-  addToBasket: (productId: string) => void;
-  removeFromBasket: (productId: string) => void;
-  removeFromAllB: (productId: string) => void;
-  favoritesLength: number;
-  basketLength: number;
-}
-
-const FavoriteContext = createContext<FavoriteContextValue
-| undefined>(undefined);
+import { FavoriteContextValue } from './types';
+
+const noop = () => {
+  //
+};
+
+const FavoriteContext = createContext<FavoriteContextValue>({
+  basket: [],
+  favorites: [],
+  addToBasket: noop,
+  addToFavorites: noop,
+  removeFromFavorites: noop,
+  removeFromBasket: noop,
+  removeFromAllB: noop,
+  favoritesLength: 0,
+  basketLength: 0,
+});
 
 export const useFavoriteContext = () => {
   const context = useContext(FavoriteContext);
 
   if (!context) {
-    throw new Error(`useFavoriteContext must be used within 
-    a FavoriteContextProvider`);
+    throw new Error(
+      'useFavoriteContext must be used within a FavoriteContextProvider',
+    );
   }
 
   return context;
@@ -32,8 +36,9 @@ export const useBasketContext = () => {
   const context = useContext(FavoriteContext);
 
   if (!context) {
-    throw new Error(`useBasketContext must be used 
-    within a FavoriteContextProvider`);
+    throw new Error(
+      'useBasketContext must be used within a FavoriteContextProvider',
+    );
   }
 
   return context;
@@ -42,7 +47,7 @@ export const useBasketContext = () => {
 export const FavoriteContextProvider: React.FC = ({ children }) => {
   const [favorites, setFavorites] = useState<string[]>([]);
   const [basket, setBasket] = useState<
-  { id: string; price: number; quantity: number }[]>([]);
+  FavoriteContextValue['basket']>([]);
 
   const addToFavorites = (productId: string) => {
     setFavorites((prevFavorites) => [...prevFavorites, productId]);

diff --git a/src/core/context/FavoriteContext/index.ts b/src/core/context/FavoriteContext/index.ts
@@ -0,0 +1 @@
+export * from './FavoriteContext';
diff --git a/src/core/context/FavoriteContext/types.ts b/src/core/context/FavoriteContext/types.ts
@@ -0,0 +1,11 @@
+export interface FavoriteContextValue {
+  basket: { id: string; price: number; quantity: number }[];
+  favorites: string[];
+  addToFavorites: (productId: string) => void;
+  removeFromFavorites: (productId: string) => void;
+  addToBasket: (productId: string) => void;
+  removeFromBasket: (productId: string) => void;
+  removeFromAllB: (productId: string) => void;
+  favoritesLength: number;
+  basketLength: number;
+}