style changes

.env

@@ -19,3 +19,11 @@ REACT_APP_TIMEOUT=600000
 # show download button
 REACT_APP_SHOW_DOWNLOAD=0
 
+REACT_APP_DNS1='dns1.mermsemr.net'
+REACT_APP_DNS2='dns1.mermsemr.net'
+REACT_APP_DNS_LINK='https://qa-www.mermsemr.com/info/dns'
+
+
+#CLOUDFLARE
+REACT_APP_TURNSTILE_SITE_KEY=0x4AAAAAADQV82wuocFR-u5O
+

.env.development

@@ -20,3 +20,10 @@ REACT_APP_TIMEOUT=600000
 # show download button
 REACT_APP_SHOW_DOWNLOAD=0
 
+REACT_APP_DNS1='dns1.mermsemr.net'
+REACT_APP_DNS2='dns1.mermsemr.net'
+REACT_APP_DNS_LINK='https://qa-www.mermsemr.com/info/dns'
+
+#CLOUDFLARE
+REACT_APP_TURNSTILE_SITE_KEY=0x4AAAAAADQV82wuocFR-u5O
+

.env.production

@@ -18,3 +18,11 @@ REACT_APP_TIMEOUT=600000
 
 # show download button
 REACT_APP_SHOW_DOWNLOAD=0
+
+REACT_APP_DNS1='dns1.mermsemr.net'
+REACT_APP_DNS2='dns1.mermsemr.net'
+REACT_APP_DNS_LINK='https://www.mermsemr.com/info/dns'
+
+#CLOUDFLARE
+REACT_APP_TURNSTILE_SITE_KEY=0x4AAAAAADQV82wuocFR-u5O
+

.env.qa

@@ -15,3 +15,11 @@ REACT_APP_TERMS_LINK='https://qa-www.mermsemr.com/terms'
 
 # Inactivity timeout/logout AT 10MINS
 REACT_APP_TIMEOUT=600000
+
+REACT_APP_DNS1='dns1.mermsemr.net'
+REACT_APP_DNS2='dns1.mermsemr.net'
+REACT_APP_DNS_LINK='https://qa-www.mermsemr.com/info/dns'
+
+#CLOUDFLARE
+REACT_APP_TURNSTILE_SITE_KEY=0x4AAAAAADQV82wuocFR-u5O
+

docker-compose.yml

@@ -1,12 +1,12 @@
-version: '3'
+# version: '3'
 services:
   merms-panel:
-    image: registry.chiefsoft.net/merms-panel-reactjs:latest
+    # image: registry.chiefsoft.net/merms-panel-reactjs:latest
     build:
       context: .
       dockerfile: docker/Dockerfile
-      args:
+      # args:
-        - NODE_ENV=development
+      #   - NODE_ENV=development
     restart: unless-stopped
     ports:
       - 8090:3000

docker/Dockerfile

@@ -1,12 +1,12 @@
 # pull the base image
 # FROM node:alpine
 
-FROM alpine:3.15
+FROM alpine:3.22
 
 # Build args
 ARG NODE_ENV
 
-ENV NODE_VERSION 14.19.0
+ENV NODE_VERSION=14.19.0
 ENV NODE_ENV=$NODE_ENV
 
 # install nginx
@@ -82,26 +82,26 @@ RUN addgroup -g 1000 node \
   && node --version \
   && npm --version
 
-ENV YARN_VERSION 1.22.17
+# ENV YARN_VERSION 1.22.17
 
-RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
+# RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
-  && for key in \
+#   && for key in \
-    6A010C5166006599AA17F08146C2130DFD2497F5 \
+#     6A010C5166006599AA17F08146C2130DFD2497F5 \
-  ; do \
+#   ; do \
-    gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
+#     gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
-    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
+#     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
-  done \
+#   done \
-  && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
+#   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
-  && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
+#   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
-  && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+#   && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
-  && mkdir -p /opt \
+#   && mkdir -p /opt \
-  && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
+#   && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
-  && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+#   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-  && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
+#   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
-  && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+#   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
-  && apk del .build-deps-yarn \
+#   && apk del .build-deps-yarn \
-  # smoke test
+#   # smoke test
-  && yarn --version
+#   && yarn --version
 
 # set working directory
 # WORKDIR /app
@@ -109,7 +109,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
 
 # add `/app/node_modules/.bin` to $PATH
 # ENV PATH /app/node_modules/.bin:$PATH
-  ENV PATH /usr/src/app/node_modules/.bin:$PATH
+  ENV PATH=/usr/src/app/node_modules/.bin:$PATH
 
   COPY nginx.conf ./
 

package.json

@@ -8,6 +8,7 @@
     "@fullcalendar/interaction": "^6.1.15",
     "@fullcalendar/react": "^6.1.15",
     "@fullcalendar/timegrid": "^6.1.15",
+    "@marsidev/react-turnstile": "^1.5.2",
     "@popperjs/core": "^2.11.8",
     "@reduxjs/toolkit": "^2.4.0",
     "@stripe/react-stripe-js": "^3.9.1",

src/component/auth/CSignup.jsx

