tabexseriescomponents 0.0.666 → 0.0.667

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

@@ -8,7 +8,6 @@ import { BsChevronLeft } from '@react-icons/all-files/bs/BsChevronLeft';
 import { BsChevronRight } from '@react-icons/all-files/bs/BsChevronRight';
 // 49
 import { Modal } from 'react-bootstrap';
-import { fontSize } from '@mui/system';
 const DynamicForm = (props) => {
     const lang = props.actions.lang;
     const langdetect = props.actions.langdetect;
@@ -128,50 +127,26 @@ const DynamicForm = (props) => {
         }
         if (item.type == 'date') {
             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 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>
-                        {sectionproperties.datestartdate == 'Today' && (
-                            <div class="col-lg-12 text-start">
-                                <input
-                                    type={type}
-                                    value={item.value}
-                                    onChange={(event) => {
-                                        updateformfield(event.target.value, index);
-                                    }}
-                                    min={currentDate}
-                                    className={`${formstyles.form_control} ${form_cssstyles.form_control}`}
-                                />
-                            </div>
-                        )}
-                        {sectionproperties.datestartdate == 'All' && (
-                            <div class="col-lg-12 text-start">
-                                <input
-                                    type={type}
-                                    value={item.value}
-                                    onChange={(event) => {
-                                        updateformfield(event.target.value, index);
-                                    }}
-                                    className={`${formstyles.form_control} ${form_cssstyles.form_control}`}
-                                />
-                            </div>
-                        )}
+                <div class="row m-0 w-100 mb-3">
+                    <div class="col-lg-12 text-start mb-2">
+                        <p class={form_cssstyles.formlabel + ' m-0 p-0 '} style={{}}>
+                            {langdetect == 'en' ? item.title_en : item.title_ar} {item.isrequired == 1 ? '*' : ''}
+                        </p>
                     </div>
-                </div>
-            );
-        } else {
-            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 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>
+                    {sectionproperties.datestartdate == 'Today' && (
+                        <div class="col-lg-12 text-start">
+                            <input
+                                type={type}
+                                value={item.value}
+                                onChange={(event) => {
+                                    updateformfield(event.target.value, index);
+                                }}
+                                min={currentDate}
+                                className={`${formstyles.form_control} ${form_cssstyles.form_control}`}
+                            />
                         </div>
+                    )}
+                    {sectionproperties.datestartdate == 'All' && (
                         <div class="col-lg-12 text-start">
                             <input
                                 type={type}
@@ -182,22 +157,20 @@ const DynamicForm = (props) => {
                                 className={`${formstyles.form_control} ${form_cssstyles.form_control}`}
                             />
                         </div>
-                    </div>
+                    )}
                 </div>
             );
-        }
-    };
-    const textareaitem = (item, index) => {
-        return (
-            <div class={'col-md-12 col-lg-12'}>
+        } else {
+            return (
                 <div class="row m-0 w-100 mb-3">
                     <div class="col-lg-12 text-start mb-2">
                         <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>
+                            {langdetect == 'en' ? item.title_en : item.title_ar} {item.isrequired == 1 ? '*' : ''}
                         </p>
                     </div>
                     <div class="col-lg-12 text-start">
-                        <TextareaAutosize
+                        <input
+                            type={type}
                             value={item.value}
                             onChange={(event) => {
                                 updateformfield(event.target.value, index);
@@ -206,6 +179,26 @@ const DynamicForm = (props) => {
                         />
                     </div>
                 </div>
+            );
+        }
+    };
+    const textareaitem = (item, index) => {
+        return (
+            <div class="row m-0 w-100 mb-3">
+                <div class="col-lg-12 text-start mb-2">
+                    <p class={form_cssstyles.formlabel + ' m-0 p-0 '} style={{}}>
+                        {langdetect == 'en' ? item.title_en : item.title_ar} {item.isrequired == 1 ? '*' : ''}
+                    </p>
+                </div>
+                <div class="col-lg-12 text-start">
+                    <TextareaAutosize
+                        value={item.value}
+                        onChange={(event) => {
+                            updateformfield(event.target.value, index);
+                        }}
+                        className={`${formstyles.form_control} ${form_cssstyles.form_control}`}
+                    />
+                </div>
             </div>
         );
     };
@@ -215,27 +208,25 @@ const DynamicForm = (props) => {
             var decoditems = JSON.parse(itemsarr);
             if (decoditems != undefined && Array.isArray(decoditems)) {
                 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 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>
-                            <div class="col-lg-12 text-start">
-                                <select
-                                    value={item.value}
-                                    onChange={(event) => {
-                                        updateformfield(event.target.value, index);
-                                    }}
-                                    className={`${formstyles.form_control} ${form_cssstyles.form_control}`}
-                                >
-                                    <option value="">{langdetect == 'en' ? 'Choose' : 'إختر'}</option>
-                                    {decoditems?.map(function (sitem) {
-                                        return <option value={sitem.optionname_en}>{langdetect == 'en' ? sitem.optionname_en : sitem.optionname_ar}</option>;
-                                    })}
-                                </select>
-                            </div>
+                    <div class="row m-0 w-100 mb-3">
+                        <div class="col-lg-12 text-start mb-2">
+                            <p class={form_cssstyles.formlabel + ' m-0 p-0 '} style={{}}>
+                                {langdetect == 'en' ? item.title_en : item.title_ar} {item.isrequired == 1 ? '*' : ''}
+                            </p>
+                        </div>
+                        <div class="col-lg-12 text-start">
+                            <select
+                                value={item.value}
+                                onChange={(event) => {
+                                    updateformfield(event.target.value, index);
+                                }}
+                                className={`${formstyles.form_control} ${form_cssstyles.form_control}`}
+                            >
+                                <option value="">{langdetect == 'en' ? 'Choose' : 'إختر'}</option>
+                                {decoditems?.map(function (sitem) {
+                                    return <option value={sitem.optionname_en}>{langdetect == 'en' ? sitem.optionname_en : sitem.optionname_ar}</option>;
+                                })}
+                            </select>
                         </div>
                     </div>
                 );
@@ -275,7 +266,7 @@ 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,
@@ -316,14 +307,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 +354,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 +519,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>

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

@@ -2,7 +2,7 @@ import React, { useEffect, useState, useContext } from 'react';
 import { css } from 'glamor';
 import '../../../../styles/sections/BackgroundImageWithTopContent.css';
 import Select from 'react-select';
-import { defaultstyles, defaultstylestranslated } from '../../../../StylesJS/Customstyles';
+import { defaultstyles, defaultstylestranslated } from '../../../../StylesJS/Customstyles.js';
 import { Imagekitimagecomp } from '../../../../Imagekitconfig.jsx';
 import InputRange from 'react-input-range';
 import CustomerAddressForm from '../../../StaticPages/Signup/CustomerAddressForm.jsx';

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

@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useContext } from 'react';
 import { css } from 'glamor';
-import { serverbaselink } from '../../../../../Env';
+import { serverbaselink } from '../../../../../Env.js';
 import { Imagekitimagecomp } from '../../../../Imagekitconfig.jsx';
 
 const Section_with_rightbgcont = (props) => {

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, '');