diff --git a/src/App.css b/src/App.css index 2f39d65..155a9f8 100644 --- a/src/App.css +++ b/src/App.css @@ -1,4 +1,4 @@ - + /* latin-ext */ @@ -208,7 +208,7 @@ body { background-color: white; - font-family: Arial; + font-family: "DM Sans", ui-sans-serif, system-ui, "-apple-system", "Segoe UI", "Roboto", "Arial", "Apple Color Emoji","Segoe UI Emoji"; text-align: center; } } diff --git a/src/App.js b/src/App.js index 03672fe..b0fdfcb 100644 --- a/src/App.js +++ b/src/App.js @@ -83,6 +83,10 @@ import img_loading_spin from "./mysy_img/mysy_spin_loading.gif"; function App() { + const New_Marktplace_2026 = lazy(() => import("./pages/marketplace_2026")); + const New_Detailled_Class_2026 = lazy(() => import("./pages/detailled_class_2026")); + const New_Landing_Page_2026 = lazy(() => import("./pages/landing_page_2026")); + const New_Marktplace_2025 = lazy(() => import("./pages/new_p_marketplace_2025")); const New_Test_Header_Footer_2025 = lazy(() => import("./pages/new_p_test_header_footer_2025")); const Jmjformation_catalogue = lazy(() => import("./pages/jmjformation_catalogue_public")); @@ -141,7 +145,7 @@ function App() { const AddArticle = lazy(() => import("./pages/addarticle")); const RechecheArticles = lazy(() => import("./pages/recherchearticles")); const PartnerLogin1 = lazy(() => import("./pages/partnerlogin1")); - const PartnerLogin0 = lazy(() => import("./pages/partnerlogin0")); + const PartnerLogin0 = lazy(() => import("./pages/partnerlogin0")); const PartnerLogin = lazy(() => import("./pages/partnerlogin")); const CreateAccount = lazy(() => import("./pages/createaccount")); const Partner = lazy(() => import("./pages/partner")); @@ -342,6 +346,10 @@ function App() { {/* Debut Migration */} + + + + diff --git a/src/components/Account.js b/src/components/Account.js index 88d4d8d..b45bbba 100644 --- a/src/components/Account.js +++ b/src/components/Account.js @@ -403,12 +403,12 @@ function Account() { -
-
-

Connexion MySy Training Technology

-
-
-
+ +
+ + + + + +
+ + {String(firstConnexion) === "1" && +
+
+ Cher Utilisateur, c'est votre première connexion,
 
+ Nous sommes ravis de vous accueillir. Nous vous invitons à modifier votre mot de passe à partir du menu "MES INFORMATIONS" ==> Pavé "SECURITE" puis "MODIFIER"

+
+  
Merci. +
} - {String(myApiResponse) !== String("true") &&
- {result} + {String(myApiResponse) === String("true") &&
+ {result} -
} +
} + {String(myApiResponse) !== String("true") &&
+ {result} - {String(menu) === String("mes_factures") && connected_user_data && connected_user_data.partner_owner_recid && - connected_user_data.partner_client_id && - } +
} - {String(menu) === String("mes_devis") && connected_user_data && connected_user_data.partner_owner_recid && - connected_user_data.partner_client_id && - } + {String(menu) === String("mes_factures") && connected_user_data && connected_user_data.partner_owner_recid && + connected_user_data.partner_client_id && + } + + {String(menu) === String("mes_devis") && connected_user_data && connected_user_data.partner_owner_recid && + connected_user_data.partner_client_id && + } - {String(menu) === String("modules_mes_documents") && connected_user_data && connected_user_data.partner_owner_recid && - connected_user_data.partner_client_id && - } + {String(menu) === String("modules_mes_documents") && connected_user_data && connected_user_data.partner_owner_recid && + connected_user_data.partner_client_id && + } - {String(menu) === String("mes_conventions") && connected_user_data && connected_user_data.partner_owner_recid && - connected_user_data.partner_client_id && - } + {String(menu) === String("mes_conventions") && connected_user_data && connected_user_data.partner_owner_recid && + connected_user_data.partner_client_id && + } - {String(menu) === String("mes_convocations") && connected_user_data && connected_user_data.partner_owner_recid && - connected_user_data.partner_client_id && - } + {String(menu) === String("mes_convocations") && connected_user_data && connected_user_data.partner_owner_recid && + connected_user_data.partner_client_id && + } - {String(menu) === String("mes_attestations") && connected_user_data && connected_user_data.partner_owner_recid && - connected_user_data.partner_client_id && - } + {String(menu) === String("mes_attestations") && connected_user_data && connected_user_data.partner_owner_recid && + connected_user_data.partner_client_id && + } - {String(menu) === String("mes_stagiaires") && connected_user_data && connected_user_data.partner_owner_recid && - connected_user_data.partner_client_id && - } + />} - {String(menu) === String("mes_documents") && } + {String(menu) === String("mes_documents") && } - {String(menu) === String("affichage") && } - - -
+ {String(menu) === String("affichage") && }
- -
); diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index 28d2e10..d85d0dd 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -664,7 +664,7 @@ const AddClassManual = (props) => { var node = { "_id": local_id, "id": localid, - "label": local_code+" - "+String(local_titre).substring(0, 20), + "label": local_code + " - " + String(local_titre).substring(0, 20), "code": local_code, "titre": local_titre, "credit": local_credit, @@ -6483,12 +6483,12 @@ const AddClassManual = (props) => { } if (mylocaltraining.ATTESTATION_FORMATION_PDF) { - console.log(" ### eeee = ", mylocaltraining.ATTESTATION_FORMATION_PDF) + console.log(" ### eeee = ", mylocaltraining.ATTESTATION_FORMATION_PDF) setselected_default_attestation_PDF(mylocaltraining.ATTESTATION_FORMATION_PDF); } if (mylocaltraining.ATTESTATION_FORMATION_MAIL) { - console.log(" ### iii = ", mylocaltraining.ATTESTATION_FORMATION_MAIL) + console.log(" ### iii = ", mylocaltraining.ATTESTATION_FORMATION_MAIL) setselected_default_attestation_Email(mylocaltraining.ATTESTATION_FORMATION_MAIL); } @@ -7296,7 +7296,6 @@ const AddClassManual = (props) => { > Assistant IA   - {String(props.mytrainingclass.ref).trim() !== "" && } @@ -7310,6 +7309,10 @@ const AddClassManual = (props) => { {String(props.mytrainingclass.ref).trim() !== "" && } + + {String(props.mytrainingclass.ref).trim() !== "" && + } +
} {submenu && String(submenu) === "unite_enseignement" && @@ -7660,7 +7663,7 @@ const AddClassManual = (props) => { - {String(props.ispending) === String("0") &&
+ {String(props.ispending) === String("0") &&
{(String(datamodification) === String("1") || String(editor_tochange) === String("1")) &&
@@ -8569,7 +8572,7 @@ const AddClassManual = (props) => {
-
} +
}
@@ -10579,7 +10582,7 @@ const AddClassManual = (props) => { } {String(selected_statistic_question_type) === "Moyenne" && -