@@ -56,7 +56,7 @@ export default function CSignup() {
     },
     onSuccess: (res) => {
         if(res?.data?.resultCode != '0'){
-            throw({message: res?.data?.resultDescription})
+            throw({message: res?.data?.error_message})
         }
         const {token, room, uid} = res?.data
         if(!token || !room){

src/component/auth/Forgetpwd2.jsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { Form, Formik } from "formik";
+import { Turnstile } from '@marsidev/react-turnstile'
 import * as Yup from "yup";
 // import LoginImg from '../../assets/bg/login.svg'
 
@@ -17,13 +18,14 @@ const validationSchema = Yup.object().shape({
     //     /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/,
     //     "Invalid email format"
     //   )
-      .min(3, "Minimum 3 characters")
+      .min(3, "Username must be at least 3 characters")
-      .max(25, "Maximum 25 characters")
+      .max(25, "Entered Username is too long")
-      .required("Email is required"),
+      .required("Enter a valid username to continue"),
   })
 
   const initialValues = {
-    username: ''
+    username: '',
+    turnstileToken: ''
   };
 
 export default function Forgetpwd2() {
@@ -77,8 +79,18 @@ export default function Forgetpwd2() {
                                                             </div>
                                                             </>
                                                             }
+
+                                                            <div className="text-center col-12 mt-3">
+                                                                <Turnstile
+                                                                    siteKey={process.env.REACT_APP_TURNSTILE_SITE_KEY}      
+                                                                    onSuccess={(token) => props.setFieldValue('turnstileToken', token)}
+                                                                    onExpire={() => props.setFieldValue('turnstileToken', null)}
+                                                                    onError={() => props.setFieldValue('turnstileToken', null)}
+                                                                />  
+                                                            </div>
+                                                            
                                                             <div className="col-12 mt-3 text-end">
-                                                                <button type='submit' className="btn btn-primary text-uppercase">{mutation.isPending ? 'loading...' : 'Send'}</button>
+                                                                <button type='submit' disabled={!props.values.turnstileToken || mutation.isPending} className="btn btn-primary text-uppercase">{mutation.isPending ? 'loading...' : 'Send'}</button>
                                                             </div>
                                                         </>
                                                     :

src/component/auth/Login2.jsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react'
 import { useMutation } from '@tanstack/react-query'
 import { useDispatch, useSelector } from 'react-redux'
+import { Turnstile } from '@marsidev/react-turnstile'
 
 // import LoginImg from '../../assets/bg/login.svg'
 
@@ -26,6 +27,8 @@ export default function Login() {
     remember: false
   })
 
+  const [turnstileToken, setTurnstileToken] = useState(null)
+
   const handleChange = ({target:{name, value}}) => {
     if(name == 'remember'){
         return setFields(prev => ({...prev, remember:!prev.remember}))
@@ -34,13 +37,13 @@ export default function Login() {
   }
 
   const login = useMutation({
-    mutationFn: (fields) => {
+    mutationFn: ({ turnstileToken, ...fields }) => {
         if(!fields.username || !fields.password){
             throw new Error('Please provide all fields marked *')
         }
-        rememberMe(fields.remember) // FUNCTION TO SAVE USERNAME OF THE USER TO LOCAL STORAGE
+        rememberMe(fields.remember)
-        delete fields.remember // REMOVING REMEMBER FROM THE PAYLOAD
+        delete fields.remember
-        return loginUser(fields)
+        return loginUser({ ...fields, turnstileToken })
     },
     onError: (error) => {
         console.log(error)
@@ -69,7 +72,7 @@ export default function Login() {
     }
   }
 
-  useEffect(()=>{ // NAVIGATES USER TO HOME PAGE IF USER IS ACTIVE
+  useEffect(()=>{ // NAVIGATES USER TO HOME PAGE IF USER IS CURRENTLY ACTIVE
     if(loggedIn){
         navigate(siteLinks.dash)
     }
@@ -101,6 +104,14 @@ export default function Login() {
                                                         <input maxLength={25} name='password' value={fields.password} onChange={handleChange} type="password" className="form-control" placeholder="Password" />
                                                     </div>
                                                 </div>
+                                                <div className="text-center col-12 mt-3">
+                                                    <Turnstile
+                                                        siteKey={process.env.REACT_APP_TURNSTILE_SITE_KEY}
+                                                        onSuccess={setTurnstileToken}
+                                                        onExpire={() => setTurnstileToken(null)}
+                                                        onError={() => setTurnstileToken(null)}
+                                                    />
+                                                </div>
                                                 <div className="col-12">
                                                     <div className="d-block d-sm-flex  align-items-center">
                                                         <div className="form-check">
@@ -120,12 +131,12 @@ export default function Login() {
                                                 </>
                                                 }
                                                 <div className="col-12 mt-3 text-end">
-                                                    <button type='button' onClick={()=>{login.mutate(fields)}} className="btn btn-primary text-uppercase">{login.isPending ? 'loading...' : 'Sign In'}</button>
+                                                    <button type='button' onClick={()=>{login.mutate({...fields, turnstileToken})}} disabled={!turnstileToken || login.isPending} className="btn btn-primary text-uppercase">{login.isPending ? 'loading...' : 'Sign In'}</button>
                                                 </div>
                                                 <div className="col-12  mt-3">
                                                     <p> <Link to={siteLinks.signup}>
                                                         {/*<span style={{fontWeight: 'bolder'}}>Sign Up</span>*/}
-                                                        <button className="btn btn-warning text-uppercase">
+                                                        <button type='button' className="btn btn-warning text-uppercase">
                                                             Sign Up
                                                         </button>
                                                     </Link><span style={{paddingLeft: '5px' , fontWeight: 'bolder'}}> if you don't have an account yet.</span></p>

src/component/auth/Signup2.jsx

@@ -1,5 +1,6 @@
 import React, {useState} from 'react'
 import {Form, Formik} from "formik";
+import { Turnstile } from '@marsidev/react-turnstile'
 import * as Yup from "yup";
 
 // import LoginImg from '../../assets/bg/login.svg'
@@ -33,6 +34,7 @@ const initialValues = {
     firstname: '',
     lastname: '',
     isChecked: false,
+    turnstileToken: '',
     // username: '',
     // password: ''
 };
@@ -135,7 +137,15 @@ export default function Signup2() {
                                                                                        onChange={props.handleChange}/>
                                                                                 <label className="form-check-label"
                                                                                        htmlFor="gridCheck">
-                                                                                    I accept terms & policy
+                                                                                   I accept{" "}
+                                                                                    <a
+                                                                                        href={process.env.REACT_APP_TERMS_LINK}
+                                                                                        target="_blank"
+                                                                                        rel="noopener noreferrer"
+                                                                                        onClick={(e) => e.stopPropagation()}
+                                                                                    >
+                                                                                        terms & policy
+                                                                                    </a>
                                                                                 </label>
                                                                             </div>
                                                                             <span
@@ -149,9 +159,17 @@ export default function Signup2() {
                                                                                 </div>
                                                                             </>
                                                                         }
-
+                                                                        <div className="text-center col-12 mt-3">
+                                                                            <Turnstile
+                                                                                siteKey={process.env.REACT_APP_TURNSTILE_SITE_KEY}      
+                                                                                onSuccess={(token) => props.setFieldValue('turnstileToken', token)}
+                                                                                onExpire={() => props.setFieldValue('turnstileToken', null)}
+                                                                                onError={() => props.setFieldValue('turnstileToken', null)}
+                                                                            />  
+                                                                        </div>
                                                                         <div className="col-12 mt-3 text-end">
                                                                             <button type='submit'
+                                                                                    disabled={!props.values.turnstileToken || mutation.isPending}
                                                                                     className="btn btn-primary text-uppercase">{mutation.isPending ? 'loading...' : 'Sign up'}</button>
                                                                         </div>
                                                                     </>

src/component/comments/Comments.js

@@ -2,10 +2,10 @@
 import React, { useEffect, useState } from "react";
 import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
 import getImage from "../../utils/getImage";
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation } from "@tanstack/react-query";
 import { commentsData } from "../../services/services";
-import queryKeys from "../../services/queryKeys";
+// import queryKeys from "../../services/queryKeys";
-import getCustomTime from "../../utils/getCustomTime";
+// import getCustomTime from "../../utils/getCustomTime";
 
 export default function Comments() {
   // const {data:contacts, isFetching, isError, error} = useQuery({
@@ -197,8 +197,13 @@ export default function Comments() {
                       </div>
                     </div>
                   </div>
-                      <div className={`${filteredContactData.length > 0 ? 'col-md-8 col-xxl-4' : 'col-md-8 col-xxl-10'} border-md-t`}>
+                  <div
-                        <div className="mail-content  border-right border-n h-100" style={{placeContent: 'center'}}>
+                    className={`${filteredContactData.length > 0 ? "col-md-8 col-xxl-4" : "col-md-8 col-xxl-10"} border-md-t`}
+                  >
+                    <div
+                      className="mail-content  border-right border-n h-100"
+                      style={{ placeContent: "center" }}
+                    >
                       {/* <div className="mail-search border-bottom">
                         <div className="row align-items-center mx-0">
                           <div className="col-12">
@@ -210,7 +215,7 @@ export default function Comments() {
                         </div>
                       </div> */}
                       <div className="mail-msg scrollbar scroll_dark">
-                            { filteredContactData.length ?
+                        {filteredContactData.length ? (
                           filteredContactData?.map((contact, index) => {
                             const isActive =
                               contact?.uid == activeContactUID ||
@@ -255,7 +260,7 @@ export default function Comments() {
                                         <p className="d-none d-xl-block">
                                           <span style={{ fontSize: "14px" }}>
                                             {new Date(
-                                                contact?.added
+                                              contact?.added,
                                             ).toDateString()}
                                           </span>
                                         </p>
@@ -272,7 +277,7 @@ export default function Comments() {
                                       <p className="d-xl-none">
                                         <span>
                                           {new Date(
-                                              contact?.added
+                                            contact?.added,
                                           ).toDateString()}
                                           {/* {getCustomTime(contact.added)} */}
                                         </span>
@@ -283,19 +288,36 @@ export default function Comments() {
                               </div>
                             );
                           })
-                                :
+                        ) : (
-                                <p className="text-center">Messages will appear here as soon as they are available for selection</p>
+                          <p className="text-center">
-                            }
+                            Messages will appear here as soon as they are
+                            available for selection
+                          </p>
+                        )}
                       </div>
                     </div>
                   </div>
-                      {filteredContactData.length > 0 &&
+                  {filteredContactData.length > 0 && (
                     <div className="col-xxl-6 border-t border-xxl-t">
                       <div className="mail-chat py-5 px-5">
                         <div className="media align-items-center">
                           <div className="bg-img mr-3">
                             <img
-                                      src={activeContactUID ? getImage("avtar/" + activeDetail[0].category + ".png") : getImage(filteredContactData[0] == undefined ? "avtar/01.jpg": "avtar/" + filteredContactData[0].category + ".png")}
+                              src={
+                                activeContactUID
+                                  ? getImage(
+                                      "avtar/" +
+                                        activeDetail[0].category +
+                                        ".png",
+                                    )
+                                  : getImage(
+                                      filteredContactData[0] == undefined
+                                        ? "avtar/01.jpg"
+                                        : "avtar/" +
+                                            filteredContactData[0].category +
+                                            ".png",
+                                    )
+                              }
                               className="img-fluid"
                               alt="user"
                             />
@@ -308,9 +330,11 @@ export default function Comments() {
                             </h4>
                             <p>
                               {activeContactUID
-                                        ? new Date(activeDetail[0]?.added).toDateString()
+                                ? new Date(
+                                    activeDetail[0]?.added,
+                                  ).toDateString()
                                 : new Date(
-                                            filteredContactData[0]?.added
+                                    filteredContactData[0]?.added,
                                   ).toDateString()}
                             </p>
                           </div>
@@ -337,7 +361,7 @@ export default function Comments() {
                         </div>
                       </div>
                     </div>
-                      }
+                  )}
                 </div>
               </div>
             </div>

src/component/context/SocketIOContext.jsx

@@ -42,19 +42,35 @@ export default function SocketIOContextProvider({children}) {
             // setSocketMsgReceived(data.message);
             // dispatch(tableReload({type:'CHATMESSAGELIST'})) // dispatches to update chat message sending from owner to worker and vice versa
             console.log('SOCKET RECEIVED DATA *** ', data)
+            if(data?.message_action === socketOnEvents.refresh_all_actions){
                 queryClient.refetchQueries({
                     queryKey: [...queryKeys.recentAction],
                     // type: 'active',
                     // exact: true,
                 })
-        });
+            }
-
+            if(data?.message_action === socketOnEvents.refresh_provision){
-        socket.on(socketOnEvents.refresh_provision, (data) => {
+                queryClient.refetchQueries({  // refetches product Page API call
+                    queryKey: [...queryKeys.product_page],
+                })
                 queryClient.refetchQueries({  // refetches productProvision API call
                     queryKey: [...queryKeys.myproduct_provision],
                 })
+            }
+
         });
 
+        // socket.on(socketOnEvents.refresh_provision, (data) => {
+            // queryClient.refetchQueries({  // refetches productProvision API call
+            //     queryKey: [...queryKeys.myproduct_provision],
+            // })
+        //     // queryClient.invalidateQueries({ queryKey: [...queryKeys.product_page] })
+        //     queryClient.refetchQueries({  // refetches product Page API call
+        //         queryKey: [...queryKeys.product_page],
+        //     })
+        //     console.log('SOCKET RECEIVED DATA *** 111 ', data)
+        // });
+
         // client-side
         socket.on("connect", () => {
             console.log(socket.id);

src/component/context/socketEvents.js

@@ -6,5 +6,6 @@ export const socketEmitEvents = {
 
 export const socketOnEvents = {
     receive_message: 'receive_message',
+    refresh_all_actions: 'refresh_all_actions',
     refresh_provision: 'refresh_provision_actions'
 }

src/component/home/Products.jsx

@@ -47,7 +47,7 @@ export default function Products() {
                         return (
                             <div key={product.uid+index} className={`col-12 col-lg-6 mb-2 mb-xxl-0`}>
                                 <Link to={productPath(product?.product_id)}  >
-                                    <div className={`d-flex align-items-center extraProductCard  ${product?.icon_style}`} style={{borderColor:'black', borderWidth: '2px'}} >
+                                    <div className={`d-flex align-items-center extraProductCard  ${product?.icon_style}`} style={{borderColor:'black', borderWidth: '2px', paddingLeft:"1px"}} >
                                         <div className="icon-container img-icon m-r-20 bg-light-gray rounded">
                                             <i className={`fa ${product?.product_icon} text-primary`}></i>
                                         </div>

src/component/layout/layoutcom/UserFooter.jsx

@@ -11,7 +11,7 @@ export default function UserFooter(){
                     <p>&copy; Copyright {year}. All rights reserved.</p>
                 </div>
                 <div className="col  col-sm-6 ml-sm-auto text-center text-sm-right">
-                    <p>A division of autoMedSys A.I.</p>
+                    <p>A division of MERMS(AI)</p>
                 </div>
             </div>
         </footer>

src/component/product/settingsTab/TemplateConfigure.jsx

@@ -1,67 +1,66 @@
-import React, {memo, useState} from 'react'
+import React, { useState } from "react";
-import getImage from "../../../utils/getImage";
+//import getImage from "../../../utils/getImage";
-import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query';
+import { useQuery, useQueryClient } from "@tanstack/react-query";
-import queryKeys from '../../../services/queryKeys';
+import queryKeys from "../../../services/queryKeys";
-import {getTemplateConfig} from '../../../services/services';
+import { getTemplateConfig } from "../../../services/services";
-import {Link} from "react-router-dom";
+//import {Link} from "react-router-dom";
-import siteLinks from "../../../links/siteLinks";
+//import siteLinks from "../../../links/siteLinks";
-import UploadModal from './UploadModal';
+import UploadModal from "./UploadModal";
 
 const TemplateConfigure = ({ productData }) => {
+  const [selectedSectionDetails, setSelectedSectionDetails] = useState({});
 
-    const [selectedSectionDetails, setSelectedSectionDetails] = useState({})
+  const {
-
+    data: templateData,
-    // /panel/myproduct/template-config
+    isFetching,
-
+    isError,
-    const queryClient = useQueryClient()
+    error,
-
+  } = useQuery({
-    const {data: templateData, isFetching, isError, error} = useQuery({
     queryKey: queryKeys.myTemplateConfig,
     queryFn: () => {
       let reqData = {
-                token: localStorage.getItem('token'), // USER TOKEN
+        token: localStorage.getItem("token"), // USER TOKEN
-                uid: localStorage.getItem('uid'), // USER UID
+        uid: localStorage.getItem("uid"), // USER UID
-                product_id: productData?.product_id
+        product_id: productData?.product_id,
-            }
+      };
-            return getTemplateConfig(reqData)
+      return getTemplateConfig(reqData);
     },
-        staleTime: 0
+    staleTime: 0,
-    })
+  });
 
-    const templateResponse = templateData?.data
+  const templateResponse = templateData?.data;
-    const templateImages = templateResponse?.template_images?.data;
+  const templateImages = Array.isArray(templateResponse?.template_images?.data)
-    // debugger;
+    ? templateResponse.template_images.data
+    : [];
   console.log("templateResponse", templateResponse);
-    // const currentColorUID = templateResponse?.current_colorstyle_uid
-    // const color_styles = templateResponse?.color_styles
-    // const custom_template_name = templateResponse?.custom_template_name
 
-    return <>
+  return (
+    <>
       <div className="card card-statistics">
-            {isFetching ?
+        {isFetching ? (
           <>
             <div className="row">
               <div className="col-12">
-                            <p className='text-mute'>Loading...</p>
+                <p className="text-mute">Loading...</p>
               </div>
             </div>
           </>
-                : isError ?
+        ) : isError ? (
           <div className="row">
             <div className="col-12">
-                            <p className='text-danger'>{error?.message}</p>
+              <p className="text-danger">{error?.message}</p>
             </div>
           </div>
-                    :
+        ) : (
           <>
             <div className="card-header">
               <div className="card-heading">
-                                <h4 className="card-title"
+                <h4 className="card-title" style={{ textTransform: "none" }}>
-                                    style={{textTransform: 'none'}}>{templateResponse?.template_name}</h4>
+                  {templateResponse?.template_name}
+                </h4>
               </div>
             </div>
 
-
             <div>
               <div className="col-12">
                 <div>
@@ -72,59 +71,96 @@ const TemplateConfigure = ({productData}) => {
                   </div>
                   <div>
                     <ul className="list-unstyled">
-                                            {templateImages && templateImages.map(
+                      {templateImages &&
-                                                (item) => {
+                        templateImages.map((item) => {
                           const currImage = item?.default_val;
                           return (
                             <li className="media">
-                                                            <div style={{
+                              <div
-                                                                display: 'flex',
+                                style={{
-                                                                flexDirection: 'row',
+                                  display: "flex",
-                                                                padding: '5px',
+                                  flexDirection: "row",
-                                                                backgroundColor: 'aliceblue',
+                                  padding: "5px",
-                                                                margin: '2px',
+                                  backgroundColor: "aliceblue",
-                                                                maxHeight: '150px'
+                                  margin: "2px",
-                                                            }}>
+                                  maxHeight: "150px",
-                                                                <div className='d-flex justify-content-center align-items-center' style={{padding: '6px', width: '120px', height: '100px'}}>
+                                  width: "100%",
-                                                                    <img className="mb-xxs-0 img-fluid"
+                                }}
-                                                                    style={{height: 'auto', maxHeight: '100px'}}
+                              >
-                                                                         src={currImage} alt="image"/>
+                                <div
+                                  className="d-flex justify-content-center align-items-center"
+                                  style={{
+                                    padding: "6px",
+                                    width: "120px",
+                                    height: "100px",
+                                  }}
+                                >
+                                  <img
+                                    className="mb-xxs-0 img-fluid"
+                                    style={{
+                                      height: "auto",
+                                      maxHeight: "100px",
+                                    }}
+                                    src={currImage}
+                                    alt="image"
+                                  />
                                 </div>
 
-                                                                <div className="media-body" style={{padding: '2px'}}>
+                                <div
-                                                                    <div style={{
+                                  className="media-body"
-                                                                        display: 'flex',
+                                  style={{ padding: "2px" }}
-                                                                        flexDirection: 'column'
+                                >
-                                                                    }}>
+                                  <div
-                                                                        <div style={{textAlign: 'right',width: '100%'}}></div>
+                                    style={{
+                                      display: "flex",
+                                      flexDirection: "column",
+                                    }}
+                                  >
+                                    <div
+                                      style={{
+                                        textAlign: "right",
+                                        width: "100%",
+                                      }}
+                                    ></div>
                                     {/* [Change Image] */}
-                                                                        <label onClick={()=>setSelectedSectionDetails(item)} className='w-100 text-end' data-bs-toggle="modal" data-bs-target="#verticalCenter" style={{cursor: 'pointer'}}>[Change Image]</label>
+                                    <label
+                                      onClick={() =>
+                                        setSelectedSectionDetails(item)
+                                      }
+                                      className="w-100 text-end"
+                                      data-bs-toggle="modal"
+                                      data-bs-target="#verticalCenter"
+                                      style={{ cursor: "pointer" }}
+                                    >
+                                      [Change Image]
+                                    </label>
                                     {/* <input id={item?.id} name={item?.id} className="d-none form-control form-control-sm" type="file" onChange={handleFileChange}/> */}
                                     <div>
-                                                                            <h5 className="mt-0 mb-1">{item?.name}</h5>
+                                      <h5 className="mt-0 mb-1">
+                                        {item?.name}
+                                      </h5>
                                       {item?.description}
                                     </div>
                                   </div>
                                 </div>
                               </div>
-
                             </li>
-                                                    )
+                          );
-                                                }
+                        })}
-                                            )
-                                            }
                     </ul>
                   </div>
                 </div>
               </div>
             </div>
-
           </>
-
+        )}{" "}
-
+      </div>
-            } </div>
+      <UploadModal
-            <UploadModal productId={productData?.product_id} selectedSectionDetails={selectedSectionDetails} />
+        productId={productData?.product_id}
+        selectedSectionDetails={selectedSectionDetails}
+      />
     </>
-}
+  );
+};
 
-export default TemplateConfigure
+export default TemplateConfigure;

src/component/product/settingsTab/URLConfiguration.jsx

@@ -1,72 +1,80 @@
 import { Form, Formik } from "formik";
 import * as Yup from "yup";
-import {useMutation} from '@tanstack/react-query';
+import { useMutation } from "@tanstack/react-query";
-import {setExternalURL} from '../../../services/services';
+import { setExternalURL } from "../../../services/services";
 import { useState } from "react";
+import { Link } from "react-router-dom";
 
 const validationSchema = Yup.object().shape({
-    url: Yup.string().required("URL is required").matches(/^https?:\/\/[a-zA-Z0-9\-]+\.[a-zA-Z0-9\-]+\.[a-zA-Z]+/, 'Must be like: https://example.mysite.com'),
+  url: Yup.string()
-})
+    .required("URL is required")
+    .matches(
+      /^https?:\/\/[a-zA-Z0-9\-]+\.[a-zA-Z0-9\-]+\.[a-zA-Z]+/,
+      "Must be like: https://example.mysite.com",
+    ),
+});
 
 // const initialValues = {
 //     url: '',
 // };
 
 const URLConfiguration = ({ productData }) => {
-
+  const [externalURLChanged, setExternalURLChanged] = useState(true);
-    const [externalURLChanged, setExternalURLChanged] = useState(true)
 
   const initialValues = {
-        url: productData?.external_url || '',
+    url: productData?.external_url || "",
   };
 
-    let defaultUrl = 'https://' + productData?.internal_url
+  let defaultUrl = "https://" + productData?.internal_url;
-    let externalUrl = productData?.external_url
+  let externalUrl = productData?.external_url;
 
   const handleExternalURLChanged = (e) => {
     if (e.target.value == externalUrl) {
-            setExternalURLChanged(true)
+      setExternalURLChanged(true);
     } else {
-            setExternalURLChanged(false)
+      setExternalURLChanged(false);
-        }
     }
+  };
 
   // API to set url
   const setURL = useMutation({
     mutationFn: (fields) => {
-            return setExternalURL(fields)
+      return setExternalURL(fields);
     },
     onSuccess: (res) => {
-            if (res.data.resultCode != '0') {
+      if (res.data.resultCode != "0") {
         // throw({message: res?.data?.resultDescription})
-                throw({message: 'Something went wrong!'})
+        throw { message: "Something went wrong!" };
       }
     },
     onSettled: () => {
       setTimeout(() => {
-                setURL.reset()
+        setURL.reset();
-            }, 3000)
+      }, 3000);
-        }
+    },
     // onError: (err) => {
     //     console.log('err', err)
     // }
-    })
+  });
 
   const handleSubmit = (values) => {
     let reqData = {
-            token: localStorage.getItem('token'), // USER TOKEN
+      token: localStorage.getItem("token"), // USER TOKEN
-            uid: localStorage.getItem('uid'), // USER UID
+      uid: localStorage.getItem("uid"), // USER UID
       subscription_uid: productData?.subscription_uid,
-            external_url: values.url
+      external_url: values.url,
-        }
+    };
-        setURL.mutate(reqData)
+    setURL.mutate(reqData);
-    }
+  };
 
-    return <>
+  return (
+    <>
       <div className="card card-statistics">
         <div className="card-header">
           <div className="card-heading">
-                    <h4 className="card-title" style={{textTransform: 'none'}}>{defaultUrl}</h4>
+            <h4 className="card-title" style={{ textTransform: "none" }}>
+              {defaultUrl}
+            </h4>
           </div>
         </div>
         {/*<div className="card-body">*/}
@@ -85,57 +93,104 @@ const URLConfiguration = ({productData}) => {
       >
         {(props) => {
           return (
-                    <Form className='w-full'>
+            <Form className="w-full">
-                        <div className="card card-statistics" style={{backgroundColor: '#b6e5ef'}}>
+              <div
+                className="card card-statistics"
+                style={{ backgroundColor: "#b6e5ef" }}
+              >
                 <div className="card-header">
                   <div className="card-heading">
-                                    <h4 className="card-title" style={{textTransform: 'none'}}>Set your own URL</h4>
+                    <h4
+                      className="card-title"
+                      style={{ textTransform: "none" }}
+                    >
+                      Set your own URL
+                    </h4>
                   </div>
                 </div>
                 <div className="card-body">
                   <div className="form-group">
-                                    <label htmlFor="exampleInputEmail1">Enter your full URL <span
+                    <label htmlFor="exampleInputEmail1">
-                                        className={`${(props.errors.url && props.touched.url) && 'text-danger'}`}>{props.errors.url}</span></label>
+                      Enter your full URL{" "}
-                                    <input value={props.values.url} onChange={(e)=>{props.handleChange(e); handleExternalURLChanged(e)}} type="text"
+                      <span
-                                           className="form-control" id="url" aria-describedby="url"
+                        className={`${props.errors.url && props.touched.url && "text-danger"}`}
-                                           placeholder="https://example.mysite.com"/>
+                      >
+                        {props.errors.url}
+                      </span>
+                    </label>
+                    <input
+                      value={props.values.url}
+                      onChange={(e) => {
+                        props.handleChange(e);
+                        handleExternalURLChanged(e);
+                      }}
+                      type="text"
+                      className="form-control"
+                      id="url"
+                      aria-describedby="url"
+                      placeholder="https://example.mysite.com"
+                    />
                   </div>
-                                <div style={{width: '100%', textAlign: 'right'}}>
+                  <div style={{ width: "100%", textAlign: "right" }}>
                     <button
                       type="submit"
                       disabled={setURL.isPending || externalURLChanged}
                       className="btn btn-primary"
                     >
-                                        {setURL.isPending ? 'Loading...' : 'Submit'}
+                      {setURL.isPending ? "Loading..." : "Submit"}
                     </button>
                   </div>
                 </div>
 
-                            {setURL.error &&
+                {setURL.error && (
                   <div className="col-12">
-                                    <p className='text-danger'>{setURL.error.message}</p>
+                    <p className="text-danger">{setURL.error.message}</p>
                   </div>
-                            }
+                )}
 
-                            {setURL.isSuccess &&
+                {setURL.isSuccess && (
                   <div className="col-12">
-                                    <p className='text-success'>{'Completed successfully'}</p>
+                    <p className="text-success">{"Completed successfully"}</p>
                   </div>
-                            }
+                )}
-                            <div style={{backgroundColor: '#94b8c0', borderRadius: '10px', padding: '10px'}}>
+                <div
-                                Final steps to configure your URL:<br/>
+                  style={{
-                                DNS:<br/>
+                    backgroundColor: "#148399",
-                                DNS:<br/>
+                    borderRadius: "10px",
-                                DNS:<br/>
+                    padding: "10px",
-
+                    color: "white",
+                    fontWeight: "bolder",
+                    fontSize: "14px",
+                  }}
+                >
+                  To link your domain to your website, update your DNS record to
+                  point to our hosting provider.
+                  <br />
+                  <hr />
+                  Enter the following DNS servers in your domain settings
+                  <br />
+                  {process.env.REACT_APP_DNS1}
+                  <br />
+                  {process.env.REACT_APP_DNS2}
+                  <hr />
+                  <Link
+                    target="_blank"
+                    to={process.env.REACT_APP_DNS_LINK}
+                    style={{ color: "#f6f5f6" }}
+                  >
+                    Click here for detailed instructions.
+                  </Link>
+                  <hr />
+                  After updating your DNS settings, click “Start Verification.”
+                  You will receive a status notification within 24 hours.
                 </div>
               </div>
             </Form>
           );
         }}
       </Formik>
-
     </>
-}
+  );
+};
 
-export default URLConfiguration
+export default URLConfiguration;

src/component/settings/ProfileForm.jsx

@@ -72,6 +72,7 @@ export default function ProfileForm({data}) {
     const handleSetInfoToUpdate = (values, helpers) => {
         delete values.email
         delete values.country
+        delete values?.picture
         setInfoToUpdate(values)
         var modal = new Modal(document.getElementById('modal'));
         modal.show();

src/component/settings/Settings.jsx

@@ -1,6 +1,6 @@
 import React, { useMemo, useState } from "react";
 import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
-import getImage from "../../utils/getImage";
+//import getImage from "../../utils/getImage";
 import queryKeys from "../../services/queryKeys";
 import { useQuery } from "@tanstack/react-query";
 import { profileDetails } from "../../services/services";

src/component/subscribe/StripeSubscriptionButton.jsx

@@ -1,14 +1,29 @@
-import React from 'react';
+import React from "react";
-import { loadStripe } from '@stripe/stripe-js';
+import { loadStripe } from "@stripe/stripe-js";
-import { Elements, useStripe, useElements, CardElement } from '@stripe/react-stripe-js';
+import {
-import {MyProductData, StripeSubscriptionCreate} from '../../services/services';
+  Elements,
+  useStripe,
+  useElements,
+  CardElement,
+} from "@stripe/react-stripe-js";
+import {
+  MyProductData,
+  StripeSubscriptionCreate,
+} from "../../services/services";
 import { useQuery } from "@tanstack/react-query";
 import queryKeys from "../../services/queryKeys";
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from "react-router-dom";
 //const stripePromise = loadStripe('your_stripe_publishable_key');
-const stripePromise = loadStripe('pk_test_51RqL5WLjZLojw6IZmEpwFidNZSl9lLlVUHNvuFZNEz1eTR9XXepnyyVhfvXe9cp4eMnqkDPpoe9wxLLRSV0dxRee00UfhayUOT');
+const stripePromise = loadStripe(
+  "pk_test_51RqL5WLjZLojw6IZmEpwFidNZSl9lLlVUHNvuFZNEz1eTR9XXepnyyVhfvXe9cp4eMnqkDPpoe9wxLLRSV0dxRee00UfhayUOT",
+);
 
-const CheckoutForm = ({ priceId, customerId ,option_name }) => {
+const CheckoutForm = ({
+  priceId,
+  customerId,
+  option_name,
+  selected_display_name,
+}) => {
   const stripe = useStripe();
   const elements = useElements();
   const navigate = useNavigate();
@@ -23,9 +38,9 @@ const CheckoutForm = ({ priceId, customerId ,option_name }) => {
       priceId: priceId,
       customerId: customerId,
       option_name: option_name,
-            token: localStorage.getItem('token'), // USER TOKEN
+      token: localStorage.getItem("token"), // USER TOKEN
-            uid: localStorage.getItem('uid') // USER UID
+      uid: localStorage.getItem("uid"), // USER UID
-        }
+    };
 
     StripeSubscriptionCreate(reqData).then((res) => {
       console.log(res);
@@ -33,23 +48,36 @@ const CheckoutForm = ({ priceId, customerId ,option_name }) => {
       //navigate(res.data.stripe_session)
       window.location.replace(res.data.stripe_session);
     });
-
   };
 
   return (
     <form onSubmit={handleSubmit}>
-            <CardElement />
+      {/*<CardElement />*/}
-            <button type="submit" disabled={!stripe}>
+      <button
-                Subscribe
+        type="submit"
+        disabled={!stripe}
+        className="btn btn-primary text-uppercase"
+      >
+        Start {selected_display_name} Subscription
       </button>
     </form>
   );
 };
 
-const StripeSubscriptionButton = ({ priceId, customerId ,option_name}) => {
+const StripeSubscriptionButton = ({
+  priceId,
+  customerId,
+  option_name,
+  selected_display_name,
+}) => {
   return (
     <Elements stripe={stripePromise}>
-            <CheckoutForm priceId={priceId} customerId={customerId} option_name={option_name} />
+      <CheckoutForm
+        priceId={priceId}
+        customerId={customerId}
+        option_name={option_name}
+        selected_display_name={selected_display_name}
+      />
     </Elements>
   );
 };

src/component/subscribe/Subscribe.jsx

@@ -5,14 +5,13 @@ import SubscribeNewCard from "./SubscribeNewCard";
 import SubscribePreviousCard from "./SubscribePreviousCard";
 import SubcribePaymentOptions from "./SubcribePaymentOptions";
 import StripeSubscriptionButton from "./StripeSubscriptionButton";
-
+import SubscribeInfo from "./SubscribeInfo";
-
-
 
 export default function Subscribe() {
-    const {state: {selectedSubscription,customerId}} = useLocation()
+    const {state: {selectedSubscription, customerId, currentSubscription}} = useLocation()
 
     console.log('selectedSubscription', selectedSubscription)
+    console.log('currentSubscription', currentSubscription)
     console.log('selectedSubscription.option_name', selectedSubscription.option_name)
     console.log('customerId', customerId)
 
@@ -27,17 +26,22 @@ export default function Subscribe() {
                     <div className="card card-statistics text-center py-3">
                         <div className="card-body pricing-content">
                             <div className="pricing-content-card">
-                                <h5>Current Subscription(s)</h5>
+                                <h3>Your Current Subscription</h3>
-                                {/*<h2 className="text-primary pt-3">{currentSubscription?.display_name}</h2>*/}
+                                <h2 className="text-primary pt-3">{currentSubscription?.display_name}</h2>
-                                <SubcribePaymentOptions activePaymentType={activePaymentType}
+                                {/*<SubcribePaymentOptions activePaymentType={activePaymentType}*/}
-                                                        setActivePaymentType={setActivePaymentType}/>
+                                {/*                        setActivePaymentType={setActivePaymentType}/>*/}
-                                {activePaymentType == 'new' ?
+                                {/*{activePaymentType == 'new' ?*/}
-                                    <SubscribeNewCard/>
+                                {/*    <SubscribeNewCard/>*/}
-                                    :
+                                {/*    :*/}
-                                    <SubscribePreviousCard/>
+                                {/*    <SubscribePreviousCard/>*/}
-                                }
+                                {/*}*/}
                                 <>
-                                    <StripeSubscriptionButton priceId={selectedSubscription.stripe_price_id} customerId={customerId} option_name={selectedSubscription.option_name} />
+                                    <SubscribeInfo />
+                                    <StripeSubscriptionButton priceId={selectedSubscription.stripe_price_id}
+                                                              customerId={customerId}
+                                                              option_name={selectedSubscription.option_name}
+                                                              selected_display_name={selectedSubscription.display_name}
+                                                              />
                                 </>
                             </div>
                         </div>

src/component/subscribe/SubscribeInfo.jsx

@@ -0,0 +1,25 @@
+import React from 'react'
+
+export default function SubscribeInfo() {
+
+    return <>
+        <div className="row">
+            <div className="col-md-12 col-12 selects-contant">
+                <div className="card card-statistics">
+                    <div className="card-body">
+                        <div className="form-group mb-0">
+                            Your subscription terms outline the details of your plan, including billing frequency,
+                            renewal dates, payment methods, and cancellation policies. Please review your subscription
+                            agreement for information on your current plan, how to manage or update your subscription,
+                            and any applicable fees or renewal conditions. Contact support if you have questions about
+                            your subscription.
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
+    </>
+
+}

src/component/subscription/Subscription.jsx

@@ -91,7 +91,8 @@ export default function Subscription() {
                                                         navigate(siteLinks.subscribe, {
                                                             state: {
                                                                 selectedSubscription: value,
-                                                                customerId: stripe_customer_id
+                                                                customerId: stripe_customer_id,
+                                                                currentSubscription: currentSubscription
                                                             }
                                                         })
                                                     }}

src/css/partials/_helpers.scss

@@ -2072,7 +2072,7 @@ ul.activity {
 }
 
 .img-icon i{
-    font-size:20px;
+    font-size:35px;
 }
 @media (max-width: 1440px) and (min-width:1200px){
     .border-xxl-t{

src/index.js

@@ -6,7 +6,6 @@ import ReactDOM from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
 
 import App from './App';
-//import reportWebVitals from './reportWebVitals';
 import 'bootstrap/dist/css/bootstrap.css';
 import 'bootstrap/dist/js/bootstrap.min.js'
 

src/services/services.js

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