From 092dc7fc49246580023a8b97101d51845c81bf04 Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Fri, 31 Mar 2023 11:17:55 +0700
Subject: iframe content

---
 src/core/api/odooApi.js                            |  4 ++--
 src/core/components/elements/Link/Link.jsx         | 10 +++++++++-
 src/core/components/elements/Popup/BottomPopup.jsx |  6 +++---
 3 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'src/core')

diff --git a/src/core/api/odooApi.js b/src/core/api/odooApi.js
index 41460fda..25ee9adf 100644
--- a/src/core/api/odooApi.js
+++ b/src/core/api/odooApi.js
@@ -4,7 +4,7 @@ import { getCookie, setCookie } from 'cookies-next'
 import { getAuth } from '../utils/auth'
 
 const renewToken = async () => {
-  let token = await axios.get(process.env.NEXT_PUBLIC_ODOO_HOST + '/api/token')
+  let token = await axios.get(process.env.NEXT_PUBLIC_ODOO_API_HOST + '/api/token')
   setCookie('token', token.data.result)
   return token.data.result
 }
@@ -26,7 +26,7 @@ const odooApi = async (method, url, data = {}, headers = {}) => {
 
     let axiosParameter = {
       method,
-      url: process.env.NEXT_PUBLIC_ODOO_HOST + url,
+      url: process.env.NEXT_PUBLIC_ODOO_API_HOST + url,
       headers: { Authorization: token, ...headers }
     }
     if (auth) axiosParameter.headers['Token'] = auth.token
diff --git a/src/core/components/elements/Link/Link.jsx b/src/core/components/elements/Link/Link.jsx
index 75fc6ca8..557abbc4 100644
--- a/src/core/components/elements/Link/Link.jsx
+++ b/src/core/components/elements/Link/Link.jsx
@@ -1,10 +1,18 @@
 import NextLink from 'next/link'
+import { useRouter } from 'next/router'
+import { useEffect } from 'react'
 
 const Link = ({ children, ...props }) => {
+  const router = useRouter()
+
+  useEffect(() => {
+    router.events.on('routeChangeStart', () => window.scrollTo({ top: 0, behavior: 'smooth' }))
+  }, [router])
+
   return (
     <NextLink
       {...props}
-      onClick={() => window.scrollTo({ top: 0, behavior: 'smooth' })}
+      // onClick={() => window.scrollTo({ top: 0, behavior: 'smooth' })}
       scroll={false}
       className={`block font-medium text-red_r-11 ${props?.className || ''}`}
     >
diff --git a/src/core/components/elements/Popup/BottomPopup.jsx b/src/core/components/elements/Popup/BottomPopup.jsx
index 1fc77932..5e9f68c7 100644
--- a/src/core/components/elements/Popup/BottomPopup.jsx
+++ b/src/core/components/elements/Popup/BottomPopup.jsx
@@ -49,9 +49,9 @@ const BottomPopup = ({ children, active = false, title, close }) => {
 
             <DesktopView>
               <motion.div
-                initial={{ bottom: '40%', opacity: 0 }}
-                animate={{ bottom: '35%', opacity: 1 }}
-                exit={{ bottom: '30%', opacity: 0 }}
+                initial={{ bottom: '55%', opacity: 0 }}
+                animate={{ bottom: '50%', opacity: 1 }}
+                exit={{ bottom: '45%', opacity: 0 }}
                 transition={transition}
                 className='fixed left-1/2 -translate-x-1/2 w-2/5 border border-gray_r-6 rounded-xl z-[60] p-4 pt-0 bg-white'
               >
-- 
cgit v1.2.3