From 31bdab8ab6807d99c4edb7faf5d6b7ebf2344112 Mon Sep 17 00:00:00 2001
From: simonreddy2001 <simon.reddy2001@gmail.com>
Date: Tue, 21 Dec 2021 11:58:55 +0100
Subject: [PATCH 1/4] scroll to top fixed

---
 src/client/App.js         | 85 ++++++++++++++++++++-------------------
 src/client/ScrollToTop.js | 13 ++++++
 2 files changed, 57 insertions(+), 41 deletions(-)
 create mode 100644 src/client/ScrollToTop.js

diff --git a/src/client/App.js b/src/client/App.js
index ce3e0232..69150560 100644
--- a/src/client/App.js
+++ b/src/client/App.js
@@ -18,6 +18,7 @@ import MonthlyArrivalsPageContainer from './containers/MonthlyArrivalsPage/Month
 import AboutpageContainer from './containers/AboutPage/AboutPage.Container';
 import ContactpageContainer from './containers/ContactPage/ContactPage.Container';
 import CartPageContainer from './containers/CartPage/CartPage.Container';
+import ScrollToTop from './ScrollToTop';
 
 function App() {
   const { isLoading, isAuthenticated } = useFirebase();
@@ -29,50 +30,52 @@ function App() {
   return (
     <Router history={reactRouterHistory}>
       <Menu isAuthenticated={isAuthenticated} />
-      <Switch>
-        <Route exact path="/">
-          <LandingPageContainer />
-        </Route>
-        <Route exact path="/about-us">
-          <AboutpageContainer />
-        </Route>
-        <Route exact path="/contact-us">
-          <ContactpageContainer />
-        </Route>
-        <Route exact path="/product/:id">
-          <ProductPageContainer isAuthenticated={isAuthenticated} />
-        </Route>
-        <Route exact path="/monthly-arrivals">
-          <MonthlyArrivalsPageContainer isAuthenticated={isAuthenticated} />
-        </Route>
-        <Route exact path="/category/:name">
-          <CategoryPage />
-        </Route>
-        <Route exact path="/cart">
-          <CartPageContainer isAuthenticated={isAuthenticated} />
-        </Route>
+      <ScrollToTop>
+        <Switch>
+          <Route exact path="/">
+            <LandingPageContainer />
+          </Route>
+          <Route exact path="/about-us">
+            <AboutpageContainer />
+          </Route>
+          <Route exact path="/contact-us">
+            <ContactpageContainer />
+          </Route>
+          <Route exact path="/product/:id">
+            <ProductPageContainer isAuthenticated={isAuthenticated} />
+          </Route>
+          <Route exact path="/monthly-arrivals">
+            <MonthlyArrivalsPageContainer isAuthenticated={isAuthenticated} />
+          </Route>
+          <Route exact path="/category/:name">
+            <CategoryPage />
+          </Route>
+          <Route exact path="/cart">
+            <CartPageContainer isAuthenticated={isAuthenticated} />
+          </Route>
 
-        {/* All routes below are authenticated routes - a user must login first */}
-        <AuthenticatedRoute exact path="/order/:id">
-          <OrderPageContainer isAuthenticated={isAuthenticated} />
-        </AuthenticatedRoute>
-        <AuthenticatedRoute exact path="/order-confirmation/:id">
-          <ConfirmationPageContainer isAuthenticated={isAuthenticated} />
-        </AuthenticatedRoute>
-        <AuthenticatedRoute exact path="/profile">
-          <ProfilePage isAuthenticated={isAuthenticated} />
-        </AuthenticatedRoute>
+          {/* All routes below are authenticated routes - a user must login first */}
+          <AuthenticatedRoute exact path="/order/:id">
+            <OrderPageContainer isAuthenticated={isAuthenticated} />
+          </AuthenticatedRoute>
+          <AuthenticatedRoute exact path="/order-confirmation/:id">
+            <ConfirmationPageContainer isAuthenticated={isAuthenticated} />
+          </AuthenticatedRoute>
+          <AuthenticatedRoute exact path="/profile">
+            <ProfilePage isAuthenticated={isAuthenticated} />
+          </AuthenticatedRoute>
 
-        {/* Favorites page */}
-        <AuthenticatedRoute exact path="/favorites">
-          <FavoritesPageContainer isAuthenticated={isAuthenticated} />
-        </AuthenticatedRoute>
+          {/* Favorites page */}
+          <AuthenticatedRoute exact path="/favorites">
+            <FavoritesPageContainer isAuthenticated={isAuthenticated} />
+          </AuthenticatedRoute>
 
-        {/* Make sure to keep wildcard "*" routes in the bottom of the Switch */}
-        <Route path="*">
-          <Page404Container />
-        </Route>
-      </Switch>
+          {/* Make sure to keep wildcard "*" routes in the bottom of the Switch */}
+          <Route path="*">
+            <Page404Container />
+          </Route>
+        </Switch>
+      </ScrollToTop>
       <Footer />
     </Router>
   );
diff --git a/src/client/ScrollToTop.js b/src/client/ScrollToTop.js
new file mode 100644
index 00000000..94ac9396
--- /dev/null
+++ b/src/client/ScrollToTop.js
@@ -0,0 +1,13 @@
+import React, { useEffect } from 'react';
+import { useLocation } from 'react-router-dom';
+
+const ScrollToTop = (props) => {
+  const location = useLocation();
+  useEffect(() => {
+    window.scrollTo(0, 0);
+  }, [location]);
+
+  return <>{props.children}</>;
+};
+
+export default ScrollToTop;

From cb6a12e6b65cd8e66615c32ad7b1d5bc4035b18f Mon Sep 17 00:00:00 2001
From: semih1239 <semihayyildiz23@hotmail.com>
Date: Wed, 5 Jan 2022 19:21:02 +0100
Subject: [PATCH 2/4] Frontend: Changed monthly arrival with all products

---
 .../LandingPage/LandingPage.Container.js        | 17 +++++++++--------
 .../MonthlyArrivalsPage.Container.js            |  6 ++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/client/containers/LandingPage/LandingPage.Container.js b/src/client/containers/LandingPage/LandingPage.Container.js
index 92e45669..7e516c3c 100644
--- a/src/client/containers/LandingPage/LandingPage.Container.js
+++ b/src/client/containers/LandingPage/LandingPage.Container.js
@@ -9,14 +9,15 @@ import Loader from '../../components/Loader/Loader.component';
 const LandingPageContainer = () => {
   const products = useFetchApi('products');
   const categories = useFetchApi('categories');
-  const monthlyArrivals = useFetchApi('products?daysBeforeToday=30');
+  // const monthlyArrivals = useFetchApi('products?daysBeforeToday=30');
 
-  const compareMonth = (date) => {
-    return new Date().getMonth() === new Date(date).getMonth();
-  };
-  const imageArray = monthlyArrivals.data.filter((product) =>
-    compareMonth(product.created_at) ? product : false,
-  );
+  // const compareMonth = (date) => {
+  //   return new Date().getMonth() === new Date(date).getMonth();
+  // };
+  // const imageArray = products.data.filter((product) =>
+  //   // compareMonth(product.created_at) ? product : false,
+  //   product
+  // );
 
   return (
     <main>
@@ -29,7 +30,7 @@ const LandingPageContainer = () => {
           <Loader />
         ) : (
           <Carousel
-            imageArray={imageArray.map((product) => product.picture)}
+            imageArray={products.data.map((product) => product.picture)}
             products={products.data}
             show={3}
           />
diff --git a/src/client/containers/MonthlyArrivalsPage/MonthlyArrivalsPage.Container.js b/src/client/containers/MonthlyArrivalsPage/MonthlyArrivalsPage.Container.js
index 2fa8e781..433ec059 100644
--- a/src/client/containers/MonthlyArrivalsPage/MonthlyArrivalsPage.Container.js
+++ b/src/client/containers/MonthlyArrivalsPage/MonthlyArrivalsPage.Container.js
@@ -7,10 +7,12 @@ import Loader from '../../components/Loader/Loader.component';
 import ButtonComponent2 from '../../components/ButtonV2/ButtonV2.component';
 
 const MonthlyArrivalsPageContainer = ({ isAuthenticated }) => {
-  const monthlyArrivals = useFetchApi('products?daysBeforeToday=30');
+  // const monthlyArrivals = useFetchApi('products?daysBeforeToday=30');
+  const monthlyArrivals = useFetchApi('products');
+
   const id =
     (isAuthenticated && JSON.parse(localStorage.getItem('user')).uid) || ' ';
-    const history = useHistory();
+  const history = useHistory();
   return (
     <div className="monthlyArrivalsPage">
       <h1>MONTHLY ARRIVALS</h1>

From 76fb4265467c3984b2a8aca4483d2119d37b67b6 Mon Sep 17 00:00:00 2001
From: semih1239 <semihayyildiz23@hotmail.com>
Date: Wed, 5 Jan 2022 19:35:20 +0100
Subject: [PATCH 3/4] Added comments for removed monthly arrival part

---
 src/client/containers/LandingPage/LandingPage.Container.js    | 4 ++++
 .../MonthlyArrivalsPage/MonthlyArrivalsPage.Container.js      | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/client/containers/LandingPage/LandingPage.Container.js b/src/client/containers/LandingPage/LandingPage.Container.js
index 7e516c3c..f4839474 100644
--- a/src/client/containers/LandingPage/LandingPage.Container.js
+++ b/src/client/containers/LandingPage/LandingPage.Container.js
@@ -9,6 +9,10 @@ import Loader from '../../components/Loader/Loader.component';
 const LandingPageContainer = () => {
   const products = useFetchApi('products');
   const categories = useFetchApi('categories');
+
+  // Monthly arrival removed from frontend.
+  // Because the database will not update anymore with new products.
+
   // const monthlyArrivals = useFetchApi('products?daysBeforeToday=30');
 
   // const compareMonth = (date) => {
diff --git a/src/client/containers/MonthlyArrivalsPage/MonthlyArrivalsPage.Container.js b/src/client/containers/MonthlyArrivalsPage/MonthlyArrivalsPage.Container.js
index 433ec059..949b4d52 100644
--- a/src/client/containers/MonthlyArrivalsPage/MonthlyArrivalsPage.Container.js
+++ b/src/client/containers/MonthlyArrivalsPage/MonthlyArrivalsPage.Container.js
@@ -7,6 +7,8 @@ import Loader from '../../components/Loader/Loader.component';
 import ButtonComponent2 from '../../components/ButtonV2/ButtonV2.component';
 
 const MonthlyArrivalsPageContainer = ({ isAuthenticated }) => {
+  // Monthly arrival removed from frontend.
+  // Because the database will not update anymore with new products.
   // const monthlyArrivals = useFetchApi('products?daysBeforeToday=30');
   const monthlyArrivals = useFetchApi('products');
 

From 40bbcf8ac4354071dc865313a0d0d0a6da1e6143 Mon Sep 17 00:00:00 2001
From: semih1239 <semihayyildiz23@hotmail.com>
Date: Wed, 5 Jan 2022 19:38:23 +0100
Subject: [PATCH 4/4] Updated commits

---
 src/client/containers/LandingPage/LandingPage.Container.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/client/containers/LandingPage/LandingPage.Container.js b/src/client/containers/LandingPage/LandingPage.Container.js
index f4839474..fc353a7c 100644
--- a/src/client/containers/LandingPage/LandingPage.Container.js
+++ b/src/client/containers/LandingPage/LandingPage.Container.js
@@ -19,8 +19,7 @@ const LandingPageContainer = () => {
   //   return new Date().getMonth() === new Date(date).getMonth();
   // };
   // const imageArray = products.data.filter((product) =>
-  //   // compareMonth(product.created_at) ? product : false,
-  //   product
+  //   compareMonth(product.created_at) ? product : false,
   // );
 
   return (