From 90df0135b4559b1f65922d7b8c52498f1480c0ad Mon Sep 17 00:00:00 2001 From: cherif Date: Sun, 19 Jan 2025 13:18:03 +0100 Subject: [PATCH] sds --- src/components/Mon_Catalogue_Public.js | 68 +- src/components/Mon_Intranet_Public.js | 145 +++- src/components/UpdatePartnerInfo.js | 275 ++++++- .../components/_mon_intranet_public.scss | 777 +++++++++++++++++- src/styles/components/_updateparnterinfo.scss | 5 +- 5 files changed, 1189 insertions(+), 81 deletions(-) diff --git a/src/components/Mon_Catalogue_Public.js b/src/components/Mon_Catalogue_Public.js index b56501b..0f618cb 100644 --- a/src/components/Mon_Catalogue_Public.js +++ b/src/components/Mon_Catalogue_Public.js @@ -2602,11 +2602,11 @@ const Mon_Catalogue_Public = (props) => { domain = url.split('://')[1]; } - // console.log(" ### local_url_subdomain = ", local_url_subdomain); + // console.log(" ### local_url_subdomain = ", local_url_subdomain); const subdomain = domain.split('.')[0]; - // console.log(" ### subdomain = ", subdomain); + // console.log(" ### subdomain = ", subdomain); var form = new FormData(); @@ -2618,7 +2618,7 @@ const Mon_Catalogue_Public = (props) => { if (String(res.data.status) === "true") { //console.log(" In Get_Subdomain_Partner_Data res.data.status = " + res.data.status); - // console.log(" In Get_Subdomain_Partner_Data res.data.message r_class = " + res.data.message); + // console.log(" In Get_Subdomain_Partner_Data res.data.message r_class = " + res.data.message); setGet_Subdomain_Partner_Data_api("true"); setGet_Subdomain_Partner_Data_result(res.data.message); @@ -2651,7 +2651,7 @@ const Mon_Catalogue_Public = (props) => { if (JSON.parse(x).catalog_pub_mention_legale_pdf) catalog_pub_mention_legale_pdf = JSON.parse(x).catalog_pub_mention_legale_pdf; - + var catalog_pub_message_1_taille = "12" if (JSON.parse(x).catalog_pub_message_1_taille) @@ -2770,11 +2770,22 @@ const Mon_Catalogue_Public = (props) => { if (JSON.parse(x).catalog_pub_indicateur_4_taille) catalog_pub_indicateur_4_taille = JSON.parse(x).catalog_pub_indicateur_4_taille; + // Les contacts publics + var catalog_pub_contact_public_email = "" + if (JSON.parse(x).catalog_pub_contact_public_email) + catalog_pub_contact_public_email = JSON.parse(x).catalog_pub_contact_public_email; + + var catalog_pub_contact_public_telephone = "" + if (JSON.parse(x).catalog_pub_contact_public_telephone) + catalog_pub_contact_public_telephone = JSON.parse(x).catalog_pub_contact_public_telephone; + var catalog_pub_theme_id = JSON.parse(x).catalog_pub_theme_id; setmy_theme_code(theme_code); + console.log(" ### setmy_theme_code = ", theme_code); + //--- var node = { @@ -2827,12 +2838,15 @@ const Mon_Catalogue_Public = (props) => { "catalog_pub_indicateur_4_gras": catalog_pub_indicateur_4_gras, "catalog_pub_indicateur_4_taille": catalog_pub_indicateur_4_taille, + // les contacts publics + "catalog_pub_contact_public_email": catalog_pub_contact_public_email, + "catalog_pub_contact_public_telephone": catalog_pub_contact_public_telephone, "catalog_pub_theme_id": catalog_pub_theme_id, "theme_code": theme_code, }; - // console.log(" --- node = ", node); + // console.log(" --- node = ", node); new_data2.push(node); }); @@ -2897,8 +2911,6 @@ const Mon_Catalogue_Public = (props) => { && String(my_theme_code) === "MySy_Theme2" &&
- - {New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 && New_Get_Subdomain_Partner_Data_result[0].catalog_pub_banniere_img &&
@@ -2920,25 +2932,12 @@ const Mon_Catalogue_Public = (props) => { {New_Get_Subdomain_Partner_Data_result[0].nom}
} - - {/*!New_Get_Subdomain_Partner_Data_result || New_Get_Subdomain_Partner_Data_result.length <= 0 - || !New_Get_Subdomain_Partner_Data_result[0].catalog_pub_logo && -
- MySy Training Technology - -
*/} -
- {New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 - && New_Get_Subdomain_Partner_Data_result[0].catalog_pub_message_3_txt && - {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_message_3_txt} } + Tél : {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_contact_public_telephone}
+ Email : {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_contact_public_email}
@@ -3723,10 +3722,10 @@ const Mon_Catalogue_Public = (props) => {
} - - {/******* FIN Gestion du THEME "MySy_Theme2" */} + + {/******* Gestion du THEME PAR DEFAULT " */} {New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 && String(my_theme_code) !== "MySy_Theme2" &&
@@ -3753,29 +3752,17 @@ const Mon_Catalogue_Public = (props) => {
} - {/*!New_Get_Subdomain_Partner_Data_result || New_Get_Subdomain_Partner_Data_result.length <= 0 - || !New_Get_Subdomain_Partner_Data_result[0].catalog_pub_logo && -
- MySy Training Technology - -
*/} +
- - {New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 - && New_Get_Subdomain_Partner_Data_result[0].catalog_pub_message_3_txt && - {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_message_3_txt} } - + Tél : {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_contact_public_telephone}
+ Email : {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_contact_public_email}
- +
{New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 @@ -3951,7 +3938,6 @@ const Mon_Catalogue_Public = (props) => {
-
diff --git a/src/components/Mon_Intranet_Public.js b/src/components/Mon_Intranet_Public.js index 20c9b7b..ca3dcc7 100644 --- a/src/components/Mon_Intranet_Public.js +++ b/src/components/Mon_Intranet_Public.js @@ -2605,11 +2605,11 @@ const Mon_Intranet_Public = (props) => { domain = url.split('://')[1]; } - console.log(" ### local_url_subdomain = ", local_url_subdomain); + // console.log(" ### local_url_subdomain = ", local_url_subdomain); const subdomain = domain.split('.')[0]; - console.log(" ### subdomain = ", subdomain); + //console.log(" ### subdomain = ", subdomain); var form = new FormData(); @@ -2774,10 +2774,22 @@ const Mon_Intranet_Public = (props) => { catalog_pub_indicateur_4_taille = JSON.parse(x).catalog_pub_indicateur_4_taille; + // Les contacts publics + var catalog_pub_contact_public_email = "" + if (JSON.parse(x).catalog_pub_contact_public_email) + catalog_pub_contact_public_email = JSON.parse(x).catalog_pub_contact_public_email; + + var catalog_pub_contact_public_telephone = "" + if (JSON.parse(x).catalog_pub_contact_public_telephone) + catalog_pub_contact_public_telephone = JSON.parse(x).catalog_pub_contact_public_telephone; + + var catalog_pub_theme_id = JSON.parse(x).catalog_pub_theme_id; setmy_theme_code(theme_code); + console.log(" ### theme_code = ", theme_code); + //--- var node = { @@ -2830,6 +2842,9 @@ const Mon_Intranet_Public = (props) => { "catalog_pub_indicateur_4_gras": catalog_pub_indicateur_4_gras, "catalog_pub_indicateur_4_taille": catalog_pub_indicateur_4_taille, + // les contacts publics + "catalog_pub_contact_public_email": catalog_pub_contact_public_email, + "catalog_pub_contact_public_telephone": catalog_pub_contact_public_telephone, "catalog_pub_theme_id": catalog_pub_theme_id, "theme_code": theme_code, @@ -2888,11 +2903,128 @@ const Mon_Intranet_Public = (props) => {
+ {/******* Gestion du THEME "MySy_Theme2" */} + {New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 + && String(my_theme_code) === "MySy_Theme2" && +
+ {New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 + && New_Get_Subdomain_Partner_Data_result[0].catalog_pub_banniere_img &&
+ +
} + +
+ +
+ {New_Get_Subdomain_Partner_Data_result[0].nom} +
+ +
+ +   +
+ +
+   +
+
+ + +
+ +
+ +
+ Indicateurs
+ {New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 + && New_Get_Subdomain_Partner_Data_result[0].catalog_pub_indicateur_1_txt && +
{New_Get_Subdomain_Partner_Data_result[0].catalog_pub_indicateur_1_txt} +
} + + {New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 + && New_Get_Subdomain_Partner_Data_result[0].catalog_pub_indicateur_2_txt && +
{New_Get_Subdomain_Partner_Data_result[0].catalog_pub_indicateur_2_txt} +
} + + {New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 + && New_Get_Subdomain_Partner_Data_result[0].catalog_pub_indicateur_3_txt && +
{New_Get_Subdomain_Partner_Data_result[0].catalog_pub_indicateur_3_txt} +
} + + {New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 + && New_Get_Subdomain_Partner_Data_result[0].catalog_pub_indicateur_4_txt && +
{New_Get_Subdomain_Partner_Data_result[0].catalog_pub_indicateur_4_txt} +
} + +
+
+ {New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 && + } + + + {New_Get_Subdomain_Partner_Data_result[0] && New_Get_Subdomain_Partner_Data_result[0].catalog_pub_message_2_txt && + } + +
+
+ + Contact
+ Tel : {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_contact_public_telephone}
+ Email : {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_contact_public_email} + +
+
+ +
+ + +
+ +
+
} + {/******* FIN Gestion du THEME "MySy_Theme2" */} + + + + {/******* Gestion du THEME PAR DEFAULT " */} {New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 && String(my_theme_code) !== "MySy_Theme2" &&
- {New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 && New_Get_Subdomain_Partner_Data_result[0].catalog_pub_banniere_img &&
@@ -2908,8 +3040,8 @@ const Mon_Intranet_Public = (props) => {
Contact
- Tel : 0101010101
- Email : email@email.com + Tel : {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_contact_public_telephone}
+ Email : {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_contact_public_email}
@@ -2993,9 +3125,8 @@ const Mon_Intranet_Public = (props) => {
} - -
+ {/******* FIN Gestion du THEME PAR DEFAULT " */}
diff --git a/src/components/UpdatePartnerInfo.js b/src/components/UpdatePartnerInfo.js index f98af6b..2b76997 100644 --- a/src/components/UpdatePartnerInfo.js +++ b/src/components/UpdatePartnerInfo.js @@ -40,7 +40,7 @@ import DialogTitle from '@mui/material/DialogTitle'; import ColorPicker from 'react-pick-color'; import { gridClasses } from '@mui/x-data-grid'; import AttachFileIcon from '@mui/icons-material/AttachFile'; - +import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; import DeleteForeverIcon from '@mui/icons-material/DeleteForever'; import DownloadingIcon from '@mui/icons-material/Downloading'; @@ -878,6 +878,19 @@ function UpdateParnterInfo(props) { var form = new FormData(); + // Pour activier la fontion de "include com", le contact foit avoir une adresse email + var validRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/; + + if (p_contact_public_email && !String(p_contact_public_email).trim().match(validRegex)) { + // alert("L'adresse email de contact public est invalide."); + var txt = "L'adresse email de contact public est invalide." + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(txt); + setalert_type("error"); + return; + } + const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); form.append("theme_id", selected_catalog_pub_theme_id); @@ -941,6 +954,14 @@ function UpdateParnterInfo(props) { form.append("indicateur_4_txt", p_indicateur4_text); form.append("indicateur_4_taille", p_indicateur4_taille); form.append("indicateur_4_color", p_indicateur4_color); + + + + form.append("contact_public_email", p_contact_public_email); + form.append("contact_public_telephone", p_contact_public_telephone); + + + if (p_indicateur4_gras) form.append("indicateur_4_gras", "700"); else @@ -967,13 +988,19 @@ function UpdateParnterInfo(props) { setAdd_Update_Catalog_Pub_Theme_result(res.data.message); Get_Partner_Catalog_Pub_Config(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setAdd_Update_Catalog_Pub_Theme_api("false"); setAdd_Update_Catalog_Pub_Theme_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -1702,14 +1729,17 @@ function UpdateParnterInfo(props) { const [partner_catalog_pub_url, setpartner_catalog_pub_url] = useState(""); + const [partner_intranet_pub_url, setpartner_intranet_pub_url] = useState(""); async function submenu_donnee_catalog_pub() { Get_Partner_Catalog_Pub_Config(); var new_nom = (p_nom).replace(/[^0-9a-z]/gi, '').toLocaleLowerCase(); - var new_url = window.location.protocol + "//" + new_nom + "." + process.env.REACT_APP_PART_PUB_CATALOG_DOMAIN + "moncatalog"; + var new_catalog_url = window.location.protocol + "//" + new_nom + "." + process.env.REACT_APP_PART_PUB_CATALOG_DOMAIN + "moncatalog"; + var new_intranet_url = window.location.protocol + "//" + new_nom + "." + process.env.REACT_APP_PART_PUB_CATALOG_DOMAIN + "intranet"; - setpartner_catalog_pub_url(new_url); + setpartner_catalog_pub_url(new_catalog_url); + setpartner_intranet_pub_url(new_intranet_url); setsubmenu("submenu_donnee_catalog_pub"); } @@ -2176,7 +2206,7 @@ function UpdateParnterInfo(props) { } //image/png - if (String(file_type) !== "image/png" && String(file_type) !== "image/jpg" && String(file_type) !== "image/webp" ) { + if (String(file_type) !== "image/png" && String(file_type) !== "image/jpg" && String(file_type) !== "image/webp") { alert("Le fichier n'est pas au format PNG"); return; } @@ -2388,7 +2418,7 @@ function UpdateParnterInfo(props) { } //image/png - if (String(file_type) !== "image/png" && String(file_type) !== "image/jpg" && String(file_type) !== "image/webp" ) { + if (String(file_type) !== "image/png" && String(file_type) !== "image/jpg" && String(file_type) !== "image/webp") { alert("Le fichier n'est pas au format PNG"); return; } @@ -2484,13 +2514,20 @@ function UpdateParnterInfo(props) { setDelete_Catalog_Pub_Banniere_Img_result(res.data.message); Get_Partner_Catalog_Pub_Config(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); + } else { setDelete_Catalog_Pub_Banniere_Img_api("false"); setDelete_Catalog_Pub_Banniere_Img_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -2530,13 +2567,19 @@ function UpdateParnterInfo(props) { setDelete_Catalog_Pub_Logo_Img_result(res.data.message); Get_Partner_Catalog_Pub_Config(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setDelete_Catalog_Pub_Logo_Img_api("false"); setDelete_Catalog_Pub_Logo_Img_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -2577,13 +2620,19 @@ function UpdateParnterInfo(props) { setimg_bg_file(""); Get_Partner_Catalog_Pub_Config(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setAdd_Update_Catalog_Pub_Banniere_api("false"); setAdd_Update_Catalog_Pub_Banniere_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -2624,13 +2673,19 @@ function UpdateParnterInfo(props) { setimg_logo_file(""); Get_Partner_Catalog_Pub_Config(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setAdd_Update_Catalog_Pub_Logo_api("false"); setAdd_Update_Catalog_Pub_Logo_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -2716,6 +2771,9 @@ function UpdateParnterInfo(props) { const [p_text1_gras, setp_text1_gras] = React.useState(false); const [p_text1_color, setp_text1_color] = React.useState("#000000"); + const [p_contact_public_email, setp_contact_public_email] = React.useState(""); + const [p_contact_public_telephone, setp_contact_public_telephone] = React.useState(""); + const [p_indicateur1_text, setp_indicateur1_text] = React.useState(""); const [p_indicateur1_taille, setp_indicateur1_taille] = React.useState("12"); @@ -2825,13 +2883,19 @@ function UpdateParnterInfo(props) { setcgv_file_name(""); setpdf_cgv_file_pdf(""); Get_Partner_Catalog_Pub_Config(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setAdd_Update_Catalog_Pub_CGV_api("false"); setAdd_Update_Catalog_Pub_CGV_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -2876,13 +2940,19 @@ function UpdateParnterInfo(props) { setcgv_file_name(""); setpdf_cgv_file_pdf(""); Get_Partner_Catalog_Pub_Config(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setSupprimer_Catalog_Pub_CGV_api("false"); setSupprimer_Catalog_Pub_CGV_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -2974,13 +3044,20 @@ function UpdateParnterInfo(props) { setcgv_file_name(""); setpdf_cgu_file_pdf(""); Get_Partner_Catalog_Pub_Config(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); + } else { setAdd_Update_Catalog_Pub_CGU_api("false"); setAdd_Update_Catalog_Pub_CGU_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -3026,13 +3103,20 @@ function UpdateParnterInfo(props) { setcgv_file_name(""); setpdf_cgu_file_pdf(""); Get_Partner_Catalog_Pub_Config(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); + } else { setSupprimer_Catalog_Pub_CGU_api("false"); setSupprimer_Catalog_Pub_CGU_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -3128,13 +3212,19 @@ function UpdateParnterInfo(props) { setcgv_file_name(""); setpdf_mention_legale_file_pdf(""); Get_Partner_Catalog_Pub_Config(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setAdd_Update_Catalog_Pub_Mention_Legale_api("false"); setAdd_Update_Catalog_Pub_Mention_Legale_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -3175,13 +3265,19 @@ function UpdateParnterInfo(props) { setcgv_file_name(""); setpdf_mention_legale_file_pdf(""); Get_Partner_Catalog_Pub_Config(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setSupprimer_Catalog_Pub_Mention_Legale_api("false"); setSupprimer_Catalog_Pub_Mention_Legale_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -3203,9 +3299,37 @@ function UpdateParnterInfo(props) { downloadLink.click(); } + const [display_alert_mysy, setdisplay_alert_mysy] = useState(""); + const [alert_message, setalert_message] = useState(""); + const [alert_type, setalert_type] = useState(""); + + function clear_alert_message() { + setalert_message(""); + } + function clear_alert_type() { + setalert_type(""); + } + + function clear_display_alert_mysy() { + setdisplay_alert_mysy(""); + } + + return (
+ {/*** Affichage des messages d'alerte*/} + {display_alert_mysy && String(display_alert_mysy) === "1" && + + } + {/*** FIN Affichage des messages d'alerte*/} + + {/*** Dialog pickup Color */} @@ -3294,6 +3418,8 @@ function UpdateParnterInfo(props) { {/*** Fin ajout pickup Color */} + +
{String(is_partner_admin_account) !== "1" && } @@ -3327,7 +3453,7 @@ function UpdateParnterInfo(props) {
+
+
+ + + + ), + }} + value={partner_intranet_pub_url} + + />
@@ -3655,7 +3811,7 @@ function UpdateParnterInfo(props) {
-
Les indicateurs zzzz
+
Les indicateurs
Text Indicateur 1
@@ -3981,7 +4137,41 @@ function UpdateParnterInfo(props) {
+
Contacts Publiques
+
+
Email
+ { + setp_contact_public_email(e.target.value); + } + } + /> + +
+ +
Téléphone
+ { + setp_contact_public_telephone(e.target.value); + } + } + /> + +
+ +
} {String(catalog_pub_config_edit) !== "1" &&
@@ -4199,8 +4389,7 @@ function UpdateParnterInfo(props) {
-
-
Les indicateurs zzzz22
+
Les indicateurs
Text Indicateur 1
@@ -4478,8 +4667,32 @@ function UpdateParnterInfo(props) {
+
Contacts Publiques
+
+
Email
+ +
+ +
Téléphone
+ + +
+
} diff --git a/src/styles/components/_mon_intranet_public.scss b/src/styles/components/_mon_intranet_public.scss index b959b0f..334c399 100644 --- a/src/styles/components/_mon_intranet_public.scss +++ b/src/styles/components/_mon_intranet_public.scss @@ -2327,7 +2327,7 @@ .bloc_connexion { width: 100%; float: left; - min-height: 40vh; + min-height: 60vh; margin-top: 35rem; } @@ -2427,6 +2427,157 @@ font-weight: 700; } + /*** Pour le modele 2 - MySy_Theme2 **/ + + .bloc_milieu_model_2 { + min-height: 5rem; + width: 90%; + margin-left: 5%; + float: left; + position: absolute; + top: 8rem; + } + + + .bloc_milieu_text_model_2 { + width: 100%; + float: left; + text-align: center; + } + + .title1_nom_model_2 { + width: 100%; + text-align: center; + height: 150px; + + font-family: 'Albert Sans'; + font-style: normal; + font-weight: 700; + font-size: 30px; + // line-height: 54px; + /* or 107% */ + + letter-spacing: 1px; + + /* Deep Blue */ + + color: #0A043C; + + + /* Inside auto layout */ + + flex: none; + order: 0; + flex-grow: 0; + } + + .title2_model_2 { + width: 100%; + text-align: center; + height: 22px; + + font-family: 'Albert Sans'; + font-style: normal; + font-weight: 500; + font-size: 18px; + line-height: 22px; + /* identical to box height */ + + + /* Deep Blue */ + + color: #0A043C; + + + /* Inside auto layout */ + + flex: none; + order: 1; + flex-grow: 0; + } + + .bloc_img_milieu_gauche { + display: none; + } + + .Partner_Catalog_Background_Header_model_2 { + // position: absolute; + width: 100%; + height: 600px; + left: 0px; + top: 0px; + } + + .bloc_logo_indic_model_2 { + min-height: 5rem; + width: 90%; + margin-left: 5%; + float: left; + position: absolute; + top: 1rem; + + } + + .bloc_logo_indic_logo_model_2 { + width: 60%; + float: left; + text-align: left; + } + + + .bloc_logo_indic_contact_model_2 { + width: 18%; + float: right; + text-align: right; + } + + + .bloc_logo_indic_indic_model_2 { + width: 18%; + float: left; + } + + .bloc_logo_indic_contact_text_model_2 { + text-align: left; + font-weight: 700; + } + + + .bloc_logo_indic_indic_text_model_2 { + text-align: left; + font-weight: 700; + } + + + .bloc_milieu_text_model_2_gauche{ + width: 100%; + float: left; + + } + + .bloc_milieu_text_model_2_centre{ + width: 100%; + float: left; + height: 250px; + } + + .bloc_milieu_text_model_2_droite{ + width: 100%; + float: right; + } + + .title1_text1_model_2 { + + } + + .bloc_connexion_model_2 { + width: 100%; + float: left; + height: 70vh; + + } + + } @media only screen and (min-width: 601px) and (max-width: 991px) { @@ -5591,8 +5742,136 @@ text-align: left; font-weight: 700; } + /*** Pour le modele 2 - MySy_Theme2 **/ + + .bloc_milieu_model_2 { + min-height: 5rem; + width: 90%; + margin-left: 5%; + float: left; + position: absolute; + top: 10rem; } + + .bloc_milieu_text_model_2 { + width: 100%; + float: left; + text-align: center; + } + + .title1_nom_model_2 { + + width: 100%; + text-align: center; + height: 150px; + + font-family: 'Albert Sans'; + font-style: normal; + font-weight: 700; + font-size: 40px; + line-height: 54px; + /* or 107% */ + + letter-spacing: 1px; + + /* Deep Blue */ + + color: #0A043C; + + + /* Inside auto layout */ + + flex: none; + order: 0; + flex-grow: 0; + } + + .title2_model_2 { + + } + + .bloc_img_milieu_gauche { + display: none; + } + + .Partner_Catalog_Background_Header_model_2 { + // position: absolute; + width: 100%; + height: 380px; + left: 0px; + top: 0px; + } + + .bloc_logo_indic_model_2 { + min-height: 5rem; + width: 90%; + margin-left: 5%; + float: left; + position: absolute; + top: 1rem; + + } + + .bloc_logo_indic_logo_model_2 { + width: 60%; + float: left; + text-align: left; + } + + + .bloc_logo_indic_contact_model_2 { + width: 18%; + float: right; + text-align: right; + } + + + .bloc_logo_indic_indic_model_2 { + width: 18%; + float: left; + } + + .bloc_logo_indic_contact_text_model_2 { + text-align: left; + font-weight: 700; + } + + + .bloc_logo_indic_indic_text_model_2 { + text-align: left; + font-weight: 700; + } + + + .bloc_milieu_text_model_2_gauche{ + width: 19%; + float: left; + + } + + .bloc_milieu_text_model_2_centre{ + width: 60%; + float: left; + } + + .bloc_milieu_text_model_2_droite{ + width: 20%; + float: right; + } + .title1_text1_model_2 { + + } + + .bloc_connexion_model_2 { + width: 100%; + float: left; + min-height: 60vh; + margin-top: 3rem; + } + +} + @media only screen and (min-width: 992px) and (max-width: 1199px) { /*style grande tablettes & Pc portable */ @@ -8714,6 +8993,156 @@ font-weight: 700; } + /*** Pour le modele 2 - MySy_Theme2 **/ + + .bloc_milieu_model_2 { + min-height: 5rem; + width: 90%; + margin-left: 5%; + float: left; + position: absolute; + top: 10rem; + } + + + .bloc_milieu_text_model_2 { + width: 100%; + float: left; + text-align: center; + } + + .title1_nom_model_2 { + width: 100%; + text-align: center; + height: 150px; + + font-family: 'Albert Sans'; + font-style: normal; + font-weight: 700; + font-size: 40px; + line-height: 54px; + /* or 107% */ + + letter-spacing: 1px; + + /* Deep Blue */ + + color: #0A043C; + + + /* Inside auto layout */ + + flex: none; + order: 0; + flex-grow: 0; + } + + .title2_model_2 { + width: 100%; + text-align: center; + height: 22px; + + font-family: 'Albert Sans'; + font-style: normal; + font-weight: 500; + font-size: 18px; + line-height: 22px; + /* identical to box height */ + + + /* Deep Blue */ + + color: #0A043C; + + + /* Inside auto layout */ + + flex: none; + order: 1; + flex-grow: 0; + } + + .bloc_img_milieu_gauche { + display: none; + } + + .Partner_Catalog_Background_Header_model_2 { + // position: absolute; + width: 100%; + height: 352px; + left: 0px; + top: 0px; + } + + .bloc_logo_indic_model_2 { + min-height: 5rem; + width: 90%; + margin-left: 5%; + float: left; + position: absolute; + top: 1rem; + + } + + .bloc_logo_indic_logo_model_2 { + width: 60%; + float: left; + text-align: left; + } + + + .bloc_logo_indic_contact_model_2 { + width: 18%; + float: right; + text-align: right; + } + + + .bloc_logo_indic_indic_model_2 { + width: 18%; + float: left; + } + + .bloc_logo_indic_contact_text_model_2 { + text-align: left; + font-weight: 700; + } + + + .bloc_logo_indic_indic_text_model_2 { + text-align: left; + font-weight: 700; + } + + + .bloc_milieu_text_model_2_gauche{ + width: 19%; + float: left; + + } + + .bloc_milieu_text_model_2_centre{ + width: 60%; + float: left; + } + + .bloc_milieu_text_model_2_droite{ + width: 20%; + float: right; + } + + .title1_text1_model_2 { + + } + + .bloc_connexion_model_2 { + width: 100%; + float: left; + min-height: 50vh; + margin-top: 3rem; + } + + } @media only screen and (min-width: 1200px) and (max-width: 1919px) { @@ -11840,6 +12269,178 @@ text-align: left; font-weight: 700; } + + /*** Pour le modele 2 - MySy_Theme2 **/ + + .bloc_milieu_model_2 { + min-height: 5rem; + width: 90%; + margin-left: 5%; + float: left; + position: absolute; + top: 10rem; + } + + + .bloc_milieu_text_model_2 { + width: 100%; + float: left; + text-align: center; + } + + .title1_nom_model_2 { + width: 100%; + text-align: center; + height: 150px; + + font-family: 'Albert Sans'; + font-style: normal; + font-weight: 700; + font-size: 40px; + line-height: 54px; + /* or 107% */ + + letter-spacing: 1px; + + /* Deep Blue */ + + color: #0A043C; + + + /* Inside auto layout */ + + flex: none; + order: 0; + flex-grow: 0; + } + + .title2_model_2 { + width: 100%; + text-align: center; + height: 22px; + + font-family: 'Albert Sans'; + font-style: normal; + font-weight: 500; + font-size: 18px; + line-height: 22px; + /* identical to box height */ + + + /* Deep Blue */ + + color: #0A043C; + + + /* Inside auto layout */ + + flex: none; + order: 1; + flex-grow: 0; + } + + .bloc_img_milieu_gauche { + display: none; + } + + .Partner_Catalog_Background_Header_model_2 { + // position: absolute; + width: 100%; + height: 352px; + left: 0px; + top: 0px; + } + + .bloc_logo_indic_model_2 { + min-height: 5rem; + width: 90%; + margin-left: 5%; + float: left; + position: absolute; + top: 1rem; + + } + + .bloc_logo_indic_logo_model_2 { + width: 60%; + float: left; + text-align: left; + } + + + .bloc_logo_indic_contact_model_2 { + width: 18%; + float: right; + text-align: right; + } + + + .bloc_logo_indic_indic_model_2 { + width: 18%; + float: left; + } + + .bloc_logo_indic_contact_text_model_2 { + text-align: left; + font-weight: 700; + } + + + .bloc_logo_indic_indic_text_model_2 { + text-align: left; + font-weight: 700; + } + + + .bloc_milieu_text_model_2_gauche{ + width: 19%; + float: left; + + } + + .bloc_milieu_text_model_2_centre{ + width: 60%; + float: left; + } + + .bloc_milieu_text_model_2_droite{ + width: 20%; + float: right; + } + + .title1_text1_model_2 { + width: 100%; + text-align: left; + height: 192px; + + font-family: 'Albert Sans'; + font-style: normal; + font-weight: 500; + font-size: 30px; + line-height: 54px; + /* or 107% */ + + letter-spacing: 1px; + + /* Deep Blue */ + + color: #0A043C; + + + /* Inside auto layout */ + + flex: none; + order: 0; + flex-grow: 0; + } + + .bloc_connexion_model_2 { + width: 100%; + float: left; + min-height: 50vh; + padding-top: 3rem; + } + } @media only screen and (min-width: 1920px) { @@ -14998,6 +15599,180 @@ font-weight: 700; } + /*** Pour le modele 2 - MySy_Theme2 **/ + + .bloc_milieu_model_2 { + min-height: 5rem; + width: 90%; + margin-left: 5%; + float: left; + position: absolute; + top: 10rem; + } + + + .bloc_milieu_text_model_2 { + width: 100%; + float: left; + text-align: center; + } + + .title1_nom_model_2 { + width: 100%; + text-align: center; + height: 150px; + + font-family: 'Albert Sans'; + font-style: normal; + font-weight: 700; + font-size: 40px; + line-height: 54px; + /* or 107% */ + + letter-spacing: 1px; + + /* Deep Blue */ + + color: #0A043C; + + + /* Inside auto layout */ + + flex: none; + order: 0; + flex-grow: 0; + } + + .title2_model_2 { + width: 100%; + text-align: center; + height: 22px; + + font-family: 'Albert Sans'; + font-style: normal; + font-weight: 500; + font-size: 18px; + line-height: 22px; + /* identical to box height */ + + + /* Deep Blue */ + + color: #0A043C; + + + /* Inside auto layout */ + + flex: none; + order: 1; + flex-grow: 0; + } + + .bloc_img_milieu_gauche { + display: none; + } + + .Partner_Catalog_Background_Header_model_2 { + // position: absolute; + width: 100%; + height: 352px; + left: 0px; + top: 0px; + } + + .bloc_logo_indic_model_2 { + min-height: 5rem; + width: 90%; + margin-left: 5%; + float: left; + position: absolute; + top: 1rem; + + } + + .bloc_logo_indic_logo_model_2 { + width: 60%; + float: left; + text-align: left; + } + + + .bloc_logo_indic_contact_model_2 { + width: 18%; + float: right; + text-align: right; + } + + + .bloc_logo_indic_indic_model_2 { + width: 18%; + float: left; + } + + .bloc_logo_indic_contact_text_model_2 { + text-align: left; + font-weight: 700; + } + + + .bloc_logo_indic_indic_text_model_2 { + text-align: left; + font-weight: 700; + } + + + + .bloc_milieu_text_model_2_gauche{ + width: 19%; + float: left; + + } + + .bloc_milieu_text_model_2_centre{ + width: 60%; + float: left; + } + + .bloc_milieu_text_model_2_droite{ + width: 20%; + float: right; + } + + .title1_text1_model_2 { + width: 100%; + text-align: left; + height: 192px; + + font-family: 'Albert Sans'; + font-style: normal; + font-weight: 500; + font-size: 30px; + line-height: 54px; + /* or 107% */ + + letter-spacing: 1px; + + /* Deep Blue */ + + color: #0A043C; + + + /* Inside auto layout */ + + flex: none; + order: 0; + flex-grow: 0; + } + + .bloc_connexion_model_2 { + width: 100%; + float: left; + min-height: 40vh; + padding-top: 3rem; + } + + + } // end media diff --git a/src/styles/components/_updateparnterinfo.scss b/src/styles/components/_updateparnterinfo.scss index 8f2a0fa..919583f 100644 --- a/src/styles/components/_updateparnterinfo.scss +++ b/src/styles/components/_updateparnterinfo.scss @@ -832,6 +832,9 @@ margin-bottom: 1.5rem !important; } + + + .texte_area_adress { float: left; width: 95% !important; @@ -1092,7 +1095,7 @@ } } - + // end media .css-mnn31 {