Compare commits

...

9 Commits

Author SHA1 Message Date
victorAnumudu 51a3c60590 bug fix 2025-07-10 09:05:30 +01:00
victorAnumudu ab597039ba updated complete signup endpoint 2025-07-10 08:59:20 +01:00
victorAnumudu 6fd2dcdb3d updated signup payload 2025-07-10 08:54:41 +01:00
victorAnumudu c8fe2eadf6 removed isChecked value 2025-07-08 19:23:51 +01:00
ameye 1e174b7432 Merge branch 'provision-bug' of MERMS/MermsPanelReactJS into master 2025-07-08 15:59:27 +00:00
victorAnumudu dda8fa7d30 fixed bug 2025-07-08 16:53:36 +01:00
ameye d0f1d5ee34 Merge branch 'product-url' of MERMS/MermsPanelReactJS into master 2025-07-08 14:24:05 +00:00
ameye a0e417fc68 Merge branch 'help-page' of MERMS/MermsPanelReactJS into master 2025-07-08 09:02:20 +00:00
victorAnumudu 10e65fa6ff added dummy help page 2025-07-07 19:56:45 +01:00
11 changed files with 111 additions and 33 deletions
+8
View File
@@ -39,4 +39,12 @@
button{
font-size: 1rem!important;
font-weight: 700!important;
}
.font-600 {
font-weight: 600;
}
.accordion-button, .accordion-button:not(.collapsed) {
background-color: transparent!important;
}
+16 -11
View File
@@ -1,23 +1,28 @@
import { QueryClientProvider, QueryClient } from '@tanstack/react-query'
import { Provider } from 'react-redux';
import store from './store/store'
import AppRouters from './AppRouters';
import './App.css';
function App() {
const queryClient = new QueryClient({
defaultOptions: {
queries: {
refetchOnWindowFocus: false,
retry: 3,
// refetchOnMount: false,
staleTime: Infinity // can also be a number in millisecond
},
const queryClient = new QueryClient({
defaultOptions: {
queries: {
refetchOnWindowFocus: false,
retry: 3,
// refetchOnMount: false,
staleTime: 360000 // can also be a number in millisecond
},
})
},
})
function App() {
return (
<QueryClientProvider client={queryClient}>
<AppRouters />
<Provider store={store}>
<AppRouters />
</Provider>
</QueryClientProvider>
);
}
+2
View File
@@ -18,6 +18,7 @@ import SettingsPage from './views/SettingsPage'
import ProductPage from './views/ProductPage'
import SocketIOContextProvider from './component/context/SocketIOContext';
import CSignupPage from './views/CSignupPage';
import HelpPage from './views/HelpPage';
function AppRouters() {
return (
@@ -45,6 +46,7 @@ function AppRouters() {
<Route path={siteLinks.user} element={<UserPage />} />
<Route path={siteLinks.calendar} element={<CalendarPage />} />
<Route path={siteLinks.settings} element={<SettingsPage />} />
<Route path={siteLinks.help} element={<HelpPage />} />
</Route>
</Route>
</Route>
+16 -8
View File
@@ -1,11 +1,13 @@
import React, { useEffect, useState } from 'react'
import { Form, Formik } from "formik";
import * as Yup from "yup";
import { useDispatch } from 'react-redux'
import { Link, useNavigate, useParams } from 'react-router-dom'
import siteLinks from '../../links/siteLinks'
import { useMutation } from '@tanstack/react-query';
import { completeRegistration, verifyEmail } from '../../services/services';
import { updateUserDetails } from '../../store/UserDetails'
import { IoMdArrowDropdown } from "react-icons/io";
@@ -29,6 +31,8 @@ export default function CSignup() {
const {jwt} = useParams()
const dispatch = useDispatch()
const navigate = useNavigate()
const [user, setUser] = useState(null)
@@ -51,15 +55,19 @@ export default function CSignup() {
return completeRegistration(fields)
},
onSuccess: (res) => {
const {token, room} = res?.data?.data
if(token){
localStorage.setItem('token', token)
localStorage.setItem('room', room)
// const data = {token}
// dispatch(updateUserDetails({ ...data }));
navigate('/dash') // later add redux to dispatch state
if(res?.data?.resultCode != '0'){
throw({message: res?.data?.resultDescription})
}
}
const {token, room, uid} = res?.data
if(!token || !room){
throw({message: 'something went wrong, try again!'})
}
localStorage.setItem('token', token)
localStorage.setItem('room', room)
localStorage.setItem('uid', uid)
dispatch(updateUserDetails({ ...res?.data }));
navigate('/dash') // later add redux to dispatch state
},
// onError: (err) => {
// console.log('err', err)
// }
+1
View File
@@ -49,6 +49,7 @@ export default function Signup2() {
const signUp = (values) => {
// helpers.resetForm()
// console.log('values', values, helpers)
delete values.isChecked
mutation.mutate(values)
}
+48
View File
@@ -0,0 +1,48 @@
import React from "react";
import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
export default function HelpCom(){
return(
<>
<BreadcrumbComBS title='Frequesntly Asked Questions' paths={['Dashboard', 'Help']} />
{/*<div className="row">*/}
{/* <div className="vh-100 col-12 flex align-items-center">Coming Soon</div>*/}
{/*</div>*/}
<div className="row account-contant">
<div className="col-12">
<div className="card card-statistics">
<div className="card-body p-lg-15" style={{backgroundColor:"#f9f9fb"}}>
<p className="mb-4">First, a disclaimer the entire process of writing a blog post often takes more than a couple of hours, even if you can type eighty words as per minute and your writing skills are sharp.</p>
<div className="row">
<div className="accordion" id="accordionExample">
{['a', 'b', 'c', 'd'].map((item, index)=>{
return (
<div className="accordion-item">
<h2 className="accordion-header">
<button className="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target={`#${item}`} aria-expanded="true" aria-controls="collapseOne">
{`Accordion Item ${item} 1`}
</button>
</h2>
<div id={item} className={`accordion-collapse collapse ${index == 0 && 'show'}`} data-bs-parent="#accordionExample">
<div className="accordion-body">
<strong>This is the first items accordion body.</strong> It is shown by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions. You can modify any of this with custom CSS or overriding our default variables. Its also worth noting that just about any HTML can go within the accordion-body, though the transition does limit overflow.
</div>
</div>
</div>
)
})}
</div>
</div>
</div>
</div>
</div>
</div>
</>
)
}
@@ -74,8 +74,8 @@ export default function UserHeader(){
<div className="bg-gradient px-4 py-3">
<div className="d-flex align-items-center justify-content-between">
<div className="mr-1">
<h5 className="text-white mb-0">{userDetails?.firstname} {userDetails?.lastname}</h5>
<small className="text-white">{userDetails.email}</small>
<h4 className="text-white mb-0 font-600">{userDetails?.firstname} {userDetails?.lastname}</h4>
<p className="text-white font-600">{userDetails.email}</p>
</div>
<a href="#" onClick={logout} className="text-white font-20 tooltip-wrapper" data-toggle="tooltip"
data-placement="top" title="" data-original-title="Logout"> <i
@@ -92,8 +92,10 @@ export default function UserHeader(){
<Link className="dropdown-item d-flex nav-link" to={siteLinks.settings}>
<i className=" ti ti-settings pr-2 text-info"></i> Settings
</Link>
<a className="dropdown-item d-flex nav-link" href="#">
<i className="fa fa-compass pr-2 text-warning"></i> Need help?</a>
<Link className="dropdown-item d-flex nav-link" to={siteLinks.help}>
<i className="fa fa-compass pr-2 text-warning"></i>
Need help?
</Link>
{/*<div className="row mt-2">*/}
{/* <div className="col">*/}
+3 -5
View File
@@ -25,7 +25,7 @@ export default function ProductProvision(props){
queryFn: () => productProvision(reqData)
})
const provisionData = provision?.data?.provision
const provisionData = provision?.data
useEffect(()=>{
joinRoom(productSubUID); // provision subscription room
@@ -60,7 +60,7 @@ export default function ProductProvision(props){
<div className="card-body">
<div className="progress">
<div className="progress-bar progress-bar-striped progress-bar-animated" role="progressbar"
aria-valuenow={`${provisionData.percent_completed}%`} aria-valuemin="0" aria-valuemax="100" style={{width:`${provisionData.percent_completed}%`}} ></div>
aria-valuenow={`${provisionData?.percent_completed}%`} aria-valuemin="0" aria-valuemax="100" style={{width:`${provisionData?.percent_completed}%`}} ></div>
</div>
</div>
</div>
@@ -111,9 +111,7 @@ export default function ProductProvision(props){
<h4 className="card-title" style={{padding:'10px'}}>Started creating your selection</h4>
<img className="card-img-top" src={getImage('widget/working.jpg')} alt="Card image cap" />
<div className="card-body">
<p>
{productDescription}
</p>
<div className="" dangerouslySetInnerHTML={{__html: productDescription}}/>
</div>
</div>
+3 -5
View File
@@ -1,9 +1,9 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
// import './index.css';
import { Provider } from 'react-redux';
// import { Provider } from 'react-redux';
// import store from './store/store'
import { BrowserRouter } from 'react-router-dom';
import store from './store/store'
import App from './App';
//import reportWebVitals from './reportWebVitals';
@@ -17,9 +17,7 @@ const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
<React.StrictMode>
<BrowserRouter>
<Provider store={store}>
<App />
</Provider>
<App />
</BrowserRouter>
</React.StrictMode>
);
+1
View File
@@ -1,5 +1,6 @@
const siteLinks = {
error: '*',
help: '/help',
home: '/',
dash: '/dash',
product: '/product/*',
+7
View File
@@ -0,0 +1,7 @@
import HelpCom from '../component/help/HelpCom'
export default function HelpPage() {
return (
<HelpCom />
)
}