Scroll false when change page

7 files changed, 11 insertions, 7 deletions

diff --git a/src/pages/404.js b/src/pages/404.js
index e22eadea..3eafbb08 100644
--- a/src/pages/404.js
+++ b/src/pages/404.js
@@ -1,5 +1,5 @@
 import Image from "next/image";
-import Link from "next/link";
+import Link from "../components/Link";
 import Header from "../components/Header";
 import Layout from "../components/Layout";
 import PageNotFoundImage from "../images/page-not-found.png";
diff --git a/src/pages/_app.js b/src/pages/_app.js
index a7a8e86e..23172bfd 100644
--- a/src/pages/_app.js
+++ b/src/pages/_app.js
@@ -19,7 +19,11 @@ function MyApp({ Component, pageProps }) {
         limit={1}
       />
       <NextProgress color="#D7A30A" options={{ showSpinner: false }} />
-      <AnimatePresence mode='wait' initial={false}>
+      <AnimatePresence 
+        mode='wait' 
+        initial={false} 
+        onExitComplete={() => window.scrollTo(0, 0)}
+      >
         <Component {...pageProps} key={router.asPath} />
       </AnimatePresence>
     </>
diff --git a/src/pages/activate.js b/src/pages/activate.js
index cb1385ba..6d534909 100644
--- a/src/pages/activate.js
+++ b/src/pages/activate.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import Head from "next/head";
 import Image from "next/image";
-import Link from "next/link";
+import Link from "../components/Link";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 import Alert from "../components/Alert";
diff --git a/src/pages/login.js b/src/pages/login.js
index e0535cd2..cff2e0cd 100644
--- a/src/pages/login.js
+++ b/src/pages/login.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import Head from "next/head";
 import Image from "next/image";
-import Link from "next/link";
+import Link from "../components/Link";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 import Alert from "../components/Alert";
diff --git a/src/pages/register.js b/src/pages/register.js
index 076710f9..ff6aa1d8 100644
--- a/src/pages/register.js
+++ b/src/pages/register.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import Head from "next/head";
 import Image from "next/image";
-import Link from "next/link";
+import Link from "../components/Link";
 import { useEffect, useState } from "react";
 import Alert from "../components/Alert";
 import Layout from "../components/Layout";
diff --git a/src/pages/shop/brands.js b/src/pages/shop/brands.js
index 2dda69a1..8faf7ba3 100644
--- a/src/pages/shop/brands.js
+++ b/src/pages/shop/brands.js
@@ -2,7 +2,7 @@ import { LazyLoadImage } from "react-lazy-load-image-component";
 import Header from "../../components/Header";
 import apiOdoo from "../../helpers/apiOdoo";
 import "react-lazy-load-image-component/src/effects/blur.css";
-import Link from "next/link";
+import Link from "../../components/Link";
 import { createSlug } from "../../helpers/slug";
 import InfiniteScroll from "react-infinite-scroll-component";
 import { useState } from "react";
diff --git a/src/pages/shop/product/[slug].js b/src/pages/shop/product/[slug].js
index 352edb99..598330f4 100644
--- a/src/pages/shop/product/[slug].js
+++ b/src/pages/shop/product/[slug].js
@@ -1,4 +1,4 @@
-import Link from "next/link";
+import Link from "../../../components/Link";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 import Header from "../../../components/Header";