Compare commits

...

13 Commits

Author SHA1 Message Date
victorAnumudu d84c266653 fixed input fields 2025-07-26 21:17:23 +01:00
CHIEFSOFT\ameye b5a37c4cc5 calendar fix 2025-07-26 15:03:21 -04:00
CHIEFSOFT\ameye ddde4bd0d5 Added Site template layout 2025-07-26 13:10:05 -04:00
ameye bf9c6c8b32 Merge branch 'tab-control-fix' of MERMS/MermsPanelReactJS into master 2025-07-25 20:58:04 +00:00
victorAnumudu 14e588b0a9 fixed tab controls 2025-07-25 20:41:25 +01:00
CHIEFSOFT\ameye dde01ab79a Site data 2025-07-25 11:58:37 -04:00
ameye a5f1c4b5bb Merge branch 'iframe-bug-fix' of MERMS/MermsPanelReactJS into master 2025-07-24 20:20:16 +00:00
victorAnumudu a16dd7af24 fixed iframe bug 2025-07-24 21:16:48 +01:00
ameye 54d44e39d3 Merge branch 'internal-url' of MERMS/MermsPanelReactJS into master 2025-07-24 15:39:28 +00:00
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
7 changed files with 234 additions and 143 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
@@ -87,7 +87,7 @@ export default function Calendar(){
<div className="card card-statistics">
<div className="card-header">
<div className="card-heading">
<h4 className="card-title">Event Calendar</h4>
<h4 className="card-title">Events</h4>
</div>
</div>
<div className="card-body">
+2 -4
View File
@@ -58,7 +58,7 @@ export default function TopBar() {
let textColor = item?.description == 'Contacts' ? 'text-danger' : item?.description == 'Site Traffic' ? 'text-primary' : item?.description == 'Appointments' ? 'text-orange' : 'text-success'
return (
<div key={item.id + index} className="col-sm-6 col-xxl-3">
<div className="card card-statistics ecommerce-contant overflow-h">
<div className={`card card-statistics ecommerce-contant overflow-h ${item?.extra_style} `}>
<div className="card-body p-0">
<div className="d-flex m-b-0 ecommerce-contant-text h-100">
<div className="w-100">
@@ -68,9 +68,7 @@ export default function TopBar() {
<small className="d-block">{item?.data_span}</small>
</div>
<div className="col text-right">
<h5 className="text-muted mb-0">{item?.description}</h5>
<strong className={`${textColor} m-t-5`}><i
className="zmdi zmdi-long-arrow-up font-weight-bold"></i> N/A</strong>
<h5 className="text-muted mb-0"><a href={item?.link}>{item?.description}</a></h5>
</div>
</div>
<div className="apexchart-wrapper">
+137 -92
View File
@@ -1,10 +1,85 @@
import React from "react";
import React, { useRef, useState } from "react";
import getImage from "../../utils/getImage";
import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
import GeneralTab from "./settingsTab/GeneralTab";
import { useMutation } from "@tanstack/react-query";
import { productRefreshSite } from "../../services/services";
export default function ProductActive(){
export default function ProductActive({productData}){
const iframe = useRef()
const dataFields ={
site_title: { name: 'Title', controls: 'TEXT', active: true },
site_description: { name: 'Description', controls: 'TEXTAREA', active: true },
site_logo_text: { name: 'Logo Text', controls: 'TEXT', active: true },
site_contact_email: { name: 'Email', controls: 'TEXT', active: true },
site_contact_phone: { name: 'Phone', controls: 'TEXT', active: true },
}
const socialFields ={
facebook: { name: 'Facebook', controls: 'TEXT', active: true },
twitter: { name: 'Twitter', controls: 'TEXT', active: true },
youtube: { name: 'Youtube', controls: 'TEXT', active: true },
}
const homeFields ={
banner_text: { name: 'Banner Text', controls: 'TEXT', active: true },
banner_description: { name: 'Banner Description', controls: 'TEXTAREA', active: true },
}
const footerFields ={
footer_description: { name: 'Footer Description', controls: 'TEXTAREA', active: true },
}
const aboutFields ={
about_description: { name: 'About us', controls: 'TEXTAREA', active: true },
}
const templateData = {
template_16 : { title: 'Template Name-16', template_id: '02af24fd-2b1a-46ed-af21-87018e726408', banner: '/assets/img/file-icon/svg.png', active: '' },
template_22 : { title: 'Template Name-22', template_id: '8b296894-42e4-4f2e-abd1-7c2a38d6e07b', banner: '/assets/img/file-icon/svg.png', active: '' },
template_47 : { title: 'Template Name-47', template_id: 'ef2ffa1c-9272-42cd-9d33-0e614047b4f8', banner: '/assets/img/file-icon/svg.png', active: '' },
template_25 : { title: 'Template Name-25', template_id: 'b3a7ba31-dc47-4a40-a5cc-fd1ff27d6b78', banner: '/assets/img/file-icon/svg.png', active: '' },
template_49 : { title: 'Template Name-49', template_id: '60959c69-6672-4f69-a006-eeb7d210e605', banner: '/assets/img/file-icon/svg.png', active: '' },
template_27 : { title: 'Template Name-27', template_id: 'e4acb98a-c584-45f2-bece-af677dcf0a1f', banner: '/assets/img/file-icon/svg.png', active: '' },
template_51 : { title: 'Template Name-51', template_id: '975ee42e-3169-4978-92d7-d28e7e2ac014', banner: '/assets/img/file-icon/svg.png', active: '' },
template_9 : { title: 'Template Name-9', template_id: 'fc8f0738-6500-4775-9895-2047cd275302', banner: '/assets/img/file-icon/svg.png', active: '' },
}
const settingsObject = {
settings: { title: 'Settings', controls: 'settings', active: 'active show' , custom: false, data: dataFields},
home_tab: { title: 'Home Page', controls: 'home', active: '', custom: false, data: homeFields},
footer_tab: { title: 'Footer', controls: 'footer', active: '', custom: false, data: footerFields },
about_tab: { title: 'About Page', controls: 'about', active: '', custom: false, data: aboutFields },
contact_tab: { title: 'Contact Page', controls: 'contact', active: '', custom: false, data: {} },
social_tab: { title: 'Socials', controls: 'social', active: '', custom: false, data: socialFields },
template_tab: { title: 'Template', controls: 'template', active: '', custom: true, data: templateData },
color_scheme_tab: { title: 'Color Scheme', controls: 'color-scheme', active: '', custom: true, data: {} },
};
const [activeTab, setActiveTab] = useState(Object.entries(settingsObject)[0][1]?.controls)
const refresh = useMutation({
mutationFn: (fields) => {
return productRefreshSite(fields)
},
onSuccess: (res) => {
iframe.current.src += ''
}
})
const handleRefresh = () => {
const reqData = {
token: localStorage.getItem('token'), // USER TOKEN
uid: localStorage.getItem('uid'), // USER UID
product_id: productData.product_id,
subscription_uid: productData.subscription_uid
}
refresh.mutate(reqData)
}
let externalUrl= 'https://'+productData?.internal_url
return(
<>
@@ -15,101 +90,71 @@ export default function ProductActive(){
<div className="row account-contant">
<>
<div className="row tabs-contant">
<div className="col-xxl-6">
<div className="card card-statistics">
<div className="card-header">
<div className="card-heading">
<h4 className="card-title">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>
</div>
</div>
</div>
<div className="col-xxl-6">
<div className="card card-statistics">
<div className="card-header">
<div className="card-heading">
<h4 className="card-title"> Site Settings </h4>
</div>
</div>
<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>
</ul>
<div className="tab-content">
<div className="tab-pane fade show active" id="general" role="tabpanel" aria-labelledby="general-tab">
<GeneralTab name='General' />
<>
<div className="row tabs-contant">
<div className="col-xxl-6">
<div className="card card-statistics">
<div className="card-header">
<div className="card-heading d-flex justify-content-between">
<h4 className="card-title">{externalUrl}</h4>
<button type="button" onClick={()=>iframe.current.src += ''} className="btn btn-primary">IC</button>
</div>
</div>
<div className="card-body">
<iframe ref={iframe} style={{borderWidth: '0px'}} src={externalUrl} width="100%" height="600" title={externalUrl}></iframe>
</div>
<div className="p-4 ml-auto">
<button type="button" onClick={handleRefresh} className="btn btn-primary">{refresh.isPending ? 'Loading...' : 'Refresh Site'}
</button>
</div>
</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>
<div className="col-xxl-6">
<div className="card card-statistics">
<div className="card-header">
<div className="card-heading">
<h4 className="card-title"> Site Settings </h4>
</div>
</div>
<div className="card-body">
<div className="tab tab-vertical">
<ul className="nav nav-tabs" role="tablist">
<>
{Object.entries(settingsObject).map(([key, value]) => (
<li key={key} className="nav-item">
<a className={`nav-link ${activeTab == value.controls && 'active show'}`}
id={key} data-bs-toggle="pill"
// data-bs-target={`#${value.controls}`}
type="button" role="tab"
// aria-controls={value.controls}
// aria-selected="true"
onClick={()=>setActiveTab(value.controls)}
>
{value.title}
</a>
</li>
))}
</>
</ul>
<div className="tab-content">
<>
{Object.entries(settingsObject).map(([key, value]) => (
<div key={key} className={`tab-pane fade ${activeTab == value.controls && 'active show'}`}
// id={value.controls} role="tabpanel"
// aria-labelledby={key}
>
<GeneralTab name={value.title} data={value.data} isCustom={value.custom} productData={productData} />
</div>
))}
</>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</>
</div>
</div>
</div>
</>
</div>
</>
)
}
@@ -1,49 +1,57 @@
import React from 'react'
import React, {memo, useState} from 'react'
import SiteTemplateSelector from './SiteTemplateSelector';
export default function GeneralTab({name='Full Name'}) {
return (
<div className="page-account-form">
<div className="p-4">
<form>
<h4>{name}</h4>
<div className="form-row">
<div className="form-group col-md-12">
<label htmlFor="name1">Full Name</label>
<input type="text" className="form-control" id="name1"
value="Alice Williams" />
</div>
<div className="form-group col-md-12">
<label htmlFor="title1">Title</label>
<input type="text" className="form-control" id="title1"
value="Marketing expert" />
</div>
<div className="form-group col-md-12">
<label htmlFor="phone1">Phone Number</label>
<input type="text" className="form-control" id="phone1"
value="(01) 97 563 15613" />
</div>
<div className="form-group col-md-12">
<label htmlFor="email1">Email</label>
<input type="email" className="form-control" id="email1"
value="alicewilliams@gmail.com" />
</div>
</div>
<div className="form-group">
<label htmlFor="add1">Address</label>
<input type="text" className="form-control" id="add1"
value="17504 Carlton Cuevas Rd, Gulfport, MS, 39503" />
</div>
<div className="form-group">
<label htmlFor="add2">Address 2</label>
<input type="text" className="form-control" id="add2"
value="1234 North Avenue Luke Lane, South Bend, IN 360001" />
</div>
const GeneralTab = memo(({name='Full Name', data, isCustom, productData}) =>{
console.log("Page data == ", data)
const fieldData = {}
Object.entries(data)?.forEach(([key, value]) => { // LOOP TO POPULATE FIELDDATA PROPERTIES WITH DATA OF EACH TAB
fieldData[value.name] = ''
})
const [fields, setFields] = useState(fieldData)
const handleChange = ({target:{name, value}}) => {
setFields(prev => ({...prev, [name]:value}))
}
const handleSubmit = () => {
console.log('formInfo', fields)
}
if (isCustom === true){
return <SiteTemplateSelector name={name} data={data} isCustom={isCustom} productData={productData} />
}
<button type="submit" className="btn btn-primary">Update Information
</button>
</form>
return (
<div className="page-account-form">
<div className="p-0" style={{ minHeight: '500px'}}>
<form id='tab_form'>
<div className="form-row">
<>
{Object.entries(data)?.map(([key, value]) => (
<div key={key} className="form-group col-md-12">
<label htmlFor="name1">{value.name}</label>
{value.controls == 'TEXT' ?
<input name={value.name} type="text" className="form-control" id={key} value={fields[value.name]} onChange={handleChange} />
:value.controls == 'TEXTAREA' ?
<textarea name={value.name} rows={5} style={{resize: 'none'}} type="text" className="form-control" id={key} value={fields[value.name]} onChange={handleChange} />
:
null
}
</div>
))}
</>
<div className="form-group col-md-12" style={{textAlign:'right'}}>
<button onClick={handleSubmit} type="button" className="btn btn-primary">Update</button>
</div>
</div>
</form>
</div>
</div>
</div>
)
}
)
}
)
export default GeneralTab
@@ -0,0 +1,32 @@
import React, {memo} from 'react'
const SiteTemplateSelector = memo(({name='Full Name', data}) =>{
console.log("Page data == ", data)
return (
<div className="page-account-form">
<div className="p-0">
<div className="row">
<>
{Object.entries(data)?.map(([key, value]) => (
<div key={key} className="col-xl-6 col-sm-6">
<div className="card card-statistics">
<div className="card-body">
<div className="text-center p-2">
<div className="mb-2">
<img src={value.banner} alt={value.title} />
</div>
<h4 className="mb-0">{value.title}</h4>
<a href="javascript:void(0)" className="btn btn-light">Activate</a>
</div>
</div>
</div>
</div>
))}
</>
</div>
</div>
</div>
)
}
)
export default SiteTemplateSelector
+8
View File
@@ -115,6 +115,14 @@ export const productsData = (reqData) => {
return postAuxEnd(`/panel/account/products`, postData, false)
}
// FUNCTION TO REFRESH SITE
export const productRefreshSite = (reqData) => {
let postData = {
...reqData,
}
return postAuxEnd(`/panel/account/products/refresh`, postData, false)
}
// FUNCTION TO GET DASHBOARD RECENT ACTIONS SECTION
export const recentActions = (reqData) => {
let postData = {