Index: frontend/src/App.css
===================================================================
--- frontend/src/App.css	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ frontend/src/App.css	(revision 3c906619c6626922bbed7a5782cbbcb4dc0c5b15)
@@ -1,3 +1,38 @@
-body {
-  overflow-x: hidden;
+.App {
+  text-align: center;
 }
+
+.App-logo {
+  height: 40vmin;
+  pointer-events: none;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  .App-logo {
+    animation: App-logo-spin infinite 20s linear;
+  }
+}
+
+.App-header {
+  background-color: #282c34;
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  font-size: calc(10px + 2vmin);
+  color: white;
+}
+
+.App-link {
+  color: #61dafb;
+}
+
+@keyframes App-logo-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
Index: frontend/src/App.js
===================================================================
--- frontend/src/App.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ frontend/src/App.js	(revision 3c906619c6626922bbed7a5782cbbcb4dc0c5b15)
@@ -1,77 +1,23 @@
-import "./App.css";
-import Home from "./screens/HomeWithJumbo";
-import ProductScreen from "./screens/ProductScreen";
-import Test from "./screens/ProductScreenBootstrap";
-import { BrowserRouter, Route, Routes } from "react-router-dom";
-import { useContext } from "react";
-import { Store } from "./Store";
-import Header from "./components/Header";
-import Footer from "./components/Footer";
-import CartScreen from "./screens/CartScreen";
-import CategoryScreen from "./screens/CategoryScreen";
-import SigninScreen from "./screens/SigninScreen";
-import { ToastContainer } from "react-toastify";
-import "react-toastify/dist/ReactToastify.css";
-import ShippingAddressScreen from "./screens/ShippingAddressScreen";
-import SignupScreen from "./screens/SignupScreen";
-import PaymentMethodScreen from "./screens/PaymentMethodScreen";
-import PlaceOrderScreen from "./screens/PlaceOrderScreen";
-import OrderScreen from "./screens/OrderScreen";
-import CardPaymentScreen from "./screens/CardPaymentScreen";
-import OrderHistoryScreen from "./screens/OrderHistoryScreen";
-import ProfileScreen from "./screens/ProfileScreen";
-import AdminDashboardScreen from "./screens/AdminDashboardScreen";
-import ListProducts from "./components/ListProducts";
-import AdminAddProductScreen from "./screens/AdminAddProductScreen";
-import AdminProductsScreen from "./screens/AdminProductsScreen";
-import AdminEditProductScreen from "./screens/AdminEditProductScreen";
-import AdminOrdersScreen from "./screens/AdminOrdersScreen";
-import AdminOrderScreen from "./screens/AdminOrderScreen";
-import AdminAddCategoryScreen from "./screens/AdminAddCategoryScreen";
-import SearchScreen from "./screens/SearchScreen";
+import logo from './logo.svg';
+import './App.css';
+
 function App() {
-  const { state } = useContext(Store);
-  const { cart } = state;
-  //<Route path="/search" element={<AdminProductsScreen />} />
   return (
-    <BrowserRouter>
-      <ToastContainer position="bottom-center" limit={1} />
-      <Header />
-
-      <Routes>
-        <Route path="/product/:slug" element={<Test />} />
-        <Route path="/" element={<Home />} />
-        <Route path="/cart" element={<CartScreen />} />
-        <Route path="/signin" element={<SigninScreen />} />
-        <Route path="/signup" element={<SignupScreen />} />
-        <Route path="/shipping" element={<ShippingAddressScreen />} />
-        <Route path="/payment" element={<PaymentMethodScreen />} />
-        <Route path="/placeorder" element={<PlaceOrderScreen />} />
-        <Route path="placeorder/payment" element={<CardPaymentScreen />} />
-        <Route path="/orderhistory" element={<OrderHistoryScreen />} />
-        <Route path="/profile" element={<ProfileScreen />} />
-        <Route path="/order/:id" element={<OrderScreen />} />
-        <Route
-          path="/products/:category/:subCategory"
-          element={<CategoryScreen />}
-        />
-        <Route path="/products/search" element={<SearchScreen />} />
-        <Route path="/admin/dashboard" element={<AdminDashboardScreen />} />
-        <Route path="/admin/addProduct" element={<AdminAddProductScreen />} />
-        <Route
-          path="/admin/addCategory"
-          element={<AdminAddCategoryScreen />}
-        ></Route>
-        <Route path="/admin/products" element={<AdminProductsScreen />} />
-        <Route path="/admin/orders" element={<AdminOrdersScreen />} />
-        <Route path="/admin/order/:id" element={<AdminOrderScreen />} />
-        <Route
-          path="/admin/product/:slug"
-          element={<AdminEditProductScreen />}
-        />
-      </Routes>
-
-      <Footer />
-    </BrowserRouter>
+    <div className="App">
+      <header className="App-header">
+        <img src={logo} className="App-logo" alt="logo" />
+        <p>
+          Edit <code>src/App.js</code> and save to reload.
+        </p>
+        <a
+          className="App-link"
+          href="https://reactjs.org"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          Learn React
+        </a>
+      </header>
+    </div>
   );
 }
Index: frontend/src/Images/icon1.svg
===================================================================
--- frontend/src/Images/icon1.svg	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.5, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 38.03 37.92" style="enable-background:new 0 0 38.03 37.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#808285;}
-</style>
-<path class="st0" d="M36.76,20.51c-0.38-0.46-0.9-0.76-1.51-0.87l-0.09-0.02l-0.31-4.23h0.13c0.23,0,0.43-0.17,0.47-0.4l0.11-0.64
-	c0.12-0.66-0.04-1.3-0.44-1.77c-0.39-0.47-0.97-0.73-1.63-0.73H28.9l0.25-1.37c0.05-0.31-0.03-0.62-0.22-0.85s-0.48-0.36-0.79-0.36
-	H18.09v0.96h10.13l-1.95,11.05c-0.02,0.12,0,0.25,0.08,0.36c0.07,0.1,0.18,0.17,0.39,0.2c0.23,0,0.43-0.17,0.47-0.39l0.16-0.9h7.34
-	c0.54,0,1,0.2,1.31,0.57c0.21,0.25,0.34,0.57,0.37,0.92l0.01,0.13h-2.15c-0.23,0-0.43,0.17-0.47,0.4l-0.23,1.29
-	c-0.08,0.48,0.04,0.96,0.33,1.31c0.29,0.34,0.73,0.54,1.21,0.54h0.72l-0.52,2.91h-1.8l-0.02-0.1c-0.1-0.52-0.32-0.98-0.66-1.38
-	c-0.59-0.71-1.47-1.1-2.46-1.1c-1.58,0-3.15,1.01-3.9,2.51l-0.03,0.07h-0.47l0.81-4.59c0.02-0.13-0.01-0.26-0.08-0.36
-	c-0.07-0.11-0.19-0.18-0.4-0.21c-0.23,0-0.43,0.17-0.47,0.4l-0.84,4.76h-11.4l-0.02-0.1c-0.1-0.52-0.32-0.98-0.66-1.38
-	c-0.59-0.71-1.47-1.1-2.46-1.1c-1.58,0-3.15,1.01-3.9,2.51L6.5,28.62H2.8L3.09,27H2.11l-0.24,1.38C1.82,28.69,1.89,29,2.09,29.23
-	c0.19,0.22,0.47,0.35,0.78,0.35h3.3l-0.02,0.15c-0.16,0.99,0.08,1.92,0.67,2.62c0.6,0.71,1.47,1.1,2.47,1.1c2,0,3.91-1.62,4.26-3.62
-	l0.04-0.25h12.5l-0.02,0.15c-0.16,0.99,0.08,1.92,0.67,2.62c0.6,0.71,1.47,1.1,2.47,1.1c2,0,3.91-1.62,4.27-3.62l0.03-0.25h2.19
-	c0.23,0,0.43-0.16,0.47-0.39l1.14-6.45C37.46,21.9,37.26,21.1,36.76,20.51z M27.54,19.59l0.74-4.2h5.6l0.31,4.2H27.54z M34.57,14.43
-	h-6.12l0.29-1.62h4.75c0.37,0,0.69,0.14,0.9,0.38c0.21,0.26,0.29,0.61,0.23,0.99L34.57,14.43z M12.61,29.66
-	c-0.28,1.57-1.77,2.83-3.32,2.83c-0.71,0-1.33-0.26-1.73-0.75c-0.42-0.5-0.59-1.18-0.46-1.91C7.38,28.27,8.87,27,10.43,27
-	c0.7,0,1.32,0.27,1.73,0.76C12.58,28.26,12.74,28.94,12.61,29.66z M32.53,29.66c-0.27,1.57-1.76,2.83-3.32,2.83
-	c-0.71,0-1.32-0.26-1.73-0.75c-0.42-0.5-0.58-1.18-0.46-1.91C27.3,28.27,28.79,27,30.35,27c0.7,0,1.32,0.27,1.73,0.76
-	C32.5,28.26,32.66,28.94,32.53,29.66z M35.98,24.75h-0.89c-0.2,0-0.36-0.07-0.47-0.2c-0.12-0.13-0.16-0.32-0.12-0.52l0.16-0.9h1.6
-	L35.98,24.75z"/>
-<path class="st0" d="M9.74,30.87c-0.31,0-0.6-0.13-0.79-0.36c-0.19-0.23-0.27-0.54-0.22-0.85c0.1-0.58,0.64-1.04,1.23-1.04
-	c0.31,0,0.6,0.13,0.79,0.36c0.19,0.23,0.27,0.54,0.22,0.85C10.87,30.42,10.33,30.87,9.74,30.87z"/>
-<path class="st0" d="M29.66,30.87c-0.31,0-0.6-0.13-0.79-0.36c-0.19-0.23-0.27-0.54-0.22-0.85c0.1-0.58,0.64-1.04,1.23-1.04
-	c0.31,0,0.6,0.13,0.79,0.36c0.19,0.23,0.27,0.54,0.22,0.85C30.79,30.42,30.25,30.87,29.66,30.87z"/>
-<path class="st0" d="M1.98,27.75l0.54-3.05c0.04-0.23,0.24-0.4,0.47-0.4c0.21,0.03,0.32,0.1,0.39,0.2c0.07,0.1,0.1,0.23,0.08,0.36
-	l-0.69,3.89"/>
-<path class="st0" d="M18.96,10.23l-3.62-0.01c-0.23,0-0.43-0.17-0.47-0.4C14.86,9.62,14.91,9.49,15,9.4
-	c0.09-0.09,0.21-0.14,0.34-0.14l4.47,0.01"/>
-<g>
-	<path class="st0" d="M3.89,22.83c-0.1,0-0.2-0.03-0.29-0.09c-0.23-0.16-0.28-0.47-0.12-0.7l8.6-12.32c0.16-0.23,0.47-0.28,0.7-0.12
-		c0.23,0.16,0.28,0.47,0.12,0.7L4.3,22.62C4.2,22.75,4.05,22.83,3.89,22.83z"/>
-</g>
-<g>
-	<path class="st0" d="M12.1,22.05c-1.64,0-2.98-1.33-2.98-2.98s1.33-2.98,2.98-2.98s2.98,1.33,2.98,2.98S13.74,22.05,12.1,22.05z
-		 M12.1,17.1c-1.09,0-1.98,0.89-1.98,1.98s0.89,1.98,1.98,1.98s1.98-0.89,1.98-1.98S13.19,17.1,12.1,17.1z"/>
-</g>
-<g>
-	<path class="st0" d="M4.33,16.26c-1.64,0-2.98-1.33-2.98-2.98s1.33-2.98,2.98-2.98s2.98,1.33,2.98,2.98S5.97,16.26,4.33,16.26z
-		 M4.33,11.31c-1.09,0-1.98,0.89-1.98,1.98s0.89,1.98,1.98,1.98s1.98-0.89,1.98-1.98S5.42,11.31,4.33,11.31z"/>
-</g>
-</svg>
Index: frontend/src/Images/icon2.svg
===================================================================
--- frontend/src/Images/icon2.svg	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.5, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 39.69 39.69" style="enable-background:new 0 0 39.69 39.69;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#808285;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M6.56,34.33c-0.7,0-1.36-0.3-1.94-0.88c-0.59-0.59-0.89-1.24-0.89-1.94V14.55
-				c-1.58-0.97-2.59-2.73-2.59-4.57c0-1.91,1.02-3.67,2.66-4.61c0.17-0.09,0.37-0.09,0.53,0C4.5,5.48,4.6,5.65,4.6,5.84v3.53
-				l1.85,1.04l1.86-1.04V5.84c0-0.19,0.1-0.37,0.27-0.46c0.17-0.1,0.37-0.1,0.53,0c1.64,0.93,2.66,2.7,2.66,4.61
-				c0,1.81-0.91,3.49-2.39,4.46v17.07C9.38,33.04,8.09,34.33,6.56,34.33z M3.53,6.91C2.7,7.69,2.21,8.8,2.21,9.98
-				c0,1.55,0.91,3.04,2.31,3.78c0.18,0.09,0.28,0.28,0.28,0.47v17.27c0,0.41,0.19,0.79,0.57,1.18c1.26,1.26,2.93,0.18,2.93-1.18
-				V14.14c0-0.19,0.1-0.37,0.27-0.47c1.33-0.75,2.12-2.13,2.12-3.69c0-1.18-0.49-2.29-1.32-3.08v2.78c0,0.19-0.1,0.37-0.27,0.47
-				L6.71,11.5c-0.16,0.09-0.36,0.09-0.53,0L3.8,10.15c-0.17-0.09-0.27-0.27-0.27-0.47V6.91z"/>
-		</g>
-	</g>
-	<g>
-		<path class="st0" d="M31.89,21.66H20.41c-0.3,0-0.54-0.24-0.54-0.54v-9.19c0-1.56,1.27-2.83,2.83-2.83h6.48
-			c1.79,0,3.24,1.45,3.24,3.24v8.77C32.42,21.42,32.18,21.66,31.89,21.66z M20.94,20.58h10.41v-8.24c0-1.2-0.97-2.17-2.17-2.17H22.7
-			c-0.97,0-1.76,0.79-1.76,1.76V20.58z M18.57,21.66H11.2c-0.3,0-0.54-0.24-0.54-0.54s0.24-0.54,0.54-0.54h6.84v-8.65
-			c0-0.97-0.79-1.76-1.76-1.76h-2.9c-0.3,0-0.54-0.24-0.54-0.54s0.24-0.54,0.54-0.54h2.9c1.56,0,2.83,1.27,2.83,2.83v9.19
-			C19.11,21.42,18.87,21.66,18.57,21.66z"/>
-	</g>
-	<g>
-		<path class="st0" d="M35.4,34.38h-2.95c-0.27,0-0.5-0.2-0.53-0.47l-0.56-4.17c-0.02-0.15,0.03-0.31,0.13-0.42
-			c0.1-0.12,0.25-0.18,0.4-0.18h2.95c0.27,0,0.5,0.2,0.53,0.47l0.56,4.17c0.02,0.15-0.03,0.31-0.13,0.42
-			C35.7,34.31,35.55,34.38,35.4,34.38z M32.91,33.3h1.87l-0.41-3.1H32.5L32.91,33.3z"/>
-	</g>
-	<g>
-		<path class="st0" d="M38.55,30.2H11.2c-0.3,0-0.54-0.24-0.54-0.54c0-0.3,0.24-0.54,0.54-0.54h26.27V18.06c0-0.49-0.4-0.9-0.9-0.9
-			h-1.37v6.15c0,0.58-0.47,1.06-1.06,1.06H11.2c-0.3,0-0.54-0.24-0.54-0.54c0-0.3,0.24-0.54,0.54-0.54h22.95l-0.02-7.21h2.44
-			c1.09,0,1.97,0.88,1.97,1.97V30.2z"/>
-	</g>
-</g>
-</svg>
Index: frontend/src/Images/icon3.svg
===================================================================
--- frontend/src/Images/icon3.svg	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.5, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 39.69 39.69" style="enable-background:new 0 0 39.69 39.69;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#808285;}
-</style>
-<g>
-	<path class="st0" d="M8.19,20.26c-0.26,0-0.47-0.21-0.47-0.47s0.21-0.47,0.47-0.47h16.57c0.26,0,0.47,0.21,0.47,0.47
-		s-0.21,0.47-0.47,0.47H8.19z"/>
-	<path class="st0" d="M30.88,31.93c-1,0-1.87-0.39-2.47-1.1c-0.59-0.7-0.83-1.64-0.67-2.63l0.02-0.14h-12.5l-0.04,0.25
-		c-0.35,2-2.27,3.62-4.27,3.62c-1,0-1.87-0.39-2.47-1.1c-0.59-0.7-0.83-1.64-0.67-2.63l0.02-0.14h-3.3c-0.31,0-0.6-0.13-0.79-0.36
-		c-0.19-0.23-0.27-0.54-0.22-0.85l0.24-1.37H1.13c-0.26,0-0.48-0.22-0.48-0.48s0.22-0.48,0.48-0.48h6.45c0.26,0,0.48,0.22,0.48,0.48
-		s-0.22,0.48-0.48,0.48H4.76L4.48,27.1h3.69l0.03-0.07c0.75-1.5,2.32-2.51,3.9-2.51c1,0,1.87,0.39,2.47,1.1
-		c0.33,0.4,0.55,0.86,0.66,1.38l0.02,0.1h11.4l0.84-4.76c0.04-0.23,0.24-0.4,0.47-0.4c0.21,0.03,0.32,0.1,0.39,0.2
-		c0.07,0.1,0.1,0.23,0.08,0.36l-0.81,4.6h0.47l0.03-0.07c0.75-1.5,2.32-2.51,3.9-2.51c1,0,1.87,0.39,2.47,1.1
-		c0.33,0.4,0.55,0.86,0.66,1.38l0.02,0.1h1.8l0.51-2.91h-0.72c-0.48,0-0.92-0.2-1.21-0.54c-0.29-0.35-0.41-0.83-0.33-1.31l0.23-1.29
-		c0.04-0.23,0.24-0.4,0.47-0.4h2.15l-0.01-0.14c-0.03-0.35-0.16-0.66-0.37-0.92c-0.31-0.37-0.77-0.57-1.31-0.57h-7.34l-0.16,0.89
-		c-0.04,0.23-0.24,0.4-0.47,0.4c-0.21-0.03-0.32-0.1-0.39-0.21c-0.07-0.1-0.1-0.23-0.08-0.36l1.95-11.05H7.96
-		c-0.12,0-0.26,0.12-0.29,0.25L5.74,19.93c-0.04,0.23-0.24,0.4-0.47,0.4c-0.34-0.05-0.52-0.3-0.47-0.56L6.73,8.79
-		c0.1-0.58,0.64-1.04,1.23-1.04h21.86c0.31,0,0.6,0.13,0.79,0.36c0.19,0.23,0.27,0.54,0.22,0.85l-0.24,1.37h4.59
-		c0.66,0,1.23,0.26,1.63,0.73c0.39,0.47,0.55,1.12,0.44,1.77l-0.11,0.65c-0.04,0.23-0.24,0.39-0.47,0.4l-0.13,0l0.31,4.23l0.09,0.02
-		c0.6,0.11,1.12,0.41,1.5,0.86c0.5,0.6,0.7,1.39,0.55,2.23l-1.14,6.45c-0.04,0.23-0.24,0.4-0.47,0.4h-2.19l-0.04,0.25
-		C34.8,30.31,32.88,31.93,30.88,31.93z M32.02,25.48c-1.56,0-3.05,1.27-3.32,2.83c-0.13,0.73,0.03,1.41,0.45,1.91
-		c0.41,0.49,1.02,0.76,1.73,0.76c1.56,0,3.05-1.27,3.32-2.83c0.13-0.73-0.03-1.41-0.45-1.91C33.35,25.75,32.73,25.48,32.02,25.48z
-		 M12.1,25.48c-1.56,0-3.05,1.27-3.32,2.83c-0.13,0.73,0.03,1.41,0.45,1.91c0.41,0.49,1.02,0.76,1.73,0.76
-		c1.56,0,3.05-1.27,3.32-2.83c0.13-0.73-0.03-1.41-0.45-1.91C13.42,25.75,12.81,25.48,12.1,25.48z M36.17,22.51
-		c-0.04,0.21,0.01,0.39,0.12,0.53c0.11,0.13,0.27,0.2,0.47,0.2l0.89,0l0.29-1.62h-1.61L36.17,22.51z M29.22,18.07h6.65l-0.31-4.2
-		h-5.6L29.22,18.07z M30.13,12.91h6.12l0.04-0.25c0.07-0.38-0.01-0.73-0.23-0.99c-0.21-0.25-0.52-0.38-0.89-0.38h-4.76L30.13,12.91z
-		"/>
-	<path class="st0" d="M11.42,29.35c-0.31,0-0.6-0.13-0.79-0.36c-0.19-0.23-0.27-0.54-0.22-0.85c0.1-0.58,0.64-1.04,1.23-1.04
-		c0.31,0,0.6,0.13,0.79,0.36c0.19,0.23,0.27,0.54,0.22,0.85C12.55,28.9,12.01,29.35,11.42,29.35z"/>
-	<path class="st0" d="M31.34,29.35c-0.31,0-0.6-0.13-0.79-0.36c-0.19-0.23-0.27-0.54-0.22-0.85c0.1-0.58,0.64-1.04,1.23-1.04
-		c0.31,0,0.6,0.13,0.79,0.36c0.19,0.23,0.27,0.54,0.22,0.85C32.47,28.9,31.93,29.35,31.34,29.35z"/>
-	<path class="st0" d="M2.88,22.9c-0.26,0-0.48-0.22-0.48-0.48c0-0.26,0.22-0.48,0.48-0.48h11.16c0.26,0,0.48,0.22,0.48,0.48
-		c0,0.26-0.22,0.48-0.48,0.48H2.88z"/>
-</g>
-</svg>
Index: frontend/src/Store.js
===================================================================
--- frontend/src/Store.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,72 +1,0 @@
-import { createContext, useReducer } from "react";
-
-export const Store = createContext();
-
-const initialState = {
-  userInfo: localStorage.getItem("userInfo")
-    ? JSON.parse(localStorage.getItem("userInfo"))
-    : null,
-  cart: {
-    shippingAddress: localStorage.getItem("shippingAddress")
-      ? JSON.parse(localStorage.getItem("shippingAddress"))
-      : {},
-    paymentMethod: localStorage.getItem("paymentMethod")
-      ? localStorage.getItem("paymentMethod")
-      : "",
-    cartItems: localStorage.getItem("cartItems")
-      ? JSON.parse(localStorage.getItem("cartItems"))
-      : [],
-  },
-};
-
-function reducer(state, action) {
-  switch (action.type) {
-    case "CART_ADD_ITEM":
-      const newItem = action.payload;
-      const existItem = state.cart.cartItems.find(
-        (item) => item._id === newItem._id
-      );
-      const cartItems = existItem
-        ? state.cart.cartItems.map((item) =>
-            item._id === existItem._id ? newItem : item
-          )
-        : [...state.cart.cartItems, newItem];
-      localStorage.setItem("cartItems", JSON.stringify(cartItems));
-      return { ...state, cart: { ...state.cart, cartItems } };
-    case "CART_REMOVE_ITEM": {
-      const cartItems = state.cart.cartItems.filter(
-        (item) => item._id !== action.payload._id
-      );
-      localStorage.setItem("cartItems", JSON.stringify(cartItems));
-      return { ...state, cart: { ...state.cart, cartItems } };
-    }
-    case "CART_CLEAR":
-      return { ...state, cart: { ...state.cart, cartItems: [] } };
-    case "USER_SIGNIN":
-      return { ...state, userInfo: action.payload };
-    case "USER_SIGNOUT":
-      return {
-        ...state,
-        userInfo: null,
-        cart: { cartItems: [], shippingAddress: {}, paymentMethod: "" },
-      };
-    case "SAVE_SHIPPING_ADDRESS":
-      return {
-        ...state,
-        cart: { ...state.cart, shippingAddress: action.payload },
-      };
-    case "SAVE_PAYMENT_METHOD":
-      return {
-        ...state,
-        cart: { ...state.cart, paymentMethod: action.payload },
-      };
-    default:
-      return state;
-  }
-}
-
-export function StoreProvider(props) {
-  const [state, dispatch] = useReducer(reducer, initialState);
-  const value = { state, dispatch };
-  return <Store.Provider value={value}>{props.children}</Store.Provider>;
-}
Index: frontend/src/components/AddProductForm.js
===================================================================
--- frontend/src/components/AddProductForm.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,345 +1,0 @@
-import axios from "axios";
-import React, { useState } from "react";
-import Button from "react-bootstrap/Button";
-import Form from "react-bootstrap/Form";
-import { toast } from "react-toastify";
-
-function AddProductForm() {
-  const [name, setName] = useState("");
-  const [slug, setSlug] = useState("");
-  const [category, setCategory] = useState("dnevna");
-  const [subCategory, setSubCategory] = useState("");
-  const [description, setDescription] = useState("");
-  const [price, setPrice] = useState("");
-  const [priceMontaza, setPriceMontaza] = useState("");
-  const [countInStock, setCountInStock] = useState("");
-  const [image, setImage] = useState("");
-  const [sideImage, setSideImage] = useState("");
-  const [sideImage2, setSideImage2] = useState("");
-  const [dimension, setDimension] = useState("");
-  const [scheme, setScheme] = useState("");
-  const [message, setMessage] = useState("");
-
-  const onChangeImage = (e) => {
-    setImage(e.target.files[0]);
-  };
-  const onChangeSideImage = (e) => {
-    setSideImage(e.target.files[0]);
-  };
-  const onChangeSideImage2 = (e) => {
-    setSideImage2(e.target.files[0]);
-  };
-  const onChangeDimension = (e) => {
-    setDimension(e.target.files[0]);
-  };
-  const onChangeScheme = (e) => {
-    setScheme(e.target.files[0]);
-  };
-
-  const submitHandler = async (e) => {
-    e.preventDefault();
-
-    const formData = new FormData();
-
-    formData.append("name", name);
-    formData.append("slug", slug);
-    formData.append("category", category);
-    formData.append("subCategory", subCategory);
-    formData.append("description", description);
-    formData.append("price", price);
-    formData.append("priceMontaza", priceMontaza);
-    formData.append("countInStock", countInStock);
-    formData.append("image", image);
-    formData.append("sideImage", sideImage);
-    formData.append("sideImage2", sideImage2);
-    formData.append("dimension", dimension);
-    formData.append("scheme", scheme);
-
-    try {
-      const result = await axios.post("/api/products/add", formData);
-      if (result) toast.success("Product Added");
-      return;
-    } catch (error) {
-      console.log(error);
-    }
-  };
-
-  return (
-    <div className="taskContainer">
-      <h1>Додади нов продукт</h1>
-      <Form
-        onSubmit={submitHandler}
-        encType="multipart/form-data"
-        className="newProductFormCointainer"
-      >
-        <div className="firstRow" style={{ display: "flex" }}>
-          <Form.Group>
-            <Form.Label>Име</Form.Label>
-            <Form.Control
-              value={name}
-              onChange={(e) => setName(e.target.value)}
-              required
-            ></Form.Control>
-          </Form.Group>
-          <Form.Group>
-            <Form.Label>Слуг</Form.Label>
-            <Form.Control
-              value={slug}
-              onChange={(e) => setSlug(e.target.value)}
-              required
-            ></Form.Control>
-          </Form.Group>
-          <Form.Group>
-            <Form.Label>Категорија</Form.Label>
-            <Form.Select onChange={(e) => setCategory(e.target.value)}>
-              <option value={"dnevna"}>Дневна</option>
-              <option value={"spalna"}>Спална</option>
-              <option value={"kancelarija"}>Канцеларија</option>
-              <option value={"hodnik"}>Ходник</option>
-              <option value={"gradina"}>Градина</option>
-              <option value={"trpezarija"}>Трпезарија</option>
-              <option value={"kujna"}>Кујна</option>
-              <option value={"detska"}>Детска</option>
-            </Form.Select>
-          </Form.Group>
-          <Form.Group>
-            <Form.Label>Подкатегорија</Form.Label>
-            <Form.Select onChange={(e) => setSubCategory(e.target.value)}>
-              <option value="default">Подкатегорија</option>
-              {category === "dnevna" && (
-                <option value="agolni-garnituri">Аголни Гарнитури</option>
-              )}
-              {category === "dnevna" && <option value="sofi">Софи</option>}
-              {category === "dnevna" && (
-                <option value="fotelji">Фотелји</option>
-              )}
-              {category === "dnevna" && (
-                <option value="taburetki">Табуретки</option>
-              )}
-              {category === "dnevna" && (
-                <option value="klub-masi">Клуб маси</option>
-              )}
-              {category === "dnevna" && (
-                <option value="tv-komodi">ТВ комоди</option>
-              )}
-              {category === "dnevna" && <option value="komodi">Комоди</option>}
-              {category === "spalna" && (
-                <option value="spalni-kompleti">Спални Комплети</option>
-              )}
-              {category === "spalna" && <option value="lezai">Лежаи</option>}
-              {category === "spalna" && (
-                <option value="kreveti">Кревети</option>
-              )}
-              {category === "spalna" && (
-                <option value="plakari">Плакари</option>
-              )}
-              {category === "spalna" && (
-                <option value="nokni-skafcinja">Ноќни шкафчиња</option>
-              )}
-              {category === "spalna" && (
-                <option value="toaletni-masi">Тоалетни маси</option>
-              )}
-              {category === "kancelarija" && (
-                <option value="biroa">Бироа</option>
-              )}
-              {category === "kancelarija" && (
-                <option value="kancelariski-stolovi">
-                  Канцелариски столови
-                </option>
-              )}
-              {category === "kancelarija" && (
-                <option value="gejmerski-stolovi">Гејмерски столови</option>
-              )}
-              {category === "kancelarija" && (
-                <option value="kancelariski-skafovi">
-                  Канцелариски шкафови
-                </option>
-              )}
-              {category === "hodnik" && (
-                <option value="skafovi-za-cevli">Шкафови за чевли</option>
-              )}
-              {category === "hodnik" && (
-                <option value="zakacalki-i-ogledala">
-                  Закачалки и огледала
-                </option>
-              )}
-              {category === "hodnik" && (
-                <option value="kolekcii-za-hodnik">Колекции за ходник</option>
-              )}
-              {category === "gradina" && (
-                <option value="gradinarski-kompleti">
-                  Градинарски комплети
-                </option>
-              )}
-              {category === "gradina" && (
-                <option value="gradinarski-lulki">Градинарски лулки</option>
-              )}
-              {category === "gradina" && (
-                <option value="gradinarski-cadori">Градинарски чадори</option>
-              )}
-              {category === "gradina" && (
-                <option value="gradinarski-masi">Градинарски маси</option>
-              )}
-              {category === "gradina" && (
-                <option value="gradinarski-stolovi">Градинарски столови</option>
-              )}
-              {category === "gradina" && (
-                <option value="gradinarsko-osvetluvanje">
-                  Градинарско осветлување
-                </option>
-              )}
-              {category === "trpezarija" && (
-                <option value="trpezariski-masi">Трпезариски маси</option>
-              )}
-              {category === "trpezarija" && (
-                <option value="trpezariski-stolovi">Трпезариски столови</option>
-              )}
-              {category === "trpezarija" && (
-                <option value="kujnski-garnituri">Кујнски гарнитури</option>
-              )}
-              {category === "trpezarija" && (
-                <option value="bar-stolovi-i-masi">Бар столови и маси</option>
-              )}
-              {category === "kujna" && (
-                <option value="kujnski-agolni-garnituri">
-                  Кујнски аголни гарнитури
-                </option>
-              )}
-              {category === "kujna" && (
-                <option value="standardni-kujni">Стандардни кујни</option>
-              )}
-              {category === "detska" && (
-                <option value="kolekcii-za-detska-soba">
-                  Колекции за детска соба
-                </option>
-              )}
-              {category === "detska" && (
-                <option value="detski-biroa">Детски бироа</option>
-              )}
-              {category === "detska" && (
-                <option value="detski-lezai">Детски лежаи</option>
-              )}
-            </Form.Select>
-          </Form.Group>
-        </div>
-        <div className="secondRow">
-          <Form.Group style={{ width: "60%", marginTop: "20px" }}>
-            <Form.Label>Опис</Form.Label>
-            <Form.Control
-              id="textArea"
-              value={description}
-              onChange={(e) => setDescription(e.target.value)}
-              as="textarea"
-              required
-            ></Form.Control>
-          </Form.Group>
-          <div
-            style={{
-              display: "flex",
-              flexDirection: "column",
-              alignItems: "center",
-              justifyContent: "center",
-              width: "40%",
-            }}
-          >
-            <Form.Group style={{ marginTop: "20px" }}>
-              <Form.Label>Цена</Form.Label>
-              <Form.Control
-                value={price}
-                onChange={(e) => setPrice(e.target.value)}
-                type="number"
-                required
-              ></Form.Control>
-            </Form.Group>
-            <Form.Group style={{ marginTop: "10px" }}>
-              <Form.Label>Цена Монтажа</Form.Label>
-              <Form.Control
-                value={priceMontaza}
-                onChange={(e) => setPriceMontaza(e.target.value)}
-                type="number"
-                required
-              ></Form.Control>
-            </Form.Group>
-            <Form.Group style={{ marginTop: "10px" }}>
-              <Form.Label>Залиха</Form.Label>
-              <Form.Control
-                value={countInStock}
-                onChange={(e) => setCountInStock(e.target.value)}
-                type="number"
-                required
-              ></Form.Control>
-            </Form.Group>
-          </div>
-        </div>
-        <div className="thirdRow">
-          <div
-            style={{
-              display: "flex",
-              flexDirection: "column",
-              alignItems: "center",
-              justifyContent: "center",
-            }}
-          >
-            <Form.Group>
-              <Form.Label>Главна слика</Form.Label>
-              <Form.Control
-                type="file"
-                name="image"
-                onChange={onChangeImage}
-                required
-              ></Form.Control>
-            </Form.Group>
-
-            <Form.Group style={{ marginTop: "10px" }}>
-              <Form.Label>Споредна слика бр.1</Form.Label>
-              <Form.Control
-                type="file"
-                name="sideImage"
-                onChange={onChangeSideImage}
-                required
-              ></Form.Control>
-            </Form.Group>
-
-            <Form.Group style={{ marginTop: "10px" }}>
-              <Form.Label>Споредна слика бр.2</Form.Label>
-              <Form.Control
-                type="file"
-                name="sideImage2"
-                onChange={onChangeSideImage2}
-                required
-              ></Form.Control>
-            </Form.Group>
-          </div>
-          <div>
-            <Form.Group>
-              <Form.Label>Слика со димензии</Form.Label>
-              <Form.Control
-                type="file"
-                name="dimension"
-                onChange={onChangeDimension}
-                required
-              ></Form.Control>
-            </Form.Group>
-
-            <Form.Group style={{ marginTop: "10px" }}>
-              <Form.Label>Слика од шема</Form.Label>
-              <Form.Control
-                type="file"
-                name="scheme"
-                onChange={onChangeScheme}
-                required
-              ></Form.Control>
-            </Form.Group>
-          </div>
-        </div>
-        <div className="submitBtnContainer">
-          <Button variant="danger" size="lg" type="submit">
-            Додади
-          </Button>
-        </div>
-      </Form>
-    </div>
-  );
-}
-
-export default AddProductForm;
Index: frontend/src/components/CategoryMenu.js
===================================================================
--- frontend/src/components/CategoryMenu.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,30 +1,0 @@
-import React from "react";
-import { Link } from "react-router-dom";
-import SubCategoryMenu from "./SubCategoryMenu";
-
-function CategoryMenu(props) {
-  let ul = document.getElementById("subCategoryList");
-
-  const result = [];
-
-  props.category.subCategories.forEach((sub) => {
-    result.push(
-      <SubCategoryMenu
-        subCategory={sub}
-        category={props.category}
-      ></SubCategoryMenu>
-    );
-  });
-
-  const categoryUrl = `/products/${props.category.categorySlug}/all`;
-  return (
-    <div>
-      <Link to={categoryUrl}>
-        <span>{props.category.categoryName}</span>
-      </Link>
-      <ul id="subCategoryList">{result}</ul>
-    </div>
-  );
-}
-
-export default CategoryMenu;
Index: frontend/src/components/CheckoutSteps.js
===================================================================
--- frontend/src/components/CheckoutSteps.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import React from "react";
-import Row from "react-bootstrap/Row";
-import Col from "react-bootstrap/Col";
-
-function CheckoutSteps(props) {
-  return (
-    <Row className="checkout-steps">
-      <Col className={props.step1 ? "active" : ""}>Најава</Col>
-      <Col className={props.step2 ? "active" : ""}>Адреса</Col>
-      <Col className={props.step3 ? "active" : ""}>Плаќање</Col>
-      <Col className={props.step4 ? "active" : ""}>Потврди</Col>
-    </Row>
-  );
-}
-
-export default CheckoutSteps;
Index: frontend/src/components/Footer.js
===================================================================
--- frontend/src/components/Footer.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,41 +1,0 @@
-import React from "react";
-import "../styles/Footer.css";
-import fbIcon from "../Images/facebook.png";
-import igIcon from "../Images/instragram.png";
-import twIcon from "../Images/twitter.png";
-import piIcon from "../Images/pinterest.png";
-
-function Footer() {
-  return (
-    <div className="footer">
-      <div className="footer__contact">
-        <h2>Контакти</h2>
-        <p>E-mail: mebelcity@gmail.com</p>
-        <p>Од понеделник до сабота: 08:00 - 19:00</p>
-        <p>Недела: 09:00 - 16:00</p>
-        <p>Call Center: 0123456789 </p>
-      </div>
-      <div className="footer__social">
-        <h2>Следете не</h2>
-        <div className="socialIconText">
-          <img alt="facebook" src={fbIcon}></img>
-          <span>Facebook</span>
-        </div>
-        <div className="socialIconText">
-          <img alt="instagram" src={igIcon}></img>
-          <span>Instagram</span>
-        </div>
-        <div className="socialIconText">
-          <img alt="twitter" src={twIcon}></img>
-          <span>Twitter</span>
-        </div>
-        <div className="socialIconText">
-          <img alt="pinterest" src={piIcon}></img>
-          <span>Pinterest</span>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default Footer;
Index: frontend/src/components/Header.js
===================================================================
--- frontend/src/components/Header.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,1271 +1,0 @@
-import React, { useEffect, useState } from "react";
-import logo from "../Images/logo.png";
-import "../styles/Header.css";
-import SearchIcon from "@mui/icons-material/Search";
-import AccountCircleIcon from "@mui/icons-material/AccountCircle";
-//import ShoppingBasketIcon from '@mui/icons-material/ShoppingBasket';
-import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
-import WeekendIcon from "@mui/icons-material/Weekend";
-import MeetingRoomIcon from "@mui/icons-material/MeetingRoom";
-import TableRestaurantIcon from "@mui/icons-material/TableRestaurant";
-import BedIcon from "@mui/icons-material/Bed";
-import KitchenIcon from "@mui/icons-material/Kitchen";
-import ChairAltIcon from "@mui/icons-material/ChairAlt";
-import BedroomChildIcon from "@mui/icons-material/BedroomChild";
-import DeckIcon from "@mui/icons-material/Deck";
-import ShoppingBasketIcon from "@mui/icons-material/ShoppingCart";
-import MenuIcon from "@mui/icons-material/Menu";
-import { Link, NavLink, useNavigate } from "react-router-dom";
-import logo2 from "../Images/logo2.png";
-import Badge from "react-bootstrap/Badge";
-import ArrowBackIcon from "@mui/icons-material/ArrowBack";
-import { Store } from "../Store";
-import { useContext } from "react";
-import NavDropdown from "react-bootstrap/NavDropdown";
-import { height } from "@mui/system";
-import Axios from "axios";
-import CategoryMenu from "./CategoryMenu";
-
-const toggleMenu = (event) => {
-  event.stopPropagation();
-  let menu = document.querySelector(".mobile-menu-container");
-  menu.classList.remove("hidden");
-  menu.classList.add("visible");
-};
-
-const toggleSubMenu = (event) => {
-  event.stopPropagation();
-  let menu = document.querySelector(".subDropdown");
-  menu.classList.remove("hidden");
-  menu.classList.add("visible");
-  let tog = document.querySelector(".subMenu");
-  tog.removeAttribute("onClick");
-  console.log("SubMenu Visible");
-};
-
-const categoryMenuTrigger = (event) => {
-  event.stopPropagation();
-  let span = event.target;
-  let menu = document.querySelector(`.${span.classList[0]}-menu`);
-  menu.classList.remove("hidden");
-  menu.classList.add("visible");
-};
-
-const closeMenu = (event) => {
-  let menu = document.querySelector(".mobile-menu-container");
-  menu.classList.remove("visible");
-  menu.classList.add("hidden");
-};
-
-const backToMenu = (event) => {
-  event.stopPropagation();
-  let menu1 = document.querySelector(".subDropdown");
-  menu1.classList.remove("visible");
-  menu1.classList.add("hidden");
-  console.log("SubMenu Invisible");
-};
-
-const backToSubMenu = (event) => {
-  event.stopPropagation();
-  let menu = document.querySelector(`.${event.target.classList[0]}-menu`);
-  menu.classList.remove("visible");
-  menu.classList.add("hidden");
-};
-
-function Header() {
-  const { state, dispatch: ctxDispatch } = useContext(Store);
-  const { cart, userInfo } = state;
-  const navigate = useNavigate();
-
-  const [categories, setCategories] = useState([]);
-  //const []
-
-  const signoutHandler = () => {
-    ctxDispatch({ type: "USER_SIGNOUT" });
-    localStorage.removeItem("userInfo");
-    localStorage.removeItem("shippingAddress");
-    localStorage.removeItem("paymentMethod");
-    window.location.href = "/signin";
-  };
-
-  const searchHandler = () => {
-    let text = document.querySelector(".header__searchInput").value;
-    console.log(text);
-    navigate(`/products/search?text=${text}`);
-  };
-
-  useEffect(() => {
-    const fetchData = async () => {
-      const cat = await Axios.get(`/api/category/getCategories`);
-      categories.splice(0, categories.length);
-      for (let i = 0; i < cat.data.length; i++) {
-        categories.push(cat.data[i]);
-      }
-      console.log(categories[0]);
-    };
-    fetchData();
-  }, [categories]);
-  const results = [];
-  const results1 = [];
-  const results2 = [];
-  const results3 = [];
-  if (categories) createMenu(categories);
-  function createMenu(categories) {
-    /*
-    let ul = document.getElementById("category-ul-1");
-    for(let i=0;i<categories.length;i++){
-      ul.appendChild()
-    }*/
-    results.splice(0, results.length);
-    categories.forEach((category) => {
-      results.push(<CategoryMenu category={category} />);
-    });
-    for (let i = 0; i < categories.length; i++) {
-      if (i < 3) {
-        results1.push(<CategoryMenu category={categories[i]} />);
-      } else if (i < 5) {
-        results2.push(<CategoryMenu category={categories[i]} />);
-      } else {
-        results3.push(<CategoryMenu category={categories[i]} />);
-      }
-    }
-    console.log("Results:");
-    console.log(categories);
-  }
-
-  return (
-    <div className="header">
-      <div className="header__iconContainer">
-        <MenuIcon
-          className="header__icon"
-          fontSize="large"
-          onClick={toggleMenu}
-        />
-        <img
-          className="header__icon"
-          src={logo2}
-          alt="logo"
-          onClick={() => {
-            navigate("/");
-          }}
-        ></img>
-      </div>
-      <div className="mobile-menu-container hidden">
-        <div className="closeBtn" onClick={closeMenu}>
-          x
-        </div>
-        <ul className="mobile-menu">
-          <Link
-            to="/"
-            style={{ textDecoration: "none", color: "black" }}
-            onClick={closeMenu}
-          >
-            <li>Почетна</li>
-          </Link>
-          <li onClick={toggleSubMenu} className="subMenu">
-            Производи <ArrowDropDownIcon />
-            <div className="subDropdown hidden">
-              <div className="backBtn" onClick={backToMenu}>
-                <ArrowBackIcon />
-                Назад
-              </div>
-              <ul className="mobile-submenu">
-                <li
-                  className="category-menu-trigger"
-                  onClick={categoryMenuTrigger}
-                >
-                  <span className="dnevna">
-                    <WeekendIcon /> Дневна
-                  </span>
-                  <div className="category-menu dnevna-menu hidden">
-                    <div onClick={backToSubMenu} className="dnevna">
-                      <ArrowBackIcon />
-                      Назад
-                    </div>
-                    <ul>
-                      <li>
-                        <Link
-                          to="/products/dnevna/agolni-garnituri"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Аголни гарнитури
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/dnevna/sofi"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Софи
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/dnevna/fotelji"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Фотелји
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/dnevna/taburetki"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Табуретки
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/dnevna/klub-masi"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Клуб Маси
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/dnevna/tv-komodi"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          ТВ Комоди
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/dnevna/komodi"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Комоди
-                        </Link>
-                      </li>
-                    </ul>
-                  </div>
-                </li>
-                <li
-                  className="category-menu-trigger"
-                  onClick={categoryMenuTrigger}
-                >
-                  <span className="hodnik">
-                    <MeetingRoomIcon />
-                    Ходник
-                  </span>
-                  <div className="category-menu hodnik-menu hidden">
-                    <div onClick={backToSubMenu} className="hodnik">
-                      <ArrowBackIcon />
-                      Назад
-                    </div>
-                    <ul>
-                      <li>
-                        <Link
-                          to="/products/hodnik/skafovi-za-cevli"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Шкафови за чевли
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/hodnik/zakacalki-i-ogledala"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Закачалки и огледала
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/hodnik/kolekcii-za-hodnik"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Колекции за ходник
-                        </Link>
-                      </li>
-                    </ul>
-                  </div>
-                </li>
-                <li
-                  className="category-menu-trigger"
-                  onClick={categoryMenuTrigger}
-                >
-                  <span className="kujna">
-                    <KitchenIcon />
-                    Кујна
-                  </span>
-                  <div className="category-menu kujna-menu hidden">
-                    <div onClick={backToSubMenu} className="kujna">
-                      <ArrowBackIcon />
-                      Назад
-                    </div>
-                    <ul>
-                      <li>
-                        <Link
-                          to="/products/kujna/kujnski-agolni-garnituri"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Кујнски аголни гарнитури
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/kujna/standarni-kujni"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Стандардни кујни
-                        </Link>
-                      </li>
-                    </ul>
-                  </div>
-                </li>
-                <li
-                  className="category-menu-trigger"
-                  onClick={categoryMenuTrigger}
-                >
-                  <span className="spalna">
-                    <BedIcon />
-                    Спална
-                  </span>
-                  <div className="category-menu spalna-menu hidden">
-                    <div onClick={backToSubMenu} className="spalna">
-                      <ArrowBackIcon />
-                      Назад
-                    </div>
-                    <ul>
-                      <li>
-                        <Link
-                          to="/products/spalna/spalni-kompleti"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Спални комплети
-                        </Link>
-                      </li>
-
-                      <li>
-                        <Link
-                          to="/products/spalna/lezai"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Лежаи
-                        </Link>
-                      </li>
-
-                      <li>
-                        <Link
-                          to="/products/spalna/kreveti"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Кревети
-                        </Link>
-                      </li>
-
-                      <li>
-                        <Link
-                          to="/products/spalna/plakari"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Плакари
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/spalna/nokni-skafcinja"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Ноќни шкафчиња
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/spalna/toaletni-masi"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Тоалетни маси
-                        </Link>
-                      </li>
-                    </ul>
-                  </div>
-                </li>
-                <li
-                  className="category-menu-trigger"
-                  onClick={categoryMenuTrigger}
-                >
-                  <span className="gradina">
-                    <DeckIcon />
-                    Градина
-                  </span>
-                  <div className="category-menu gradina-menu hidden">
-                    <div onClick={backToSubMenu} className="gradina">
-                      <ArrowBackIcon />
-                      Назад
-                    </div>
-                    <ul>
-                      <li>
-                        <Link
-                          to="/products/gradina/gradinarski-kompleti"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Градинарски комплети
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/gradina/gradinarski-lulki"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Градинарски лулки
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/gradina/gradinarski-cadori"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Градинарски чадори
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/gradina/gradinarski-masi"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Градинарски маси
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/gradina/gradinarski-stolovi"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Градинарски столови
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/gradina/gradinarsko-osvetluvanje"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Градинарско осветлување
-                        </Link>
-                      </li>
-                    </ul>
-                  </div>
-                </li>
-                <li
-                  className="category-menu-trigger"
-                  onClick={categoryMenuTrigger}
-                >
-                  <span className="kancelarija">
-                    <ChairAltIcon />
-                    Канцеларија
-                  </span>
-                  <div className="category-menu kancelarija-menu hidden">
-                    <div onClick={backToSubMenu} className="kancelarija">
-                      <ArrowBackIcon />
-                      Назад
-                    </div>
-                    <ul>
-                      <li>
-                        <Link
-                          to="/products/kancelarija/biroa"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Бироа
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/kancelarija/kancelariski-stolovi"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Канцелариски столови
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/kancelarija/gejmerski-stolovi"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Гејмерски столови
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/kancelarija/kancelariski-skafovi"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Канцелариски шкафови
-                        </Link>
-                      </li>
-                    </ul>
-                  </div>
-                </li>
-                <li
-                  className="category-menu-trigger"
-                  onClick={categoryMenuTrigger}
-                >
-                  <span className="trpezarija">
-                    <TableRestaurantIcon />
-                    Трпезарија
-                  </span>
-                  <div className="category-menu trpezarija-menu hidden">
-                    <div onClick={backToSubMenu} className="trpezarija">
-                      <ArrowBackIcon />
-                      Назад
-                    </div>
-                    <ul>
-                      <li>
-                        <Link
-                          to="/products/trpezarija/trpezariski-masi"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Трпезариски маси
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/trpezarija/trpezariski-stolovi"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Трпезариски столови
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/trpezarija/kujnski-garnituri"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Кујнски гарнитури
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/trpezarija/bar-stolovi-i-masi"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Бар столови и маси
-                        </Link>
-                      </li>
-                    </ul>
-                  </div>
-                </li>
-                <li
-                  className="category-menu-trigger"
-                  onClick={categoryMenuTrigger}
-                >
-                  <span className="detska">
-                    <BedroomChildIcon />
-                    Детска соба
-                  </span>
-                  <div className="category-menu detska-menu hidden">
-                    <div onClick={backToSubMenu} className="detska">
-                      <ArrowBackIcon />
-                      Назад
-                    </div>
-                    <ul>
-                      <li>
-                        <Link
-                          to="/products/detska/kolekcii-za-detska-soba"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Колекции за детска соба
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/detska/detski-biroa"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Детски бироа
-                        </Link>
-                      </li>
-                      <li>
-                        <Link
-                          to="/products/detska/detski-lezai"
-                          style={{
-                            textDecoration: "none",
-                            color: "black",
-                            width: "100%",
-                            height: "100%",
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                          }}
-                        >
-                          Лежаи
-                        </Link>
-                      </li>
-                    </ul>
-                  </div>
-                </li>
-              </ul>
-            </div>
-          </li>
-          <li>За Нас</li>
-          <li>Контакти</li>
-        </ul>
-      </div>
-      <nav className="header__menu">
-        <img src={logo} alt="logo"></img>
-        <li>
-          <Link to={"/"} className="link">
-            Почетна
-          </Link>
-        </li>
-        <li className="header__products">
-          <span className="header__productsSpan">
-            Производи <ArrowDropDownIcon />
-          </span>
-          <div className="header__dropdown">
-            <div className="header__dropdownColumn">
-              <ul id="category-ul-1">
-                <li>{categories[0] && results1}</li>
-                {/*
-                <li>
-                  <Link to="/products/dnevna/all">
-                    <span>
-                      <WeekendIcon /> Дневна
-                    </span>
-                  </Link>
-                  <ul>
-                    <li>
-                      <Link to="/products/dnevna/agolni-garnituri">
-                        Аголни гарнитури
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/dnevna/sofi">Софи</Link>
-                    </li>
-                    <li>
-                      <Link to="/products/dnevna/fotelji">Фотелји</Link>
-                    </li>
-                    <li>
-                      <Link to="/products/dnevna/taburetki">Табуретки</Link>
-                    </li>
-                    <li>
-                      <Link to="/products/dnevna/klub-masi">Клуб Маси</Link>
-                    </li>
-                    <li>
-                      <Link to="/products/dnevna/tv-komodi">ТВ Комоди</Link>
-                    </li>
-                    <li>
-                      <Link to="/products/dnevna/komodi">Комоди</Link>
-                    </li>
-                  </ul>
-                </li>
-                <li>
-                  <Link to="/products/hodnik/all">
-                    <span>
-                      <MeetingRoomIcon />
-                      Ходник
-                    </span>
-                  </Link>
-                  <ul>
-                    <li>
-                      <Link to="/products/hodnik/skafovi-za-cevli">
-                        Шкафови за чевли
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/hodnik/zakacalki-i-ogledala">
-                        Закачалки и огледала
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/hodnik/kolekcii-za-hodnik">
-                        Колекции за ходник
-                      </Link>
-                    </li>
-                  </ul>
-                </li>
-                <li>
-                  <Link to="/products/kujna/all">
-                    <span>
-                      <KitchenIcon />
-                      Кујна
-                    </span>
-                  </Link>
-                  <ul>
-                    <li>
-                      <Link to="/products/kujna/kujnski-agolni-garnituri">
-                        Кујнски аголни гарнитури
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/kujna/standarni-kujni">
-                        Стандардни кујни
-                      </Link>
-                    </li>
-                  </ul>
-                        </li>*/}
-              </ul>
-            </div>
-            <div className="header__dropdownColumn">
-              <ul>
-                <li>{categories[0] && results2}</li>
-                {/*
-                <li>
-                  <Link to="/products/spalna/all">
-                    <span>
-                      <BedIcon />
-                      Спална
-                    </span>
-                  </Link>
-                  <ul>
-                    <li>
-                      <Link to="/products/spalna/spalni-kompleti">
-                        Спални комплети
-                      </Link>
-                    </li>
-
-                    <li>
-                      <Link to="/products/spalna/lezai">Лежаи</Link>
-                    </li>
-
-                    <li>
-                      <Link to="/products/spalna/kreveti">Кревети</Link>
-                    </li>
-
-                    <li>
-                      <Link to="/products/spalna/plakari">Плакари</Link>
-                    </li>
-                    <li>
-                      <Link to="/products/spalna/nokni-skafcinja">
-                        Ноќни шкафчиња
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/spalna/toaletni-masi">
-                        Тоалетни маси
-                      </Link>
-                    </li>
-                  </ul>
-                </li>
-                <li>
-                  <Link to="/products/gradina/all">
-                    <span>
-                      <DeckIcon />
-                      Мебел за градина
-                    </span>
-                  </Link>
-                  <ul>
-                    <li>
-                      <Link to="/products/gradina/gradinarski-kompleti">
-                        Градинарски комплети
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/gradina/gradinarski-lulki">
-                        Градинарски лулки
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/gradina/gradinarski-cadori">
-                        Градинарски чадори
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/gradina/gradinarski-masi">
-                        Градинарски маси
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/gradina/gradinarski-stolovi">
-                        Градинарски столови
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/gradina/gradinarsko-osvetluvanje">
-                        Градинарско осветлување
-                      </Link>
-                    </li>
-                  </ul>
-                </li>
-                      */}
-              </ul>
-            </div>
-            <div className="header__dropdownColumn">
-              <ul>
-                <li>{categories[0] && results3}</li>
-                {/*
-                <li>
-                  <Link to="/products/kancelarija/all">
-                    <span>
-                      <ChairAltIcon />
-                      Канцеларија
-                    </span>
-                  </Link>
-                  <ul>
-                    <li>
-                      <Link to="/products/kancelarija/biroa">Бироа</Link>
-                    </li>
-                    <li>
-                      <Link to="/products/kancelarija/kancelariski-stolovi">
-                        Канцелариски столови
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/kancelarija/gejmerski-stolovi">
-                        Гејмерски столови
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/kancelarija/kancelariski-skafovi">
-                        Канцелариски шкафови
-                      </Link>
-                    </li>
-                  </ul>
-                </li>
-                <li>
-                  <Link to="/products/trpezarija/all">
-                    <span>
-                      <TableRestaurantIcon />
-                      Трпезарија
-                    </span>
-                  </Link>
-                  <ul>
-                    <li>
-                      <Link to="/products/trpezarija/trpezariski-masi">
-                        Трпезариски маси
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/trpezarija/trpezariski-stolovi">
-                        Трпезариски столови
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/trpezarija/kujnski-garnituri">
-                        Кујнски гарнитури
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/trpezarija/bar-stolovi-i-masi">
-                        Бар столови и маси
-                      </Link>
-                    </li>
-                  </ul>
-                </li>
-                <li>
-                  <Link to="/products/detska/all">
-                    <span>
-                      <BedroomChildIcon />
-                      Детска соба
-                    </span>
-                  </Link>
-                  <ul>
-                    <li>
-                      <Link to="/products/detska/kolekcii-za-detska-soba">
-                        Колекции за детска соба
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/detska/detski-biroa">
-                        Детски бироа
-                      </Link>
-                    </li>
-                    <li>
-                      <Link to="/products/detska/detski-lezai">Лежаи</Link>
-                    </li>
-                  </ul>
-                </li>
-                */}
-              </ul>
-            </div>
-            <div className="header__dropdownColumn">
-              <ul></ul>
-            </div>
-          </div>
-        </li>
-        <li className="header__aboutUs">За Нас</li>
-        <li className="header__contacts">Контакти</li>
-      </nav>
-      <div className="header__right">
-        <div className="header__buttons">
-          {userInfo && userInfo.isAdmin && (
-            <NavDropdown
-              title={
-                <span>
-                  <AccountCircleIcon
-                    className="header__login"
-                    fontSize="large"
-                  />
-                  <p>{userInfo.name}</p>
-                </span>
-              }
-              id="basic-nav-dropdown"
-            >
-              <NavDropdown.Item
-                onClick={() => {
-                  navigate("/profile");
-                }}
-              >
-                Профил
-              </NavDropdown.Item>
-
-              <NavDropdown.Item
-                onClick={() => {
-                  navigate("/admin/dashboard");
-                }}
-              >
-                Dashboard
-              </NavDropdown.Item>
-
-              <NavDropdown.Divider />
-              <NavDropdown.Item
-                className="drowdown-item"
-                to="#signout"
-                onClick={signoutHandler}
-              >
-                Одјави се
-              </NavDropdown.Item>
-            </NavDropdown>
-          )}
-          {userInfo && !userInfo.isAdmin && (
-            <NavDropdown
-              title={
-                <span>
-                  <AccountCircleIcon
-                    className="header__login"
-                    fontSize="large"
-                  />
-                  <p>{userInfo.name}</p>
-                </span>
-              }
-              id="basic-nav-dropdown"
-            >
-              <NavDropdown.Item
-                onClick={() => {
-                  navigate("/profile");
-                }}
-              >
-                Профил
-              </NavDropdown.Item>
-
-              <NavDropdown.Item
-                onClick={() => {
-                  navigate("/orderhistory");
-                }}
-              >
-                Нарачки
-              </NavDropdown.Item>
-
-              <NavDropdown.Divider />
-              <NavDropdown.Item
-                className="drowdown-item"
-                to="#signout"
-                onClick={signoutHandler}
-              >
-                Одјави се
-              </NavDropdown.Item>
-            </NavDropdown>
-          )}
-          {!userInfo && (
-            <Link
-              to={"/signin"}
-              className="link"
-              onClick={() => {
-                navigate("/orderhistory");
-              }}
-            >
-              <span>
-                <AccountCircleIcon className="header__login" fontSize="large" />
-                <p>Најави се</p>
-              </span>
-            </Link>
-          )}
-
-          <Link to="/cart" className="badgee">
-            <span>
-              <ShoppingBasketIcon className="header__cart" fontSize="large" />
-
-              {cart.cartItems.length > 0 && (
-                <Badge pill bg="danger">
-                  {cart.cartItems.reduce((a, c) => a + c.quantity, 0)}
-                </Badge>
-              )}
-            </span>
-          </Link>
-        </div>
-        <div className="header__search">
-          <input className="header__searchInput" type="text" name="text" />
-          <button onClick={searchHandler}>
-            <SearchIcon className="header__searchIcon" fontSize="large" />
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default Header;
Index: frontend/src/components/ImageSlider.js
===================================================================
--- frontend/src/components/ImageSlider.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,96 +1,0 @@
-import React from 'react'
-import { useState } from 'react'
-
-
-const ImageSlider = ({ slides }) => {
-    const [currentIndex, setCurrentIndex] = useState(0);
-
-    const sliderStyles = {
-        height: "100%",
-        position: "relative",
-    }
-
-    const slideStyles = {
-        display: "flex",
-        justifyContent: "space-between",
-        alignItems: "center",
-        width: "100%",
-        height: "100%",
-        backgroundPosition: "center",
-        backgroundSize: 'cover',
-        backgroundImage: `url(${slides[currentIndex].url})`
-    }
-
-    const leftArrowStyle = {
-        fontSize: '60px',
-        color: '#fff',
-        userSelect: 'none',
-        zIndex: 2,
-        cursor: 'pointer',
-        marginLeft: "10px",
-    };
-
-    const rightArrowStyle = {
-        fontSize: '60px',
-        userSelect: 'none',
-        color: '#fff',
-        zIndex: 2,
-        cursor: 'pointer',
-        marginRight: "10px",
-    };
-
-    const goToPrevious = () =>{
-        const isFirstSlide = currentIndex === 0;
-        const newIndex = isFirstSlide ? slides.length - 1 : currentIndex - 1;
-        setCurrentIndex(newIndex);
-    }
-
-    const goToNext = () =>{
-        const isLastSlide = currentIndex === slides.length - 1;
-        const newIndex = isLastSlide ? 0 : currentIndex + 1;
-        setCurrentIndex(newIndex);
-    }
-
-    /*
-    const slideBtnContainer = {
-        display: "flex",
-        justifyContent: "center",
-        alignItems: "center",
-        marginTop: "5px",
-
-    }
-
-    const slideBtn = {
-        marginLeft: "5px",
-        width: "20px",
-        height: "20px",
-        borderRadius: "50%",
-        backgroundColor: "grey",
-        cursor: "pointer",
-    }
-    
-    const changeSlide = (index) =>{
-        setCurrentIndex(index);
-    }
-
-     <div style={slideBtnContainer}>
-                <button style={slideBtn} onClick={()=>changeSlide(0)}></button>
-                <button style={slideBtn} onClick={()=>changeSlide(1)}></button>
-                <button style={slideBtn} onClick={()=>changeSlide(2)}></button>
-            </div>
-    */
-
-    return(
-        <div style={sliderStyles}>
-            
-            <div style={slideStyles}>
-                <div style={leftArrowStyle} onClick={goToPrevious}>{"<"}</div>
-                <div style={rightArrowStyle} onClick={goToNext}>{">"}</div>
-            </div>
-           
-            
-        </div>
-    )
-}
-
-export default ImageSlider
Index: frontend/src/components/JumboSlider.js
===================================================================
--- frontend/src/components/JumboSlider.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,21 +1,0 @@
-import Carousel from "react-bootstrap/Carousel";
-import image1 from "../Images/slideshow1.png";
-import image2 from "../Images/slideshow2.png";
-import image3 from "../Images/slideshow3.png";
-function CarouselFadeExample() {
-  return (
-    <Carousel fade>
-      <Carousel.Item>
-        <img className="d-block w-100" src={image1} alt="First slide" />
-      </Carousel.Item>
-      <Carousel.Item>
-        <img className="d-block w-100" src={image2} alt="Second slide" />
-      </Carousel.Item>
-      <Carousel.Item>
-        <img className="d-block w-100" src={image3} alt="Third slide" />
-      </Carousel.Item>
-    </Carousel>
-  );
-}
-
-export default CarouselFadeExample;
Index: frontend/src/components/ListProducts.js
===================================================================
--- frontend/src/components/ListProducts.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,354 +1,0 @@
-/*
-import axios from "axios";
-import React, { useEffect, useReducer, useState } from "react";
-import { useNavigate, useLocation } from "react-router-dom";
-import ListGroup from "react-bootstrap/ListGroup";
-import Button from "react-bootstrap/Button";
-import Form from "react-bootstrap/Form";
-import { getError } from "./utils";
-import { toast } from "react-toastify";
-import LoadingBox from "./LoadingBox";
-import MessageBox from "./MessageBox";
-import LinkContainer from "react-router-bootstrap/LinkContainer";
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "FETCH_REQUEST":
-      return { ...state, loading: true };
-    case "FETCH_SUCCESS":
-      return {
-        ...state,
-        products: action.payload.products,
-        page: action.payload.page,
-        pages: action.payload.pages,
-        countProducts: action.payload.countProducts,
-        loading: false,
-      };
-    case "FETCH_FAIL":
-      return { ...state, loading: false, error: action.payload };
-    default:
-      return state;
-  }
-};
-
-function ListProducts() {
-  const navigate = useNavigate();
-  const { search } = useLocation();
-  const sp = new URLSearchParams(search);
-  const category = sp.get("category") || "all";
-  const query = sp.get("query") || "all";
-  const subCategory = sp.get("subCategory") || "all";
-  const name = sp.get("name") || "all";
-  const order = sp.get("order") || "newest";
-  const page = sp.get("page") || 1;
-
-  const [{ loading, error, products, pages, countProducts }, dispatch] =
-    useReducer(reducer, { loading: true, error: "" });
-
-  useEffect(() => {
-    const fetchData = async () => {
-      try {
-        const { data } = await axios.get(
-          `/api/products/search?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}`
-        );
-        dispatch({ type: "FETCH_SUCCSS", payload: data });
-      } catch (err) {
-        dispatch({ type: "FETCH_FAIL", payload: getError(error) });
-      }
-    };
-    fetchData();
-  }, [category, order, page, query, subCategory, error]);
-  /*
-  const [categories, setCategories] = useState([]);
-  useEffect(() => {
-    const fetchCategories = async () => {
-      try {
-        const { data } = await axios.get(`api/products/categories`);
-        setCategories(data);
-      } catch (err) {
-        toast.error(getError(err));
-      }
-    };
-    fetchCategories();
-  }, [dispatch]);
-  
-  const getFilterUrl = (filter) => {
-    const filterPage = filter.page || page;
-    const filterCategorry = filter.category || category;
-    const filterQuery = filter.query || query;
-    const filterSubCategory = filter.subCategory || subCategory;
-    const sortOrder = filter.order || order;
-    return `/search?category=${filterCategorry}&query=${filterQuery}&subCategory=${filterSubCategory}&order=${sortOrder}&page=${filterPage}`;
-  };
-
-  return (
-    <div
-      style={{
-        display: "flex",
-        flexDirection: "column",
-        alignItems: "center",
-        justifyContent: "center",
-      }}
-    >
-      {loading ? (
-        <LoadingBox></LoadingBox>
-      ) : error ? (
-        <MessageBox varriant="danger">{error}</MessageBox>
-      ) : (
-        <div className="taskContainer">
-          <h1>Производи</h1>
-          <div className="filterContainer" style={{ width: "100%" }}>
-            <Form
-              id="fff"
-              style={{
-                display: "flex",
-                alignItems: "center",
-                justifyContent: "space-around",
-              }}
-            >
-              <Form.Group>
-                <Form.Control
-                  id="filterName"
-                  placeholder="Име"
-                  value={name}
-                  required
-                ></Form.Control>
-              </Form.Group>
-              <Form.Group>
-                <Form.Select
-                  value={category}
-                  onChange={(e) => {
-                    navigate(getFilterUrl({ category: e.target.value }));
-                  }}
-                >
-                  <option value="default">Категорија</option>
-                  <option value={"dnevna"}>Дневна</option>
-                  <option value={"spalna"}>Спална</option>
-                  <option value={"kancelarija"}>Канцеларија</option>
-                  <option value={"hodnik"}>Ходник</option>
-                  <option value={"gradina"}>Градина</option>
-                  <option value={"trpezarija"}>Трпезарија</option>
-                  <option value={"kujna"}>Кујна</option>
-                  <option value={"detska"}>Детска</option>
-                </Form.Select>
-              </Form.Group>
-              <Form.Group>
-                <Form.Select
-                  value={subCategory}
-                  onChange={(e) => {
-                    navigate(getFilterUrl({ subCategory: e.target.value }));
-                  }}
-                >
-                  <option value="default">Подкатегорија</option>
-
-                  {category === "dnevna" && (
-                    <option value="agolni-garnituri">Аголни Гарнитури</option>
-                  )}
-                  {category === "dnevna" && <option value="sofi">Софи</option>}
-                  {category === "dnevna" && (
-                    <option value="fotelji">Фотелји</option>
-                  )}
-                  {category === "dnevna" && (
-                    <option value="taburetki">Табуретки</option>
-                  )}
-                  {category === "dnevna" && (
-                    <option value="klub-masi">Клуб маси</option>
-                  )}
-                  {category === "dnevna" && (
-                    <option value="tv-komodi">ТВ комоди</option>
-                  )}
-                  {category === "dnevna" && (
-                    <option value="komodi">Комоди</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="spalni-kompleti">Спални Комплети</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="lezai">Лежаи</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="kreveti">Кревети</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="plakari">Плакари</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="nokni-skafcinja">Ноќни шкафчиња</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="toaletni-masi">Тоалетни маси</option>
-                  )}
-                  {category === "kancelarija" && (
-                    <option value="biroa">Бироа</option>
-                  )}
-                  {category === "kancelarija" && (
-                    <option value="kancelariski-stolovi">
-                      Канцелариски столови
-                    </option>
-                  )}
-                  {category === "kancelarija" && (
-                    <option value="gejmerski-stolovi">Гејмерски столови</option>
-                  )}
-                  {category === "kancelarija" && (
-                    <option value="kancelariski-skafovi">
-                      Канцелариски шкафови
-                    </option>
-                  )}
-                  {category === "hodnik" && (
-                    <option value="skafovi-za-cevli">Шкафови за чевли</option>
-                  )}
-                  {category === "hodnik" && (
-                    <option value="zakacalki-i-ogledala">
-                      Закачалки и огледала
-                    </option>
-                  )}
-                  {category === "hodnik" && (
-                    <option value="kolekcii-za-hodnik">
-                      Колекции за ходник
-                    </option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-kompleti">
-                      Градинарски комплети
-                    </option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-lulki">Градинарски лулки</option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-cadori">
-                      Градинарски чадори
-                    </option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-masi">Градинарски маси</option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-stolovi">
-                      Градинарски столови
-                    </option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarsko-osvetluvanje">
-                      Градинарско осветлување
-                    </option>
-                  )}
-                  {category === "trpezarija" && (
-                    <option value="trpezariski-masi">Трпезариски маси</option>
-                  )}
-                  {category === "trpezarija" && (
-                    <option value="trpezariski-stolovi">
-                      Трпезариски столови
-                    </option>
-                  )}
-                  {category === "trpezarija" && (
-                    <option value="kujnski-garnituri">Кујнски гарнитури</option>
-                  )}
-                  {category === "trpezarija" && (
-                    <option value="bar-stolovi-i-masi">
-                      Бар столови и маси
-                    </option>
-                  )}
-                  {category === "kujna" && (
-                    <option value="kujnski-agolni-garnituri">
-                      Кујнски аголни гарнитури
-                    </option>
-                  )}
-                  {category === "kujna" && (
-                    <option value="standardni-kujni">Стандардни кујни</option>
-                  )}
-                  {category === "detska" && (
-                    <option value="kolekcii-za-detska-soba">
-                      Колекции за детска соба
-                    </option>
-                  )}
-                  {category === "detska" && (
-                    <option value="detski-biroa">Детски бироа</option>
-                  )}
-                  {category === "detska" && (
-                    <option value="detski-lezai">Детски лежаи</option>
-                  )}
-                </Form.Select>
-              </Form.Group>
-              <Form.Group>
-                <Form.Select
-                  id="sortOrder"
-                  value={order}
-                  onChange={(e) => {
-                    navigate(getFilterUrl({ order: e.target.value }));
-                  }}
-                >
-                  <option value={"default"}>Сортирај по цена</option>
-                  <option value={"lowFirst"}>Од ниска кон висока</option>
-                  <option value={"highFirst"}>Од висока кон ниска</option>
-                </Form.Select>
-              </Form.Group>
-              <Button variant="danger">Филтрирај</Button>
-            </Form>
-          </div>
-          <ListGroup
-            id="filteredProductsContainer"
-            variant="success"
-            style={{ width: "95%", margin: "auto", marginTop: "20px" }}
-          >
-            {products.map((item) => (
-              <ListGroup.Item key={item._id}>
-                <div
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    justifyContent: "space-between",
-                  }}
-                >
-                  <div style={{ display: "flex", alignItems: "center" }}>
-                    <img
-                      src={item.image}
-                      alt={item.name}
-                      className="img-fluid rounded img-thumbnail"
-                      style={{ margin: "0px" }}
-                    ></img>
-                    <span style={{ marginLeft: "20px" }}>{item.name}</span>
-                  </div>
-                  <span>{item.category}</span>
-                  <span>{item.subCategory}</span>
-                  <span>{item.countInStock}</span>
-
-                  <span>{item.price} ден</span>
-                  <Button
-                    type="button"
-                    variant="primary"
-                    style={{ height: "50px" }}
-                  >
-                    Измени
-                  </Button>
-                </div>
-              </ListGroup.Item>
-            ))}
-          </ListGroup>
-          <div>
-            {[...Array(pages).keys()].map((x) => (
-              <LinkContainer
-                key={x + 1}
-                className="mx-1"
-                to={getFilterUrl({ page: x + 1 })}
-              >
-                <Button
-                  className={Number(page) === x + 1 ? "text-bold" : ""}
-                  variant="light"
-                >
-                  {x + 1}
-                </Button>
-              </LinkContainer>
-            ))}
-          </div>
-          {/*products.map((product) => (
-          <Product key={product.slug} product={product} />
-           ))}
-        </div>
-      )}
-    </div>
-  );
-}
-
-export default ListProducts;
-*/
Index: frontend/src/components/LoadingBox.js
===================================================================
--- frontend/src/components/LoadingBox.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,12 +1,0 @@
-import Spinner from "react-bootstrap/Spinner";
-import Header from "./Header";
-
-export default function LoadingBox() {
-  return (
-    <div>
-      <Spinner animation="border" role="status">
-        <span className="visually-hidden">Loading...</span>
-      </Spinner>
-    </div>
-  );
-}
Index: frontend/src/components/MessageBox.js
===================================================================
--- frontend/src/components/MessageBox.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,10 +1,0 @@
-import Alert from "react-bootstrap/Alert";
-import Header from "./Header";
-
-export default function MessageBox(props) {
-  return (
-    <div>
-      <Alert variant={props.variant || "info"}>{props.children}</Alert>
-    </div>
-  );
-}
Index: frontend/src/components/Product.js
===================================================================
--- frontend/src/components/Product.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,96 +1,0 @@
-import React, { useContext } from "react";
-import "../styles/Product.css";
-import ShoppingBasketIcon from "@mui/icons-material/ShoppingCart";
-import { Link } from "react-router-dom";
-import { Store } from "../Store";
-import CheckIcon from "@mui/icons-material/Check";
-import ClearIcon from "@mui/icons-material/Clear";
-
-function Product({ product }) {
-  const { state, dispatch: ctxDispatch } = useContext(Store);
-  const addToCartHandler = () => {
-    ctxDispatch({
-      type: "CART_ADD_ITEM",
-      payload: { ...product, quantity: 1 },
-    });
-  };
-  return (
-    <div
-      className="product__container"
-      style={{ marginLeft: "5px", marginRight: "5px", marginTop: "10px" }}
-    >
-      <Link to={`/product/${product.slug}`} style={{ height: "165.91px" }}>
-        <div className="product__img" style={{ height: "100%" }}>
-          <img
-            src={product.image}
-            alt="product"
-            style={{ height: "100%" }}
-          ></img>
-        </div>
-      </Link>
-      <div
-        className="product__textContainer"
-        style={{
-          display: "flex",
-          justifyContent: "space-evenly",
-          alignItems: "center",
-          marginLeft: "25px",
-        }}
-      >
-        <Link
-          to={`/product/${product.slug}`}
-          style={{ textDecoration: "none", color: "black" }}
-        >
-          <div className="product__name">
-            <h3>{product.name}</h3>
-          </div>
-        </Link>
-        <div className="product__price">
-          <h3 style={{ textDecoration: "none", color: "black" }}>
-            {product.price}ден
-          </h3>
-        </div>
-      </div>
-      <div
-        style={{
-          display: "flex",
-          justifyContent: "space-around",
-          alignItems: "center",
-        }}
-      >
-        <h5>H: {product.height}</h5>
-        <h5>W: {product.width}</h5>
-        <h5>L: {product.length}</h5>
-      </div>
-      <div
-        className="product__addToCart"
-        style={{ marginTop: "15px", display: "flex", justifyContent: "center" }}
-      >
-        <button onClick={addToCartHandler}>
-          <ShoppingBasketIcon />
-        </button>
-        <div
-          style={{
-            //width: "100%",
-            display: "flex",
-            justifyContent: "center",
-            alignItems: "center",
-            marginLeft: "10px",
-          }}
-        >
-          {product.countInStock > 0 ? (
-            <span style={{ color: "green" }}>
-              <CheckIcon></CheckIcon>Залиха
-            </span>
-          ) : (
-            <span style={{ color: "red" }}>
-              <ClearIcon></ClearIcon>Залиха
-            </span>
-          )}
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default Product;
Index: frontend/src/components/SubCategoryMenu.js
===================================================================
--- frontend/src/components/SubCategoryMenu.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,56 +1,0 @@
-import axios from "axios";
-import React, { useEffect, useReducer } from "react";
-import { Link } from "react-router-dom";
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "FETCH_REQUEST":
-      return { ...state, loading: true };
-    case "FETCH_SUCCESS":
-      return {
-        ...state,
-        getCategories: action.payload,
-        loading: false,
-      };
-    case "FETCH_FAIL":
-      return { ...state, loading: false, error: action.payload };
-    default:
-      return state;
-  }
-};
-
-function SubCategoryMenu(props) {
-  const [{ loading, getCategories }, dispatch] = useReducer(reducer, {
-    loading: true,
-    error: "",
-  });
-
-  useEffect(() => {
-    const fetchData = async () => {
-      try {
-        dispatch({ type: "FETCH_REQUEST" });
-        const { data } = await axios.get(
-          `/api/category/getSubCategory?subCategory=${props.subCategory}`
-        );
-        dispatch({ type: "FETCH_SUCCESS", payload: data });
-      } catch (err) {
-        dispatch({ type: "FETCH_FAIL", payload: err });
-      }
-    };
-    fetchData();
-  }, [props.subCategory]);
-
-  return (
-    <li>
-      {getCategories && (
-        <Link
-          to={`/products/${props.category.categorySlug}/${getCategories[0].subCategorySlug}`}
-        >
-          {getCategories && getCategories[0].subCategoryName}
-        </Link>
-      )}
-    </li>
-  );
-}
-
-export default SubCategoryMenu;
Index: frontend/src/components/utils.js
===================================================================
--- frontend/src/components/utils.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,5 +1,0 @@
-export const getError = (error) => {
-  return error.response && error.response.data.message
-    ? error.response.data.message
-    : error.message;
-};
Index: frontend/src/data.js
===================================================================
--- frontend/src/data.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,32 +1,0 @@
-const data = {
-  products: [
-    {
-      name: "Арин",
-      slug: "gejmerski-stol-arin",
-      category: "office",
-      subCategory: "gaming-chair",
-      image: "/products/arin_0.jpg",
-      price: 4400,
-      countInStock: 20,
-      description:
-        "Димензии:\n- L58 B58 H92-102 см.\nЛицев материјал:\n- еко кожа\nГрадба:\n- пластика\n- челик\n* амортизер на гас",
-      dimension: "/products/arin_dp_0.jpg",
-      scheme: "products/arin_ap_0.jpg",
-    },
-    {
-      name: "Торин",
-      slug: "gejmerski-stol-torin",
-      category: "office",
-      subCategory: "gaming-chair",
-      image: "/products/torin_0.jpg",
-      price: 6300,
-      countInStock: 20,
-      description:
-        "Димензии:\n-  L63 B62 H108 / 115 см.\nЛицев материјал:\n- еко кожа\nГрадба:\n- пластика\n- челик\n* амортизер на гас",
-      dimension: "/products/arin_dp_0.jpg",
-      scheme: "products/arin_ap_0.jpg",
-    },
-  ],
-};
-
-export default data;
Index: frontend/src/index.css
===================================================================
--- frontend/src/index.css	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ frontend/src/index.css	(revision 3c906619c6626922bbed7a5782cbbcb4dc0c5b15)
@@ -1,9 +1,13 @@
-.checkout-steps > div {
-  border-bottom: 0.2rem solid #a0a0a0;
-  color: #a0a0a0;
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+    sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
-.checkout-steps > div.active {
-  border-bottom: 0.2rem solid #f08000;
-  color: #f08000;
+code {
+  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+    monospace;
 }
Index: frontend/src/index.js
===================================================================
--- frontend/src/index.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ frontend/src/index.js	(revision 3c906619c6626922bbed7a5782cbbcb4dc0c5b15)
@@ -1,18 +1,12 @@
-import React from "react";
-import ReactDOM from "react-dom/client";
-import { HelmetProvider } from "react-helmet-async";
-import "./index.css";
-import App from "./App";
-import reportWebVitals from "./reportWebVitals";
-import { StoreProvider } from "./Store";
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import './index.css';
+import App from './App';
+import reportWebVitals from './reportWebVitals';
 
-const root = ReactDOM.createRoot(document.getElementById("root"));
+const root = ReactDOM.createRoot(document.getElementById('root'));
 root.render(
   <React.StrictMode>
-    <StoreProvider>
-      <HelmetProvider>
-        <App />
-      </HelmetProvider>
-    </StoreProvider>
+    <App />
   </React.StrictMode>
 );
Index: frontend/src/logo.svg
===================================================================
--- frontend/src/logo.svg	(revision 3c906619c6626922bbed7a5782cbbcb4dc0c5b15)
+++ frontend/src/logo.svg	(revision 3c906619c6626922bbed7a5782cbbcb4dc0c5b15)
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>
Index: frontend/src/screens/AdminAddCategoryScreen.js
===================================================================
--- frontend/src/screens/AdminAddCategoryScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,282 +1,0 @@
-import React, { useContext, useEffect, useReducer, useState } from "react";
-import Button from "react-bootstrap/Button";
-import "../styles/AdminDashboard.css";
-import { Store } from "../Store";
-import { useNavigate, Link } from "react-router-dom";
-import { Helmet } from "react-helmet-async";
-import Form from "react-bootstrap/Form";
-import Axios from "axios";
-import { toast } from "react-toastify";
-import axios from "axios";
-
-// Mesto podkategorii cuvaj stringovi od slugovite na podkategoriite vo kategoriite. Posle koga ce treba da gi stavas
-//ce pravis get povik i ce gi zemis site podkategorii so tia slugovi zacuvani u kategorijata, i vnesi gi vo lista i vrati
-//gi kako objekti (podkategorija)
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "FETCH_REQUEST":
-      return { ...state, loading: true };
-    case "FETCH_SUCCESS":
-      return {
-        ...state,
-        getCategories: action.payload,
-        loading: false,
-      };
-    case "FETCH_FAIL":
-      return { ...state, loading: false, error: action.payload };
-    default:
-      return state;
-  }
-};
-
-function AdminDashboardScreen() {
-  const navigate = useNavigate();
-  const { state } = useContext(Store);
-  const { userInfo } = state;
-  useEffect(() => {
-    if (!userInfo || !userInfo.isAdmin) {
-      return navigate("/");
-    }
-  }, [userInfo, navigate]);
-
-  const [category, setCategory] = useState("");
-  const [categorySlug, setCategorySlug] = useState("");
-  const [categories, setCategories] = useState([]);
-  const [subCategory, setSubCategory] = useState("");
-  const [subCategorySlug, setSubCategorySlug] = useState("");
-  let counter = 0;
-  const addCategoryHandler = async (e) => {
-    e.preventDefault();
-    setCategories([]);
-    try {
-      const { data } = await Axios.post("/api/category/addCategory", {
-        category,
-        categorySlug,
-        categories,
-      });
-      toast.success("Категоријата е додадена");
-      counter++;
-    } catch (err) {
-      console.log(err);
-      toast.error("Грешка");
-    }
-  };
-
-  const addSubCategoryHandler = async (e) => {
-    e.preventDefault();
-
-    try {
-      const data3 = await Axios.get(
-        `/api/category/getCategory?category=${category}`
-      );
-
-      //console.log("<=============KATEGORII POCETNA SOSTOJBA==============>");
-      //console.log(categories);
-      let subcategoriesSlugs = data3.data[0].subCategories;
-      for (let i = 0; i < subcategoriesSlugs.length; i++) {
-        categories.push(subcategoriesSlugs[i]);
-      }
-
-      console.log(
-        "<=============KATEGORII PO DOBIVANJETO NA PODKATEGORIITE==============>"
-      );
-      console.log(categories);
-
-      const { data } = await Axios.post("/api/category/addSubCategory", {
-        subCategory,
-        subCategorySlug,
-      });
-
-      categories.push(data.subCategory.subCategorySlug);
-      console.log("<=============KATEGORII POSLE PUSH==============>");
-      console.log(categories);
-
-      //categories.push(data.subCategory);
-      //console.log(categories);
-
-      const { data1 } = await Axios.put("/api/category/updateCategory", {
-        category,
-        //categorySlug,
-        categories,
-      });
-      toast.success("Категоријата е додадена");
-      categories.splice(0, categories.length);
-
-      counter++;
-    } catch (err) {
-      console.log(err);
-      toast.error("Грешка");
-    } finally {
-    }
-  };
-
-  const [{ loading, getCategories }, dispatch] = useReducer(reducer, {
-    loading: true,
-    error: "",
-  });
-
-  const flag = 1;
-  useEffect(() => {
-    const fetchData = async () => {
-      try {
-        dispatch({ type: "FETCH_REQUEST" });
-        /*
-      const { data } = await axios.get(
-        `/api/products/search?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}`
-      );*/
-        const { data } = await Axios.get(`/api/category/getCategories`);
-        dispatch({ type: "FETCH_SUCCESS", payload: data });
-      } catch (err) {
-        dispatch({ type: "FETCH_FAIL", payload: err });
-      }
-      console.log(counter);
-    };
-    fetchData();
-  }, [counter]);
-  if (getCategories) foo(getCategories);
-  function foo(getCategories) {
-    let container = document.getElementById("selectContainer");
-    container.innerHTML = "";
-    for (let i = 0; i < getCategories.length; i++) {
-      let option = document.createElement("option");
-      option.setAttribute("value", getCategories[i].categorySlug);
-      option.innerHTML = getCategories[i].categoryName;
-      container.appendChild(option);
-    }
-  }
-
-  return (
-    <div id="pgContainer">
-      <Helmet>
-        <title>Dashboard</title>
-      </Helmet>
-      <div id="sidebarMenu">
-        <Link
-          to={"/admin/addProduct"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn" to="/admin/addProduct">
-            Додади нов производ
-          </div>
-        </Link>
-        <Link
-          to={"/admin/addCategory"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Додади категорија</div>
-        </Link>
-        <Link
-          to={"/admin/products"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Производи</div>
-        </Link>
-        <Link
-          to={"/admin/orders"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Нарачки</div>
-        </Link>
-      </div>
-      <div
-        style={{
-          display: "flex",
-          justifyContent: "space-around",
-          width: "100%",
-        }}
-      >
-        <div
-          id="category-form-container"
-          style={{
-            display: "flex",
-            flexDirection: "column",
-            alignItems: "center",
-            marginTop: "40px",
-          }}
-        >
-          <h2>Додади категорија</h2>
-          <Form
-            className="formCointainer"
-            onSubmit={addCategoryHandler}
-            style={{ marginTop: "30px" }}
-          >
-            <Form.Group controlId="category">
-              <Form.Control
-                type="text"
-                placeholder="Категорија"
-                required
-                onChange={(e) => setCategory(e.target.value)}
-              />
-            </Form.Group>
-            <Form.Group controlId="categorySlug" style={{ marginTop: "20px" }}>
-              <Form.Control
-                type="text"
-                placeholder="slug"
-                required
-                onChange={(e) => setCategorySlug(e.target.value)}
-              />
-            </Form.Group>
-            <div className="submitBtnContainer">
-              <Button variant="danger" size="lg" type="submit">
-                Додади категорија
-              </Button>
-            </div>
-          </Form>
-        </div>
-        <div
-          id="subcategory-form-container"
-          style={{
-            display: "flex",
-            flexDirection: "column",
-            alignItems: "center",
-            marginTop: "40px",
-          }}
-        >
-          <h2>Додади подкатегорија</h2>
-          <Form
-            className="formCointainer"
-            onSubmit={addSubCategoryHandler}
-            style={{ marginTop: "30px" }}
-          >
-            <Form.Group>
-              <Form.Select
-                id="selectContainer"
-                value={category}
-                onChange={(e) => {
-                  setCategory(e.target.value);
-                }}
-              ></Form.Select>
-            </Form.Group>
-            <Form.Group controlId="subcategory" style={{ marginTop: "20px" }}>
-              <Form.Control
-                type="text"
-                placeholder="Подкатегорија"
-                required
-                onChange={(e) => setSubCategory(e.target.value)}
-              />
-            </Form.Group>
-            <Form.Group
-              controlId="subcategorySlug"
-              style={{ marginTop: "20px" }}
-            >
-              <Form.Control
-                type="text"
-                placeholder="slug"
-                required
-                onChange={(e) => setSubCategorySlug(e.target.value)}
-              />
-            </Form.Group>
-            <div className="submitBtnContainer">
-              <Button variant="danger" size="lg" type="submit">
-                Додади подкатегорија
-              </Button>
-            </div>
-          </Form>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default AdminDashboardScreen;
Index: frontend/src/screens/AdminAddProductScreen.js
===================================================================
--- frontend/src/screens/AdminAddProductScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,452 +1,0 @@
-import axios from "axios";
-import React, { useState } from "react";
-import { Link } from "react-router-dom";
-import { toast } from "react-toastify";
-import Button from "react-bootstrap/Button";
-import Form from "react-bootstrap/Form";
-
-function AdminAddProductScreen() {
-  const [name, setName] = useState("");
-  const [slug, setSlug] = useState("");
-  const [category, setCategory] = useState("dnevna");
-  const [subCategory, setSubCategory] = useState("");
-  const [description, setDescription] = useState("");
-  const [price, setPrice] = useState("");
-  const [priceMontaza, setPriceMontaza] = useState("");
-  const [countInStock, setCountInStock] = useState("");
-  const [image, setImage] = useState("");
-  const [sideImage, setSideImage] = useState("");
-  const [sideImage2, setSideImage2] = useState("");
-  const [dimension, setDimension] = useState("");
-  const [scheme, setScheme] = useState("");
-  const [H, setH] = useState("");
-  const [W, setW] = useState("");
-  const [L, setL] = useState("");
-  const [message, setMessage] = useState("");
-
-  const onChangeImage = (e) => {
-    setImage(e.target.files[0]);
-  };
-  const onChangeSideImage = (e) => {
-    setSideImage(e.target.files[0]);
-  };
-  const onChangeSideImage2 = (e) => {
-    setSideImage2(e.target.files[0]);
-  };
-  const onChangeDimension = (e) => {
-    setDimension(e.target.files[0]);
-  };
-  const onChangeScheme = (e) => {
-    setScheme(e.target.files[0]);
-  };
-
-  const submitHandler = async (e) => {
-    e.preventDefault();
-
-    const formData = new FormData();
-
-    formData.append("name", name);
-    formData.append("slug", slug);
-    formData.append("category", category);
-    formData.append("subCategory", subCategory);
-    formData.append("description", description);
-    formData.append("price", price);
-    formData.append("priceMontaza", priceMontaza);
-    formData.append("countInStock", countInStock);
-    formData.append("image", image);
-    formData.append("sideImage", sideImage);
-    formData.append("sideImage2", sideImage2);
-    formData.append("dimension", dimension);
-    formData.append("scheme", scheme);
-    formData.append("H", H);
-    formData.append("W", W);
-    formData.append("L", L);
-    try {
-      const result = await axios.post("/api/products/add", formData);
-      if (result) toast.success("Product Added");
-      return;
-    } catch (error) {
-      console.log(error);
-    }
-  };
-
-  return (
-    <div id="pgContainer">
-      <div id="sidebarMenu">
-        <Link
-          to={"/admin/addProduct"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn" to="/admin/addProduct">
-            Додади нов производ
-          </div>
-        </Link>
-        <Link
-          to={"/admin/addCategory"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Додади категорија</div>
-        </Link>
-        <Link
-          to={"/admin/products"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Производи</div>
-        </Link>
-        <Link
-          to={"/admin/orders"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Нарачки</div>
-        </Link>
-      </div>
-      <div id="mainScreen">
-        <div className="taskContainer">
-          <h1>Додади нов продукт</h1>
-          <Form
-            onSubmit={submitHandler}
-            encType="multipart/form-data"
-            className="newProductFormCointainer"
-          >
-            <div className="firstRow" style={{ display: "flex" }}>
-              <Form.Group>
-                <Form.Label>Име</Form.Label>
-                <Form.Control
-                  value={name}
-                  onChange={(e) => setName(e.target.value)}
-                  required
-                ></Form.Control>
-              </Form.Group>
-              <Form.Group>
-                <Form.Label>Слуг</Form.Label>
-                <Form.Control
-                  value={slug}
-                  onChange={(e) => setSlug(e.target.value)}
-                  required
-                ></Form.Control>
-              </Form.Group>
-              <Form.Group>
-                <Form.Label>Категорија</Form.Label>
-                <Form.Select onChange={(e) => setCategory(e.target.value)}>
-                  <option value={"dnevna"}>Дневна</option>
-                  <option value={"spalna"}>Спална</option>
-                  <option value={"kancelarija"}>Канцеларија</option>
-                  <option value={"hodnik"}>Ходник</option>
-                  <option value={"gradina"}>Градина</option>
-                  <option value={"trpezarija"}>Трпезарија</option>
-                  <option value={"kujna"}>Кујна</option>
-                  <option value={"detska"}>Детска</option>
-                </Form.Select>
-              </Form.Group>
-              <Form.Group>
-                <Form.Label>Подкатегорија</Form.Label>
-                <Form.Select onChange={(e) => setSubCategory(e.target.value)}>
-                  <option value="default">Подкатегорија</option>
-                  {category === "dnevna" && (
-                    <option value="agolni-garnituri">Аголни Гарнитури</option>
-                  )}
-                  {category === "dnevna" && <option value="sofi">Софи</option>}
-                  {category === "dnevna" && (
-                    <option value="fotelji">Фотелји</option>
-                  )}
-                  {category === "dnevna" && (
-                    <option value="taburetki">Табуретки</option>
-                  )}
-                  {category === "dnevna" && (
-                    <option value="klub-masi">Клуб маси</option>
-                  )}
-                  {category === "dnevna" && (
-                    <option value="tv-komodi">ТВ комоди</option>
-                  )}
-                  {category === "dnevna" && (
-                    <option value="komodi">Комоди</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="spalni-kompleti">Спални Комплети</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="lezai">Лежаи</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="kreveti">Кревети</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="plakari">Плакари</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="nokni-skafcinja">Ноќни шкафчиња</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="toaletni-masi">Тоалетни маси</option>
-                  )}
-                  {category === "kancelarija" && (
-                    <option value="biroa">Бироа</option>
-                  )}
-                  {category === "kancelarija" && (
-                    <option value="kancelariski-stolovi">
-                      Канцелариски столови
-                    </option>
-                  )}
-                  {category === "kancelarija" && (
-                    <option value="gejmerski-stolovi">Гејмерски столови</option>
-                  )}
-                  {category === "kancelarija" && (
-                    <option value="kancelariski-skafovi">
-                      Канцелариски шкафови
-                    </option>
-                  )}
-                  {category === "hodnik" && (
-                    <option value="skafovi-za-cevli">Шкафови за чевли</option>
-                  )}
-                  {category === "hodnik" && (
-                    <option value="zakacalki-i-ogledala">
-                      Закачалки и огледала
-                    </option>
-                  )}
-                  {category === "hodnik" && (
-                    <option value="kolekcii-za-hodnik">
-                      Колекции за ходник
-                    </option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-kompleti">
-                      Градинарски комплети
-                    </option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-lulki">Градинарски лулки</option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-cadori">
-                      Градинарски чадори
-                    </option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-masi">Градинарски маси</option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-stolovi">
-                      Градинарски столови
-                    </option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarsko-osvetluvanje">
-                      Градинарско осветлување
-                    </option>
-                  )}
-                  {category === "trpezarija" && (
-                    <option value="trpezariski-masi">Трпезариски маси</option>
-                  )}
-                  {category === "trpezarija" && (
-                    <option value="trpezariski-stolovi">
-                      Трпезариски столови
-                    </option>
-                  )}
-                  {category === "trpezarija" && (
-                    <option value="kujnski-garnituri">Кујнски гарнитури</option>
-                  )}
-                  {category === "trpezarija" && (
-                    <option value="bar-stolovi-i-masi">
-                      Бар столови и маси
-                    </option>
-                  )}
-                  {category === "kujna" && (
-                    <option value="kujnski-agolni-garnituri">
-                      Кујнски аголни гарнитури
-                    </option>
-                  )}
-                  {category === "kujna" && (
-                    <option value="standardni-kujni">Стандардни кујни</option>
-                  )}
-                  {category === "detska" && (
-                    <option value="kolekcii-za-detska-soba">
-                      Колекции за детска соба
-                    </option>
-                  )}
-                  {category === "detska" && (
-                    <option value="detski-biroa">Детски бироа</option>
-                  )}
-                  {category === "detska" && (
-                    <option value="detski-lezai">Детски лежаи</option>
-                  )}
-                </Form.Select>
-              </Form.Group>
-            </div>
-            <div className="secondRow">
-              <Form.Group style={{ width: "60%", marginTop: "20px" }}>
-                <Form.Label>Опис</Form.Label>
-                <Form.Control
-                  id="textArea"
-                  value={description}
-                  onChange={(e) => setDescription(e.target.value)}
-                  as="textarea"
-                  required
-                ></Form.Control>
-              </Form.Group>
-              <div
-                style={{
-                  display: "flex",
-                  flexDirection: "column",
-                  alignItems: "center",
-                  justifyContent: "center",
-                  width: "40%",
-                }}
-              >
-                <Form.Group style={{ marginTop: "20px" }}>
-                  <Form.Label>Цена</Form.Label>
-                  <Form.Control
-                    value={price}
-                    onChange={(e) => setPrice(e.target.value)}
-                    type="number"
-                    required
-                  ></Form.Control>
-                </Form.Group>
-                <Form.Group style={{ marginTop: "10px" }}>
-                  <Form.Label>Цена Монтажа</Form.Label>
-                  <Form.Control
-                    value={priceMontaza}
-                    onChange={(e) => setPriceMontaza(e.target.value)}
-                    type="number"
-                    required
-                  ></Form.Control>
-                </Form.Group>
-                <Form.Group style={{ marginTop: "10px" }}>
-                  <Form.Label>Залиха</Form.Label>
-                  <Form.Control
-                    value={countInStock}
-                    onChange={(e) => setCountInStock(e.target.value)}
-                    type="number"
-                    required
-                  ></Form.Control>
-                </Form.Group>
-              </div>
-            </div>
-            <div className="thirdRow">
-              <div
-                style={{
-                  display: "flex",
-                  flexDirection: "column",
-                  alignItems: "center",
-                  justifyContent: "center",
-                }}
-              >
-                <Form.Group>
-                  <Form.Label>Главна слика</Form.Label>
-                  <Form.Control
-                    type="file"
-                    name="image"
-                    onChange={onChangeImage}
-                    required
-                  ></Form.Control>
-                </Form.Group>
-
-                <Form.Group style={{ marginTop: "10px" }}>
-                  <Form.Label>Споредна слика бр.1</Form.Label>
-                  <Form.Control
-                    type="file"
-                    name="sideImage"
-                    onChange={onChangeSideImage}
-                    required
-                  ></Form.Control>
-                </Form.Group>
-
-                <Form.Group style={{ marginTop: "10px" }}>
-                  <Form.Label>Споредна слика бр.2</Form.Label>
-                  <Form.Control
-                    type="file"
-                    name="sideImage2"
-                    onChange={onChangeSideImage2}
-                    required
-                  ></Form.Control>
-                </Form.Group>
-              </div>
-              <div>
-                <Form.Group
-                  style={{ display: "flex", justifyContent: "space-around" }}
-                >
-                  <div
-                    style={{
-                      display: "flex",
-                      flexDirection: "row",
-                      alignItems: "center",
-                    }}
-                  >
-                    <Form.Label>H:</Form.Label>
-                    <Form.Control
-                      type="text"
-                      name="dimension"
-                      style={{ width: "60px" }}
-                      value={H}
-                      onChange={(e) => setH(e.target.value)}
-                      required
-                    ></Form.Control>
-                  </div>
-                  <div
-                    style={{
-                      display: "flex",
-                      flexDirection: "row",
-                      alignItems: "center",
-                    }}
-                  >
-                    <Form.Label>W:</Form.Label>
-                    <Form.Control
-                      type="text"
-                      name="dimension"
-                      value={W}
-                      onChange={(e) => setW(e.target.value)}
-                      style={{ width: "60px" }}
-                      required
-                    ></Form.Control>
-                  </div>
-                  <div
-                    style={{
-                      display: "flex",
-                      flexDirection: "row",
-                      alignItems: "center",
-                    }}
-                  >
-                    <Form.Label>L:</Form.Label>
-                    <Form.Control
-                      type="text"
-                      name="dimension"
-                      style={{ width: "60px" }}
-                      value={L}
-                      onChange={(e) => setL(e.target.value)}
-                      required
-                    ></Form.Control>
-                  </div>
-                </Form.Group>
-                <Form.Group>
-                  <Form.Label>Слика со димензии</Form.Label>
-                  <Form.Control
-                    type="file"
-                    name="dimension"
-                    onChange={onChangeDimension}
-                    required
-                  ></Form.Control>
-                </Form.Group>
-
-                <Form.Group style={{ marginTop: "10px" }}>
-                  <Form.Label>Слика од шема</Form.Label>
-                  <Form.Control
-                    type="file"
-                    name="scheme"
-                    onChange={onChangeScheme}
-                    required
-                  ></Form.Control>
-                </Form.Group>
-              </div>
-            </div>
-            <div className="submitBtnContainer">
-              <Button variant="danger" size="lg" type="submit">
-                Додади
-              </Button>
-            </div>
-          </Form>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default AdminAddProductScreen;
Index: frontend/src/screens/AdminDashboardScreen.js
===================================================================
--- frontend/src/screens/AdminDashboardScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,57 +1,0 @@
-import React, { useContext, useEffect, useState } from "react";
-import Button from "react-bootstrap/Button";
-import "../styles/AdminDashboard.css";
-import AddProductForm from "../components/AddProductForm";
-import { Store } from "../Store";
-import { useNavigate, Link } from "react-router-dom";
-import ListProducts from "../components/ListProducts";
-import { Helmet } from "react-helmet-async";
-
-function AdminDashboardScreen() {
-  const navigate = useNavigate();
-  const { state } = useContext(Store);
-  const { userInfo } = state;
-  useEffect(() => {
-    if (!userInfo || !userInfo.isAdmin) {
-      return navigate("/");
-    }
-  }, [userInfo, navigate]);
-
-  return (
-    <div id="pgContainer">
-      <Helmet>
-        <title>Dashboard</title>
-      </Helmet>
-      <div id="sidebarMenu">
-        <Link
-          to={"/admin/addProduct"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn" to="/admin/addProduct">
-            Додади нов производ
-          </div>
-        </Link>
-        <Link
-          to={"/admin/addCategory"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Додади категорија</div>
-        </Link>
-        <Link
-          to={"/admin/products"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Производи</div>
-        </Link>
-        <Link
-          to={"/admin/orders"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Нарачки</div>
-        </Link>
-      </div>
-    </div>
-  );
-}
-
-export default AdminDashboardScreen;
Index: frontend/src/screens/AdminEditProductScreen.js
===================================================================
--- frontend/src/screens/AdminEditProductScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,345 +1,0 @@
-import axios from "axios";
-import React, { useEffect, useReducer, useState } from "react";
-import { Link, useParams } from "react-router-dom";
-import { toast } from "react-toastify";
-import Button from "react-bootstrap/Button";
-import Form from "react-bootstrap/Form";
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "FETCH_REQUEST":
-      return { ...state, loading: true };
-    case "FETCH_SUCCESS":
-      return { ...state, product: action.payload, loading: false };
-    case "FETCH_FAIL":
-      return { ...state, loading: false, error: action.payload };
-    default:
-      return state;
-  }
-};
-
-function AdminEditProductScreen() {
-  const params = useParams();
-  const { slug } = params;
-
-  const [{ loading, error, product }, dispatch] = useReducer(reducer, {
-    product: [],
-    loading: true,
-    error: "",
-  });
-
-  useEffect(() => {
-    const fetchData = async () => {
-      dispatch({ type: "FETCH_REQUEST" });
-      try {
-        const result = await axios.get(`/api/products/slug/${slug}`);
-        dispatch({ type: "FETCH_SUCCESS", payload: result.data });
-      } catch (err) {
-        dispatch({ type: "FETCH_FAIL", payload: err.message });
-      }
-    };
-    fetchData();
-  }, [slug]);
-
-  const [category, setCategory] = useState("all");
-  const [subCategory, setSubCategory] = useState("all");
-
-  const submitHandler = async (e) => {
-    e.preventDefault();
-    let name = document.getElementById("name").value;
-    let slug = document.getElementById("slug").value;
-    let price = document.getElementById("price").value;
-    let priceMontaza = document.getElementById("priceMontaza").value;
-    let countInStock = document.getElementById("stock").value;
-    let description = document.getElementById("textArea").value;
-
-    try {
-      const { data } = await axios.put("/api/products/edit", {
-        name,
-        slug,
-        category,
-        subCategory,
-        description,
-        price,
-        priceMontaza,
-        countInStock,
-      });
-
-      toast.success("Успешно ажурирање");
-    } catch (err) {
-      dispatch({ type: "FETCH_FAIL" });
-      toast.error("Грешка");
-    }
-  };
-
-  return (
-    <div id="pgContainer">
-      <div id="sidebarMenu">
-        <Link
-          to={"/admin/addProduct"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn" to="/admin/addProduct">
-            Додади нов производ
-          </div>
-        </Link>
-        <Link
-          to={"/admin/addCategory"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Додади категорија</div>
-        </Link>
-        <Link
-          to={"/admin/products"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Производи</div>
-        </Link>
-        <Link
-          to={"/admin/orders"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Нарачки</div>
-        </Link>
-      </div>
-      <div id="mainScreen">
-        <div className="taskContainer">
-          <h1>Ажурирај продукт</h1>
-          <Form
-            onSubmit={submitHandler}
-            encType="multipart/form-data"
-            className="newProductFormCointainer"
-          >
-            <div className="firstRow" style={{ display: "flex" }}>
-              <Form.Group>
-                <Form.Label>Име</Form.Label>
-                <Form.Control
-                  id="name"
-                  defaultValue={product.name}
-                  required
-                ></Form.Control>
-              </Form.Group>
-              <Form.Group>
-                <Form.Label>Слуг</Form.Label>
-                <Form.Control
-                  id="slug"
-                  defaultValue={slug}
-                  required
-                ></Form.Control>
-              </Form.Group>
-              <Form.Group>
-                <Form.Label>Категорија</Form.Label>
-                <Form.Select onChange={(e) => setCategory(e.target.value)}>
-                  <option value={"all"}>Категорија</option>
-                  <option value={"dnevna"}>Дневна</option>
-                  <option value={"spalna"}>Спална</option>
-                  <option value={"kancelarija"}>Канцеларија</option>
-                  <option value={"hodnik"}>Ходник</option>
-                  <option value={"gradina"}>Градина</option>
-                  <option value={"trpezarija"}>Трпезарија</option>
-                  <option value={"kujna"}>Кујна</option>
-                  <option value={"detska"}>Детска</option>
-                </Form.Select>
-              </Form.Group>
-              <Form.Group>
-                <Form.Label>Подкатегорија</Form.Label>
-                <Form.Select
-                  onChange={(e) => {
-                    setSubCategory(e.target.value);
-                  }}
-                >
-                  <option value="all">Подкатегорија</option>
-
-                  {category === "dnevna" && (
-                    <option value="agolni-garnituri">Аголни Гарнитури</option>
-                  )}
-                  {category === "dnevna" && <option value="sofi">Софи</option>}
-                  {category === "dnevna" && (
-                    <option value="fotelji">Фотелји</option>
-                  )}
-                  {category === "dnevna" && (
-                    <option value="taburetki">Табуретки</option>
-                  )}
-                  {category === "dnevna" && (
-                    <option value="klub-masi">Клуб маси</option>
-                  )}
-                  {category === "dnevna" && (
-                    <option value="tv-komodi">ТВ комоди</option>
-                  )}
-                  {category === "dnevna" && (
-                    <option value="komodi">Комоди</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="spalni-kompleti">Спални Комплети</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="lezai">Лежаи</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="kreveti">Кревети</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="plakari">Плакари</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="nokni-skafcinja">Ноќни шкафчиња</option>
-                  )}
-                  {category === "spalna" && (
-                    <option value="toaletni-masi">Тоалетни маси</option>
-                  )}
-                  {category === "kancelarija" && (
-                    <option value="biroa">Бироа</option>
-                  )}
-                  {category === "kancelarija" && (
-                    <option value="kancelariski-stolovi">
-                      Канцелариски столови
-                    </option>
-                  )}
-                  {category === "kancelarija" && (
-                    <option value="gejmerski-stolovi">Гејмерски столови</option>
-                  )}
-                  {category === "kancelarija" && (
-                    <option value="kancelariski-skafovi">
-                      Канцелариски шкафови
-                    </option>
-                  )}
-                  {category === "hodnik" && (
-                    <option value="skafovi-za-cevli">Шкафови за чевли</option>
-                  )}
-                  {category === "hodnik" && (
-                    <option value="zakacalki-i-ogledala">
-                      Закачалки и огледала
-                    </option>
-                  )}
-                  {category === "hodnik" && (
-                    <option value="kolekcii-za-hodnik">
-                      Колекции за ходник
-                    </option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-kompleti">
-                      Градинарски комплети
-                    </option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-lulki">Градинарски лулки</option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-cadori">
-                      Градинарски чадори
-                    </option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-masi">Градинарски маси</option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarski-stolovi">
-                      Градинарски столови
-                    </option>
-                  )}
-                  {category === "gradina" && (
-                    <option value="gradinarsko-osvetluvanje">
-                      Градинарско осветлување
-                    </option>
-                  )}
-                  {category === "trpezarija" && (
-                    <option value="trpezariski-masi">Трпезариски маси</option>
-                  )}
-                  {category === "trpezarija" && (
-                    <option value="trpezariski-stolovi">
-                      Трпезариски столови
-                    </option>
-                  )}
-                  {category === "trpezarija" && (
-                    <option value="kujnski-garnituri">Кујнски гарнитури</option>
-                  )}
-                  {category === "trpezarija" && (
-                    <option value="bar-stolovi-i-masi">
-                      Бар столови и маси
-                    </option>
-                  )}
-                  {category === "kujna" && (
-                    <option value="kujnski-agolni-garnituri">
-                      Кујнски аголни гарнитури
-                    </option>
-                  )}
-                  {category === "kujna" && (
-                    <option value="standardni-kujni">Стандардни кујни</option>
-                  )}
-                  {category === "detska" && (
-                    <option value="kolekcii-za-detska-soba">
-                      Колекции за детска соба
-                    </option>
-                  )}
-                  {category === "detska" && (
-                    <option value="detski-biroa">Детски бироа</option>
-                  )}
-                  {category === "detska" && (
-                    <option value="detski-lezai">Детски лежаи</option>
-                  )}
-                </Form.Select>
-              </Form.Group>
-            </div>
-            <div className="secondRow">
-              <Form.Group style={{ width: "60%", marginTop: "20px" }}>
-                <Form.Label>Опис</Form.Label>
-                <Form.Control
-                  id="textArea"
-                  defaultValue={product.description}
-                  as="textarea"
-                  required
-                ></Form.Control>
-              </Form.Group>
-              <div
-                style={{
-                  display: "flex",
-                  flexDirection: "column",
-                  alignItems: "center",
-                  justifyContent: "center",
-                  width: "40%",
-                }}
-              >
-                <Form.Group style={{ marginTop: "20px" }}>
-                  <Form.Label>Цена</Form.Label>
-                  <Form.Control
-                    id="price"
-                    defaultValue={product.price}
-                    type="number"
-                    style={{ color: "black" }}
-                    required
-                  ></Form.Control>
-                </Form.Group>
-                <Form.Group style={{ marginTop: "10px" }}>
-                  <Form.Label>Цена Монтажа</Form.Label>
-                  <Form.Control
-                    id="priceMontaza"
-                    defaultValue={product.priceMontaza}
-                    type="number"
-                    required
-                  ></Form.Control>
-                </Form.Group>
-                <Form.Group style={{ marginTop: "10px" }}>
-                  <Form.Label>Залиха</Form.Label>
-                  <Form.Control
-                    id="stock"
-                    defaultValue={product.countInStock}
-                    type="number"
-                    required
-                  ></Form.Control>
-                </Form.Group>
-              </div>
-            </div>
-
-            <div className="submitBtnContainer">
-              <Button variant="danger" size="lg" type="submit">
-                Ажурирај
-              </Button>
-            </div>
-          </Form>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default AdminEditProductScreen;
Index: frontend/src/screens/AdminOrderScreen.js
===================================================================
--- frontend/src/screens/AdminOrderScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,277 +1,0 @@
-import axios from "axios";
-import React, { useContext, useEffect, useReducer } from "react";
-import { Link, useNavigate, useParams } from "react-router-dom";
-import LoadingBox from "../components/LoadingBox";
-import MessageBox from "../components/MessageBox";
-import { Store } from "../Store";
-import { getError } from "../components/utils";
-import { Helmet } from "react-helmet-async";
-import Row from "react-bootstrap/Row";
-import Card from "react-bootstrap/Card";
-import Col from "react-bootstrap/Col";
-import ListGroup from "react-bootstrap/ListGroup";
-import Button from "react-bootstrap/Button";
-import { toast } from "react-toastify";
-
-function reducer(state, action) {
-  switch (action.type) {
-    case "FETCH_REQUEST":
-      return { ...state, loading: true, error: "" };
-    case "FETCH_SUCCESS":
-      return { ...state, loading: false, order: action.payload, error: "" };
-    case "FETCH_FAIL":
-      return { ...state, loading: false, error: action.payload };
-    default:
-      return state;
-  }
-}
-
-export default function OrderScreen() {
-  const { state } = useContext(Store);
-  const { userInfo } = state;
-  const params = useParams();
-  const { id: orderId } = params;
-  const navigate = useNavigate();
-
-  const [{ loading, error, order }, dispatch] = useReducer(reducer, {
-    loading: true,
-    order: {},
-    error: "",
-  });
-
-  useEffect(() => {
-    const fetchOrder = async () => {
-      try {
-        dispatch({ type: "FETCH_REQUEST" });
-        const { data } = await axios.get(`/api/orders/${orderId}`, {
-          headers: { authorization: `Bearer ${userInfo.token}` },
-        });
-        dispatch({ type: "FETCH_SUCCESS", payload: data });
-      } catch (err) {
-        dispatch({ type: "FETCH_FAIL", payload: getError(err) });
-      }
-    };
-    if (!userInfo) {
-      return navigate("/login");
-    }
-    if (!order._id || (order._id && order._id !== orderId)) {
-      fetchOrder();
-    }
-  }, [order, userInfo, orderId, navigate]);
-
-  const confirmOrderHandler = async () => {
-    let isConfirmed = true;
-    let _id = order._id;
-    try {
-      const { data } = await axios.put("/api/orders/action", {
-        isConfirmed,
-        _id,
-      });
-
-      toast.success("Нарачката е потврдена");
-    } catch (err) {
-      dispatch({ type: "FETCH_FAIL" });
-      toast.error("Грешка");
-    }
-  };
-  const sendOrderHandler = async () => {
-    let isShipped = true;
-    let shippedAt = Date();
-    let _id = order._id;
-    try {
-      const { data } = await axios.put("/api/orders/action", {
-        isShipped,
-        shippedAt,
-        _id,
-      });
-
-      toast.success("Нарачката е испратена");
-    } catch (err) {
-      dispatch({ type: "FETCH_FAIL" });
-      toast.error("Грешка");
-    }
-  };
-  const finishOrderHandler = async () => {
-    let isDelivered = true;
-    let deliveredAt = Date();
-    let _id = order._id;
-    try {
-      if (order.isPaid) {
-        const { data } = await axios.put("/api/orders/action", {
-          isDelivered,
-          deliveredAt,
-          _id,
-        });
-      } else {
-        let isPaid = true;
-        let paidAt = Date();
-        const { data } = await axios.put("/api/orders/action", {
-          _id,
-          isDelivered,
-          deliveredAt,
-          isPaid,
-          paidAt,
-        });
-      }
-
-      toast.success("Нарачката е пристигната");
-    } catch (err) {
-      dispatch({ type: "FETCH_FAIL" });
-      toast.error("Грешка");
-    }
-  };
-
-  return loading ? (
-    <LoadingBox></LoadingBox>
-  ) : error ? (
-    <MessageBox variant="danger">{error}</MessageBox>
-  ) : (
-    <div className="pageContainer shipPC">
-      <Helmet>
-        <title>Нарачка {orderId}</title>
-      </Helmet>
-      <h1 style={{ marginTop: "20px" }}>Нарачка {orderId}</h1>
-      <Row style={{ width: "90%" }}>
-        <Col md={8}>
-          <Card className="mb-3">
-            <Card.Body>
-              <Card.Title>Испорака</Card.Title>
-              <Card.Text>
-                <strong>Име:</strong> {order.shippingAddress.fullName}
-                <br />
-                <strong>Адреса:</strong> {order.shippingAddress.address},
-                {order.shippingAddress.city},{order.shippingAddress.postalCode},
-                {order.shippingAddress.country}
-                <br />
-                <strong>Телефон:</strong> {order.contactNumber}
-                <br />
-              </Card.Text>
-            </Card.Body>
-          </Card>
-          <Card className="mb-3">
-            <Card.Body>
-              <Card.Title>Плаќање</Card.Title>
-              <Card.Text>
-                <strong>Начин:</strong>{" "}
-                {order.paymentMethod === "Karticka"
-                  ? "Со платежна картичка"
-                  : "Во готово при достава"}
-              </Card.Text>
-              {order.isPaid ? (
-                <MessageBox variant="success">
-                  Платено на {order.paidAt}
-                </MessageBox>
-              ) : (
-                <MessageBox variant="danger">Не е платено</MessageBox>
-              )}
-            </Card.Body>
-          </Card>
-          <Card className="mb-3">
-            <Card.Body>
-              <Card.Title>Продукти</Card.Title>
-              <ListGroup variant="flush">
-                {order.orderItems.map((item) => (
-                  <ListGroup.Item key={item._id}>
-                    <div
-                      style={{
-                        display: "flex",
-                        justifyContent: "space-between",
-                      }}
-                    >
-                      <div style={{ display: "flex", alignItems: "center" }}>
-                        <img
-                          src={item.image}
-                          alt={item.name}
-                          className="img-fluid rounded img-thumbnail"
-                          style={{ margin: "0px" }}
-                        ></img>
-                        <Link to={`/product/${item.slug}`}>{item.name}</Link>
-                      </div>
-
-                      <span>{item.quantity}</span>
-
-                      <span>{item.price} ден</span>
-                    </div>
-                  </ListGroup.Item>
-                ))}
-              </ListGroup>
-            </Card.Body>
-          </Card>
-        </Col>
-        <Col md={4}>
-          <Card>
-            <Card.Body>
-              <Card.Title>Нарачка</Card.Title>
-              <ListGroup variant="flush">
-                <ListGroup.Item>
-                  <Row>
-                    <Col>Продукти:</Col>
-                    <Col>{order.itemsPrice.toFixed(2)} ден</Col>
-                  </Row>
-                </ListGroup.Item>
-                <ListGroup.Item>
-                  <Row>
-                    <Col>Испорака:</Col>
-                    <Col>{order.shippingPrice.toFixed(2)} ден</Col>
-                  </Row>
-                </ListGroup.Item>
-
-                <ListGroup.Item>
-                  <Row>
-                    <Col>
-                      <strong>Вкупно</strong>
-                    </Col>
-                    <Col>
-                      <strong>{order.totalPrice.toFixed(2)} ден</strong>
-                    </Col>
-                  </Row>
-                </ListGroup.Item>
-              </ListGroup>
-            </Card.Body>
-          </Card>
-          <Card style={{ marginTop: "40px" }}>
-            <Card.Body>
-              <Card.Title>Акции</Card.Title>
-              <ListGroup variant="flush">
-                <ListGroup.Item>
-                  <Button
-                    style={{ width: "100%" }}
-                    disabled={order.isConfirmed === true}
-                    onClick={confirmOrderHandler}
-                  >
-                    Потврди Нарачка
-                  </Button>
-                </ListGroup.Item>
-                <ListGroup.Item>
-                  <Button
-                    style={{ width: "100%" }}
-                    disabled={
-                      order.isConfirmed === false || order.isShipped === true
-                    }
-                    onClick={sendOrderHandler}
-                  >
-                    Испрати Нарачка
-                  </Button>
-                </ListGroup.Item>
-
-                <ListGroup.Item>
-                  <Button
-                    style={{ width: "100%" }}
-                    disabled={
-                      order.isConfirmed === false ||
-                      order.isShipped === false ||
-                      order.isDelivered === true
-                    }
-                    onClick={finishOrderHandler}
-                  >
-                    Нарачката е пристигната
-                  </Button>
-                </ListGroup.Item>
-              </ListGroup>
-            </Card.Body>
-          </Card>
-        </Col>
-      </Row>
-    </div>
-  );
-}
Index: frontend/src/screens/AdminOrdersScreen.js
===================================================================
--- frontend/src/screens/AdminOrdersScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,220 +1,0 @@
-import axios from "axios";
-import React, { useEffect, useReducer } from "react";
-import { Link, useLocation, useNavigate } from "react-router-dom";
-import { getError } from "../components/utils";
-import Button from "react-bootstrap/Button";
-import LoadingBox from "../components/LoadingBox";
-import MessageBox from "../components/MessageBox";
-import CheckIcon from "@mui/icons-material/Check";
-import ClearIcon from "@mui/icons-material/Clear";
-import PhonePausedIcon from "@mui/icons-material/PhonePaused";
-import HourglassBottomIcon from "@mui/icons-material/HourglassBottom";
-import LocalShippingIcon from "@mui/icons-material/LocalShipping";
-import LinkContainer from "react-router-bootstrap/LinkContainer";
-import Form from "react-bootstrap/Form";
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "FETCH_REQUEST":
-      return { ...state, loading: true };
-    case "FETCH_SUCCESS":
-      console.log(action.payload);
-      return {
-        ...state,
-        //orders: action.payload,
-
-        orders: action.payload.orders,
-        page: action.payload.page,
-        pages: action.payload.pages,
-        countProducts: action.payload.countProducts,
-        loading: false,
-      };
-    case "FETCH_FAIL":
-      return { ...state, loading: false, error: action.payload };
-    default:
-      return state;
-  }
-};
-
-function AdminOrdersScreen() {
-  const navigate = useNavigate();
-  const { search } = useLocation();
-  const sp = new URLSearchParams(search);
-  const isConfirmed = sp.get("isConfirmed") || "all";
-  const isShipped = sp.get("isShipped") || "all";
-  const query = sp.get("query") || "all";
-  const page = sp.get("page") || 1;
-  const [{ loading, error, orders, pages, countProducts }, dispatch] =
-    useReducer(reducer, {
-      loading: true,
-      error: "",
-    });
-
-  useEffect(() => {
-    const fetchData = async () => {
-      dispatch({ type: "FETCH_REQUEST" });
-      try {
-        const { data } = await axios.get(
-          `/api/orders?page=${page}&isConfirmed=${isConfirmed}&isShipped=${isShipped}&query=${query}`
-        );
-        dispatch({ type: "FETCH_SUCCESS", payload: data });
-      } catch (error) {
-        dispatch({ type: "FETCH_FAIL", payload: getError(error) });
-      }
-    };
-    fetchData();
-  }, [isConfirmed, isShipped, page, query]);
-  const getFilterUrl = (filter) => {
-    const filterPage = filter.page || page;
-    const filterIsConfirmed = filter.isConfirmed || isConfirmed;
-    const filterIsShipped = filter.isShipped || isShipped;
-    const filterQuery = filter.query || query;
-    return `?page=${filterPage}&isConfirmed=${filterIsConfirmed}&isShipped=${filterIsShipped}&query=${filterQuery}`;
-  };
-
-  return (
-    <div id="pgContainer">
-      <div id="sidebarMenu">
-        <Link
-          to={"/admin/addProduct"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn" to="/admin/addProduct">
-            Додади нов производ
-          </div>
-        </Link>
-        <Link
-          to={"/admin/addCategory"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Додади категорија</div>
-        </Link>
-        <Link
-          to={"/admin/products"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Производи</div>
-        </Link>
-        <Link
-          to={"/admin/orders"}
-          style={{ textDecoration: "none", width: "100%" }}
-        >
-          <div className="dashboard-btn">Нарачки</div>
-        </Link>
-      </div>
-      <div id="mainScreen">
-        <div className="taskContainer">
-          <h1 style={{ marginTop: "20px" }}>Нарачки</h1>
-          <div
-            className="filterContainer"
-            style={{
-              width: "100%",
-              display: "flex",
-              justifyContent: "space-around",
-            }}
-          >
-            <Button
-              variant="danger"
-              onClick={(e) => {
-                navigate(
-                  getFilterUrl({ isConfirmed: "false", isShipped: "false" })
-                );
-              }}
-            >
-              За потврда
-            </Button>
-            <Button
-              variant="danger"
-              onClick={(e) =>
-                navigate(
-                  getFilterUrl({ isShipped: "false", isConfirmed: "true" })
-                )
-              }
-            >
-              За испорака
-            </Button>
-            <Button
-              variant="danger"
-              onClick={(e) =>
-                navigate(
-                  getFilterUrl({ isShipped: "true", isConfirmed: "true" })
-                )
-              }
-            >
-              Пристигнати
-            </Button>
-          </div>
-          {loading ? (
-            <LoadingBox></LoadingBox>
-          ) : error ? (
-            <MessageBox variant="danger">{error}</MessageBox>
-          ) : (
-            <table
-              className="table"
-              style={{ marginTop: "20px", width: "90%", textAlign: "center" }}
-            >
-              <thead>
-                <tr>
-                  <th>ID</th>
-                  <th>Дата</th>
-                  <th>Вкупно</th>
-                  <th>Статус</th>
-                  <th>Акции</th>
-                </tr>
-              </thead>
-              <tbody>
-                {orders.map((order) => (
-                  <tr key={order._id}>
-                    <td>{order._id.substring(0, 7)}</td>
-                    <td>{order.createdAt.substring(0, 10)}</td>
-                    <td>{order.totalPrice.toFixed(2)}</td>
-
-                    <td>
-                      {order.isDelivered ? (
-                        <CheckIcon></CheckIcon>
-                      ) : order.isShipped ? (
-                        <LocalShippingIcon></LocalShippingIcon>
-                      ) : order.isConfirmed ? (
-                        <HourglassBottomIcon></HourglassBottomIcon>
-                      ) : (
-                        <PhonePausedIcon></PhonePausedIcon>
-                      )}
-                    </td>
-                    <td>
-                      <Button
-                        type="button"
-                        variant="primary"
-                        onClick={() => {
-                          navigate(`/admin/order/${order._id}`);
-                        }}
-                      >
-                        Детали
-                      </Button>
-                    </td>
-                  </tr>
-                ))}
-              </tbody>
-            </table>
-          )}
-          <div style={{ marginTop: "20px" }}>
-            {[...Array(pages).keys()].map((x) => (
-              <LinkContainer
-                key={x + 1}
-                className="mx-1"
-                to={getFilterUrl({ page: x + 1 })}
-              >
-                <Button
-                  className={Number(page) === x + 1 ? "text-bold" : ""}
-                  variant={Number(page) === x + 1 ? "danger" : "light"}
-                >
-                  {x + 1}
-                </Button>
-              </LinkContainer>
-            ))}
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default AdminOrdersScreen;
Index: frontend/src/screens/AdminProductsScreen.js
===================================================================
--- frontend/src/screens/AdminProductsScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,395 +1,0 @@
-import axios from "axios";
-import React, { useEffect, useReducer, useState } from "react";
-import { Link, useNavigate, useLocation } from "react-router-dom";
-import ListGroup from "react-bootstrap/ListGroup";
-import Button from "react-bootstrap/Button";
-import Form from "react-bootstrap/Form";
-import { getError } from "../components/utils";
-import { toast } from "react-toastify";
-import LoadingBox from "../components/LoadingBox";
-import MessageBox from "../components/MessageBox";
-import LinkContainer from "react-router-bootstrap/LinkContainer";
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "FETCH_REQUEST":
-      return { ...state, loading: true };
-    case "FETCH_SUCCESS":
-      return {
-        ...state,
-        products: action.payload.products,
-        page: action.payload.page,
-        pages: action.payload.pages,
-        countProducts: action.payload.countProducts,
-        loading: false,
-      };
-    case "FETCH_FAIL":
-      return { ...state, loading: false, error: action.payload };
-    default:
-      return state;
-  }
-};
-
-function AdminProductsScreen() {
-  const navigate = useNavigate();
-  const { search } = useLocation();
-  const sp = new URLSearchParams(search);
-  const category = sp.get("category") || "all";
-  const query = sp.get("query") || "all";
-  const subCategory = sp.get("subCategory") || "all";
-  //const name = sp.get("name") || "all";
-  const order = sp.get("order") || "newest";
-  const page = sp.get("page") || 1;
-
-  const [{ loading, error, products, pages, countProducts }, dispatch] =
-    useReducer(reducer, { loading: true, error: "" });
-
-  useEffect(() => {
-    const fetchData = async () => {
-      try {
-        dispatch({ type: "FETCH_REQUEST" });
-        /*
-        const { data } = await axios.get(
-          `/api/products/search?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}`
-        );*/
-        const { data } = await axios.get(
-          `/api/products?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}`
-        );
-        dispatch({ type: "FETCH_SUCCESS", payload: data });
-      } catch (err) {
-        dispatch({ type: "FETCH_FAIL", payload: getError(err) });
-      }
-    };
-    fetchData();
-  }, [category, page, query, order, subCategory, error]);
-
-  const getFilterUrl = (filter) => {
-    const filterPage = filter.page || page;
-    const filterCategorry = filter.category || category;
-    const filterQuery = filter.query || query;
-    const filterSubCategory = filter.subCategory || subCategory;
-    const sortOrder = filter.order || order;
-    return `?category=${filterCategorry}&query=${filterQuery}&subCategory=${filterSubCategory}&page=${filterPage}&order=${sortOrder}`;
-  };
-
-  return (
-    <div
-      style={{
-        display: "flex",
-        flexDirection: "column",
-        alignItems: "center",
-        justifyContent: "center",
-      }}
-    >
-      {loading ? (
-        <LoadingBox></LoadingBox>
-      ) : error ? (
-        <MessageBox varriant="danger">{error}</MessageBox>
-      ) : (
-        <div id="pgContainer">
-          <div id="sidebarMenu">
-            <Link
-              to={"/admin/addProduct"}
-              style={{ textDecoration: "none", width: "100%" }}
-            >
-              <div className="dashboard-btn" to="/admin/addProduct">
-                Додади нов производ
-              </div>
-            </Link>
-            <Link
-              to={"/admin/addCategory"}
-              style={{ textDecoration: "none", width: "100%" }}
-            >
-              <div className="dashboard-btn">Додади категорија</div>
-            </Link>
-            <Link
-              to={"/admin/products"}
-              style={{ textDecoration: "none", width: "100%" }}
-            >
-              <div className="dashboard-btn">Производи</div>
-            </Link>
-            <Link
-              to={"/admin/orders"}
-              style={{ textDecoration: "none", width: "100%" }}
-            >
-              <div className="dashboard-btn">Нарачки</div>
-            </Link>
-          </div>
-          <div className="taskContainer">
-            <h1>Производи</h1>
-            <div className="filterContainer" style={{ width: "100%" }}>
-              <Form
-                id="fff"
-                style={{
-                  display: "flex",
-                  alignItems: "center",
-                  justifyContent: "space-around",
-                }}
-              >
-                {/*
-              <Form.Group>
-                <Form.Control
-                  id="filterName"
-                  placeholder="Име"
-                  onSubmit={submitHandler}
-                  required
-                ></Form.Control>
-            </Form.Group>*/}
-                <Form.Group>
-                  <Form.Select
-                    value={category}
-                    onChange={(e) => {
-                      if (e.target.value === "all") {
-                        navigate(
-                          getFilterUrl({
-                            page: 1,
-                            category: e.target.value,
-                            subCategory: "all",
-                          })
-                        );
-                      } else {
-                        navigate(
-                          getFilterUrl({ category: e.target.value, page: 1 })
-                        );
-                      }
-                    }}
-                  >
-                    <option value="all">Категорија</option>
-                    <option value={"dnevna"}>Дневна</option>
-                    <option value={"spalna"}>Спална</option>
-                    <option value={"kancelarija"}>Канцеларија</option>
-                    <option value={"hodnik"}>Ходник</option>
-                    <option value={"gradina"}>Градина</option>
-                    <option value={"trpezarija"}>Трпезарија</option>
-                    <option value={"kujna"}>Кујна</option>
-                    <option value={"detska"}>Детска</option>
-                  </Form.Select>
-                </Form.Group>
-                <Form.Group>
-                  <Form.Select
-                    value={subCategory}
-                    onChange={(e) => {
-                      navigate(
-                        getFilterUrl({ subCategory: e.target.value, page: 1 })
-                      );
-                    }}
-                  >
-                    <option value="all">Подкатегорија</option>
-
-                    {category === "dnevna" && (
-                      <option value="agolni-garnituri">Аголни Гарнитури</option>
-                    )}
-                    {category === "dnevna" && (
-                      <option value="sofi">Софи</option>
-                    )}
-                    {category === "dnevna" && (
-                      <option value="fotelji">Фотелји</option>
-                    )}
-                    {category === "dnevna" && (
-                      <option value="taburetki">Табуретки</option>
-                    )}
-                    {category === "dnevna" && (
-                      <option value="klub-masi">Клуб маси</option>
-                    )}
-                    {category === "dnevna" && (
-                      <option value="tv-komodi">ТВ комоди</option>
-                    )}
-                    {category === "dnevna" && (
-                      <option value="komodi">Комоди</option>
-                    )}
-                    {category === "spalna" && (
-                      <option value="spalni-kompleti">Спални Комплети</option>
-                    )}
-                    {category === "spalna" && (
-                      <option value="lezai">Лежаи</option>
-                    )}
-                    {category === "spalna" && (
-                      <option value="kreveti">Кревети</option>
-                    )}
-                    {category === "spalna" && (
-                      <option value="plakari">Плакари</option>
-                    )}
-                    {category === "spalna" && (
-                      <option value="nokni-skafcinja">Ноќни шкафчиња</option>
-                    )}
-                    {category === "spalna" && (
-                      <option value="toaletni-masi">Тоалетни маси</option>
-                    )}
-                    {category === "kancelarija" && (
-                      <option value="biroa">Бироа</option>
-                    )}
-                    {category === "kancelarija" && (
-                      <option value="kancelariski-stolovi">
-                        Канцелариски столови
-                      </option>
-                    )}
-                    {category === "kancelarija" && (
-                      <option value="gejmerski-stolovi">
-                        Гејмерски столови
-                      </option>
-                    )}
-                    {category === "kancelarija" && (
-                      <option value="kancelariski-skafovi">
-                        Канцелариски шкафови
-                      </option>
-                    )}
-                    {category === "hodnik" && (
-                      <option value="skafovi-za-cevli">Шкафови за чевли</option>
-                    )}
-                    {category === "hodnik" && (
-                      <option value="zakacalki-i-ogledala">
-                        Закачалки и огледала
-                      </option>
-                    )}
-                    {category === "hodnik" && (
-                      <option value="kolekcii-za-hodnik">
-                        Колекции за ходник
-                      </option>
-                    )}
-                    {category === "gradina" && (
-                      <option value="gradinarski-kompleti">
-                        Градинарски комплети
-                      </option>
-                    )}
-                    {category === "gradina" && (
-                      <option value="gradinarski-lulki">
-                        Градинарски лулки
-                      </option>
-                    )}
-                    {category === "gradina" && (
-                      <option value="gradinarski-cadori">
-                        Градинарски чадори
-                      </option>
-                    )}
-                    {category === "gradina" && (
-                      <option value="gradinarski-masi">Градинарски маси</option>
-                    )}
-                    {category === "gradina" && (
-                      <option value="gradinarski-stolovi">
-                        Градинарски столови
-                      </option>
-                    )}
-                    {category === "gradina" && (
-                      <option value="gradinarsko-osvetluvanje">
-                        Градинарско осветлување
-                      </option>
-                    )}
-                    {category === "trpezarija" && (
-                      <option value="trpezariski-masi">Трпезариски маси</option>
-                    )}
-                    {category === "trpezarija" && (
-                      <option value="trpezariski-stolovi">
-                        Трпезариски столови
-                      </option>
-                    )}
-                    {category === "trpezarija" && (
-                      <option value="kujnski-garnituri">
-                        Кујнски гарнитури
-                      </option>
-                    )}
-                    {category === "trpezarija" && (
-                      <option value="bar-stolovi-i-masi">
-                        Бар столови и маси
-                      </option>
-                    )}
-                    {category === "kujna" && (
-                      <option value="kujnski-agolni-garnituri">
-                        Кујнски аголни гарнитури
-                      </option>
-                    )}
-                    {category === "kujna" && (
-                      <option value="standardni-kujni">Стандардни кујни</option>
-                    )}
-                    {category === "detska" && (
-                      <option value="kolekcii-za-detska-soba">
-                        Колекции за детска соба
-                      </option>
-                    )}
-                    {category === "detska" && (
-                      <option value="detski-biroa">Детски бироа</option>
-                    )}
-                    {category === "detska" && (
-                      <option value="detski-lezai">Детски лежаи</option>
-                    )}
-                  </Form.Select>
-                </Form.Group>
-                <Form.Group>
-                  <Form.Select
-                    id="sortOrder"
-                    onChange={(e) => {
-                      navigate(getFilterUrl({ order: e.target.value }));
-                    }}
-                  >
-                    <option value={"newest"}>Сортирај по цена</option>
-                    <option value={"lowFirst"}>Од ниска кон висока</option>
-                    <option value={"highFirst"}>Од висока кон ниска</option>
-                  </Form.Select>
-                </Form.Group>
-              </Form>
-            </div>
-            <ListGroup
-              id="filteredProductsContainer"
-              variant="success"
-              style={{ width: "95%", margin: "auto", marginTop: "20px" }}
-            >
-              {products.map((item) => (
-                <ListGroup.Item key={item._id}>
-                  <div
-                    style={{
-                      display: "flex",
-                      alignItems: "center",
-                      justifyContent: "space-between",
-                    }}
-                  >
-                    <div style={{ display: "flex", alignItems: "center" }}>
-                      <img
-                        src={item.image}
-                        alt={item.name}
-                        className="img-fluid rounded img-thumbnail"
-                        style={{ margin: "0px" }}
-                      ></img>
-                      <span style={{ marginLeft: "20px" }}>{item.name}</span>
-                    </div>
-                    <span>{item.category}</span>
-                    <span>{item.subCategory}</span>
-                    <span>{item.countInStock}</span>
-
-                    <span>{item.price} ден</span>
-                    <Button
-                      type="button"
-                      variant="primary"
-                      style={{ height: "50px" }}
-                      onClick={() => {
-                        navigate(`/admin/product/${item.slug}`);
-                      }}
-                    >
-                      Измени
-                    </Button>
-                  </div>
-                </ListGroup.Item>
-              ))}
-            </ListGroup>
-            <div style={{ marginTop: "20px" }}>
-              {[...Array(pages).keys()].map((x) => (
-                <LinkContainer
-                  key={x + 1}
-                  className="mx-1"
-                  to={getFilterUrl({ page: x + 1 })}
-                >
-                  <Button
-                    className={Number(page) === x + 1 ? "text-bold" : ""}
-                    variant={Number(page) === x + 1 ? "danger" : "light"}
-                  >
-                    {x + 1}
-                  </Button>
-                </LinkContainer>
-              ))}
-            </div>
-          </div>
-        </div>
-      )}
-    </div>
-  );
-}
-
-export default AdminProductsScreen;
Index: frontend/src/screens/CardPaymentScreen.js
===================================================================
--- frontend/src/screens/CardPaymentScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,176 +1,0 @@
-import React, { useContext, useEffect, useReducer, useState } from "react";
-import Container from "react-bootstrap/Container";
-import { Helmet } from "react-helmet-async";
-import Form from "react-bootstrap/Form";
-import Button from "react-bootstrap/Button";
-import { useNavigate, useParams } from "react-router-dom";
-import { Store } from "../Store";
-import axios from "axios";
-import { getError } from "../components/utils";
-import { toast } from "react-toastify";
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "CREATE_REQUEST":
-      return { ...state, loading: true };
-    case "CREATE_SUCCESS":
-      return { ...state, loading: false };
-    case "CREATE_FAIL":
-      return { ...state, loading: false };
-    default:
-      return state;
-  }
-};
-
-function CardPaymentScreen() {
-  const [validated, setValidated] = useState(false);
-  const navigate = useNavigate();
-
-  const [{ loading }, dispatch] = useReducer(reducer, {
-    loading: false,
-  });
-
-  const { state, dispatch: ctxDispatch } = useContext(Store);
-  const { cart, userInfo } = state;
-
-  const round2 = (num) => Math.round(num * 100 + Number.EPSILON) / 100;
-  cart.itemsPrice = round2(
-    cart.cartItems.reduce((a, c) => a + c.quantity * c.price, 0)
-  );
-  cart.shippingPrice = cart.itemsPrice > 1500 ? round2(0) : round2(150);
-  cart.totalPrice = cart.itemsPrice + cart.shippingPrice;
-
-  const [cardNumber, setCardNumber] = useState("");
-  const handleChange = (event) => {
-    const result = event.target.value.replace(/[^0-9]/gi, "");
-    setCardNumber(result);
-  };
-  const [ccvNumber, setCcvNumber] = useState("");
-  const handleChangeCCV = (event) => {
-    const result = event.target.value.replace(/[^0-9]/gi, "");
-    console.log(event.currentTarget.validity.valid);
-
-    setCcvNumber(result);
-  };
-  const paymentHandler = async (event) => {
-    event.preventDefault();
-    const form = event.currentTarget;
-    if (form.checkValidity() === false) {
-      event.preventDefault();
-      event.stopPropagation();
-    }
-    if (cardNumber.length !== 16) {
-      event.preventDefault();
-      event.stopPropagation();
-    }
-    setValidated(true);
-    if (form.checkValidity() === true) {
-      try {
-        dispatch({ type: "CREATE_REQUEST" });
-        const { data } = await axios.post(
-          "/api/orders",
-          {
-            orderItems: cart.cartItems,
-            shippingAddress: cart.shippingAddress,
-            paymentMethod: cart.paymentMethod,
-            itemsPrice: cart.itemsPrice,
-            shippingPrice: cart.shippingPrice,
-            totalPrice: cart.totalPrice,
-            isPaid: true,
-            paidAt: Date.now(),
-            isConfirmed: true,
-            contactNumber: userInfo.contact,
-          },
-          {
-            headers: {
-              authorization: `Bearer ${userInfo.token}`,
-            },
-          }
-        );
-        ctxDispatch({ type: "CART_CLEAR" });
-        dispatch({ type: "CREATE_SUCCESS" });
-        localStorage.removeItem("cartItems");
-        navigate(`/order/${data.order._id}`);
-      } catch (err) {
-        dispatch({ type: "CREATE_FAIL" });
-        toast.error(getError(err));
-      }
-    }
-  };
-
-  return (
-    <div className="pageContainer">
-      <Container className="pageContainer shipPC">
-        <Helmet>
-          <title>Плати нарачка</title>
-        </Helmet>
-        <Form
-          noValidate
-          validated={validated}
-          onSubmit={paymentHandler}
-          className="formCointainer"
-        >
-          <Form.Group id="nameInput">
-            <Form.Label>Име и Презиме</Form.Label>
-            <Form.Control type="text" required></Form.Control>
-          </Form.Group>
-          <Form.Group>
-            <Form.Label>Број на картичка</Form.Label>
-            <Form.Control
-              type="text"
-              minLength="16"
-              maxLength="16"
-              value={cardNumber}
-              onChange={handleChange}
-              required
-            ></Form.Control>
-          </Form.Group>
-          <Form.Group>
-            <Form.Label>CVV2/CVC2</Form.Label>
-            <Form.Control
-              type="text"
-              minLength={3}
-              maxLength={3}
-              value={ccvNumber}
-              onChange={handleChangeCCV}
-              required
-            ></Form.Control>
-          </Form.Group>
-          <Form.Group>
-            <Form.Label>Рок на важност</Form.Label>
-            <div style={{ display: "flex" }}>
-              <Form.Select style={{ width: "47%", margin: "auto" }}>
-                <option value="01">01</option>
-                <option value="02">02</option>
-                <option value="03">03</option>
-                <option value="04">04</option>
-                <option value="05">05</option>
-                <option value="06">06</option>
-                <option value="07">07</option>
-                <option value="08">08</option>
-                <option value="09">09</option>
-                <option value="10">10</option>
-                <option value="11">11</option>
-                <option value="12">12</option>
-              </Form.Select>
-              <Form.Select style={{ width: "47%", margin: "auto" }}>
-                <option value="02">23</option>
-                <option value="03">24</option>
-                <option value="04">25</option>
-                <option value="05">26</option>
-              </Form.Select>
-            </div>
-          </Form.Group>
-
-          <div className="submitBtnContainer">
-            <Button variant="danger" size="lg" type="submit">
-              Плати
-            </Button>
-          </div>
-        </Form>
-      </Container>
-    </div>
-  );
-}
-
-export default CardPaymentScreen;
Index: frontend/src/screens/CartScreen.js
===================================================================
--- frontend/src/screens/CartScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,148 +1,0 @@
-import React, { useContext } from "react";
-import "../styles/CartScreen.css";
-import { Store } from "../Store";
-import { Helmet } from "react-helmet-async";
-import Row from "react-bootstrap/Row";
-import Col from "react-bootstrap/Col";
-import MessageBox from "../components/MessageBox";
-import ListGroup from "react-bootstrap/ListGroup";
-import Button from "react-bootstrap/Button";
-import { Link, useNavigate } from "react-router-dom";
-import "bootstrap/dist/css/bootstrap.min.css";
-import AddCircleIcon from "@mui/icons-material/AddCircle";
-import RemoveCircleIcon from "@mui/icons-material/RemoveCircle";
-import DeleteIcon from "@mui/icons-material/Delete";
-import axios from "axios";
-function CartScreen() {
-  const navigate = useNavigate();
-  const { state, dispatch: ctxDispatch } = useContext(Store);
-  const {
-    cart: { cartItems },
-  } = state;
-
-  const updateCartHandler = async (item, quantity) => {
-    const { data } = await axios.get(`/api/products/${item._id}`);
-    if (data.countInStock < quantity) {
-      window.alert("Sorry. Product is out of stock");
-      return;
-    }
-    ctxDispatch({
-      type: "CART_ADD_ITEM",
-      payload: { ...item, quantity },
-    });
-  };
-
-  const removeItemHandler = (item) => {
-    ctxDispatch({ type: "CART_REMOVE_ITEM", payload: item });
-  };
-
-  const checkoutHandler = () => {
-    navigate("/signin?redirect=/shipping");
-  };
-
-  return (
-    <div className="d-flex flex-column pageContainer">
-      <Helmet>
-        <title>Кошничка</title>
-      </Helmet>
-      <main>
-        <h2>Кошничка</h2>
-        <Row className="productRow">
-          <Col>
-            {cartItems.length === 0 ? (
-              <MessageBox>Кошничката е празна</MessageBox>
-            ) : (
-              <ListGroup>
-                {cartItems.map((item) => (
-                  <ListGroup.Item
-                    variant="dark"
-                    key={item._id}
-                    className="item"
-                  >
-                    <div className="itemContainer ">
-                      <div className="trashImgContainer">
-                        <div className="trashIconContainer">
-                          <Button
-                            variant="dark"
-                            onClick={() => removeItemHandler(item)}
-                          >
-                            <DeleteIcon />
-                          </Button>
-                        </div>
-                        <div>
-                          <Link className="link" to={`/product/${item.slug}`}>
-                            <img
-                              src={item.image}
-                              alt={item.name}
-                              className="img-fluid rounded img-thumbnail"
-                            ></img>
-                            <p>{item.name}</p>
-                          </Link>
-                        </div>
-                      </div>
-                      <div className="btnsPriceContainer">
-                        <div className="">
-                          <Button
-                            variant="danger"
-                            onClick={() =>
-                              updateCartHandler(item, item.quantity - 1)
-                            }
-                            disabled={item.quantity === 1}
-                          >
-                            <RemoveCircleIcon />
-                          </Button>{" "}
-                          <input
-                            className="quantityInput"
-                            readOnly
-                            value={item.quantity}
-                          ></input>{" "}
-                          <Button
-                            variant="danger"
-                            className="marginBtn"
-                            onClick={() =>
-                              updateCartHandler(item, item.quantity + 1)
-                            }
-                            disabled={item.quantity === item.countInStock}
-                          >
-                            <AddCircleIcon />
-                          </Button>
-                        </div>
-                        <div>
-                          <h3>{item.price}ден</h3>
-                        </div>
-                      </div>
-                    </div>
-                  </ListGroup.Item>
-                ))}
-              </ListGroup>
-            )}
-          </Col>
-        </Row>
-        {cartItems.length === 0 ? (
-          <h2></h2>
-        ) : (
-          <Row className="productRow lastRow">
-            <div className="totalPriceContainer">
-              <h3>Вкупно:</h3>
-              <h3>
-                {cartItems.reduce((a, c) => a + c.price * c.quantity, 0)}ден
-              </h3>
-            </div>
-            <div className="checkoutBtnContainer">
-              <Button
-                variant="danger"
-                size="lg"
-                onClick={checkoutHandler}
-                disabled={cartItems.length === 0}
-              >
-                НАРАЧАЈТЕ
-              </Button>
-            </div>
-          </Row>
-        )}
-      </main>
-    </div>
-  );
-}
-
-export default CartScreen;
Index: frontend/src/screens/CategoryScreen.js
===================================================================
--- frontend/src/screens/CategoryScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,444 +1,0 @@
-import React, { useEffect, useReducer, useState } from "react";
-import "../styles/Home.css";
-// import data from "./data";
-import Product from "../components/Product";
-import axios from "axios";
-import { Helmet } from "react-helmet-async";
-import { getError } from "../components/utils";
-import { useLocation, useNavigate, useParams } from "react-router-dom";
-import Form from "react-bootstrap/Form";
-import Button from "react-bootstrap/Button";
-import LinkContainer from "react-router-bootstrap/LinkContainer";
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "FETCH_REQUEST":
-      return { ...state, loading: true };
-    case "FETCH_SUCCESS":
-      return {
-        ...state,
-        products: action.payload.products,
-        page: action.payload.page,
-        pages: action.payload.pages,
-        countProducts: action.payload.countProducts,
-        loading: false,
-      };
-    case "FETCH_FAIL":
-      return { ...state, loading: false, error: action.payload };
-    default:
-      return state;
-  }
-};
-
-function Home() {
-  const params = useParams();
-  const { category, subCategory } = params;
-  var HF = 0;
-  var HT = 1000;
-  var WF = 0;
-  var WT = 1000;
-  var LF = 0;
-  var LT = 1000;
-  //const [HT, setHT] = useState(1000);
-  //const [WF, setWF] = useState(0);
-  //const [WT, setWT] = useState(1000);
-  //const [LF, setLF] = useState(0);
-  //const [LT, setLT] = useState(1000);
-  const navigate = useNavigate();
-  const { search } = useLocation();
-  const sp = new URLSearchParams(search);
-  //const category = sp.get("category") || "all";
-  const query = sp.get("query") || "all";
-  //const subCategory = sp.get("subCategory") || "all";
-  //const name = sp.get("name") || "all";
-  const order = sp.get("order") || "newest";
-  const page = sp.get("page") || 1;
-  const [{ loading, error, products, pages, countProducts }, dispatch] =
-    useReducer(reducer, { loading: true, error: "" });
-
-  useEffect(() => {
-    const fetchData = async () => {
-      try {
-        dispatch({ type: "FETCH_REQUEST" });
-        /*
-        const { data } = await axios.get(
-          `/api/products/search?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}`
-        );*/
-        const { data } = await axios.get(
-          `/api/products?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}&HF=${HF}&HT=${HT}&WF=${WF}&WT=${WT}&LF=${LF}&LT=${LT}`
-        );
-        dispatch({ type: "FETCH_SUCCESS", payload: data });
-      } catch (err) {
-        dispatch({ type: "FETCH_FAIL", payload: getError(err) });
-      }
-    };
-    fetchData();
-  }, [
-    category,
-    page,
-    query,
-    order,
-    subCategory,
-    error,
-    HF,
-    HT,
-    WF,
-    WT,
-    LF,
-    LT,
-  ]);
-
-  const getFilterUrl = (filter) => {
-    const filterPage = filter.page || page;
-    const filterCategorry = filter.category || category;
-    const filterQuery = filter.query || query;
-    const filterSubCategory = filter.subCategory || subCategory;
-    const sortOrder = filter.order || order;
-    const filterHF = filter.HF || HF;
-    const filterHT = filter.HT || HT;
-    const filterWF = filter.WF || WF;
-    const filterWT = filter.WT || WT;
-    const filterLF = filter.LF || LF;
-    const filterLT = filter.LT || LT;
-    return `?category=${filterCategorry}&query=${filterQuery}&subCategory=${filterSubCategory}&page=${filterPage}&order=${sortOrder}&HF=${filterHF}&HT=${filterHT}&WF=${filterWF}&WT=${filterWT}&LF=${filterLF}&LT=${filterLT}`;
-  };
-
-  const filterHandler = (e) => {
-    e.preventDefault();
-    HF = document.getElementById("HF").value;
-    HT = document.getElementById("HT").value;
-    WF = document.getElementById("WF").value;
-    WT = document.getElementById("WT").value;
-    LF = document.getElementById("LF").value;
-    LT = document.getElementById("LT").value;
-    console.log(HT);
-    const fetchData = async () => {
-      try {
-        dispatch({ type: "FETCH_REQUEST" });
-        /*
-        const { data } = await axios.get(
-          `/api/products/search?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}`
-        );*/
-        const { data } = await axios.get(
-          `/api/products?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}&HF=${HF}&HT=${HT}&WF=${WF}&WT=${WT}&LF=${LF}&LT=${LT}`
-        );
-        dispatch({ type: "FETCH_SUCCESS", payload: data });
-      } catch (err) {
-        dispatch({ type: "FETCH_FAIL", payload: getError(err) });
-      }
-    };
-    fetchData();
-  };
-
-  return (
-    <div style={{ width: "100%" }}>
-      <Helmet>
-        <title>MebelCity</title>
-      </Helmet>
-
-      <div className="most-popular-products">
-        {loading ? (
-          <div>Loading...</div>
-        ) : error ? (
-          <div>{error}</div>
-        ) : (
-          <div style={{ width: "100%" }}>
-            {category === "kancelarija" ? (
-              <h1 style={{ textAlign: "center", marginTop: "10px" }}>
-                Канцеларија
-              </h1>
-            ) : category === "dnevna" ? (
-              <h1 style={{ textAlign: "center", marginTop: "10px" }}>Дневна</h1>
-            ) : category === "spalna" ? (
-              <h1 style={{ textAlign: "center", marginTop: "10px" }}>Спална</h1>
-            ) : category === "hodnik" ? (
-              <h1 style={{ textAlign: "center", marginTop: "10px" }}>Ходник</h1>
-            ) : category === "kujna" ? (
-              <h1 style={{ textAlign: "center", marginTop: "10px" }}>Кујна</h1>
-            ) : category === "gradina" ? (
-              <h1 style={{ textAlign: "center", marginTop: "10px" }}>
-                Градина
-              </h1>
-            ) : category === "trpezarija" ? (
-              <h1 style={{ textAlign: "center", marginTop: "10px" }}>
-                Трпезарија
-              </h1>
-            ) : (
-              <h1 style={{ textAlign: "center", marginTop: "10px" }}>
-                Детска соба
-              </h1>
-            )}
-
-            <div
-              style={{
-                width: "100%",
-                display: "flex",
-                justifyContent: "space-evenly",
-                alignItems: "center",
-                marginTop: "20px",
-              }}
-            >
-              <Form
-                onSubmit={filterHandler}
-                style={{
-                  width: "100%",
-                  display: "flex",
-                  justifyContent: "space-around",
-                  marginRight: "40px",
-                  alignItems: "center",
-                }}
-              >
-                <Form.Group style={{ display: "flex", alignItems: "center" }}>
-                  <Form.Label style={{ margin: "0px" }}>H:</Form.Label>
-                  <Form.Control
-                    style={{ width: "60px" }}
-                    id="HF"
-                    //onChange={(e) => setHF(e.target.value)}
-                  />
-                  <Form.Label style={{ margin: "0px" }}>-</Form.Label>
-                  <Form.Control
-                    style={{ width: "60px" }}
-                    id="HT"
-                    //onChange={(e) => setHT(e.target.value)}
-                  />
-                </Form.Group>
-                <Form.Group style={{ display: "flex", alignItems: "center" }}>
-                  <Form.Label style={{ margin: "0px" }}>W:</Form.Label>
-                  <Form.Control
-                    style={{ width: "60px" }}
-                    id="WF"
-                    //onChange={(e) => setWF(e.target.value)}
-                  />
-                  <Form.Label style={{ margin: "0px" }}>-</Form.Label>
-                  <Form.Control
-                    style={{ width: "60px" }}
-                    id="WT"
-                    //onChange={(e) => setWT(e.target.value)}
-                  />
-                </Form.Group>
-                <Form.Group style={{ display: "flex", alignItems: "center" }}>
-                  <Form.Label style={{ margin: "0px" }}>L:</Form.Label>
-                  <Form.Control
-                    id="LF"
-                    style={{ width: "60px" }}
-                    //onChange={(e) => setLF(e.target.value)}
-                  />
-                  <Form.Label style={{ margin: "0px" }}>-</Form.Label>
-                  <Form.Control
-                    id="LT"
-                    style={{ width: "60px" }}
-                    //onChange={(e) => setLT(e.target.value)}
-                  />
-                </Form.Group>
-                {/*}
-                <Form.Group>
-                  <Form.Select
-                    value={subCategory}
-                    onChange={(e) => {
-                      navigate(
-                        getFilterUrl({ subCategory: e.target.value, page: 1 })
-                      );
-                    }}
-                  >
-                    <option value="all">Подкатегорија</option>
-
-                    {category === "dnevna" && (
-                      <option value="agolni-garnituri">Аголни Гарнитури</option>
-                    )}
-                    {category === "dnevna" && (
-                      <option value="sofi">Софи</option>
-                    )}
-                    {category === "dnevna" && (
-                      <option value="fotelji">Фотелји</option>
-                    )}
-                    {category === "dnevna" && (
-                      <option value="taburetki">Табуретки</option>
-                    )}
-                    {category === "dnevna" && (
-                      <option value="klub-masi">Клуб маси</option>
-                    )}
-                    {category === "dnevna" && (
-                      <option value="tv-komodi">ТВ комоди</option>
-                    )}
-                    {category === "dnevna" && (
-                      <option value="komodi">Комоди</option>
-                    )}
-                    {category === "spalna" && (
-                      <option value="spalni-kompleti">Спални Комплети</option>
-                    )}
-                    {category === "spalna" && (
-                      <option value="lezai">Лежаи</option>
-                    )}
-                    {category === "spalna" && (
-                      <option value="kreveti">Кревети</option>
-                    )}
-                    {category === "spalna" && (
-                      <option value="plakari">Плакари</option>
-                    )}
-                    {category === "spalna" && (
-                      <option value="nokni-skafcinja">Ноќни шкафчиња</option>
-                    )}
-                    {category === "spalna" && (
-                      <option value="toaletni-masi">Тоалетни маси</option>
-                    )}
-                    {category === "kancelarija" && (
-                      <option value="biroa">Бироа</option>
-                    )}
-                    {category === "kancelarija" && (
-                      <option value="kancelariski-stolovi">
-                        Канцелариски столови
-                      </option>
-                    )}
-                    {category === "kancelarija" && (
-                      <option value="gejmerski-stolovi">
-                        Гејмерски столови
-                      </option>
-                    )}
-                    {category === "kancelarija" && (
-                      <option value="kancelariski-skafovi">
-                        Канцелариски шкафови
-                      </option>
-                    )}
-                    {category === "hodnik" && (
-                      <option value="skafovi-za-cevli">Шкафови за чевли</option>
-                    )}
-                    {category === "hodnik" && (
-                      <option value="zakacalki-i-ogledala">
-                        Закачалки и огледала
-                      </option>
-                    )}
-                    {category === "hodnik" && (
-                      <option value="kolekcii-za-hodnik">
-                        Колекции за ходник
-                      </option>
-                    )}
-                    {category === "gradina" && (
-                      <option value="gradinarski-kompleti">
-                        Градинарски комплети
-                      </option>
-                    )}
-                    {category === "gradina" && (
-                      <option value="gradinarski-lulki">
-                        Градинарски лулки
-                      </option>
-                    )}
-                    {category === "gradina" && (
-                      <option value="gradinarski-cadori">
-                        Градинарски чадори
-                      </option>
-                    )}
-                    {category === "gradina" && (
-                      <option value="gradinarski-masi">Градинарски маси</option>
-                    )}
-                    {category === "gradina" && (
-                      <option value="gradinarski-stolovi">
-                        Градинарски столови
-                      </option>
-                    )}
-                    {category === "gradina" && (
-                      <option value="gradinarsko-osvetluvanje">
-                        Градинарско осветлување
-                      </option>
-                    )}
-                    {category === "trpezarija" && (
-                      <option value="trpezariski-masi">Трпезариски маси</option>
-                    )}
-                    {category === "trpezarija" && (
-                      <option value="trpezariski-stolovi">
-                        Трпезариски столови
-                      </option>
-                    )}
-                    {category === "trpezarija" && (
-                      <option value="kujnski-garnituri">
-                        Кујнски гарнитури
-                      </option>
-                    )}
-                    {category === "trpezarija" && (
-                      <option value="bar-stolovi-i-masi">
-                        Бар столови и маси
-                      </option>
-                    )}
-                    {category === "kujna" && (
-                      <option value="kujnski-agolni-garnituri">
-                        Кујнски аголни гарнитури
-                      </option>
-                    )}
-                    {category === "kujna" && (
-                      <option value="standardni-kujni">Стандардни кујни</option>
-                    )}
-                    {category === "detska" && (
-                      <option value="kolekcii-za-detska-soba">
-                        Колекции за детска соба
-                      </option>
-                    )}
-                    {category === "detska" && (
-                      <option value="detski-biroa">Детски бироа</option>
-                    )}
-                    {category === "detska" && (
-                      <option value="detski-lezai">Детски лежаи</option>
-                    )}
-                  </Form.Select>
-                    </Form.Group>*/}
-                <Form.Group>
-                  <Form.Select
-                    id="sortOrder"
-                    onChange={(e) => {
-                      navigate(getFilterUrl({ order: e.target.value }));
-                    }}
-                  >
-                    <option value={"newest"}>Сортирај по цена</option>
-                    <option value={"lowFirst"}>Од ниска кон висока</option>
-                    <option value={"highFirst"}>Од висока кон ниска</option>
-                  </Form.Select>
-                </Form.Group>
-                <Form.Group>
-                  <Button variant="danger" size="lg" type="submit">
-                    Филтрирај
-                  </Button>
-                </Form.Group>
-              </Form>
-            </div>
-            <div
-              style={{
-                display: "flex",
-                flexWrap: "wrap",
-                justifyContent: "space-evenly",
-                alignItems: "center",
-                marginTop: "10px",
-              }}
-            >
-              {products.map((product) => (
-                <Product key={product.slug} product={product} />
-              ))}
-            </div>
-            <div
-              style={{
-                marginTop: "20px",
-                display: "flex",
-                justifyContent: "center",
-                alignItems: "center",
-              }}
-            >
-              {[...Array(pages).keys()].map((x) => (
-                <LinkContainer
-                  key={x + 1}
-                  className="mx-1"
-                  to={getFilterUrl({ page: x + 1 })}
-                >
-                  <Button
-                    className={Number(page) === x + 1 ? "text-bold" : ""}
-                    variant={Number(page) === x + 1 ? "danger" : "light"}
-                  >
-                    {x + 1}
-                  </Button>
-                </LinkContainer>
-              ))}
-            </div>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}
-
-export default Home;
Index: frontend/src/screens/Home.js
===================================================================
--- frontend/src/screens/Home.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,182 +1,0 @@
-import React, { useEffect, useReducer, useState } from "react";
-import "../styles/Home.css";
-import Header from "../components/Header";
-import ImageSlider from "../components/ImageSlider";
-import image1 from "../Images/slideshow1.png";
-import image2 from "../Images/slideshow2.png";
-import image3 from "../Images/slideshow3.png";
-import icon1 from "../Images/icon1.svg";
-import icon2 from "../Images/icon2.svg";
-import icon3 from "../Images/icon3.svg";
-import Footer from "../components/Footer";
-// import data from "./data";
-import Product from "../components/Product";
-import axios from "axios";
-import { Helmet } from "react-helmet-async";
-import { useNavigate } from "react-router-dom";
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "FETCH_REQUEST":
-      return { ...state, loading: true };
-    case "FETCH_SUCCESS":
-      return { ...state, products: action.payload, loading: false };
-    case "FETCH_FAIL":
-      return { ...state, loading: false, error: action.payload };
-    default:
-      return state;
-  }
-};
-
-function Home() {
-  const [{ loading, error, products }, dispatch] = useReducer(reducer, {
-    products: [],
-    loading: true,
-    error: "",
-  });
-  const navigate = useNavigate();
-  //const [products, setProducts] = useState([]);
-  useEffect(() => {
-    const fetchData = async () => {
-      dispatch({ type: "FETCH_REQUEST" });
-      try {
-        const result = await axios.get("/api/products");
-        dispatch({ type: "FETCH_SUCCESS", payload: result.data });
-      } catch (err) {
-        dispatch({ type: "FETCH_FAIL", payload: err.message });
-      }
-
-      //setProducts(result.data);
-    };
-    fetchData();
-  }, []);
-
-  const slides = [
-    { url: image1, title: "Shiping" },
-    { url: image2, title: "SchoolDiscount" },
-    { url: image3, title: "OfficeDiscount" },
-  ];
-
-  const clearActive = () => {
-    let icon1 = document.getElementById("icon1");
-    icon1.classList.remove("activeIcon");
-    let icon2 = document.getElementById("icon2");
-    icon2.classList.remove("activeIcon");
-    let icon3 = document.getElementById("icon3");
-    icon3.classList.remove("activeIcon");
-
-    let icon1Text = document.getElementById("icon1-text");
-    icon1Text.classList.remove("activeIcon");
-    let icon2Text = document.getElementById("icon2-text");
-    icon2Text.classList.remove("activeIcon");
-    let icon3Text = document.getElementById("icon3-text");
-    icon3Text.classList.remove("activeIcon");
-
-    let icon1Container = document.getElementById("1");
-    icon1Container.classList.remove("activeIconContainer");
-    let icon2Container = document.getElementById("2");
-    icon2Container.classList.remove("activeIconContainer");
-    let icon3Container = document.getElementById("3");
-    icon3Container.classList.remove("activeIconContainer");
-  };
-
-  const handleClick = (event) => {
-    let clickedIcon = document.getElementById("icon" + event.currentTarget.id);
-    let clickedIconText = document.getElementById(
-      "icon" + event.currentTarget.id + "-text"
-    );
-    clearActive();
-    clickedIcon.classList.add("activeIcon");
-    clickedIconText.classList.add("activeIcon");
-
-    let iconContainer = document.getElementById(event.currentTarget.id);
-    iconContainer.classList.add("activeIconContainer");
-
-    const icon1Text = "Бесплатна достава за нарачки над 1500 ден.";
-    const icon2Text =
-      "Ние можеме да го монтираме мебелот наместо Вас – брзо, лесно и чисто.";
-    const icon3Text = "Доставуваме над 1000 производи до 10 дена.";
-
-    let p = document.querySelector(".icon-description");
-    if (event.currentTarget.id === "1") p.textContent = icon1Text;
-    else if (event.currentTarget.id === "2") p.textContent = icon2Text;
-    else p.textContent = icon3Text;
-  };
-
-  return (
-    <div>
-      <Helmet>
-        <title>MebelCity</title>
-      </Helmet>
-      <Header />
-      <div className="sliderContainer">
-        <ImageSlider slides={slides} />
-      </div>
-      <div className="section">
-        <div className="iconWrapper">
-          <div
-            className="iconContainer activeIconContainer"
-            id="1"
-            onClick={handleClick}
-          >
-            <img
-              src={icon1}
-              alt="бесплатна достава"
-              className="icon activeIcon"
-              id="icon1"
-            />
-            <p className="icon-text activeIcon" id="icon1-text">
-              Бесплатна достава
-            </p>
-          </div>
-          <div className="iconContainer" id="2" onClick={handleClick}>
-            <img src={icon2} className="icon" alt="монтажа" id="icon2" />
-            <p className="icon-text" id="icon2-text">
-              Монтажа
-            </p>
-          </div>
-          <div className="iconContainer" onClick={handleClick} id="3">
-            <img src={icon3} alt="брза достава" className="icon" id="icon3" />
-            <p className="icon-text" id="icon3-text">
-              Брза достава
-            </p>
-          </div>
-        </div>
-        <div className="descriptionContainer">
-          <p className="icon-description">
-            Бесплатна достава за нарачки над 1500 ден.
-          </p>
-        </div>
-      </div>
-      <div className="grid-container">
-        <div
-          className="grid-item item1"
-          onClick={() => navigate("/products/dnevna/all")}
-        >
-          Дневна
-        </div>
-        <div className="grid-item item2">Ходник</div>
-        <div className="grid-item item3">Трпезарија</div>
-        <div className="grid-item item4">Спална</div>
-        <div className="grid-item item5">Кујна</div>
-        <div className="grid-item item6">Канцеларија</div>
-        <div className="grid-item item7">Детска соба</div>
-        <div className="grid-item item8">Мебел за градина</div>
-      </div>
-      <div className="most-popular-products">
-        {loading ? (
-          <div>Loading...</div>
-        ) : error ? (
-          <div>{error}</div>
-        ) : (
-          products.map((product) => (
-            <Product key={product.slug} product={product} />
-          ))
-        )}
-      </div>
-      <Footer />
-    </div>
-  );
-}
-
-export default Home;
Index: frontend/src/screens/HomeWithJumbo.js
===================================================================
--- frontend/src/screens/HomeWithJumbo.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,165 +1,0 @@
-import React from "react";
-import "../styles/Home.css";
-import Header from "../components/Header";
-
-import image1 from "../Images/slideshow1.png";
-import image2 from "../Images/slideshow2.png";
-import image3 from "../Images/slideshow3.png";
-import icon1 from "../Images/icon1.svg";
-import icon2 from "../Images/icon2.svg";
-import icon3 from "../Images/icon3.svg";
-import Footer from "../components/Footer";
-// import data from "./data";
-
-import { Helmet } from "react-helmet-async";
-import Jumbo from "../components/JumboSlider";
-import { useNavigate } from "react-router-dom";
-
-function Home() {
-  const navigate = useNavigate();
-  const clearActive = () => {
-    let icon1 = document.getElementById("icon1");
-    icon1.classList.remove("activeIcon");
-    let icon2 = document.getElementById("icon2");
-    icon2.classList.remove("activeIcon");
-    let icon3 = document.getElementById("icon3");
-    icon3.classList.remove("activeIcon");
-
-    let icon1Text = document.getElementById("icon1-text");
-    icon1Text.classList.remove("activeIcon");
-    let icon2Text = document.getElementById("icon2-text");
-    icon2Text.classList.remove("activeIcon");
-    let icon3Text = document.getElementById("icon3-text");
-    icon3Text.classList.remove("activeIcon");
-
-    let icon1Container = document.getElementById("1");
-    icon1Container.classList.remove("activeIconContainer");
-    let icon2Container = document.getElementById("2");
-    icon2Container.classList.remove("activeIconContainer");
-    let icon3Container = document.getElementById("3");
-    icon3Container.classList.remove("activeIconContainer");
-  };
-
-  const handleClick = (event) => {
-    let clickedIcon = document.getElementById("icon" + event.currentTarget.id);
-    let clickedIconText = document.getElementById(
-      "icon" + event.currentTarget.id + "-text"
-    );
-    clearActive();
-    clickedIcon.classList.add("activeIcon");
-    clickedIconText.classList.add("activeIcon");
-
-    let iconContainer = document.getElementById(event.currentTarget.id);
-    iconContainer.classList.add("activeIconContainer");
-
-    const icon1Text = "Бесплатна достава за нарачки над 1500 ден.";
-    const icon2Text =
-      "Ние можеме да го монтираме мебелот наместо Вас – брзо, лесно и чисто.";
-    const icon3Text = "Доставуваме над 1000 производи до 10 дена.";
-
-    let p = document.querySelector(".icon-description");
-    if (event.currentTarget.id === "1") p.textContent = icon1Text;
-    else if (event.currentTarget.id === "2") p.textContent = icon2Text;
-    else p.textContent = icon3Text;
-  };
-
-  return (
-    <div>
-      <Helmet>
-        <title>MebelCity</title>
-      </Helmet>
-
-      <div className="sliderContainer">
-        <Jumbo />
-      </div>
-      <div className="section">
-        <div className="iconWrapper">
-          <div
-            className="iconContainer activeIconContainer"
-            id="1"
-            onClick={handleClick}
-          >
-            <img
-              src={icon1}
-              alt="бесплатна достава"
-              className="icon activeIcon"
-              id="icon1"
-            />
-            <p className="icon-text activeIcon" id="icon1-text">
-              Бесплатна достава
-            </p>
-          </div>
-          <div className="iconContainer" id="2" onClick={handleClick}>
-            <img src={icon2} className="icon" alt="монтажа" id="icon2" />
-            <p className="icon-text" id="icon2-text">
-              монтажа
-            </p>
-          </div>
-          <div className="iconContainer" onClick={handleClick} id="3">
-            <img src={icon3} alt="брза достава" className="icon" id="icon3" />
-            <p className="icon-text" id="icon3-text">
-              Брза достава
-            </p>
-          </div>
-        </div>
-        <div className="descriptionContainer">
-          <p className="icon-description">
-            Бесплатна достава за нарачки над 1500 ден.
-          </p>
-        </div>
-      </div>
-      <div className="grid-container">
-        <div
-          className="grid-item item1"
-          onClick={() => navigate("/products/dnevna/all")}
-        >
-          Дневна
-        </div>
-        <div
-          className="grid-item item2"
-          onClick={() => navigate("/products/hodnik/all")}
-        >
-          Ходник
-        </div>
-        <div
-          className="grid-item item3"
-          onClick={() => navigate("/products/trpezarija/all")}
-        >
-          Трпезарија
-        </div>
-        <div
-          className="grid-item item4"
-          onClick={() => navigate("/products/spalna/all")}
-        >
-          Спална
-        </div>
-        <div
-          className="grid-item item5"
-          onClick={() => navigate("/products/kujna/all")}
-        >
-          Кујна
-        </div>
-        <div
-          className="grid-item item6"
-          onClick={() => navigate("/products/kancelarija/all")}
-        >
-          Канцеларија
-        </div>
-        <div
-          className="grid-item item7"
-          onClick={() => navigate("/products/detska/all")}
-        >
-          Детска соба
-        </div>
-        <div
-          className="grid-item item8"
-          onClick={() => navigate("/products/gradina/all")}
-        >
-          Мебел за градина
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default Home;
Index: frontend/src/screens/OrderHistoryScreen.js
===================================================================
--- frontend/src/screens/OrderHistoryScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,112 +1,0 @@
-import axios from "axios";
-import React, { useContext, useEffect, useReducer } from "react";
-import { Helmet } from "react-helmet-async";
-import { useNavigate } from "react-router-dom";
-import LoadingBox from "../components/LoadingBox";
-import MessageBox from "../components/MessageBox";
-import { getError } from "../components/utils";
-import { Store } from "../Store";
-import Button from "react-bootstrap/Button";
-import CheckIcon from "@mui/icons-material/Check";
-import ClearIcon from "@mui/icons-material/Clear";
-import PhonePausedIcon from "@mui/icons-material/PhonePaused";
-import LocalShippingIcon from "@mui/icons-material/LocalShipping";
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "FETCH_REQUEST":
-      return { ...state, loading: true };
-    case "FETCH_SUCCESS":
-      return { ...state, orders: action.payload, loading: false };
-    case "FETCH_FAIL":
-      return { ...state, loading: false, error: action.payload };
-    default:
-      return state;
-  }
-};
-
-function OrderHistoryScreen() {
-  const { state } = useContext(Store);
-  const { userInfo } = state;
-  const navigate = useNavigate();
-
-  const [{ loading, error, orders }, dispatch] = useReducer(reducer, {
-    loading: true,
-    error: "",
-  });
-
-  useEffect(() => {
-    const fetchData = async () => {
-      dispatch({ type: "FETCH_REQUEST" });
-      try {
-        const { data } = await axios.get("/api/orders/mine", {
-          headers: { Authorization: `Bearer ${userInfo.token}` },
-        });
-        dispatch({ type: "FETCH_SUCCESS", payload: data });
-      } catch (error) {
-        dispatch({ type: "FETCH_FAIL", payload: getError(error) });
-      }
-    };
-    fetchData();
-  }, [userInfo]);
-
-  return (
-    <div className="pageContainer shipPC" style={{ justifyContent: "normal" }}>
-      <Helmet>
-        <title>Историја на нарачки</title>
-      </Helmet>
-      <h1 style={{ marginTop: "20px" }}>Историја на нарачки</h1>
-      {loading ? (
-        <LoadingBox></LoadingBox>
-      ) : error ? (
-        <MessageBox variant="danger">{error}</MessageBox>
-      ) : (
-        <table
-          className="table"
-          style={{ marginTop: "20px", width: "90%", textAlign: "center" }}
-        >
-          <thead>
-            <tr>
-              <th>ID</th>
-              <th>Дата</th>
-              <th>Вкупно</th>
-              <th>Статус</th>
-              <th>Акции</th>
-            </tr>
-          </thead>
-          <tbody>
-            {orders.map((order) => (
-              <tr key={order._id}>
-                <td>{order._id.substring(0, 7)}</td>
-                <td>{order.createdAt.substring(0, 10)}</td>
-                <td>{order.totalPrice.toFixed(2)}</td>
-
-                <td>
-                  {order.isDelivered ? (
-                    <CheckIcon></CheckIcon>
-                  ) : order.isShipped ? (
-                    <LocalShippingIcon></LocalShippingIcon>
-                  ) : (
-                    <PhonePausedIcon></PhonePausedIcon>
-                  )}
-                </td>
-                <td>
-                  <Button
-                    type="button"
-                    variant="primary"
-                    onClick={() => {
-                      navigate(`/order/${order._id}`);
-                    }}
-                  >
-                    Детали
-                  </Button>
-                </td>
-              </tr>
-            ))}
-          </tbody>
-        </table>
-      )}
-    </div>
-  );
-}
-
-export default OrderHistoryScreen;
Index: frontend/src/screens/OrderScreen.js
===================================================================
--- frontend/src/screens/OrderScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,187 +1,0 @@
-import axios from "axios";
-import React, { useContext, useEffect, useReducer } from "react";
-import { Link, useNavigate, useParams } from "react-router-dom";
-import LoadingBox from "../components/LoadingBox";
-import MessageBox from "../components/MessageBox";
-import { Store } from "../Store";
-import { getError } from "../components/utils";
-import { Helmet } from "react-helmet-async";
-import Row from "react-bootstrap/Row";
-import Card from "react-bootstrap/Card";
-import Col from "react-bootstrap/Col";
-import ListGroup from "react-bootstrap/ListGroup";
-
-function reducer(state, action) {
-  switch (action.type) {
-    case "FETCH_REQUEST":
-      return { ...state, loading: true, error: "" };
-    case "FETCH_SUCCESS":
-      return { ...state, loading: false, order: action.payload, error: "" };
-    case "FETCH_FAIL":
-      return { ...state, loading: false, error: action.payload };
-    default:
-      return state;
-  }
-}
-
-export default function OrderScreen() {
-  const { state } = useContext(Store);
-  const { userInfo } = state;
-  const params = useParams();
-  const { id: orderId } = params;
-  const navigate = useNavigate();
-
-  const [{ loading, error, order }, dispatch] = useReducer(reducer, {
-    loading: true,
-    order: {},
-    error: "",
-  });
-
-  useEffect(() => {
-    const fetchOrder = async () => {
-      try {
-        dispatch({ type: "FETCH_REQUEST" });
-        const { data } = await axios.get(`/api/orders/${orderId}`, {
-          headers: { authorization: `Bearer ${userInfo.token}` },
-        });
-        dispatch({ type: "FETCH_SUCCESS", payload: data });
-      } catch (err) {
-        dispatch({ type: "FETCH_FAIL", payload: getError(err) });
-      }
-    };
-    if (!userInfo) {
-      return navigate("/login");
-    }
-    if (!order._id || (order._id && order._id !== orderId)) {
-      fetchOrder();
-    }
-  }, [order, userInfo, orderId, navigate]);
-
-  return loading ? (
-    <LoadingBox></LoadingBox>
-  ) : error ? (
-    <MessageBox variant="danger">{error}</MessageBox>
-  ) : (
-    <div className="pageContainer shipPC">
-      <Helmet>
-        <title>Нарачка {orderId}</title>
-      </Helmet>
-      <h1 style={{ marginTop: "20px" }}>Нарачка {orderId}</h1>
-      <Row style={{ width: "90%" }}>
-        <Col md={8}>
-          <Card className="mb-3">
-            <Card.Body>
-              <Card.Title>Испорака</Card.Title>
-              <Card.Text>
-                <strong>Име:</strong> {order.shippingAddress.fullName}
-                <br />
-                <strong>Адреса:</strong> {order.shippingAddress.address},
-                {order.shippingAddress.city},{order.shippingAddress.postalCode},
-                {order.shippingAddress.country}
-              </Card.Text>
-              {order.isDelivered ? (
-                <MessageBox variant="success">
-                  Доставено на {order.deliveredAt}
-                </MessageBox>
-              ) : order.isShipped ? (
-                <MessageBox variant="primary">
-                  Вашата нарачка е испратена.
-                </MessageBox>
-              ) : order.isConfirmed ? (
-                <MessageBox variant="primary">
-                  Вашата нарачка се процесира.
-                </MessageBox>
-              ) : (
-                <MessageBox variant="danger">
-                  Потребно е да ја потврдите нарачката. Ќе бидете контактирани
-                  преку телефонскиот број оставен за контакт.
-                </MessageBox>
-              )}
-            </Card.Body>
-          </Card>
-          <Card className="mb-3">
-            <Card.Body>
-              <Card.Title>Плаќање</Card.Title>
-              <Card.Text>
-                <strong>Начин:</strong>{" "}
-                {order.paymentMethod === "Karticka"
-                  ? "Со платежна картичка"
-                  : "Во готово при достава"}
-              </Card.Text>
-              {order.isPaid ? (
-                <MessageBox variant="success">
-                  Платено на {order.paidAt}
-                </MessageBox>
-              ) : (
-                <MessageBox variant="danger">Не е платено</MessageBox>
-              )}
-            </Card.Body>
-          </Card>
-          <Card className="mb-3">
-            <Card.Body>
-              <Card.Title>Продукти</Card.Title>
-              <ListGroup variant="flush">
-                {order.orderItems.map((item) => (
-                  <ListGroup.Item key={item._id}>
-                    <div
-                      style={{
-                        display: "flex",
-                        justifyContent: "space-between",
-                      }}
-                    >
-                      <div style={{ display: "flex", alignItems: "center" }}>
-                        <img
-                          src={item.image}
-                          alt={item.name}
-                          className="img-fluid rounded img-thumbnail"
-                          style={{ margin: "0px" }}
-                        ></img>
-                        <Link to={`/product/${item.slug}`}>{item.name}</Link>
-                      </div>
-
-                      <span>{item.quantity}</span>
-
-                      <span>{item.price} ден</span>
-                    </div>
-                  </ListGroup.Item>
-                ))}
-              </ListGroup>
-            </Card.Body>
-          </Card>
-        </Col>
-        <Col md={4}>
-          <Card>
-            <Card.Body>
-              <Card.Title>Нарачка</Card.Title>
-              <ListGroup variant="flush">
-                <ListGroup.Item>
-                  <Row>
-                    <Col>Продукти:</Col>
-                    <Col>{order.itemsPrice.toFixed(2)} ден</Col>
-                  </Row>
-                </ListGroup.Item>
-                <ListGroup.Item>
-                  <Row>
-                    <Col>Испорака:</Col>
-                    <Col>{order.shippingPrice.toFixed(2)} ден</Col>
-                  </Row>
-                </ListGroup.Item>
-
-                <ListGroup.Item>
-                  <Row>
-                    <Col>
-                      <strong>Вкупно</strong>
-                    </Col>
-                    <Col>
-                      <strong>{order.totalPrice.toFixed(2)} ден</strong>
-                    </Col>
-                  </Row>
-                </ListGroup.Item>
-              </ListGroup>
-            </Card.Body>
-          </Card>
-        </Col>
-      </Row>
-    </div>
-  );
-}
Index: frontend/src/screens/PaymentMethodScreen.js
===================================================================
--- frontend/src/screens/PaymentMethodScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,79 +1,0 @@
-import React, { useContext, useEffect, useState } from "react";
-import { Helmet } from "react-helmet-async";
-import CheckoutSteps from "../components/CheckoutSteps";
-import Container from "react-bootstrap/Container";
-import Button from "react-bootstrap/Button";
-import Form from "react-bootstrap/Form";
-import { Store } from "../Store";
-import { useNavigate } from "react-router-dom";
-import CreditCardIcon from "@mui/icons-material/CreditCard";
-
-function PaymentMethodScreen() {
-  const navigate = useNavigate();
-  const { state, dispatch: ctxDispatch } = useContext(Store);
-  const {
-    cart: { shippingAddress, paymentMethod },
-  } = state;
-  const [paymentMethodName, setPaymentMethod] = useState(
-    paymentMethod || "Karticka"
-  );
-
-  useEffect(() => {
-    if (!shippingAddress.address) {
-      navigate("/shipping");
-    }
-  }, [shippingAddress, navigate]);
-  const submitHandler = (e) => {
-    e.preventDefault();
-    ctxDispatch({ type: "SAVE_PAYMENT_METHOD", payload: paymentMethodName });
-    localStorage.setItem("paymentMethod", paymentMethodName);
-    navigate("/placeorder");
-  };
-  return (
-    <div className="pageContainer shipPC">
-      <CheckoutSteps step1 step2 step3 />
-      <Container className="main">
-        <Helmet>
-          <title>Начин на наплата</title>
-        </Helmet>
-        <h1 style={{ marginTop: "10px" }}>Начин на наплата</h1>
-        <Form
-          onSubmit={submitHandler}
-          style={{
-            display: "flex",
-            flexDirection: "column",
-            alignItems: "center",
-          }}
-        >
-          <div className="radioContainer" style={{ marginTop: "10px" }}>
-            <Form.Check
-              type="radio"
-              id="Karticka"
-              label="Со платежна картичка"
-              value="Karticka"
-              checked={paymentMethodName === "Karticka"}
-              onChange={(e) => setPaymentMethod(e.target.value)}
-            />
-          </div>
-          <div className="radioContainer" style={{ marginTop: "10px" }}>
-            <Form.Check
-              type="radio"
-              id="voGotovo"
-              label="Во готово при достава"
-              value="voGotovo"
-              checked={paymentMethodName === "voGotovo"}
-              onChange={(e) => setPaymentMethod(e.target.value)}
-            />
-          </div>
-          <div style={{ marginTop: "20px" }}>
-            <Button variant="danger" type="submit">
-              Продолжи
-            </Button>
-          </div>
-        </Form>
-      </Container>
-    </div>
-  );
-}
-
-export default PaymentMethodScreen;
Index: frontend/src/screens/PlaceOrderScreen.js
===================================================================
--- frontend/src/screens/PlaceOrderScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,218 +1,0 @@
-import React, { useContext, useEffect, useReducer } from "react";
-import Axios from "axios";
-import { Helmet } from "react-helmet-async";
-import CheckoutSteps from "../components/CheckoutSteps";
-import Row from "react-bootstrap/Row";
-import Col from "react-bootstrap/Col";
-import Card from "react-bootstrap/Card";
-import Button from "react-bootstrap/Button";
-import ListGroup from "react-bootstrap/ListGroup";
-import { getError } from "../components/utils";
-import { toast } from "react-toastify";
-import { Store } from "../Store";
-import { Link, useNavigate } from "react-router-dom";
-import LoadingBox from "../components/LoadingBox";
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "CREATE_REQUEST":
-      return { ...state, loading: true };
-    case "CREATE_SUCCESS":
-      return { ...state, loading: false };
-    case "CREATE_FAIL":
-      return { ...state, loading: false };
-    default:
-      return state;
-  }
-};
-
-function PlaceOrderScreen() {
-  const navigate = useNavigate();
-
-  const [{ loading }, dispatch] = useReducer(reducer, {
-    loading: false,
-  });
-
-  const { state, dispatch: ctxDispatch } = useContext(Store);
-  const { cart, userInfo } = state;
-
-  const round2 = (num) => Math.round(num * 100 + Number.EPSILON) / 100;
-  cart.itemsPrice = round2(
-    cart.cartItems.reduce((a, c) => a + c.quantity * c.price, 0)
-  );
-  cart.shippingPrice = cart.itemsPrice > 1500 ? round2(0) : round2(150);
-  cart.totalPrice = cart.itemsPrice + cart.shippingPrice;
-
-  const paymentHandler = async () => {
-    navigate(`/placeorder/payment`);
-  };
-
-  const placeOrderHandler = async () => {
-    try {
-      dispatch({ type: "CREATE_REQUEST" });
-      const { data } = await Axios.post(
-        "/api/orders",
-        {
-          orderItems: cart.cartItems,
-          shippingAddress: cart.shippingAddress,
-          paymentMethod: cart.paymentMethod,
-          itemsPrice: cart.itemsPrice,
-          shippingPrice: cart.shippingPrice,
-          totalPrice: cart.totalPrice,
-          isConfirmed: false,
-          contactNumber: userInfo.contact,
-        },
-        {
-          headers: {
-            authorization: `Bearer ${userInfo.token}`,
-          },
-        }
-      );
-      ctxDispatch({ type: "CART_CLEAR" });
-      dispatch({ type: "CREATE_SUCCESS" });
-      localStorage.removeItem("cartItems");
-      navigate(`/order/${data.order._id}`);
-    } catch (err) {
-      dispatch({ type: "CREATE_FAIL" });
-      toast.error(getError(err));
-    }
-  };
-
-  useEffect(() => {
-    if (!cart.paymentMethod) {
-      navigate("/payment");
-    }
-  }, [cart, navigate]);
-
-  return (
-    <div className="pageContainer shipPC">
-      <CheckoutSteps step1 step2 step3 step4 />
-
-      <Helmet>
-        <title>Потврди нарачка</title>
-      </Helmet>
-      <h1 style={{ marginTop: "20px" }}>Потврди нарачка</h1>
-      <Row style={{ width: "90%" }}>
-        <Col md={8}>
-          <Card className="mb-3">
-            <Card.Body>
-              <Card.Title>Испорака</Card.Title>
-              <Card.Text>
-                <strong>Име:</strong> {cart.shippingAddress.fullName}
-                <br />
-                <strong>Адреса:</strong> {cart.shippingAddress.address},
-                {cart.shippingAddress.city},{cart.shippingAddress.postalCode},
-                {cart.shippingAddress.country}
-                <br />
-              </Card.Text>
-              <Link to="/shipping">Измени</Link>
-            </Card.Body>
-          </Card>
-          <Card className="mb-3">
-            <Card.Body>
-              <Card.Title>Плаќање</Card.Title>
-              <Card.Text>
-                <strong>Начин:</strong>{" "}
-                {cart.paymentMethod === "Karticka"
-                  ? "Со платежна картичка"
-                  : "Во готово при достава"}
-              </Card.Text>
-              <Link to="/payment">Измени</Link>
-            </Card.Body>
-          </Card>
-
-          <Card className="mb-3">
-            <Card.Body>
-              <Card.Title>Продукти</Card.Title>
-              <ListGroup variant="flush">
-                {cart.cartItems.map((item) => (
-                  <ListGroup.Item key={item._id}>
-                    <div
-                      style={{
-                        display: "flex",
-                        justifyContent: "space-between",
-                      }}
-                    >
-                      <div style={{ display: "flex", alignItems: "center" }}>
-                        <img
-                          src={item.image}
-                          alt={item.name}
-                          className="img-fluid rounded img-thumbnail"
-                          style={{ margin: "0px" }}
-                        ></img>
-                        <Link to={`/product/${item.slug}`}>{item.name}</Link>
-                      </div>
-
-                      <span>{item.quantity}</span>
-
-                      <span>{item.price} ден</span>
-                    </div>
-                  </ListGroup.Item>
-                ))}
-              </ListGroup>
-              <Link to="/cart">Измени</Link>
-            </Card.Body>
-          </Card>
-        </Col>
-        <Col md={4}>
-          <Card>
-            <Card.Body>
-              <Card.Title>Нарачка</Card.Title>
-              <ListGroup variant="flush">
-                <ListGroup.Item>
-                  <Row>
-                    <Col>Продукти:</Col>
-                    <Col>{cart.itemsPrice.toFixed(2)} ден</Col>
-                  </Row>
-                </ListGroup.Item>
-                <ListGroup.Item>
-                  <Row>
-                    <Col>Испорака:</Col>
-                    <Col>{cart.shippingPrice.toFixed(2)} ден</Col>
-                  </Row>
-                </ListGroup.Item>
-
-                <ListGroup.Item>
-                  <Row>
-                    <Col>
-                      <strong>Вкупно</strong>
-                    </Col>
-                    <Col>
-                      <strong>{cart.totalPrice.toFixed(2)} ден</strong>
-                    </Col>
-                  </Row>
-                </ListGroup.Item>
-                <ListGroup.Item>
-                  <div className="d-grid">
-                    {cart.paymentMethod === "Karticka" ? (
-                      <Button
-                        type="button"
-                        onClick={paymentHandler}
-                        disabled={cart.cartItems.length === 0}
-                        variant="danger"
-                      >
-                        Плати
-                      </Button>
-                    ) : (
-                      <Button
-                        type="button"
-                        onClick={placeOrderHandler}
-                        disabled={cart.cartItems.length === 0}
-                        variant="danger"
-                      >
-                        Потврди нарачка
-                      </Button>
-                    )}
-                  </div>
-                  {loading && <LoadingBox></LoadingBox>}
-                </ListGroup.Item>
-              </ListGroup>
-            </Card.Body>
-          </Card>
-        </Col>
-      </Row>
-    </div>
-  );
-}
-
-export default PlaceOrderScreen;
Index: frontend/src/screens/ProductScreen.js
===================================================================
--- frontend/src/screens/ProductScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,115 +1,0 @@
-import axios from "axios";
-import React, { useEffect, useReducer } from "react";
-import { Helmet } from "react-helmet-async";
-import { useParams } from "react-router-dom";
-import Footer from "../components/Footer";
-import "bootstrap/dist/css/bootstrap.min.css";
-import Header from "../components/Header";
-import icon1 from "../Images/icon3.svg";
-import ShoppingBasketIcon from "@mui/icons-material/ShoppingCart";
-import "../styles/ProductScreen.css";
-import Container from "react-bootstrap/Container";
-import Row from "react-bootstrap/Row";
-import Col from "react-bootstrap/Col";
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "FETCH_REQUEST":
-      return { ...state, loading: true };
-    case "FETCH_SUCCESS":
-      return { ...state, product: action.payload, loading: false };
-    case "FETCH_FAIL":
-      return { ...state, loading: false, error: action.payload };
-    default:
-      return state;
-  }
-};
-
-function ProductScreen() {
-  const params = useParams();
-  const { slug } = params;
-
-  const [{ loading, error, product }, dispatch] = useReducer(reducer, {
-    product: [],
-    loading: true,
-    error: "",
-  });
-
-  useEffect(() => {
-    const fetchData = async () => {
-      dispatch({ type: "FETCH_REQUEST" });
-      try {
-        const result = await axios.get(`/api/products/slug/${slug}`);
-        dispatch({ type: "FETCH_SUCCESS", payload: result.data });
-      } catch (err) {
-        dispatch({ type: "FETCH_FAIL", payload: err.message });
-      }
-    };
-    fetchData();
-  }, [slug]);
-
-  return loading ? (
-    <div>Loading...</div>
-  ) : error ? (
-    <div>{error}</div>
-  ) : (
-    <div>
-      <Helmet>
-        <title>{product.name}</title>
-      </Helmet>
-      <div>
-        <Header />
-        <Container>
-          <div className="left-side">
-            <div className="mainImg">
-              <img src={product.image} alt={product.name}></img>
-            </div>
-            <div className="sideImgContainer">
-              <div className="sideImg">
-                <img src={product.image} alt={product.name}></img>
-              </div>
-              <div className="sideImg">
-                <img src={product.sideImage} alt={product.name}></img>
-              </div>
-              <div className="sideImg">
-                <img src={product.sideImage2} alt={product.name}></img>
-              </div>
-            </div>
-          </div>
-          <div className="right-side">
-            <div className="name-container">
-              <h2>{product.name}</h2>
-            </div>
-            <div className="price-container">
-              <div className="price-left">
-                <h2>{product.price} ден</h2>
-                <span>
-                  <img src={icon1} alt="10-day-delivery"></img>Бесплатна
-                  достава: 10 дена
-                </span>
-              </div>
-              <div className="price-right">
-                <button className="addToCartBtn">
-                  <ShoppingBasketIcon />
-                  ДОДАЈ ВО КОШНИЧКА
-                </button>
-              </div>
-            </div>
-
-            <div className="informationContainer">
-              <div className="table">
-                <div>Опис</div>
-                <div>Димензии</div>
-                <div>Монтажа</div>
-                <div>Шема за монтажа</div>
-              </div>
-            </div>
-          </div>
-        </Container>
-        <Footer />
-      </div>
-    </div>
-  );
-}
-
-export default ProductScreen;
Index: frontend/src/screens/ProductScreenBootstrap.js
===================================================================
--- frontend/src/screens/ProductScreenBootstrap.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,233 +1,0 @@
-import axios from "axios";
-import React, { useContext, useEffect, useReducer } from "react";
-import { Helmet } from "react-helmet-async";
-import { useNavigate, useParams } from "react-router-dom";
-import Footer from "../components/Footer";
-import "bootstrap/dist/css/bootstrap.min.css";
-import Header from "../components/Header";
-import icon1 from "../Images/icon3.svg";
-import ShoppingBasketIcon from "@mui/icons-material/ShoppingCart";
-import "../styles/ProductScreen.css";
-import Container from "react-bootstrap/Container";
-import Row from "react-bootstrap/Row";
-import Col from "react-bootstrap/Col";
-import Button from "react-bootstrap/Button";
-import Table from "react-bootstrap/Table";
-import LoadingBox from "../components/LoadingBox";
-import MessageBox from "../components/MessageBox";
-import { getError } from "../components/utils";
-import { Store } from "../Store";
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "FETCH_REQUEST":
-      return { ...state, loading: true };
-    case "FETCH_SUCCESS":
-      return { ...state, product: action.payload, loading: false };
-    case "FETCH_FAIL":
-      return { ...state, loading: false, error: action.payload };
-    default:
-      return state;
-  }
-};
-
-function ProductScreen() {
-  const navigate = useNavigate();
-  const params = useParams();
-  const { slug } = params;
-
-  const [{ loading, error, product }, dispatch] = useReducer(reducer, {
-    product: [],
-    loading: true,
-    error: "",
-  });
-
-  useEffect(() => {
-    const fetchData = async () => {
-      dispatch({ type: "FETCH_REQUEST" });
-      try {
-        const result = await axios.get(`/api/products/slug/${slug}`);
-        dispatch({ type: "FETCH_SUCCESS", payload: result.data });
-      } catch (err) {
-        dispatch({ type: "FETCH_FAIL", payload: getError(err) });
-      }
-    };
-    fetchData();
-  }, [slug]);
-
-  const handleClick = (event) => {
-    let tmp = document.querySelector("#tmp");
-    if (tmp != null) {
-      tmp.parentNode.removeChild(tmp);
-      if (document.querySelector("#tmp") != null) {
-        let tmp = document.querySelector("#tmp");
-        tmp.parentNode.removeChild(tmp);
-      }
-    }
-    if (event.target.textContent === "Опис") {
-      let pre = document.createElement("pre");
-      pre.setAttribute("id", "tmp");
-      pre.textContent = product.description;
-      event.target.appendChild(pre);
-    } else if (event.target.textContent === "Монтажа") {
-      let table = document.createElement("table");
-      let thModel = document.createElement("th");
-      let thPrice = document.createElement("th");
-      let tdName = document.createElement("td");
-      let tdPrice = document.createElement("td");
-      let tr1 = document.createElement("tr");
-      let tr2 = document.createElement("tr");
-      thModel.innerHTML = "Модел";
-      thPrice.innerHTML = "Цена";
-      tdName.innerHTML = product.name;
-      tdPrice.innerHTML = product.priceMontaza;
-      tr1.appendChild(thModel);
-      tr1.appendChild(thPrice);
-      tr2.appendChild(tdName);
-      tr2.appendChild(tdPrice);
-      table.appendChild(tr1);
-      table.appendChild(tr2);
-      table.setAttribute("id", "tmp");
-      let p = document.createElement("p");
-      p.innerHTML = "Цената за монтажа е посочена на секој производ посебно.";
-      p.setAttribute("id", "tmp");
-
-      event.target.appendChild(table);
-      event.target.appendChild(p);
-    } else {
-      let p = document.createElement("p");
-      let a = document.createElement("a");
-      let img = document.createElement("img");
-      if (event.target.textContent === "Димензии") {
-        a.setAttribute("href", product.dimension);
-        img.src = product.dimension;
-      } else {
-        a.setAttribute("href", product.scheme);
-        img.src = product.scheme;
-      }
-      p.appendChild(img);
-      a.setAttribute("id", "tmp");
-      a.appendChild(p);
-      event.target.appendChild(a);
-    }
-  };
-
-  const changePhoto = (event) => {
-    let main = document.getElementById("main");
-    main.setAttribute("src", event.target.src);
-  };
-
-  const { state, dispatch: ctxDispatch } = useContext(Store);
-  const { cart } = state;
-  const addToCartHandler = async () => {
-    const existItem = cart.cartItems.find((x) => x._id === product._id);
-    const quantity = existItem ? existItem.quantity + 1 : 1;
-    const { data } = await axios.get(`/api/products/${product._id}`);
-    if (data.countInStock < quantity) {
-      window.alert("Sorry. Product is out of stock");
-      return;
-    }
-    ctxDispatch({
-      type: "CART_ADD_ITEM",
-      payload: { ...product, quantity },
-    });
-    navigate("/cart");
-  };
-
-  return loading ? (
-    <LoadingBox />
-  ) : error ? (
-    <MessageBox variant="danger">{error}</MessageBox>
-  ) : (
-    <div>
-      <Helmet>
-        <title>{product.name}</title>
-      </Helmet>
-      <div>
-        <Container>
-          <Row>
-            <Col>
-              <Row>
-                <img id="main" src={product.image} alt={product.name}></img>
-              </Row>
-              <Row className="imgRow">
-                <img
-                  id="sec"
-                  src={product.image}
-                  alt={product.name}
-                  onClick={changePhoto}
-                ></img>
-
-                <img
-                  id="sec"
-                  src={product.sideImage}
-                  alt={product.name}
-                  onClick={changePhoto}
-                ></img>
-
-                <img
-                  id="sec"
-                  src={product.sideImage2}
-                  alt={product.name}
-                  onClick={changePhoto}
-                ></img>
-              </Row>
-
-              {/*</div>*/}
-            </Col>
-            <Col sm>
-              <Row>
-                <h2 id="name">{product.name}</h2>
-              </Row>
-              <Row>
-                <h2 id="price">{product.price} ден</h2>
-                <span>
-                  <img id="icon" src={icon1} alt="10-day-delivery"></img>
-                  Бесплатна достава: 10 дена
-                </span>
-              </Row>
-              <Row>
-                <Button
-                  onClick={addToCartHandler}
-                  className="addToCartBtn"
-                  variant="danger"
-                >
-                  <ShoppingBasketIcon />
-                  ДОДАЈ ВО КОШНИЧКА
-                </Button>
-              </Row>
-              <Row>
-                <Table id="table">
-                  <tbody>
-                    <tr>
-                      <td>
-                        <div onClick={handleClick}>Опис</div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>
-                        <div onClick={handleClick}>Димензии</div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>
-                        <div onClick={handleClick}>Монтажа</div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>
-                        <div onClick={handleClick}>Шема за монтажа</div>
-                      </td>
-                    </tr>
-                  </tbody>
-                </Table>
-              </Row>
-            </Col>
-          </Row>
-        </Container>
-      </div>
-    </div>
-  );
-}
-
-export default ProductScreen;
Index: frontend/src/screens/ProfileScreen.js
===================================================================
--- frontend/src/screens/ProfileScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,122 +1,0 @@
-import React, { useContext, useReducer, useState } from "react";
-import { Helmet } from "react-helmet-async";
-import { Store } from "../Store";
-import Form from "react-bootstrap/Form";
-import Button from "react-bootstrap/Button";
-import { toast } from "react-toastify";
-import { getError } from "../components/utils";
-import axios from "axios";
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "UPDATE_REQUEST":
-      return { ...state, loadingUpdate: true };
-    case "UPDATE_SUCCSS":
-      return { ...state, loadingUpdate: false };
-    case "UPDATE_FAIL":
-      return { ...state, loadingUpdate: false };
-    default:
-      return state;
-  }
-};
-
-function ProfileScreen() {
-  const { state, dispatch: ctxDispatch } = useContext(Store);
-  const { userInfo } = state;
-
-  const [name, setName] = useState(userInfo.name);
-  const [contact, setContact] = useState(userInfo.contact);
-  const [email, setEmail] = useState(userInfo.email);
-  const [password, setPassword] = useState("");
-  const [confirmPassword, setConfirmPassword] = useState("");
-
-  const [{ loadingUpdate }, dispatch] = useReducer(reducer, {
-    loadingUpdate: false,
-  });
-
-  const submitHandler = async (e) => {
-    e.preventDefault();
-    try {
-      const { data } = await axios.put(
-        "/api/users/profile",
-        {
-          name,
-          contact,
-          email,
-          password,
-        },
-        {
-          headers: { Authorization: `Bearer ${userInfo.token}` },
-        }
-      );
-      dispatch({ type: "UPDATE_SUCCESS" });
-      ctxDispatch({ type: "USER_SIGNIN", payload: data });
-      localStorage.setItem("userInfo", JSON.stringify(data));
-      toast.success("Успешно ажурирање");
-    } catch (err) {
-      dispatch({ type: "FETCH_FAIL" });
-      toast.error(getError(err));
-    }
-  };
-
-  return (
-    <div className="pageContainer shipPC">
-      <Helmet>
-        <title>Мој профил</title>
-      </Helmet>
-      <h1>Моите податоци</h1>
-      <Form onSubmit={submitHandler} className="formCointainer">
-        <Form.Group controlId="name">
-          <Form.Label>Име и Презиме</Form.Label>
-          <Form.Control
-            value={name}
-            style={{ textAlign: "left" }}
-            required
-            onChange={(e) => setName(e.target.value)}
-          />
-        </Form.Group>
-        <Form.Group controlId="contact">
-          <Form.Label>Телефон</Form.Label>
-          <Form.Control
-            value={contact}
-            type="text"
-            required
-            onChange={(e) => setContact(e.target.value)}
-          />
-        </Form.Group>
-        <Form.Group controlId="email">
-          <Form.Label>Email</Form.Label>
-          <Form.Control
-            value={email}
-            type="email"
-            required
-            onChange={(e) => setEmail(e.target.value)}
-          />
-        </Form.Group>
-        <Form.Group controlId="password">
-          <Form.Label>Лозинка</Form.Label>
-          <Form.Control
-            type="password"
-            required
-            onChange={(e) => setPassword(e.target.value)}
-          />
-        </Form.Group>
-        <Form.Group controlId="confirmPassword">
-          <Form.Label>Потврди Лозинка</Form.Label>
-          <Form.Control
-            type="password"
-            required
-            onChange={(e) => setConfirmPassword(e.target.value)}
-          />
-        </Form.Group>
-        <div className="submitBtnContainer">
-          <Button variant="danger" size="lg" type="submit">
-            Ажурирај
-          </Button>
-        </div>
-      </Form>
-    </div>
-  );
-}
-
-export default ProfileScreen;
Index: frontend/src/screens/SearchScreen.js
===================================================================
--- frontend/src/screens/SearchScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,157 +1,0 @@
-import React, { useEffect, useReducer, useState } from "react";
-import "../styles/Home.css";
-// import data from "./data";
-import Product from "../components/Product";
-import axios from "axios";
-import { Helmet } from "react-helmet-async";
-import { getError } from "../components/utils";
-import { useLocation, useNavigate, useParams } from "react-router-dom";
-import Form from "react-bootstrap/Form";
-import Button from "react-bootstrap/Button";
-import LinkContainer from "react-router-bootstrap/LinkContainer";
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "FETCH_REQUEST":
-      return { ...state, loading: true };
-    case "FETCH_SUCCESS":
-      return {
-        ...state,
-        products: action.payload.products,
-        page: action.payload.page,
-        pages: action.payload.pages,
-        countProducts: action.payload.countProducts,
-        loading: false,
-      };
-    case "FETCH_FAIL":
-      return { ...state, loading: false, error: action.payload };
-    default:
-      return state;
-  }
-};
-
-function Home() {
-  const params = useParams();
-
-  const navigate = useNavigate();
-  const { search } = useLocation();
-  const sp = new URLSearchParams(search);
-  const text = sp.get("text") || "";
-  const page = sp.get("page") || 1;
-  const [{ loading, error, products, pages, countProducts }, dispatch] =
-    useReducer(reducer, { loading: true, error: "" });
-
-  useEffect(() => {
-    const fetchData = async () => {
-      try {
-        dispatch({ type: "FETCH_REQUEST" });
-        /*
-        const { data } = await axios.get(
-          `/api/products/search?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}`
-        );*/
-        const { data } = await axios.get(
-          `/api/products/search?page=${page}&text=${text}`
-        );
-        dispatch({ type: "FETCH_SUCCESS", payload: data });
-      } catch (err) {
-        dispatch({ type: "FETCH_FAIL", payload: getError(err) });
-      }
-    };
-    fetchData();
-  }, [page, error, text]);
-
-  const getFilterUrl = (filter) => {
-    const filterPage = filter.page || page;
-    const filterText = filter.text || text;
-    return `?page=${filterPage}&text=${filterText}`;
-  };
-
-  const filterHandler = (e) => {
-    e.preventDefault();
-
-    const fetchData = async () => {
-      try {
-        dispatch({ type: "FETCH_REQUEST" });
-        /*
-        const { data } = await axios.get(
-          `/api/products/search?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}`
-        );*/
-        const { data } = await axios.get(
-          `/api/products/search?page=${page}&text=${text}`
-        );
-        dispatch({ type: "FETCH_SUCCESS", payload: data });
-      } catch (err) {
-        dispatch({ type: "FETCH_FAIL", payload: getError(err) });
-      }
-    };
-    fetchData();
-  };
-
-  return (
-    <div style={{ width: "100%" }}>
-      <Helmet>
-        <title>MebelCity</title>
-      </Helmet>
-
-      <div className="most-popular-products">
-        {loading ? (
-          <div>Loading...</div>
-        ) : error ? (
-          <div>{error}</div>
-        ) : (
-          <div style={{ width: "100%" }}>
-            <h1>Резултати од пребарување</h1>
-
-            <div
-              style={{
-                width: "100%",
-                display: "flex",
-                justifyContent: "space-evenly",
-                alignItems: "center",
-                marginTop: "20px",
-              }}
-            ></div>
-            <div
-              style={{
-                display: "flex",
-                flexWrap: "wrap",
-                justifyContent: "space-evenly",
-                alignItems: "center",
-                marginTop: "10px",
-              }}
-            >
-              {products.map((product) => (
-                <Product key={product.slug} product={product} />
-              ))}
-            </div>
-            <div
-              style={{
-                marginTop: "20px",
-                display: "flex",
-                justifyContent: "center",
-                alignItems: "center",
-              }}
-            >
-              {[...Array(pages).keys()].map((x) => (
-                <LinkContainer
-                  key={x + 1}
-                  className="mx-1"
-                  to={getFilterUrl({ page: x + 1 })}
-                >
-                  <Button
-                    className={Number(page) === x + 1 ? "text-bold" : ""}
-                    variant={Number(page) === x + 1 ? "danger" : "light"}
-                  >
-                    {x + 1}
-                  </Button>
-                </LinkContainer>
-              ))}
-            </div>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}
-
-export default Home;
Index: frontend/src/screens/ShippingAddressScreen.js
===================================================================
--- frontend/src/screens/ShippingAddressScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,118 +1,0 @@
-import React, { useContext, useEffect, useState } from "react";
-import { Helmet } from "react-helmet-async";
-import Form from "react-bootstrap/Form";
-import Button from "react-bootstrap/Button";
-import Container from "react-bootstrap/Container";
-import { useNavigate } from "react-router-dom";
-import { Store } from "../Store";
-import CheckoutSteps from "../components/CheckoutSteps";
-
-function ShippingAddressScreen() {
-  const navigate = useNavigate();
-  const { state, dispatch: ctxDispatch } = useContext(Store);
-  const {
-    userInfo,
-    cart: { shippingAddress },
-  } = state;
-  const [fullName, setFullName] = useState(shippingAddress.fullName || "");
-  const [address, setAddress] = useState(shippingAddress.address || "");
-  const [city, setCity] = useState(shippingAddress.city || "");
-  const [postalCode, setPostalCode] = useState(
-    shippingAddress.postalCode || ""
-  );
-  const [country, setCountry] = useState(shippingAddress.country || "");
-
-  useEffect(() => {
-    if (!userInfo) {
-      navigate("/signin");
-    }
-  }, [userInfo, navigate]);
-
-  const submitHandler = (e) => {
-    e.preventDefault();
-    ctxDispatch({
-      type: "SAVE_SHIPPING_ADDRESS",
-      payload: {
-        fullName,
-        address,
-        city,
-        postalCode,
-        country,
-      },
-    });
-    localStorage.setItem(
-      "shippingAddress",
-      JSON.stringify({
-        fullName,
-        address,
-        city,
-        postalCode,
-        country,
-      })
-    );
-    navigate("/payment");
-  };
-
-  return (
-    <div className="pageContainer shipPC">
-      <CheckoutSteps step1 step2 />
-      <Container className="main">
-        <Helmet>
-          <title>Адреса</title>
-        </Helmet>
-
-        <h1 className="my-3">Адреса</h1>
-
-        <Form onSubmit={submitHandler} className="formCointainer">
-          <Form.Group>
-            <Form.Label>Име и Презиме</Form.Label>
-            <Form.Control
-              value={fullName}
-              onChange={(e) => setFullName(e.target.value)}
-              required
-            ></Form.Control>
-          </Form.Group>
-          <Form.Group>
-            <Form.Label>Адреса</Form.Label>
-            <Form.Control
-              value={address}
-              onChange={(e) => setAddress(e.target.value)}
-              required
-            ></Form.Control>
-          </Form.Group>
-          <Form.Group>
-            <Form.Label>Град</Form.Label>
-            <Form.Control
-              value={city}
-              onChange={(e) => setCity(e.target.value)}
-              required
-            ></Form.Control>
-          </Form.Group>
-          <Form.Group>
-            <Form.Label>Поштенски код</Form.Label>
-            <Form.Control
-              value={postalCode}
-              onChange={(e) => setPostalCode(e.target.value)}
-              required
-            ></Form.Control>
-          </Form.Group>
-          <Form.Group>
-            <Form.Label>Држава</Form.Label>
-            <Form.Control
-              value={country}
-              onChange={(e) => setCountry(e.target.value)}
-              required
-            ></Form.Control>
-          </Form.Group>
-          <div className="submitBtnContainer">
-            <Button variant="danger" size="lg" type="submit">
-              Продолжи
-            </Button>
-          </div>
-        </Form>
-      </Container>
-    </div>
-  );
-}
-
-export default ShippingAddressScreen;
Index: frontend/src/screens/SigninScreen.js
===================================================================
--- frontend/src/screens/SigninScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,86 +1,0 @@
-import Axios from "axios";
-import Container from "react-bootstrap/Container";
-import Form from "react-bootstrap/Form";
-import { Helmet } from "react-helmet-async";
-import Button from "react-bootstrap/Button";
-import "../styles/SigninScreen.css";
-import React, { useContext, useEffect, useState } from "react";
-import { Link, useLocation, useNavigate } from "react-router-dom";
-import { Store } from "../Store";
-import { toast } from "react-toastify";
-import { getError } from "../components/utils";
-
-function SigninScreen() {
-  const navigate = useNavigate();
-  const { search } = useLocation();
-  const redirectInUrl = new URLSearchParams(search).get("redirect");
-  const redirect = redirectInUrl ? redirectInUrl : "/";
-
-  const [email, setEmail] = useState("");
-  const [password, setPassword] = useState("");
-
-  const { state, dispatch: ctxDispatch } = useContext(Store);
-  const { userInfo } = state;
-
-  const submitHandler = async (e) => {
-    e.preventDefault();
-    try {
-      const { data } = await Axios.post("/api/users/signin", {
-        email,
-        password,
-      });
-      ctxDispatch({ type: "USER_SIGNIN", payload: data });
-      localStorage.setItem("userInfo", JSON.stringify(data));
-      if (data.isAdmin) navigate("/admin/dashboard");
-      else navigate(redirect || "/");
-    } catch (err) {
-      toast.error(getError(err));
-    }
-  };
-
-  useEffect(() => {
-    if (userInfo) {
-      navigate(redirect);
-    }
-  }, [navigate, redirect, userInfo]);
-
-  return (
-    <div className="pageContainer">
-      <Container className="main">
-        <Helmet>
-          <title>Најави се</title>
-        </Helmet>
-        <h1>Најави се</h1>
-        <Form className="formCointainer" onSubmit={submitHandler}>
-          <Form.Group controlId="email">
-            <Form.Label>Email</Form.Label>
-            <Form.Control
-              type="email"
-              required
-              onChange={(e) => setEmail(e.target.value)}
-            />
-          </Form.Group>
-          <Form.Group controlId="password">
-            <Form.Label>Лозинка</Form.Label>
-            <Form.Control
-              type="password"
-              required
-              onChange={(e) => setPassword(e.target.value)}
-            />
-          </Form.Group>
-          <div className="submitBtnContainer">
-            <Button variant="danger" size="lg" type="submit">
-              Најави се
-            </Button>
-          </div>
-          <div className="registerParagraph">
-            Нов корисник?{" "}
-            <Link to={`/signup?redirect=${redirect}`}>Регистрирај се</Link>
-          </div>
-        </Form>
-      </Container>
-    </div>
-  );
-}
-
-export default SigninScreen;
Index: frontend/src/screens/SignupScreen.js
===================================================================
--- frontend/src/screens/SignupScreen.js	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,118 +1,0 @@
-import Axios from "axios";
-import Container from "react-bootstrap/Container";
-import Form from "react-bootstrap/Form";
-import { Helmet } from "react-helmet-async";
-import Button from "react-bootstrap/Button";
-import "../styles/SigninScreen.css";
-import React, { useContext, useEffect, useState } from "react";
-import { Link, useLocation, useNavigate } from "react-router-dom";
-import { Store } from "../Store";
-import { toast } from "react-toastify";
-import { getError } from "../components/utils";
-
-function SignupScreen() {
-  const navigate = useNavigate();
-  const { search } = useLocation();
-  const redirectInUrl = new URLSearchParams(search).get("redirect");
-  const redirect = redirectInUrl ? redirectInUrl : "/";
-
-  const [name, setName] = useState("");
-  const [contact, setContact] = useState("");
-  const [email, setEmail] = useState("");
-  const [password, setPassword] = useState("");
-  const [confirmPassword, setConfirmPassword] = useState("");
-
-  const { state, dispatch: ctxDispatch } = useContext(Store);
-  const { userInfo } = state;
-
-  const submitHandler = async (e) => {
-    e.preventDefault();
-    if (password !== confirmPassword) {
-      toast.error("Лозинките не се совпаѓаат");
-      return;
-    }
-    try {
-      const { data } = await Axios.post("/api/users/signup", {
-        name,
-        contact,
-        email,
-        password,
-      });
-      ctxDispatch({ type: "USER_SIGNIN", payload: data });
-      localStorage.setItem("userInfo", JSON.stringify(data));
-      navigate(redirect || "/");
-    } catch (err) {
-      toast.error(getError(err));
-    }
-  };
-
-  useEffect(() => {
-    if (userInfo) {
-      navigate(redirect);
-    }
-  }, [navigate, redirect, userInfo]);
-
-  return (
-    <div className="pageContainer">
-      <Container className="main">
-        <Helmet>
-          <title>Регистрирај се</title>
-        </Helmet>
-        <h1>Регистрирај се</h1>
-        <Form className="formCointainer" onSubmit={submitHandler}>
-          <Form.Group controlId="name">
-            <Form.Label>Име и Презиме</Form.Label>
-            <Form.Control
-              style={{ textAlign: "left" }}
-              required
-              onChange={(e) => setName(e.target.value)}
-            />
-          </Form.Group>
-          <Form.Group controlId="contact">
-            <Form.Label>Телефон</Form.Label>
-            <Form.Control
-              type="text"
-              required
-              onChange={(e) => setContact(e.target.value)}
-            />
-          </Form.Group>
-          <Form.Group controlId="email">
-            <Form.Label>Email</Form.Label>
-            <Form.Control
-              type="email"
-              required
-              onChange={(e) => setEmail(e.target.value)}
-            />
-          </Form.Group>
-          <Form.Group controlId="password">
-            <Form.Label>Лозинка</Form.Label>
-            <Form.Control
-              type="password"
-              required
-              onChange={(e) => setPassword(e.target.value)}
-            />
-          </Form.Group>
-          <Form.Group controlId="confirmPassword">
-            <Form.Label>Потврди Лозинка</Form.Label>
-            <Form.Control
-              type="password"
-              required
-              onChange={(e) => setConfirmPassword(e.target.value)}
-            />
-          </Form.Group>
-          <div className="submitBtnContainer">
-            <Button variant="danger" size="lg" type="submit">
-              Регистрирај се
-            </Button>
-          </div>
-          <div className="registerParagraph">
-            Имате профил?{" "}
-            <Link to={`/signin?redirect=${redirect}`}>Најави се</Link>
-          </div>
-        </Form>
-      </Container>
-    </div>
-  );
-}
-
-export default SignupScreen;
Index: frontend/src/styles/AdminDashboard.css
===================================================================
--- frontend/src/styles/AdminDashboard.css	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,76 +1,0 @@
-#pgContainer {
-  display: flex;
-  width: 100vw;
-  height: 850px;
-}
-
-#sidebarMenu {
-  height: 100%;
-  background-color: rgb(66, 63, 72);
-  display: flex;
-  flex-direction: column;
-  width: 18%;
-  align-items: center;
-  padding-top: 30px;
-  overflow-x: hidden;
-}
-
-#mainScreen {
-  flex: 1;
-}
-
-.taskContainer {
-  width: 90%;
-  margin-top: 20px;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-
-.dashboard-btn {
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: 20px;
-  height: 40px;
-  color: white;
-}
-
-.dashboard-btn:hover {
-  background-color: #0d6efd;
-  cursor: pointer;
-}
-
-.newProductFormCointainer {
-  margin-top: 20px;
-  width: 90%;
-  display: flex;
-  flex-direction: column;
-}
-
-.firstRow {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.secondRow {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.thirdRow {
-  margin-top: 30px;
-  display: flex;
-  justify-content: space-around;
-  margin-bottom: 20px;
-  align-items: center;
-}
-
-#textArea {
-  height: 200px;
-}
Index: frontend/src/styles/CartScreen.css
===================================================================
--- frontend/src/styles/CartScreen.css	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,114 +1,0 @@
-.img-thumbnail {
-  height: 80px;
-  margin-left: 20px;
-}
-
-.pageContainer {
-  min-height: 100vh;
-}
-
-main {
-  margin-top: 20px;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.itemContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.trashImgContainer {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.link {
-  color: black;
-  display: flex;
-  text-decoration: none;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.btnsPriceContainer {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.productRow {
-  width: 800px;
-}
-
-.quantityInput {
-  height: 40px;
-  width: 40px;
-  text-align: center;
-}
-
-.marginBtn {
-  margin-right: 20px;
-}
-
-.lastRow {
-  border-top: 1px solid black;
-  margin-top: 20px;
-  display: flex;
-  flex-direction: column;
-}
-
-.totalPriceContainer {
-  margin-top: 20px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.checkoutBtnContainer {
-  display: flex;
-  justify-content: right;
-}
-
-@media only screen and (max-width: 801px) {
-  .productRow {
-    width: 100vw;
-  }
-}
-
-@media only screen and (max-width: 554px) {
-  .productRow {
-    width: 100vw;
-  }
-
-  .itemContainer {
-    flex-direction: column;
-  }
-
-  .trashImgContainer {
-    width: 100%;
-    flex-direction: row-reverse;
-    justify-content: space-between;
-  }
-
-  .trashIconContainer {
-    display: flex;
-    justify-content: right;
-  }
-
-  .btnsPriceContainer {
-    width: 100%;
-    justify-content: space-between;
-  }
-
-  .checkoutBtnContainer button {
-    width: 100%;
-  }
-}
Index: frontend/src/styles/Footer.css
===================================================================
--- frontend/src/styles/Footer.css	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,63 +1,0 @@
-.footer {
-  box-sizing: border-box;
-  margin-top: 40px;
-  padding-top: 10px;
-  border-top: 5px solid red;
-  display: flex;
-  justify-content: space-evenly;
-}
-
-.footer__social {
-  display: flex;
-  flex-direction: column;
-}
-
-.footer__social img {
-  width: 30px;
-  margin-top: 7px;
-}
-
-.socialIconText {
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-}
-
-.socialIconText span {
-  margin-left: 5px;
-}
-
-.footer__newsletter {
-  display: flex;
-  flex-direction: column;
-}
-
-.footer__newsletter div {
-  width: auto;
-  display: flex;
-}
-
-.footer__newsletter input {
-  background-color: #e9e9e9;
-  border: none;
-  height: 30px;
-}
-
-#email {
-  flex: 1;
-}
-#submit {
-  height: 32px;
-  cursor: pointer;
-  user-select: none;
-}
-
-#email:focus {
-  outline: none;
-}
-
-@media only screen and (max-width: 440px) {
-  .footer {
-    flex-direction: column;
-  }
-}
Index: frontend/src/styles/Header.css
===================================================================
--- frontend/src/styles/Header.css	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,290 +1,0 @@
-* {
-  font-family: Arial, Helvetica, sans-serif;
-}
-
-.header {
-  margin: 0;
-  padding: 0;
-  margin-top: 10px;
-  height: 70px;
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding-bottom: 5px;
-  border-bottom: 1px solid rgb(166, 165, 165);
-}
-
-span {
-  display: flex;
-  align-items: center;
-}
-
-span p {
-  display: flex;
-  align-items: center;
-  margin: 0;
-}
-
-.header__menu {
-  display: flex;
-  list-style: none;
-  align-items: center;
-  justify-content: space-evenly;
-}
-
-.header__menu li {
-  margin-left: 20px;
-}
-
-.header__right {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-
-.header__search {
-  display: flex;
-}
-
-.header__searchInput {
-  width: 300px;
-}
-
-.header__buttons {
-  display: flex;
-  justify-content: space-evenly;
-}
-
-.link {
-  color: black;
-  text-decoration: none;
-}
-
-.link:hover {
-  color: black;
-}
-
-.header__cart {
-  color: black;
-}
-
-.badgee {
-  text-decoration: none;
-}
-
-.header__dropdown {
-  width: 700px;
-  padding-top: 28px;
-  background-color: #ffffff;
-  border: 1px solid rgb(166, 165, 165);
-  box-shadow: 0 6px 12px rgb(0 0 0 / 18%);
-  padding-right: 10px;
-  position: absolute;
-  display: none;
-  z-index: 10;
-}
-
-.header__products {
-  position: relative;
-  cursor: pointer;
-}
-
-.header__products:hover .header__dropdown {
-  display: flex;
-}
-
-.header__dropdown a {
-  display: block;
-}
-
-.header__dropdownColumn ul {
-  list-style: none;
-  padding: 0;
-}
-
-.header__dropdownColumn ul li {
-  font-weight: bold;
-  margin-top: 4px;
-}
-
-.header__dropdownColumn ul li a {
-  color: rgb(45, 44, 44);
-  text-decoration: 0;
-}
-
-.header__dropdownColumn ul li ul {
-  margin-bottom: 15px;
-}
-
-.header__dropdownColumn ul li ul li {
-  font-weight: 100;
-  text-decoration: none;
-  color: rgb(107, 106, 106);
-}
-
-.header__dropdownColumn ul li:hover span {
-  border-bottom: 1px solid rgb(45, 44, 44);
-}
-
-.header__dropdownColumn ul li ul li a:hover {
-  text-decoration: underline;
-  color: red;
-}
-
-.header__icon {
-  display: none !important;
-}
-
-.header__iconContainer {
-  display: none;
-}
-
-.header__iconContainer img {
-  margin-left: 10px;
-}
-
-.mobile-menu-container {
-  background-color: white;
-  box-shadow: 0 10px 15px rgb(0 0 0 / 40%);
-  height: 100vh;
-  z-index: 20;
-  position: absolute;
-  top: 0;
-}
-
-.closeBtn {
-  margin-right: 20px;
-  text-align: right;
-  cursor: pointer;
-  font-size: 40px;
-}
-
-.mobile-menu-container ul {
-  list-style: none;
-  padding: 0px;
-  margin-top: 10px;
-}
-
-.mobile-menu-container ul li {
-  cursor: pointer;
-  border-top: 1px solid grey;
-  font-size: 20px;
-  display: flex;
-  justify-content: left;
-  align-items: center;
-  height: 50px;
-}
-
-.subDropdown {
-  background-color: white;
-  height: 100vh;
-  z-index: 21;
-  position: absolute;
-  top: 0;
-}
-
-.visible {
-  display: block;
-}
-
-.hidden {
-  display: none;
-}
-
-.category-menu {
-  position: absolute;
-  background-color: #ffffff;
-  top: 0;
-  z-index: 22;
-  height: 100vh;
-}
-
-#basic-nav-dropdown {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-@media only screen and (max-width: 1015px) {
-  .header__dropdown {
-    margin-left: -200px;
-  }
-}
-
-@media only screen and (max-width: 873px) {
-  .header__menu {
-    display: none;
-  }
-
-  .header__icon {
-    display: block !important;
-    cursor: pointer;
-  }
-
-  .header__iconContainer {
-    display: flex;
-  }
-
-  .mobile-menu-container {
-    width: 40vw;
-  }
-
-  .subDropdown {
-    width: 40vw;
-  }
-
-  .category-menu {
-    width: 40vw;
-  }
-}
-
-@media only screen and (max-width: 500px) {
-  .mobile-menu-container {
-    width: 50vw;
-  }
-
-  .subDropdown {
-    width: 50vw;
-  }
-
-  .category-menu {
-    width: 50vw;
-  }
-}
-
-@media only screen and (max-width: 400px) {
-  .header__search {
-    display: none;
-  }
-
-  .mobile-menu-container {
-    width: 80vw;
-  }
-
-  .subDropdown {
-    width: 80vw;
-  }
-
-  .category-menu {
-    width: 80vw;
-  }
-}
-
-@media only screen and (max-width: 355px) {
-  span p {
-    display: none;
-  }
-
-  .mobile-menu-container {
-    width: 100vw;
-  }
-
-  .subDropdown {
-    width: 100vw;
-  }
-
-  .category-menu {
-    width: 100vw;
-  }
-}
Index: frontend/src/styles/Home.css
===================================================================
--- frontend/src/styles/Home.css	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,192 +1,0 @@
-.sliderContainer {
-  width: auto;
-  margin: 0 auto;
-  margin-top: 10px;
-}
-
-.iconWrapper {
-  width: 100%;
-  height: 120px;
-  display: flex;
-  justify-content: space-evenly;
-  align-items: center;
-  margin-top: 5px;
-}
-
-.iconContainer {
-  width: 200px;
-  height: 100%;
-  text-transform: uppercase;
-  font-weight: bold;
-  color: #808285;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  cursor: pointer;
-}
-
-.icon {
-  width: 100px;
-  height: 100px;
-}
-
-.icon-text {
-  margin: 0px;
-  text-align: center;
-}
-
-.activeIcon {
-  filter: invert(42%) sepia(100%) saturate(7464%) hue-rotate(349deg)
-    brightness(86%) contrast(96%);
-}
-
-.activeIconContainer {
-  background-color: #dbd8d8;
-  border-top-left-radius: 10%;
-  border-top-right-radius: 10%;
-}
-
-.descriptionContainer {
-  width: 100%;
-  height: 40px;
-  background-color: #dbd8d8;
-  border-radius: 10px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.section {
-  display: flex;
-  flex-direction: column;
-}
-
-.grid-container {
-  display: grid;
-  grid-template-columns: auto auto auto;
-  grid-template-rows: 300px 300px 300px 300px;
-  gap: 10px;
-  margin-top: 20px;
-  padding: 10px;
-}
-
-.grid-item {
-  text-align: center;
-  font-size: 30px;
-  border-radius: 20px;
-  box-shadow: 0 3px 5px rgb(0 0 0 / 100%);
-  color: #ffffff;
-  text-shadow: 3px 3px 3px rgb(0 0 0 / 100%);
-  cursor: pointer;
-}
-
-.item1 {
-  background-image: url("../Images/dnevna.jpg");
-  background-size: cover;
-  background-position: center;
-  background-repeat: no-repeat;
-  grid-row: 1 / 3;
-}
-.item2 {
-  background-image: url("../Images/hodnik.jpg");
-  background-size: cover;
-}
-.item3 {
-  background-image: url("../Images/trpezarija.jpg");
-  background-size: cover;
-}
-.item4 {
-  background-image: url("../Images/spalna.jpg");
-  background-size: cover;
-  background-position: center;
-  grid-column: 2 / 4;
-}
-.item5 {
-  background-image: url("../Images/kujna.jpg");
-  background-size: cover;
-}
-.item6 {
-  background-image: url("../Images/kancelarija.jpg");
-  background-size: cover;
-}
-.item7 {
-  background-image: url("../Images/detska.jpg");
-  background-size: cover;
-  grid-column: 3;
-  grid-row: 3 / 5;
-}
-.item8 {
-  background-image: url("../Images/gradina.jpg");
-  background-size: cover;
-  grid-column: 1 / 3;
-}
-
-.most-popular-products {
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-}
-.icon-description {
-  margin-top: 2px;
-}
-
-@media only screen and (max-width: 650px) {
-  .grid-container {
-    display: grid;
-    grid-template-columns: repeat(2, minmax(0, 1fr));
-    grid-template-rows: 300px 300px 300px 300px;
-    gap: 10px;
-    margin-top: 20px;
-    padding: 10px;
-  }
-
-  .grid-container .grid-item {
-    grid-row: auto;
-    grid-column: auto;
-  }
-
-  .iconWrapper {
-    height: 70px;
-  }
-
-  .iconContainer {
-    width: 120px;
-  }
-
-  .icon {
-    width: 50px;
-    height: 50px;
-  }
-
-  .icon-text {
-    font-size: 10px;
-  }
-}
-
-@media only screen and (max-width: 560px) {
-  .icon-description {
-    font-size: 15px;
-  }
-}
-
-@media only screen and (max-width: 534px) {
-  .descriptionContainer {
-    display: none;
-  }
-}
-
-@media only screen and (max-width: 400px) {
-  .grid-container {
-    display: grid;
-    grid-template-columns: repeat(1, minmax(0, 1fr));
-    grid-template-rows: repeat(8, minmax(0, 200px));
-    gap: 10px;
-    margin-top: 20px;
-    padding: 10px;
-  }
-
-  .grid-container .grid-item {
-    grid-row: auto;
-    grid-column: auto;
-  }
-}
Index: frontend/src/styles/Product.css
===================================================================
--- frontend/src/styles/Product.css	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,50 +1,0 @@
-.product__container {
-  height: 300px;
-  width: 300px;
-  display: flex;
-  flex-direction: column;
-  border: 1px solid grey;
-  padding: 2px;
-  box-shadow: 0 3px 5px rgb(0 0 0 / 100%);
-}
-
-.product__img img {
-  width: 100%;
-}
-
-.product__textContainer {
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-}
-
-.product__name {
-  flex: 1;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.product__price {
-  flex: 1;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.product__addToCart {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.product__addToCart button {
-  width: 40%;
-  height: 30px;
-  background-color: red;
-  border: none;
-  border-radius: 10px;
-  cursor: pointer;
-  color: white;
-  font-size: 19px;
-}
Index: frontend/src/styles/ProductScreen.css
===================================================================
--- frontend/src/styles/ProductScreen.css	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,155 +1,0 @@
-.container {
-  display: flex;
-}
-
-.container img {
-  height: 100%;
-}
-
-.left-side {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-}
-
-.right-side {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-}
-
-.mainImg {
-  height: 500px;
-}
-
-.sideImgContainer {
-  height: 150px;
-  display: flex;
-  justify-content: space-evenly;
-  align-items: center;
-}
-
-.sideImg {
-  height: 100%;
-}
-
-.name-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.price-container {
-  display: flex;
-}
-
-.price-left {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  justify-content: left;
-  align-items: center;
-}
-
-.price-left h2 {
-  color: red;
-}
-
-.price-left img {
-  width: 40px;
-  height: 40px;
-}
-
-.price-right {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-
-.price-right button {
-  height: 80%;
-  width: 80%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background-color: red;
-  border: none;
-  border-radius: 10px;
-  cursor: pointer;
-  color: white;
-  font-size: 19px;
-}
-
-#name {
-  text-align: center;
-}
-
-#price {
-  color: red;
-}
-
-#icon {
-  width: 40px;
-  height: 40px;
-  filter: invert(0%) sepia(00%) saturate(8000%) hue-rotate(8deg) brightness(0%)
-    contrast(234%);
-}
-
-#table {
-  margin-top: 10px;
-}
-
-tr {
-  cursor: pointer;
-}
-
-.imgRow {
-  display: flex !important;
-  justify-content: center !important;
-  margin-top: 10px;
-}
-
-#sec {
-  width: 100px;
-  height: 100px;
-}
-
-table img {
-  width: 200px;
-}
-#tmp {
-  margin-left: 20px;
-}
-#tmp tr,
-#tmp td,
-#tmp th {
-  border: 1px solid black;
-  height: 40px;
-  padding: 3px;
-}
-
-@media only screen and (max-width: 750) {
-  #main {
-    height: 300px;
-  }
-}
-
-@media only screen and (max-width: 400px) {
-  #sec {
-    height: 50px;
-  }
-}
-
-@media only screen and (max-width: 768) {
-  #main {
-    height: 260px !important;
-  }
-}
-
-@media only screen and (max-width: 575) {
-  #main {
-    height: auto !important;
-  }
-}
Index: frontend/src/styles/SigninScreen.css
===================================================================
--- frontend/src/styles/SigninScreen.css	(revision a2e57352512ead87a9738f42509448ff26fdd514)
+++ 	(revision )
@@ -1,56 +1,0 @@
-.pageContainer {
-  min-height: 100vh;
-}
-
-.main {
-  margin-top: 20px;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.formCointainer {
-  width: 400px;
-}
-
-.shipPC {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-
-.shipPC .checkout-steps {
-  width: 70%;
-}
-
-.submitBtnContainer {
-  margin-top: 20px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.registerParagraph {
-  margin-top: 10px;
-  text-align: center;
-}
-
-@media only screen and (max-width: 440px) {
-  .formCointainer {
-    width: 100%;
-  }
-}
-
-@media only screen and (max-width: 559px) {
-  .shipPC .checkout-steps {
-    width: 100%;
-  }
-}
-
-@media only screen and (max-width: 331px) {
-  .shipPC .checkout-steps {
-    display: none;
-  }
-}
