mate-academy · u5135039754-dev · May 4, 2026 · May 5, 2026 · May 13, 2026 · May 13, 2026
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -1,9 +1,10 @@
-const { defineConfig } = require('cypress');
+/* eslint-disable */
+import { defineConfig } from 'cypress';
 
-module.exports = defineConfig({
+export default defineConfig({
   e2e: {
     baseUrl: 'http://localhost:3000',
-    specPattern: 'cypress/integration/**/*.spec.{js,ts,jsx,tsx}',
+    specPattern: 'cypress/integration/**/*.{cy,spec}.{js,ts,jsx,tsx}',
   },
   video: true,
   viewportHeight: 1920,

diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "extends": "@mate-academy/students-ts-config",
   "compilerOptions": {
-    "sourceMap": false
+    "sourceMap": false,
+    "baseUrl": "."
   }
 }
diff --git a/index.html b/index.html
@@ -3,9 +3,10 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>Welcome to Nice Gadgets store!</title>
+    <link rel="icon" type="image/x-icon" href="./src/images/icons/favicon.svg" />
   </head>
-  <body>
+  <body class="page__body-open">
     <div id="root"></div>
     <script type="module" src="/src/index.tsx"></script>
   </body>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react_phone-catalog",
-  "homepage": "react_phone-catalog",
+  "homepage": "https://u5135039754-dev.github.io/react_phone-catalog/",
   "version": "0.1.0",
   "keywords": [],
   "author": "Mate Academy",
@@ -12,11 +12,12 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.25.1",
-    "react-transition-group": "^4.4.5"
+    "react-transition-group": "^4.4.5",
+    "swiper": "^12.1.4"
   },
   "devDependencies": {
     "@cypress/react18": "^2.0.1",
-    "@mate-academy/scripts": "^1.8.5",
+    "@mate-academy/scripts": "^2.1.3",
     "@mate-academy/students-ts-config": "*",
     "@mate-academy/stylelint-config": "*",
     "@types/node": "^20.14.10",

diff --git a/public/api/accessories.json b/public/api/accessories.json
@@ -1428,3 +1428,5 @@
     "cell": ["Wi-Fi", "Bluetooth", "LTE"]
   }
 ]
+
+
diff --git a/public/api/phones.json b/public/api/phones.json
@@ -5833,3 +5833,5 @@
     "cell": ["GPRS", "EDGE", "WCDMA", "UMTS", "HSPA", "LTE", "5G"]
   }
 ]
+
+
diff --git a/public/api/products.json b/public/api/products.json
@@ -2715,4 +2715,5 @@
     "year": 2022,
     "image": "img/phones/apple-iphone-14-pro/gold/00.webp"
   }
-]
+]
+
diff --git a/public/api/tablets.json b/public/api/tablets.json
@@ -1700,3 +1700,5 @@
     "cell": ["Not applicable"]
   }
 ]
+
+
diff --git a/setup.md b/setup.md
@@ -155,7 +155,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: "12.x"
+          node-version: [20.x]
       - run: npm ci
       - run: npm run build
       - name: Deploy

diff --git a/src/App.scss b/src/App.scss
@@ -1 +1,52 @@
-// not empty
+@import './Components/Home/Home';
+@import './Components/TopBar/top-bar';
+@import './Components/TopBar/nav';
+@import './utils/vars';
+@import './utils/mixins';
+@import './fonts/fonts';
+@import './Components/Header/header';
+@import './styles/section';
+@import './styles/WelcomeBlock';
+@import './styles/icon';
+@import './styles/categories';
+@import './styles/Page';
+@import './Components/Footer/Footer';
+@import './Components/ErrorNotification/ErrorNotification';
+@import './styles/newModels';
+@import './styles/Aside';
+
+
+html,
+body {
+  width: 100%;
+  min-height: 100%;
+  overflow-x: hidden;
+}
+
+html {
+  box-sizing: border-box;
+}
+
+*, *::before, *::after {
+  box-sizing: inherit;
+  min-width: 0;
+}
+
+img,
+svg,
+button,
+a {
+  max-width: 100%;
+}
+
+body {
+  margin: 0;
+  min-height: 100vh;
+  background-color: #0F1121;
+  color: #F1F2F9;
+  font-family: Mont, sans-serif;
+}
+
+.container {
+  @include content-padding-inline;
+}
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,7 +1,10 @@
-import './App.scss';
+import { Outlet } from 'react-router-dom';
+import React from 'react';
 
-export const App = () => (
-  <div className="App">
-    <h1>Product Catalog</h1>
-  </div>
-);
+export const App = () => {
+  return (
+    <div className="App">
+      <Outlet />
+    </div>
+  );
+};
diff --git a/src/Components/Accessories/Accessories.scss b/src/Components/Accessories/Accessories.scss
@@ -0,0 +1,21 @@
+.accessories {
+  &__path {
+    display: flex;
+
+    gap: 8px;
+
+    align-items: center;
+
+    margin-top: 25px;
+
+
+    &-phones {
+      font-family: "Mont SemiBold", sans-serif;
+
+      color: #75767F;
+      font-weight: 700;
+      font-size: 12px;
+      line-height: 100%;
+    }
+  }
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1428,3 +1428,5 @@
		"cell": ["Wi-Fi", "Bluetooth", "LTE"]
		}
		]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5833,3 +5833,5 @@
		"cell": ["GPRS", "EDGE", "WCDMA", "UMTS", "HSPA", "LTE", "5G"]
		}
		]
-Original file line number
+Diff line change
@@ Expand Up / @@ -2715,4 +2715,5 @@ @@
         "year": 2022,
         "image": "img/phones/apple-iphone-14-pro/gold/00.webp"
       }
-    ]
+    ]