template max height added

.env

@@ -16,3 +16,6 @@ REACT_APP_TERMS_LINK='https://qa-www.mermsemr.com/terms'
 # Inactivity timeout/logout AT 10MINS
 REACT_APP_TIMEOUT=600000
 
+# show download button
+REACT_APP_SHOW_DOWNLOAD=0
+

.env.development

@@ -17,3 +17,6 @@ REACT_APP_TERMS_LINK='https://qa-www.mermsemr.com/terms'
 # Inactivity timeout/logout AT 10MINS
 REACT_APP_TIMEOUT=600000
 
+# show download button
+REACT_APP_SHOW_DOWNLOAD=0
+

.env.production

@@ -15,3 +15,6 @@ REACT_APP_TERMS_LINK='https://www.mermsemr.com/terms'
 
 # Inactivity timeout/logout AT 10MINS
 REACT_APP_TIMEOUT=600000
+
+# show download button
+REACT_APP_SHOW_DOWNLOAD=0

src/component/auth/AuthFooter.jsx

@@ -5,27 +5,31 @@ import IOSDownload from '../../assets/img/download/apple.jpg'
 export default function AuthFooter() {
   return (
     <div className='w-100'>
-        <div className="row" style={{margin: '5px'}}>
+        {Number(process.env.REACT_APP_SHOW_DOWNLOAD) == 100 &&
-            <hr />
+        <>
-        </div>
+            <div className="row" style={{margin: '5px'}}>
-        <div className="row" style={{marginTop: '20px'}}>
+                <hr />
-            <div className="col-6">
-                <div className="app-store-icons-wrap text-center">
-                    <a className="icon google"
-                        href='#' >
-                        <img src={IOSDownload} className='w-80 h-auto' alt='IOS Download' />
-                    </a>
-                </div>
             </div>
+            <div className="row" style={{marginTop: '20px'}}>
+                <div className="col-6">
+                    <div className="app-store-icons-wrap text-center">
+                        <a className="icon google"
+                            href='#' >
+                            <img src={IOSDownload} className='w-80 h-auto' alt='IOS Download' />
+                        </a>
+                    </div>
+                </div>
 
-            <div className="col-6">
+                <div className="col-6">
-                <div className="app-store-icons-wrap text-center">
+                    <div className="app-store-icons-wrap text-center">
-                    <a className="icon apple"  href='#'>
+                        <a className="icon apple"  href='#'>
-                        <img src={GoogleDownload} className='w-80 h-auto' alt='IOS Download' />
+                            <img src={GoogleDownload} className='w-80 h-auto' alt='IOS Download' />
-                    </a>
+                        </a>
+                    </div>
                 </div>
             </div>
-        </div>
+        </>
+        }
 
         <div className="login-links">
             <a href={process.env.REACT_APP_HOME_LINK}>Home</a>

src/component/auth/Forgetpwd2.jsx

@@ -8,6 +8,7 @@ import siteLinks from '../../links/siteLinks'
 import { useMutation } from '@tanstack/react-query'
 import { recoverPWD } from '../../services/services';
 import getImage from '../../utils/getImage';
+import AuthFooter from './AuthFooter';
 
 const validationSchema = Yup.object().shape({
     username: Yup.string()
@@ -49,7 +50,7 @@ export default function Forgetpwd2() {
                         <div className="row no-gutters justify-content-center">
                             <div className="col-11 col-sm-6 col-lg-5 col-xxl-4 align-self-center order-2 order-sm-1h" style={{maxWidth: '520px'}}>
                                 <div className="mt-5 d-flex">
-                                    <div className="bg-white register p-5">
+                                    <div className="bg-white register px-5 pt-5 pb-3">
                                         <h1 className="mb-2">{process.env.REACT_APP_PANEL_NAME}</h1>
                                         {!mutation.isSuccess && <p>Please enter your username.</p>}
                                         <Formik
@@ -97,6 +98,7 @@ export default function Forgetpwd2() {
                                             );
                                             }}
                                         </Formik>
+                                        <AuthFooter />
                                     </div>
                                 </div>
                             </div>

src/component/auth/Login2.jsx

@@ -46,12 +46,12 @@ export default function Login() {
         console.log(error)
     },
       onSuccess: (res) => {
-        if(res?.data?.error_message){
+        if(res?.data && res?.data?.error_message){
             throw({message: res?.data?.error_message})
         }
         const {token, room, uid} = res?.data
         if(!token || !room){
-            throw({message: 'something went wrong, try again!'})
+            throw({message: 'Unable to complete your login, Please try again!'})
         }
         localStorage.setItem('token', token)
         localStorage.setItem('room', room)

src/component/product/settingsTab/ColorStyleConfigure.jsx

@@ -103,7 +103,7 @@ const ColorStyleConfigure = memo(({name = 'Full Name', data, productData}) => {
                                 </div>
                             </div>
                             :
-                            <div className="row">
+                            <div className="row overflow-y-auto" style={{maxHeight: '550px'}}>
                                 <>
                                     {!color_styles?.length ?
                                         <p>No data Found</p>

src/component/product/settingsTab/SiteTemplateSelector.jsx

@@ -98,7 +98,7 @@ const SiteTemplateSelector = memo(({name = 'Full Name', data, productData}) => {
                                 </div>
                             </div>
                             :
-                            <div className="row">
+                            <div className="row overflow-y-auto" style={{maxHeight: '550px'}}>
                                 <>
                                     {!templates?.length ?
                                         <p>No data Found</p>

src/services/services.js

@@ -26,8 +26,8 @@ const postAuxEnd = (path, postData, media=false) => {
     return axios.post(`${basePath}${path}`, postData).then(res => {
         return res
     }).catch(err => {
-        // console.log('res', err.response.data)
+        // throw new Error(err.response.data.error_message);
-        throw new Error(err.response.data.error_message);
+        throw new Error(err);
     })
 }