Compare commits

...

7 Commits

Author SHA1 Message Date
victorAnumudu ec11a7b5b3 started font matching 2025-06-29 14:43:04 +01:00
CHIEFSOFT\ameye 38c5717667 register 2025-06-28 20:46:19 -04:00
CHIEFSOFT\ameye 77eaf15c6a sign up url 2025-06-28 20:38:43 -04:00
CHIEFSOFT\ameye 60488524ed new logo 2025-06-28 00:42:52 -04:00
ameye 58cd232f91 Merge branch 'token-uid-payload' of MERMS/MermsPanelReactJS into master 2025-06-26 19:03:07 +00:00
victorAnumudu 9684e7fcfa added token and uid to all endpoints 2025-06-26 17:37:11 +01:00
ameye d4eda11477 Merge branch 'products-endpont' of MERMS/MermsPanelReactJS into master 2025-06-25 19:55:14 +00:00
7 changed files with 57 additions and 25 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 18 KiB

+7 -3
View File
@@ -22,10 +22,9 @@
}
.login-links a {
font-size: 15px;
font-weight: 700;
font-size: 14px;
padding: 0px 20px;
border-right: 2px solid;
border-right: 2px solid #6c757d;
cursor: pointer;
}
@@ -35,4 +34,9 @@
.login-links a:last-child{
border: 0px;
}
button{
font-size: 1rem!important;
font-weight: 700!important;
}
-1
View File
@@ -29,7 +29,6 @@ export default function Products() {
},[])
const products = getProductsData?.data?.data?.products_data // PRODUCTS DATA
console.log('PPP', products)
return (
<>
+1
View File
@@ -10,6 +10,7 @@ body {
outline:0;
background:$body;
color:$muted;
font-weight: $font-regular;
&.sidebar-mini {
.app-main {
padding-left:$sidebar-mini;
+1 -2
View File
@@ -39,8 +39,7 @@ h6 {
p {
color: $muted;
font-weight: $font-regular;
font-size: $font-base;
font-size: $font-18;
line-height: $line-md;
}
a {
+3 -3
View File
@@ -35,13 +35,13 @@ $container-max-widths: (
// Colors
$body : #f9f9fb;
$primary : #8E54E9;
$primary : #148399; //#8E54E9;
$primary2 : #4776E6;
$secondary : #a1a1a1;
$light-gray : #eceef3;
$dark-gray : #2c2e3e;
$darker-gray : #333333;
$muted : #a6a9b7;
$muted : #6c757d; //#a6a9b7;
$info : #45aaf2;
$danger : #e3324c;
$cyan : #2bcbba;
@@ -75,7 +75,7 @@ $behance : #053eff;
$whatsapp : #4FCE5D;
// Font family
$font-primary : 'Roboto', sans-serif;
$font-primary : 'Plus Jakarta Sans', sans-serif;
//Font size
+45 -16
View File
@@ -79,6 +79,8 @@ export const topBar = (reqData) => {
export const recentActions = (reqData) => {
let postData = {
...reqData,
token: localStorage.getItem('token'), // USER TOKEN
uid: localStorage.getItem('uid') // USER UID
}
//return getAuxEnd(`/panel/account/actions`)
return postAuxEnd(`/panel/account/actions`, postData, false)
@@ -94,9 +96,17 @@ export const productsData = (reqData) => {
// FUNCTION TO GET DASHBOARD PRODUCT URL DATA SECTION
export const productsURL = () => {
return getAuxEnd(`/panel/account/products/url`)
export const productsURL = (reqData) => {
let postData = {
...reqData,
token: localStorage.getItem('token'), // USER TOKEN
uid: localStorage.getItem('uid') // USER UID
}
return postAuxEnd(`/panel/account/products/url`, postData, false)
// return getAuxEnd(`/panel/account/products/url`)
}
// FUNCTION TO REGISTER USER
@@ -104,7 +114,7 @@ export const signUpUser = (reqData) => {
let postData = {
...reqData
}
return postAuxEnd('/panel/auth/register', postData, false)
return postAuxEnd('/panel/Register', postData, false)
}
// FUNCTION TO VERIFY EMAIL
@@ -112,7 +122,7 @@ export const verifyEmail = (reqData) => {
let postData = {
...reqData
}
return postAuxEnd('/panel/auth/register/verify', postData, false)
return postAuxEnd('/panel/Register/verify', postData, false)
}
// FUNCTION TO COMPLETE REGISTRATION
@@ -120,15 +130,17 @@ export const completeRegistration = (reqData) => {
let postData = {
...reqData
}
return postAuxEnd('/panel/auth/register/complete', postData, false)
return postAuxEnd('/panel/Register/complete', postData, false)
}
// FUNCTION TO SUBSCRIBE
export const subscribe = (reqData) => {
let postData = {
...reqData
...reqData,
token: localStorage.getItem('token'), // USER TOKEN
uid: localStorage.getItem('uid') // USER UID
}
return postAuxEnd('/panel/myproduct/subscription', postData, false)
return postAuxEnd(`/panel/myproduct/subscription`, postData, false)
}
@@ -141,27 +153,44 @@ export const recoverPWD = (reqData) => {
}
// FUNCTION TO GET CALENDAR EVENTS
export const getCalendarEvents = () => {
// return getAuxEnd(`/panel/account/calendar`)
export const getCalendarEvents = (reqData) => {
let postData = {
"a":"b"
...reqData,
token: localStorage.getItem('token'), // USER TOKEN
uid: localStorage.getItem('uid') // USER UID
}
return postAuxEnd(`/panel/account/calendar`, postData, false)
}
// FUNCTION TO GET MY PRODUCT PROVISION DATA
export const productProvision = (reqData) => {
const postData = { ...reqData }
return getAuxEnd(`/panel/myproduct/provision`, postData)
let postData = {
...reqData,
token: localStorage.getItem('token'), // USER TOKEN
uid: localStorage.getItem('uid') // USER UID
}
return postAuxEnd(`/panel/myproduct/provision`, postData, false)
// return getAuxEnd(`/panel/myproduct/provision`, postData)
}
// FUNCTION TO GET DASHBOARD PRODUCT DATA SECTION
export const contactData = () => {
return getAuxEnd(`/panel/contacts`)
export const contactData = (reqData) => {
let postData = {
...reqData,
token: localStorage.getItem('token'), // USER TOKEN
uid: localStorage.getItem('uid') // USER UID
}
return postAuxEnd(`/panel/contacts`, postData, false)
// return getAuxEnd(`/panel/contacts`)
}
export const MyProductData = (productID) => {
const reqData = { product_id : productID}
//console.log(reqData)
return getAuxEnd(`/panel/myproduct/dash`,reqData)
let postData = {
...reqData,
token: localStorage.getItem('token'), // USER TOKEN
uid: localStorage.getItem('uid') // USER UID
}
return postAuxEnd(`/panel/myproduct/dash`, postData, false)
// return getAuxEnd(`/panel/myproduct/dash`,reqData)
}