tabexseriescomponents 0.0.680 → 0.0.682

package/{srcoman → srcoriginal}/TabexComponents/Headers/Headerresponsive/HeaderresponsiveStyle2.jsx

@@ -367,33 +367,261 @@ const HeaderresponsiveStyle2 = (props) => {
                                         position: 'relative',
                                     }}
                                 >
-                                    <div className="col-md-6 col-sm-6 d-flex filter align-items-center p-0">{InstLogoContainer()}</div>
-                                    <div className="col-md-6 col-sm-6 text-end p-0">
-                                        <div style={{}}>
-                                            <i
-                                                class={' h-100 allcentered '}
+                                    {sectionproperties.logocentered == 'Centered' && (
+                                        <div className="col-md-4 col-sm-3 text-start p-0">
+                                            <div style={{}}>
+                                                <i
+                                                    class={' h-100 allcentered '}
+                                                    style={{
+                                                        color: sectionproperties.resp_sidenav_color,
+                                                    }}
+                                                    onClick={() => {
+                                                        if (sectionproperties.responsiveheaderstyle == 'Style 2') {
+                                                            if (menuactive == true) {
+                                                                setmenuactive(false);
+                                                            } else {
+                                                                setmenuactive(true);
+                                                            }
+                                                        } else {
+                                                            setopenmenuCanvas(true);
+                                                            setactiveTab('menu');
+                                                        }
+                                                    }}
+                                                >
+                                                    {menuactive == false && <FiMenu size={sectionproperties.resp_sidenav_size} color={sectionproperties.resp_sidenav_color} />}
+                                                    {menuactive == true && <AiOutlineClose size={sectionproperties.resp_sidenav_size} color={sectionproperties.resp_sidenav_color} />}
+                                                </i>
+                                            </div>
+                                            {sectionproperties.searchbar_show == 'Show' && (
+                                                <div
+                                                    style={{
+                                                        width: '30px',
+                                                        height: sectionproperties.cart_BtnHeight_resp + 'px',
+                                                    }}
+                                                >
+                                                    <i
+                                                        class="h-100 allcentered"
+                                                        onClick={() => {
+                                                            setopenSearch(true);
+                                                        }}
+                                                    >
+                                                        <IoSearchOutline size={22} color={sectionproperties.cart_BtnTextcolor_resp} />
+                                                    </i>
+                                                </div>
+                                            )}
+                                        </div>
+                                    )}
+                                    {sectionproperties.logocentered == 'Not Centered' && (
+                                        <div className="col-md-6 col-sm-6 d-flex filter align-items-center p-0">
+                                            <div
                                                 style={{
-                                                    color: sectionproperties.resp_sidenav_color,
+                                                    width: sectionproperties.cart_BtnWidth_resp + 'px',
+                                                    height: sectionproperties.cart_BtnHeight_resp + 'px',
                                                 }}
-                                                onClick={() => {
-                                                    if (sectionproperties.responsiveheaderstyle == 'Style 2') {
-                                                        if (menuactive == true) {
-                                                            setmenuactive(false);
+                                                class={langdetect == 'en' ? 'mr-2' : 'ml-2'}
+                                            >
+                                                <i
+                                                    class={' h-100 allcentered '}
+                                                    style={{
+                                                        color: sectionproperties.cart_BtnTextcolor_resp,
+                                                    }}
+                                                    onClick={() => {
+                                                        if (sectionproperties.responsiveheaderstyle == 'Style 2') {
+                                                            if (menuactive == true) {
+                                                                setmenuactive(false);
+                                                            } else {
+                                                                setmenuactive(true);
+                                                            }
                                                         } else {
-                                                            setmenuactive(true);
+                                                            setopenmenuCanvas(true);
+                                                            setactiveTab('menu');
                                                         }
+                                                    }}
+                                                >
+                                                    {menuactive == false && <FiMenu size={20} color={sectionproperties.cart_BtnTextcolor_resp} />}
+                                                    {menuactive == true && <AiOutlineClose size={20} color={sectionproperties.cart_BtnTextcolor_resp} />}
+                                                </i>
+                                            </div>
+                                            {InstLogoContainer()}
+                                        </div>
+                                    )}
+                                    {sectionproperties.logocentered == 'Centered' && <div className="col-md-4 col-sm-6 allcentered p-0">{InstLogoContainer()}</div>}
+                                    <div
+                                        className={
+                                            sectionproperties.logocentered != 'Centered'
+                                                ? 'col-md-6 col-sm-6 d-flex align-items-center justify-content-end p-0'
+                                                : 'col-md-4 col-sm-3 d-flex align-items-center justify-content-end p-0'
+                                        }
+                                    >
+                                        {sectionproperties.searchbar_show == 'Show' && sectionproperties.logocentered == 'Not Centered' && (
+                                            <div
+                                                style={{
+                                                    width: '30px',
+                                                    height: sectionproperties.cart_BtnHeight_resp + 'px',
+                                                }}
+                                            >
+                                                <i
+                                                    class="h-100 allcentered"
+                                                    onClick={() => {
+                                                        setopenSearch(true);
+                                                    }}
+                                                >
+                                                    <IoSearchOutline size={22} color={sectionproperties.cart_BtnTextcolor_resp} />
+                                                </i>
+                                            </div>
+                                        )}
+                                        {templateproperties_context.showfavorites == 'Show' && (
+                                            <div
+                                                style={{
+                                                    width: '30px',
+                                                    height: sectionproperties.cart_BtnHeight_resp + 'px',
+                                                }}
+                                            >
+                                                <i
+                                                    class="h-100 allcentered"
+                                                    onClick={() => {
+                                                        routingcountext(StaticPagesLinksContext.Wishlist);
+                                                    }}
+                                                >
+                                                    <FaRegHeart size={22} color={sectionproperties.cart_BtnTextcolor_resp} />
+                                                </i>
+                                            </div>
+                                        )}
+                                        {sectionproperties.cartBtnShow == 'Show' && CartButton()}
+                                        {authdetailsContext != undefined && authdetailsContext?.instinfo?.instcurrencies?.length > 1 && (
+                                            <div class={'d-flex align-items-center pl-1 pr-1 pt-1'} style={{}}>
+                                                <Dropdown>
+                                                    <Dropdown.Toggle>
+                                                        <li class={' d-flex align-items-center justify-content-center '}>
+                                                            {langdetect == 'en' && (
+                                                                <div class={`${header_cssstyles.languagecontainer}` + ' row m-0 w-100 d-flex align-items-center '}>
+                                                                    <p class="m-0 p-0 mr-1 ml-1">{authdetailsContext?.currencyname_en}</p>
+                                                                    <MdKeyboardArrowDown />
+                                                                </div>
+                                                            )}
+                                                            {langdetect == 'ar' && (
+                                                                <div class={`${header_cssstyles.languagecontainer}` + ' row m-0 w-100 d-flex align-items-center '}>
+                                                                    <p class="m-0 p-0 ml-1 mr-1">{authdetailsContext?.currencyname_ar}</p>
+                                                                    <MdKeyboardArrowDown />
+                                                                </div>
+                                                            )}
+                                                        </li>
+                                                    </Dropdown.Toggle>
+                                                    <Dropdown.Menu>
+                                                        {authdetailsContext?.instinfo?.instcurrencies?.map(function (item, index) {
+                                                            return (
+                                                                <Dropdown.Item
+                                                                    class="m-0 p-0"
+                                                                    onClick={() => {
+                                                                        setcurrencyfunccontext(item);
+                                                                    }}
+                                                                >
+                                                                    <div class="row m-0 w-100">
+                                                                        <div class="col-lg-12 p-0 d-flex justify-content-start">
+                                                                            <div class={`${header_cssstyles.dropdownitemcontainer}`}>
+                                                                                <p
+                                                                                    class={'dropdownitem d-flex align-items-center justify-content-center m-0 p-0'}
+                                                                                    style={{
+                                                                                        fontSize: sectionproperties.dropdown_fontsize + 'px',
+                                                                                        fontWeight: sectionproperties.dropdown_fontweight,
+                                                                                        textTransform: sectionproperties.dropdown_texttransform,
+                                                                                    }}
+                                                                                >
+                                                                                    <FaMoneyBillWave />
+                                                                                    <span class={'ml-2 mr-2'}>{langdetect == 'en' ? item.currencyname_en : item.currencyname_ar}</span>
+                                                                                </p>
+                                                                            </div>
+                                                                        </div>
+                                                                        {index != authdetailsContext?.instinfo?.instcurrencies?.length - 1 && (
+                                                                            <div class="col-lg-12 p-0">
+                                                                                <hr class="m-0" />
+                                                                            </div>
+                                                                        )}
+                                                                    </div>
+                                                                </Dropdown.Item>
+                                                            );
+                                                        })}
+                                                    </Dropdown.Menu>
+                                                </Dropdown>
+                                            </div>
+                                        )}
+                                        {/* here */}
+                                        {sectionproperties.searchbar_show == 'Hide' &&
+                                            sectionproperties.logocentered == 'Centered' &&
+                                            sectionproperties.cartBtnShow == 'Hide' &&
+                                            sectionproperties.favBtnShow == 'Hide' && (
+                                                <div
+                                                    className={'allcentered resposiveheader_languagedropdown'}
+                                                    style={{
+                                                        marginLeft: langdetect == 'en' ? '0.25rem' : 0,
+                                                        marginRight: langdetect == 'ar' ? '0.25rem' : 0,
+                                                    }}
+                                                >
+                                                    {langdetect == 'en' && (
+                                                        <div
+                                                            className={' row m-0 w-100 allcentered '}
+                                                            style={{ direction: 'rtl', color: sectionproperties.cart_BtnTextcolor_resp }}
+                                                            onClick={() => {
+                                                                setlang('ar');
+                                                            }}
+                                                        >
+                                                            <p class="m-0 p-0 font-weight-500">ع</p>
+                                                            <i className={langdetect == 'en' ? 'h-100 allcentered mr-1' : 'h-100 allcentered ml-1'}>
+                                                                <BiChevronDown size={20} />
+                                                            </i>
+                                                        </div>
+                                                    )}
+                                                    {langdetect == 'ar' && (
+                                                        <div
+                                                            className={' row m-0 w-100 allcentered '}
+                                                            style={{ direction: 'ltr', color: sectionproperties.cart_BtnTextcolor_resp }}
+                                                            onClick={() => {
+                                                                setlang('en');
+                                                            }}
+                                                        >
+                                                            <p class="m-0 p-0 font-weight-500 mr-1">En</p>
+                                                            <i className="h-100 allcentered">
+                                                                <BiChevronDown size={20} />
+                                                            </i>
+                                                        </div>
+                                                    )}
+                                                </div>
+                                            )}
+                                        {sectionproperties.logocentered == 'Not Centered' && sectionproperties.showlanuagecontainer == 'Show' && (
+                                            <div
+                                                class={langdetect == 'en' ? ' allcentered m-0 cursor-pointer ml-1 ' : ' m-0 cursor-pointer mr-1 '}
+                                                style={{ minWidth: '30px' }}
+                                                onClick={() => {
+                                                    if (langdetect == 'en') {
+                                                        setlang('ar');
                                                     } else {
-                                                        setopenmenuCanvas(true);
-                                                        setactiveTab('menu');
+                                                        setlang('en');
                                                     }
                                                 }}
                                             >
-                                                {menuactive == false && <FiMenu size={sectionproperties.resp_sidenav_size} color={sectionproperties.resp_sidenav_color} />}
-                                                {menuactive == true && <AiOutlineClose size={sectionproperties.resp_sidenav_size} color={sectionproperties.resp_sidenav_color} />}
-                                            </i>
-                                        </div>
+                                                {langdetect == 'en' && (
+                                                    <div class={`${header_cssstyles.languagecontainer}` + ' row m-0 allcentered w-100 '}>
+                                                        <p class="m-0 p-0 d-flex align-items-center w-100">
+                                                            En{' '}
+                                                            <i class="h-100 allcentered ml-auto pl-3">
+                                                                <BsChevronDown />
+                                                            </i>
+                                                        </p>
+                                                    </div>
+                                                )}
+                                                {langdetect == 'ar' && (
+                                                    <div class={`${header_cssstyles.languagecontainer}` + ' row m-0 allcentered w-100 '}>
+                                                        <p class="m-0 p-0 d-flex align-items-center w-100">
+                                                            ع{' '}
+                                                            <i class="h-100 allcentered mr-auto pr-3">
+                                                                <BsChevronDown />
+                                                            </i>
+                                                        </p>
+                                                    </div>
+                                                )}
+                                            </div>
+                                        )}
                                     </div>
-
                                     {menuactive == true && (
                                         <div
                                             class="px-4 py-4 scrollvertical"

package/{srcoman → srcoriginal}/TabexComponents/Headers/Modernheader/Modernheader.jsx

@@ -430,24 +430,24 @@ const Modernheader = (props) => {
                                     <Searchlist sectionpropertiesprops={sectionproperties} srcfromprops={'fullheader'} actions={actions} />
                                 </div>
                             )}
-                            {/* {sectionproperties.searchbartype == 'Icon' && ( */}
-                            <div
-                                class={header_cssstyles.searchbarcont + ' allcentered '}
-                                style={{
-                                    width: sectionproperties.searchbaricon_width + 'px',
-                                    height: sectionproperties.searchbaricon_height + 'px',
-                                }}
-                                onClick={() => {
-                                    setopenSearchBar(true);
-                                }}
-                            >
-                                <span class={header_cssstyles.searchbar_icon + ' m-0 pr-0 cursor-pointer  '}>
-                                    <i class="h-100 ">
-                                        <FiSearch size={sectionproperties.searchbaricon_fontsize} />
-                                    </i>
-                                </span>
-                            </div>
-                            {/* )} */}
+                            {sectionproperties.searchbartype == 'Icon' && (
+                                <div
+                                    class={header_cssstyles.searchbarcont + ' allcentered '}
+                                    style={{
+                                        width: sectionproperties.searchbaricon_width + 'px',
+                                        height: sectionproperties.searchbaricon_height + 'px',
+                                    }}
+                                    onClick={() => {
+                                        setopenSearchBar(true);
+                                    }}
+                                >
+                                    <span class={header_cssstyles.searchbar_icon + ' m-0 pr-0 cursor-pointer  '}>
+                                        <i class="h-100 ">
+                                            <FiSearch size={sectionproperties.searchbaricon_fontsize} />
+                                        </i>
+                                    </span>
+                                </div>
+                            )}
                             {authdetailsContext != undefined && authdetailsContext?.instinfo?.instcurrencies?.length > 1 && (
                                 <div class={' d-flex align-items-center justify-content-end '}>
                                     <Dropdown>
@@ -455,14 +455,28 @@ const Modernheader = (props) => {
                                             <li class={' d-flex align-items-center justify-content-center '}>
                                                 {langdetect == 'en' && (
                                                     <div class={' row m-0 w-100 d-flex align-items-center '}>
-                                                        <p class="m-0 p-0 mr-2 ml-2">{authdetailsContext?.currencyname_en}</p>
-                                                        <MdKeyboardArrowDown />
+                                                        <p
+                                                            class="m-0 p-0 mr-2 ml-2"
+                                                            style={{
+                                                                color: sectionproperties.searchbaricon_color,
+                                                            }}
+                                                        >
+                                                            {authdetailsContext?.currencyname_en}
+                                                        </p>
+                                                        <MdKeyboardArrowDown color={sectionproperties.searchbaricon_color} />
                                                     </div>
                                                 )}
                                                 {langdetect == 'ar' && (
                                                     <div class={' row m-0 w-100 d-flex align-items-center '}>
-                                                        <p class="m-0 p-0 ml-2 mr-2">{authdetailsContext?.currencyname_ar}</p>
-                                                        <MdKeyboardArrowDown />
+                                                        <p
+                                                            class="m-0 p-0 ml-2 mr-2"
+                                                            style={{
+                                                                color: sectionproperties.searchbaricon_color,
+                                                            }}
+                                                        >
+                                                            {authdetailsContext?.currencyname_ar}
+                                                        </p>
+                                                        <MdKeyboardArrowDown color={sectionproperties.searchbaricon_color} />
                                                     </div>
                                                 )}
                                             </li>
@@ -484,6 +498,7 @@ const Modernheader = (props) => {
                                                                             fontSize: sectionproperties.dropdown_fontsize + 'px',
                                                                             fontWeight: sectionproperties.dropdown_fontweight,
                                                                             textTransform: sectionproperties.dropdown_texttransform,
+                                                                            color: sectionproperties.searchbaricon_color,
                                                                         }}
                                                                     >
                                                                         <span class={'ml-2 mr-2'}>{langdetect == 'en' ? item.currencyname_en : item.currencyname_ar}</span>

package/{srcoman → srcoriginal}/TabexComponents/Headers/Simpleheader/Simpleheader.jsx

@@ -359,7 +359,32 @@ const Simpleheader = (props) => {
             {templateproperties_context.showsocialmedia == 'Show' && (
                 <SocialMediaSection sectionpropertiesprops={sectionproperties} templateproperties_contextprops={templateproperties_context} actions={actions} />
             )}
+            {/* Show when logged in */}
             {sectionproperties.showfloatingbtn == 'Show' && (
+                <div
+                    style={{
+                        position: 'fixed',
+                        bottom: 15,
+                        right: 15,
+                        zIndex: 2000,
+                        transition: 'all 0.3s ease-out',
+                        width: '100%',
+                        display: sectionproperties.showfloatingbtn == 'Show when logged in' ? 'none' : 'flex',
+                    }}
+                    class="text-end"
+                >
+                    <div
+                        class={header_cssstyles.floatingbtn + ' allcentered '}
+                        style={{}}
+                        onClick={() => {
+                            routingcountext(sectionproperties.floatingbtnlink, false, '');
+                        }}
+                    >
+                        <p class="m-0 p-0">{langdetect == 'en' ? sectionproperties.floatingbtntxten : sectionproperties.floatingbtntxtar}</p>
+                    </div>
+                </div>
+            )}
+            {sectionproperties.showfloatingbtn == 'Show when logged in' && authdetailsContext.loggedin && (
                 <div
                     style={{
                         position: 'fixed',
@@ -583,7 +608,7 @@ const Simpleheader = (props) => {
                                                 </i>
                                             </div>
                                         )}
-                                        {sectionproperties.userbtnstyle == 'Style 2' && !authdetailsContext.loggedin && sectionproperties.ShowUserBtn == 'Show' && (
+                                        {sectionproperties.userbtnstyle == 'Style 2' && !authdetailsContext.loggedin && (
                                             <div
                                                 class={`${header_cssstyles.user_btn}` + ' allcentered '}
                                                 onClick={() => {
@@ -602,7 +627,7 @@ const Simpleheader = (props) => {
                                                 </p>
                                             </div>
                                         )}
-                                        {sectionproperties.userbtnstyle == 'Style 2' && authdetailsContext.loggedin && sectionproperties.ShowUserBtn == 'Show' && (
+                                        {sectionproperties.userbtnstyle == 'Style 2' && authdetailsContext.loggedin && (
                                             <Dropdown>
                                                 <Dropdown.Toggle>
                                                     <div className={header_cssstyles.userBtnLoggedinContainer + ' allcentered '} sytle={{ position: 'relative' }}>
@@ -704,7 +729,7 @@ const Simpleheader = (props) => {
                                                 </Dropdown.Menu>
                                             </Dropdown>
                                         )}
-                                        {sectionproperties.userbtnstyle == 'Style 1' && sectionproperties.ShowUserBtn == 'Show' && (
+                                        {sectionproperties.userbtnstyle == 'Style 1' && (
                                             <Dropdown>
                                                 <Dropdown.Toggle>
                                                     {!authdetailsContext.loggedin && (

package/{srcoman → srcoriginal}/TabexComponents/Headers/SocialMediaSection/SocialMediaSection.jsx

@@ -5,6 +5,7 @@ import { FaWhatsapp } from '@react-icons/all-files/fa/FaWhatsapp';
 import { AiFillInstagram } from '@react-icons/all-files/ai/AiFillInstagram';
 import { AiFillYoutube } from '@react-icons/all-files/ai/AiFillYoutube';
 import { IoLogoTiktok } from '@react-icons/all-files/io5/IoLogoTiktok';
+import { FaLinkedinIn } from '@react-icons/all-files/fa/FaLinkedinIn';
 
 const SocialMediaSection = (props) => {
     const actions = props.actions;
@@ -93,6 +94,23 @@ const SocialMediaSection = (props) => {
                 </div>
             )}
 
+            {authdetailsContext?.instinfo?.linkedinlink != null && (
+                <div
+                    class={`${header_cssstyles.socialmediaicon}` + '  allcentered mx-2 cursor-pointer '}
+                    onClick={() => {
+                        if (authdetailsContext?.instinfo?.linkedinlink != null) {
+                            window.open(authdetailsContext?.instinfo?.linkedinlink, '_blank');
+                        }
+                    }}
+                >
+                    <FaLinkedinIn
+                        style={{
+                            fontSize: parseFloat(templateproperties_context.socialmediasectioniconfontsize) + 2 + 'px',
+                        }}
+                    />
+                </div>
+            )}
+
             {authdetailsContext?.instinfo?.tiktoklink != null && (
                 <div
                     class={`${header_cssstyles.socialmediaicon}` + '  allcentered mx-2 cursor-pointer '}

package/{srcoman → srcoriginal}/TabexComponents/Sections/BackgroundImages/DynamicForm/DynamicForm.jsx

@@ -7,8 +7,9 @@ import { IoMdClose } from '@react-icons/all-files/io/IoMdClose';
 import { BsChevronLeft } from '@react-icons/all-files/bs/BsChevronLeft';
 import { BsChevronRight } from '@react-icons/all-files/bs/BsChevronRight';
 // 49
+import PhoneInput from 'react-phone-input-2';
+
 import { Modal } from 'react-bootstrap';
-import { fontSize } from '@mui/system';
 const DynamicForm = (props) => {
     const lang = props.actions.lang;
     const langdetect = props.actions.langdetect;
@@ -125,6 +126,8 @@ const DynamicForm = (props) => {
             type = 'number';
         } else if (item.type == 'text') {
             type = 'text';
+        } else if (item.type == 'phone number') {
+            type = 'phonenumber';
         }
         if (item.type == 'date') {
             return (
@@ -187,6 +190,37 @@ const DynamicForm = (props) => {
             );
         }
     };
+    const phonenumber = (item, index) => {
+        return (
+            <div class={'col-md-12 col-lg-' + sectionproperties.numberofcolsperrow}>
+                <div class="row m-0 w-100 mb-3">
+                    <div class="col-lg-12 text-start mb-2 p-0">
+                        <p class={form_cssstyles.formlabel + ' m-0 p-0 '} style={{}}>
+                            {langdetect == 'en' ? item.title_en : item.title_ar} <sup class="text-danger">{item.isrequired == 1 ? '*' : ''}</sup>
+                        </p>
+                    </div>
+                    <PhoneInput
+                        className={`${formstyles.form_control} ${form_cssstyles.form_control}`}
+                        country={'eg'}
+                        enableSearch={true}
+                        autoFormat={true}
+                        value={item.value}
+                        inputStyle={{
+                            color: sectionproperties.inputfieldcolor,
+                        }}
+                        onChange={(event, country) => {
+                            updateformfield(event, index);
+                            // var temp = { ...payloadobj };
+                            // temp.mobile = event;
+                            // temp.countrydialcode = country.dialCode;
+                            // setpayloadobj({ ...temp });
+                        }}
+                        style={{ direction: 'ltr', color: sectionproperties.inputfieldcolor }}
+                    />
+                </div>
+            </div>
+        );
+    };
     const textareaitem = (item, index) => {
         return (
             <div class={'col-md-12 col-lg-12'}>
@@ -275,10 +309,11 @@ const DynamicForm = (props) => {
             width: sectionproperties.generalbtn_width + '%',
             height: sectionproperties.generalbtn_height + 'px',
             backgroundColor: sectionproperties.generalbtn_bgColor,
-            borderRadius: sectionproperties.generalbtnborderradius + 'px',
+            borderRadius: sectionproperties.generalbtn_bgColor,
             color: sectionproperties.generalbtn_textColor,
             fontSize: sectionproperties.generalbtn_fontsize,
             fontWeight: sectionproperties.generalbtn_fontweight,
+            borderRadius: sectionproperties.generalbtnborderradius + 'px',
             ':hover': {
                 transition: '.3s',
                 color: sectionproperties.generalbtn_textColoronhover,
@@ -316,14 +351,6 @@ const DynamicForm = (props) => {
                 backgroundColor: '#044da6',
             },
         }),
-        sectiontitle: css({
-            color: sectionproperties.sectionTitleColor,
-            fontSize: sectionproperties.sectionTitleFontSize + 'px',
-            fontWeight: sectionproperties.sectionTitleFontWeight,
-            '@media (max-width: 800px)': {
-                fontSize: sectionproperties.sectionTitleFontSizeresp,
-            },
-        }),
     };
     return (
         <div
@@ -371,7 +398,14 @@ const DynamicForm = (props) => {
                                 marginBottom: sectionproperties.sectionTitleMarginBottom + 'px',
                             }}
                         >
-                            <p class={form_cssstyles.sectiontitle + ' m-0 p-0 '} style={{}}>
+                            <p
+                                class="m-0 p-0"
+                                style={{
+                                    color: sectionproperties.sectionTitleColor,
+                                    fontSize: sectionproperties.sectionTitleFontSize + 'px',
+                                    fontWeight: sectionproperties.sectionTitleFontWeight,
+                                }}
+                            >
                                 {langdetect == 'en' ? formtitleen : formtitlear}
                             </p>
                         </div>
@@ -529,7 +563,14 @@ const DynamicForm = (props) => {
                             marginBottom: sectionproperties.sectionTitleMarginBottom + 'px',
                         }}
                     >
-                        <p class={form_cssstyles.sectiontitle + ' m-0 p-0 '} style={{}}>
+                        <p
+                            class="m-0 p-0"
+                            style={{
+                                color: sectionproperties.sectionTitleColor,
+                                fontSize: sectionproperties.sectionTitleFontSize + 'px',
+                                fontWeight: sectionproperties.sectionTitleFontWeight,
+                            }}
+                        >
                             {langdetect == 'en' ? formtitleen : formtitlear}
                         </p>
                     </div>
@@ -540,6 +581,8 @@ const DynamicForm = (props) => {
                                     {dynamicform?.fields?.map(function (item, index) {
                                         if (item.type == 'text' || item.type == 'date' || item.type == 'number') {
                                             return inputitem(item, index);
+                                        } else if (item.type == 'phone number') {
+                                            return phonenumber(item, index);
                                         } else if (item.type == 'textarea') {
                                             return textareaitem(item, index);
                                         } else if (item.type == 'selectbox') {
@@ -607,16 +650,23 @@ const DynamicForm = (props) => {
                             <IoMdClose size={20} class="" color={'#fff'} />
                         </i>
                     </div>
-                    <div class="col-lg-12 allcentered my-4 py-4">
-                        <p
-                            class="m-0 p-0"
-                            style={{
-                                fontSize: 20,
-                                color: '#000',
-                            }}
-                        >
-                            {confirmationtext}
-                        </p>
+                    <div
+                        class="row m-0 w-100 py-4"
+                        style={{
+                            background: sectionproperties.popupbackgroundcolor,
+                        }}
+                    >
+                        <div class="col-lg-12 allcentered py-4">
+                            <p
+                                class="m-0 p-0"
+                                style={{
+                                    fontSize: 20,
+                                    color: sectionproperties.popuptextcolor,
+                                }}
+                            >
+                                {confirmationtext}
+                            </p>
+                        </div>
                     </div>
                 </Modal.Body>
                 <Modal.Footer></Modal.Footer>

package/{srcoman → srcoriginal}/TabexComponents/Sections/BackgroundImages/Twobgimages/Twobgimages.jsx

@@ -222,7 +222,6 @@ const Twobgimages = (props) => {
                                                 if (item.place_clickable == 'General') {
                                                     if (item.externallink == 'Yes') {
                                                         window.open(item.clickable_page_route, '_blank');
-
                                                         // history.push(item.clickable_page_route);
                                                     } else if (item.clickable_page_route && item.clickable_page_route.length != 0) {
                                                         routingcountext(item.clickable_page_route, false, '');