Compare commits

...

7 Commits

Author SHA1 Message Date
victorAnumudu 578a0e4c8f url fixed 2025-07-24 13:18:10 +01:00
CHIEFSOFT\ameye d0ac2515a3 form data 2025-07-23 22:47:44 -04:00
CHIEFSOFT\ameye b26f8b4e0d fix data 2025-07-23 22:30:27 -04:00
ameye ab6518e2ee Merge branch 'text-hidden' of MERMS/MermsPanelReactJS into master 2025-07-22 20:08:58 +00:00
victorAnumudu 563abe6c35 menu dropdown fix 2025-07-22 20:03:27 +01:00
victorAnumudu 894ed6ea35 hid text on success 2025-07-22 20:01:11 +01:00
ameye 71859d9712 Merge branch 'tab-menu-fix' of MERMS/MermsPanelReactJS into master 2025-07-22 00:19:02 +00:00
5 changed files with 41 additions and 59 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ const queryClient = new QueryClient({
refetchOnWindowFocus: false,
retry: 3,
// refetchOnMount: false,
staleTime: 360000 // can also be a number in millisecond
staleTime: 10*60*1000 // can also be a number in millisecond
},
},
})
+1 -1
View File
@@ -51,7 +51,7 @@ export default function Forgetpwd2() {
<div className="mt-5 d-flex">
<div className="bg-white register p-5">
<h1 className="mb-2">MERMS Panel</h1>
<p>Please enter your username.</p>
{!mutation.isSuccess && <p>Please enter your username.</p>}
<Formik
initialValues={initialValues}
validationSchema={validationSchema}
+33 -51
View File
@@ -4,7 +4,16 @@ import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
import GeneralTab from "./settingsTab/GeneralTab";
export default function ProductActive(){
export default function ProductActive({productData}){
const settingsObject = {
home_tab: { title: 'Home Page', controls: 'home', active: 'active show' , data: {}},
footer_tab: { title: 'Footer', controls: 'footer', active: '', data: {} },
about_tab: { title: 'About Page', controls: 'about', active: '', data: {} },
contact_tab: { title: 'Contact Page', controls: 'contact', active: '', data: {} },
social_tab: { title: 'Socials', controls: 'social', active: '', data: {} },
template_tab: { title: 'Template', controls: 'template', active: '', data: {} },
color_scheme_tab: { title: 'Color Scheme', controls: 'color-scheme', active: '', data: {} },
};
return(
<>
@@ -23,11 +32,11 @@ export default function ProductActive(){
<div className="card card-statistics">
<div className="card-header">
<div className="card-heading">
<h4 className="card-title">https://25681.devprov.mermsemr.com/</h4>
<h4 className="card-title">{productData?.internal_url ? productData?.internal_url : 'https://25681.devprov.mermsemr.com/'}</h4>
</div>
</div>
<div className="card-body">
<iframe style={{borderWidth: '0px;'}} src="https://25681.devprov.mermsemr.com/" width="100%" height="600" title="https://25681.devprov.mermsemr.com"></iframe>
<iframe style={{borderWidth: '0px;'}} src={productData?.internal_url ? productData?.internal_url : 'https://25681.devprov.mermsemr.com/'} width="100%" height="600" title={productData?.internal_url ? productData?.internal_url : 'https://25681.devprov.mermsemr.com/'}></iframe>
</div>
</div>
@@ -42,56 +51,29 @@ export default function ProductActive(){
<div className="card-body">
<div className="tab tab-vertical">
<ul className="nav nav-tabs" role="tablist">
<li className="nav-item">
<a className="nav-link active show" id="general-tab" data-bs-toggle="pill" data-bs-target="#general" type="button" role="tab" aria-controls="general" aria-selected="true">General</a>
</li>
<li className="nav-item">
<a className="nav-link" id="home-tab" data-bs-toggle="pill" data-bs-target="#home" type="button" role="tab" aria-controls="home" aria-selected="false">Home Page</a>
</li>
<li className="nav-item">
<a className="nav-link" id="footer-tab" data-bs-toggle="pill" data-bs-target="#footer" type="button" role="tab" aria-controls="footer" aria-selected="false">Footer</a>
</li>
<li className="nav-item">
<a className="nav-link" id="about-tab" data-bs-toggle="pill" data-bs-target="#about" type="button" role="tab" aria-controls="about" aria-selected="false">About Page</a>
</li>
<li className="nav-item">
<a className="nav-link" id="contact-tab" data-bs-toggle="pill" data-bs-target="#contact" type="button" role="tab" aria-controls="contact" aria-selected="true">Contact Page</a>
</li>
<li className="nav-item">
<a className="nav-link" id="social-tab" data-bs-toggle="pill" data-bs-target="#social" type="button" role="tab" aria-controls="social" aria-selected="false">Socials</a>
</li>
<li className="nav-item">
<a className="nav-link" id="template-tab" data-bs-toggle="pill" data-bs-target="#template" type="button" role="tab" aria-controls="template" aria-selected="false">Template</a>
</li>
<li className="nav-item">
<a className="nav-link" id="color-scheme-tab" data-bs-toggle="pill" data-bs-target="#color-scheme" type="button" role="tab" aria-controls="color-scheme" aria-selected="false">Color Scheme</a>
</li>
<>
{Object.entries(settingsObject).map(([key, value]) => (
<li className="nav-item">
<a className={`nav-link ${value.active}`}
id={key} data-bs-toggle="pill"
data-bs-target={`#${value.controls}`}
type="button" role="tab"
aria-controls={value.controls}
aria-selected="true">{value.title}</a>
</li>
))}
</>
</ul>
<div className="tab-content">
<div className="tab-pane fade show active" id="general" role="tabpanel" aria-labelledby="general-tab">
<GeneralTab name='General' />
</div>
<div className="tab-pane fade" id="home" role="tabpanel" aria-labelledby="home-tab">
<GeneralTab name='Home Page' />
</div>
<div className="tab-pane fade" id="footer" role="tabpanel" aria-labelledby="footer-tab">
<GeneralTab name='Footer' />
</div>
<div className="tab-pane fade" id="about" role="tabpanel" aria-labelledby="about-tab">
<GeneralTab name='About Page' />
</div>
<div className="tab-pane fade" id="contact" role="tabpanel" aria-labelledby="contact-tab">
<GeneralTab name='Contact Page' />
</div>
<div className="tab-pane fade" id="social" role="tabpanel" aria-labelledby="social-tab">
<GeneralTab name='Socials' />
</div>
<div className="tab-pane fade" id="template" role="tabpanel" aria-labelledby="template-tab">
<GeneralTab name='Template' />
</div>
<div className="tab-pane fade" id="color-scheme" role="tabpanel" aria-labelledby="color-scheme-tab">
<GeneralTab name='Color Scheme' />
</div>
<>
{Object.entries(settingsObject).map(([key, value]) => (
<div className={`tab-pane fade ${value.active}`}
id={value.controls} role="tabpanel"
aria-labelledby={key}>
<GeneralTab name={value.title} data={value.data} />
</div>
))}
</>
</div>
</div>
</div>
@@ -3,7 +3,7 @@ import React from 'react'
export default function GeneralTab({name='Full Name'}) {
return (
<div className="page-account-form">
<div className="p-4">
<div className="p-0">
<form>
<h4>{name}</h4>
<div className="form-row">
+5 -5
View File
@@ -588,11 +588,11 @@
left: 0px;
}
}
// .show{
// margin-top: 0!important;
// visibility: visible!important;
// opacity: 1!important;
// }
.show{
margin-top: 0!important;
visibility: visible!important;
opacity: 1!important;
}
// .show + .dropdown-menu{
// margin-top: 0;
// visibility: visible;