login and register

3 files changed, 32 insertions, 9 deletions

diff --git a/src/pages/login.jsx b/src/pages/login.jsx
index 03509e93..bd7ec5c1 100644
--- a/src/pages/login.jsx
+++ b/src/pages/login.jsx
@@ -1,11 +1,22 @@
 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'
 
 export default function Login() {
   return (
     <>
-      <LoginComponent />
-      <SimpleFooter />
+      <DesktopView>
+        <BasicLayout>
+          <LoginComponent />
+        </BasicLayout>
+      </DesktopView>
+
+      <MobileView>
+        <LoginComponent />
+        <SimpleFooter />
+      </MobileView>
     </>
   )
 }
diff --git a/src/pages/register.jsx b/src/pages/register.jsx
index 0ca1e81e..7f5e9f2b 100644
--- a/src/pages/register.jsx
+++ b/src/pages/register.jsx
@@ -1,11 +1,22 @@
 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'
 
 export default function Register() {
   return (
     <>
-      <RegisterComponent />
-      <SimpleFooter />
+      <DesktopView>
+        <BasicLayout>
+          <RegisterComponent />
+        </BasicLayout>
+      </DesktopView>
+
+      <MobileView>
+        <RegisterComponent />
+        <SimpleFooter />
+      </MobileView>
     </>
   )
 }
diff --git a/src/pages/shop/product/[slug].jsx b/src/pages/shop/product/[slug].jsx
index cc6924a3..83939291 100644
--- a/src/pages/shop/product/[slug].jsx
+++ b/src/pages/shop/product/[slug].jsx
@@ -11,11 +11,12 @@ export async function getServerSideProps(context) {
   let product = await productApi({ id: getIdFromSlug(slug) })
   if (product?.length == 1) {
     product = product[0]
-    product.description = product.description.replaceAll('<p>', '||p||')
-    product.description = product.description.replaceAll('</p>', '||/p||')
-    product.description = product.description.replace(/(<([^>]+)>)/gi, ' ')
-    product.description = product.description.replaceAll('||p||', '<p>')
-    product.description = product.description.replaceAll('||/p||', '</p>')
+    const regexHtmlTags = /(<([^>]+)>)/gi
+    const regexHtmlTagsExceptP = /<\/?(?!p\b)[^>]*>/g
+    if (product.description.replace(regexHtmlTags, ' ').trim() == '') {
+      product.description = ''
+    }
+    product.description = product.description.replace(regexHtmlTagsExceptP, ' ')
     product.description = product.description.trim()
   }
   return { props: { product } }