3 files changed, 18 insertions, 33 deletions
diff --git a/src/pages/login.jsx b/src/pages/login.jsx
index 38174f84..9a1aa85b 100644
--- a/src/pages/login.jsx
+++ b/src/pages/login.jsx
@@ -1,9 +1,10 @@
-import Seo from '@/core/components/Seo'
-import SimpleFooter from '@/core/components/elements/Footer/SimpleFooter'
-import BasicLayout from '@/core/components/layouts/BasicLayout'
-import DesktopView from '@/core/components/views/DesktopView'
-import MobileView from '@/core/components/views/MobileView'
-import LoginComponent from '@/lib/auth/components/Login'
+import Seo from '@/core/components/Seo';
+import SimpleFooter from '@/core/components/elements/Footer/SimpleFooter';
+import BasicLayout from '@/core/components/layouts/BasicLayout';
+import DesktopView from '@/core/components/views/DesktopView';
+import MobileView from '@/core/components/views/MobileView';
+import LoginComponent from '@/lib/auth/components/Login';
+import AccountActivation from '~/modules/account-activation';
 
 export default function Login() {
   return (
@@ -20,6 +21,8 @@ export default function Login() {
         <LoginComponent />
         <SimpleFooter />
       </MobileView>
+
+      <AccountActivation />
     </>
-  )
+  );
 }
diff --git a/src/pages/register.jsx b/src/pages/register.jsx
index a2fbbf94..6112c72b 100644
--- a/src/pages/register.jsx
+++ b/src/pages/register.jsx
@@ -1,25 +1,5 @@
-import Seo from '@/core/components/Seo'
-import SimpleFooter from '@/core/components/elements/Footer/SimpleFooter'
-import BasicLayout from '@/core/components/layouts/BasicLayout'
-import DesktopView from '@/core/components/views/DesktopView'
-import MobileView from '@/core/components/views/MobileView'
-import RegisterComponent from '@/lib/auth/components/Register'
+import RegisterPage from '~/pages/register';
 
 export default function Register() {
-  return (
-    <>
-      <Seo title='Register - Indoteknik.com' />
-
-      <DesktopView>
-        <BasicLayout>
-          <RegisterComponent />
-        </BasicLayout>
-      </DesktopView>
-
-      <MobileView>
-        <RegisterComponent />
-        <SimpleFooter />
-      </MobileView>
-    </>
-  )
+  return <RegisterPage />;
 }
diff --git a/src/pages/shop/product/variant/[slug].jsx b/src/pages/shop/product/variant/[slug].jsx
index 455b248b..401bce82 100644
--- a/src/pages/shop/product/variant/[slug].jsx
+++ b/src/pages/shop/product/variant/[slug].jsx
@@ -21,16 +21,18 @@ export async function getServerSideProps(context) {
   const tier = auth.pricelist ? auth.pricelist : false
   const authToken = auth?.token || ''
 
-
   let response = await axios(
-    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/variant-detail?id=` + getIdFromSlug(slug) +'&auth=' + tier
+    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/variant-detail?id=` +
+      getIdFromSlug(slug) +
+      '&auth=' +
+      tier
   )
   let product = response.data
   // let product = await variantApi({ id: getIdFromSlug(slug), headers: { Token: authToken } })
-  
+
   if (product?.length == 1) {
     product = product[0]
-   /* const regexHtmlTags = /(<([^>]+)>)/gi
+    /* const regexHtmlTags = /(<([^>]+)>)/gi
     const regexHtmlTagsExceptP = /<\/?(?!p\b)[^>]*>/g
     product.description = product.description
       .replace(regexHtmlTagsExceptP, ' ')