diff --git a/src_060326.zip b/public_src_070326_18h.zip similarity index 84% rename from src_060326.zip rename to public_src_070326_18h.zip index a72fbf3..31271b9 100644 Binary files a/src_060326.zip and b/public_src_070326_18h.zip differ diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index 78769c8..c96f9b9 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -9628,8 +9628,8 @@ const AddClassManual = (props) => { height: 300, menubar: true, plugins: [ - 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', - 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', ], @@ -9688,8 +9688,8 @@ const AddClassManual = (props) => { height: 300, menubar: true, plugins: [ - 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', - 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', ], @@ -9750,8 +9750,8 @@ const AddClassManual = (props) => { height: 300, menubar: true, plugins: [ - 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', - 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', ], @@ -9786,8 +9786,8 @@ const AddClassManual = (props) => { height: 300, menubar: true, plugins: [ - 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', - 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', ], @@ -9823,8 +9823,8 @@ const AddClassManual = (props) => { height: 300, menubar: true, plugins: [ - 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', - 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', ], @@ -9861,8 +9861,8 @@ const AddClassManual = (props) => { height: 300, menubar: true, plugins: [ - 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', - 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', ], @@ -9921,8 +9921,8 @@ const AddClassManual = (props) => { height: 300, menubar: true, plugins: [ - 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', - 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', ], @@ -9957,8 +9957,8 @@ const AddClassManual = (props) => { height: 300, menubar: true, plugins: [ - 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', - 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', ], @@ -9993,8 +9993,8 @@ const AddClassManual = (props) => { height: 300, menubar: true, plugins: [ - 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', - 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', ], @@ -10052,8 +10052,8 @@ const AddClassManual = (props) => { height: 300, menubar: true, plugins: [ - 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', - 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', ], @@ -10111,8 +10111,8 @@ const AddClassManual = (props) => { height: 300, menubar: true, plugins: [ - 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', - 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', ], diff --git a/src/components/CheckOut.js b/src/components/CheckOut.js index dba7495..6a901c0 100644 --- a/src/components/CheckOut.js +++ b/src/components/CheckOut.js @@ -26,9 +26,8 @@ import { useStripe, useElements, } from '@stripe/react-stripe-js'; -import { Elements } from '@stripe/react-stripe-js'; -import { loadStripe } from '@stripe/stripe-js'; -import { PaymentElement } from '@stripe/react-stripe-js'; + + import Popup from 'reactjs-popup'; @@ -36,10 +35,6 @@ import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; -const stripePromise = loadStripe('pk_test_51LUUfAAbmaEugrFTI25uZBD3IFjbtaL6jUfRV83diDf7nco8worna4NGKhMHbPP71WCwT5EHFRdDNatxPrJWwgZ300kgH5EO4p'); -//const stripePromise_PROD = loadStripe('pk_live_51LUUfAAbmaEugrFTyfNe4Dj0vbxc5qXQqNs0rztjAKy8oSlc5EEQyJGjA8Z5kXmP2gvUMcYLUBYCIyWWzLCw59RY00PtGInkVf'); - - function CheckOut(props) { diff --git a/src/components/ENT_Student_header_automatic_files/ENT_Student_Header.jsx b/src/components/ENT_Student_header_automatic_files/ENT_Student_Header.jsx index 117b147..ecdd13e 100644 --- a/src/components/ENT_Student_header_automatic_files/ENT_Student_Header.jsx +++ b/src/components/ENT_Student_header_automatic_files/ENT_Student_Header.jsx @@ -89,6 +89,8 @@ const ENT_Student_Header = () => { const stored_part = getCookie('tokenmysypart'); const stored_apprenant_id = getCookie('tokenmysychapprenant'); + const stored_tuteur_id = getCookie('tokenmysytuteurrhid'); + const stored_tokenmysytypeconnexion = getCookie('tokenmysytypeconnexion'); const [cookie, setCookie, removeCookie] = useCookies(['tokenmysych'], { path: '/' }); @@ -408,7 +410,7 @@ const ENT_Student_Header = () => { } {stored_tokenmysytypeconnexion === "tuteur" && } diff --git a/src/components/Ent_Intranet.js b/src/components/Ent_Intranet.js index c1a91ea..7e52a1e 100644 --- a/src/components/Ent_Intranet.js +++ b/src/components/Ent_Intranet.js @@ -10,6 +10,7 @@ import 'react-input-range/lib/css/index.css'; import img_header from "../mysy_img2/img_header.png" import Module_Connexion_Ent_Student from "./Module_Connexion_Ent_Student"; +import Module_Connexion_Ent_Student_V2 from "./Module_Connexion_Ent_Student_V2"; import Fotter_Intranet_Client_Pub from "./Fotter_Intranet_Client_Pub" @@ -2440,6 +2441,8 @@ const Ent_Intranet = (props) => { var catalog_pub_logo = JSON.parse(x).catalog_pub_logo; var catalog_pub_banniere_img = JSON.parse(x).catalog_pub_banniere_img; + + var theme_code = JSON.parse(x).theme_code; var catalog_pub_message_1_txt = JSON.parse(x).catalog_pub_message_1_txt; @@ -2821,7 +2824,7 @@ const Ent_Intranet = (props) => {
- +
} {/******* FIN Gestion du THEME "MySy_Theme2" */} @@ -2930,7 +2933,7 @@ const Ent_Intranet = (props) => {
- +
} diff --git a/src/components/HebergementLms.js b/src/components/HebergementLms.js index d2a822d..7599db2 100644 --- a/src/components/HebergementLms.js +++ b/src/components/HebergementLms.js @@ -7,12 +7,6 @@ import { useHistory } from "react-router-dom"; import { FcIdea } from "react-icons/fc"; import img_loading_spin from "./../mysy_img/mysy_spin_loading.gif"; -import { - CardElement, - useStripe, - useElements, -} from '@stripe/react-stripe-js'; - import Popup from 'reactjs-popup'; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' @@ -20,9 +14,6 @@ import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; import Fab from '@mui/material/Fab'; import { IoIosAddCircleOutline, IoMdTrash } from "react-icons/io"; -//const stripePromise = loadStripe('pk_test_51LUUfAAbmaEugrFTI25uZBD3IFjbtaL6jUfRV83diDf7nco8worna4NGKhMHbPP71WCwT5EHFRdDNatxPrJWwgZ300kgH5EO4p'); -//const stripePromise_PROD = loadStripe('pk_live_51LUUfAAbmaEugrFTyfNe4Dj0vbxc5qXQqNs0rztjAKy8oSlc5EEQyJGjA8Z5kXmP2gvUMcYLUBYCIyWWzLCw59RY00PtGInkVf'); - function HebergementLms(props) { diff --git a/src/components/Module_Absence.js b/src/components/Module_Absence.js index 79e17e1..250aefc 100644 --- a/src/components/Module_Absence.js +++ b/src/components/Module_Absence.js @@ -38,11 +38,52 @@ import allLocales from '@fullcalendar/core/locales-all' import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; import ToggleSwitch from "./ToggleSwitch"; +import ToggleSwitch_v2_mysy from "./ToggleSwitch_v2_mysy"; + import { IoAddCircleOutline, IoCloseCircleOutline } from "react-icons/io5"; +import { makeStyles } from "@material-ui/core/styles"; +import CancelPresentationIcon from '@mui/icons-material/CancelPresentation'; +import { IconButton } from '@material-ui/core'; +import Paper from '@material-ui/core/Paper'; +import Draggable from 'react-draggable'; + +function PaperComponent(props) { + return ( + + + + ); +} +const useStyles = makeStyles((theme) => ({ + + dialog: { + position: 'absolute', + // left: 10, + top: 400 + }, + + paper: { + overflowY: 'unset', + }, + customizedButton: { + position: 'absolute', + left: '95%', + top: '-3%', + backgroundColor: 'lightgray', + color: 'gray', + }, +})); + + const Module_Absence = (props) => { const myconntected_employee_id = props.conntected_employee_id; -registerLocale('fr', fr); + registerLocale('fr', fr); + + const classes = useStyles(); const attendee_email = props.attendee_email; const [selected_employee_id, setselected_employee_id] = useState(props.conntected_employee_id); @@ -449,13 +490,14 @@ registerLocale('fr', fr); } - setp_detail_title("Nouvelle") + setp_detail_title("Nouvelle Absence") setp_detail_start(info.start) setp_detail_end(info.end) setp_detail_comment(""); setp_detail_event_id(""); setp_detail_justified(false); - setp_detail_event_type(""); + setp_detail_event_type("absence"); + setStartDate(info.start); setendDate(info.end); @@ -495,13 +537,13 @@ registerLocale('fr', fr); var new_start_date = new Date(); var new_end_date = new Date(); - setp_detail_title("Nouvelle") + setp_detail_title("Nouvelle Absence") setp_detail_start(new_start_date) setp_detail_end(new_start_date) setp_detail_comment(""); setp_detail_event_id(""); setp_detail_justified(false); - setp_detail_event_type(""); + setp_detail_event_type("absence"); setStartDate(new_start_date); setendDate(new_start_date); @@ -638,13 +680,13 @@ registerLocale('fr', fr); function Close_Dialog_Detail_Event_open() { - setp_detail_title("Nouvelle") + setp_detail_title("Nouvelle Absence") setp_detail_start() setp_detail_end() setp_detail_comment(""); setp_detail_event_id(""); setp_detail_justified(false); - setp_detail_event_type(""); + setp_detail_event_type("absence"); setDialog_1_open(false); } @@ -961,9 +1003,34 @@ registerLocale('fr', fr); null} + + PaperProps={{ + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '35rem', + margin: "2px", + maxWidth: 'unset', + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + + className="displaypartnersession mysy_MuiPaper-root" + disableEnforceFocus={true} > @@ -973,59 +1040,61 @@ registerLocale('fr', fr); {Dialog_1_message} -
+ +
+
Titre -
Debut - { - if (String(props.write_access) === "1") - return setStartDate(date); - } - } +
-
Fin - Fin + { - if (String(props.write_access) === "1") - return setendDate(date); - } - } + onChange={(date) => { + if (String(props.write_access) === "1") + return setendDate(date); + } + } - className="disabled_style session_caract_Dialog_DatePicker" - locale={'fr'} - showTimeSelect - timeFormat="HH:mm" - timeIntervals={15} - dateFormat="dd/MM/yyyy HH:mm" - is24Hour + className="disabled_style session_caract_Dialog_DatePicker" + locale={'fr'} + showTimeSelect + timeFormat="HH:mm" + timeIntervals={15} + dateFormat="dd/MM/yyyy HH:mm" + is24Hour - /> + /> -
+
+ +
Commentaire
+ + + + @@ -1163,7 +1244,7 @@ registerLocale('fr', fr);
-

Planning

+

Absences

Affichage : @@ -1245,9 +1326,9 @@ registerLocale('fr', fr); },*/ "& .MuiDataGrid-columnHeaders": { backgroundColor: "#dfe8f2", - color: "#0a2a4d", - fontSize: '14px', - fontFamily:'DM Sans', + color: "#0a2a4d", + fontSize: '14px', + fontFamily: 'DM Sans', }, }} @@ -1351,7 +1432,7 @@ registerLocale('fr', fr);
diff --git a/src/components/Module_Connexion_Ent_Student_V2.js b/src/components/Module_Connexion_Ent_Student_V2.js new file mode 100644 index 0000000..03b3f35 --- /dev/null +++ b/src/components/Module_Connexion_Ent_Student_V2.js @@ -0,0 +1,1011 @@ +import React, { useState, useEffect } from "react"; +import { useForm } from "react-hook-form"; +import { useHistory } from "react-router-dom"; +import { Button, FormGroup, Label, Input } from "reactstrap"; +import { useCookies } from "react-cookie"; +import { confirmAlert } from 'react-confirm-alert'; // Import +import 'react-confirm-alert/src/react-confirm-alert.css'; // Import css +import Popup from 'reactjs-popup'; +import 'reactjs-popup/dist/index.css'; +import axios from "axios"; +import { useParams } from 'react-router-dom' +import { useLocation } from "react-router-dom"; +import Visibility from '@mui/icons-material/Visibility'; +import VisibilityOff from '@mui/icons-material/VisibilityOff'; +import 'react-tooltip/dist/react-tooltip.css' +import { Tooltip } from 'react-tooltip' +import ent_studend_img from "../mysy_img/ent_studend_img.jpg"; +import { getCookie } from 'react-use-cookie'; + +function Module_Connexion_Ent_Student_V2() { + const [isconnected, setisconnected] = useState(""); + const [cookie_acces_right, setCookie_acces_right, removeCookie_acces_right] = useCookies(['mysy_user_access_right']); + const [cookie, setCookie, removeCookie] = useCookies(['tokenmysych'], { path: '/' }); + const [cookie_apprenant_id, setCookie_apprenant_id, removeCooki_apprenant_ide] = useCookies(['tokenmysychapprenant'], { path: '/' }); + const [cookie_part, setCookie_part, removeCookie_part] = useCookies(['tokenmysypart'], { path: '/' }); + const [retval, setretval] = useState("0"); + const [myApimyApiMessage, setmyApimyApiMessage] = useState(""); + const [initpasswd, setinitpasswd] = useState(); + + const [selected_apprenant_id, setselected_apprenant_id] = useState(""); + + const [result, setResult] = useState(""); + const [myApiResponse, setmyApiResponse] = useState("false"); + const url_login = process.env.REACT_APP_API_URL + "myclass/api/Ent_Student_login/"; + + const random1 = Math.floor(Math.random() * 10); + const random2 = Math.floor(Math.random() * 10); + + const [closepopup, setclosepopup] = useState(0); + const { obj, objid } = useParams(); + const [menucompte, setmenucompte] = useState("user"); + const [currentpawdvisible, setcurrentpawdvisible] = useState(false); + const [typecompte, settypecompte] = useState("user"); + + const { + register, + formState: { errors }, + handleSubmit, + } = useForm(); + + + const history = useHistory(); + + function logout_partner_confirmation() { + removeCookie_part('tokenmysypart', { path: '/' }); + const stored_cookie = getCookie('tokenmysypart'); + + if (stored_cookie) { + var acces_right_token_name = stored_cookie + "_uar"; + + removeCookie(acces_right_token_name,); + } + + removeCookie("tokenmysychapprenant"); + removeCookie("tokenmysych"); + removeCookie("tokenmysychconnecteduserid"); + removeCookie("tokenmysytypeconnexion"); + + removeCookie("__stripe_sid"); + removeCookie("__stripe_mid"); + + + removeCookie("tokenmysypart"); + removeCookie("mysy_session_display_view",); + removeCookie("mysy_menu_gauche_reduit",); + removeCookie("mysy_catalog_data_row_grouped_by",); + removeCookie("tokenmysytuteurrhid"); + removeCookie("tokenmysychclient"); + + } + + function retnull() { + setretval("-1"); + } + + + function logout_user_confirmation() { + removeCookie_part('tokenmysych', { path: '/' }); + const stored_cookie = getCookie('tokenmysypart'); + + if (stored_cookie) { + var acces_right_token_name = stored_cookie + "_uar"; + + removeCookie(acces_right_token_name,); + } + + removeCookie("tokenmysychapprenant"); + removeCookie("tokenmysych"); + removeCookie("tokenmysychconnecteduserid"); + removeCookie("tokenmysytypeconnexion"); + + removeCookie("__stripe_sid"); + removeCookie("__stripe_mid"); + + + removeCookie("tokenmysypart"); + removeCookie("mysy_session_display_view",); + removeCookie("mysy_menu_gauche_reduit",); + removeCookie("mysy_catalog_data_row_grouped_by",); + removeCookie("tokenmysytuteurrhid"); + removeCookie("tokenmysychclient"); + + } + + function Logout_User() { + confirmAlert({ + title: 'Deconnexion utilisateur ?', + message: 'Confirmez la deconnexion utilisateur', + buttons: [ + { + label: 'Oui', + onClick: () => logout_user_confirmation() + }, + /* { + label: 'Non', + onClick: () => retnull() + + }*/ + ] + }); + } + + + const [is_tuteur_connexion, setis_tuteur_connexion] = useState(""); + + const onSubmit = async (data) => { + + //console.log(" CONNEXION DE = ",menucompte); + var partner_connexion = ""; + var url_login = ""; + + url_login = process.env.REACT_APP_API_URL + "myclass/api/Ent_Student_login/"; + setmenucompte("user"); + partner_connexion = "user"; + + + + // console.log( " ### full url_login = ", url_login) + + // Gestion des Cookies + const stored_partner = cookie_part.tokenmysypart; + const stored_user = cookie.tokenmysych; + + const formData = new FormData(); + var mymail = document.getElementsByName("email")[0].value; + var mypwd = document.getElementsByName("pwd")[0].value; + + formData.append("email", mymail); + formData.append("pwd", mypwd); + formData.append("type", "student"); + + var re = /\S+@\S+\.\S+/; + if (re.test(mymail) === false) { + alert("l'adresse email est incorrecte"); + return; + } + + if (mypwd.length <= 0) { + alert("Vous n'avez pas saisi de mot de passe"); + return; + } + + + // si c'est une connexion user qui est active + if (typeof (stored_user) != "undefined" && String(stored_user) !== String('')) { + //alert(" c'est une connexion USERR qui est active"); + Logout_User(); + } + + + fetch( + url_login, + { + method: 'POST', + body: formData, + } + ).then((response) => response.json()) + .then((result) => { + console.log('Success:', result['message'], "result['status'] = ", result['status'], "result['apprenant_id'] = ", result['apprenant_id'], + "result['type_connexion'] = ", result['type_connexion'], "result['tab_apprenant_tutored'] = ", result['tab_apprenant_tutored'], + ); + + var val = result['status']; + + if (String(val) === String("true")) { + + if (result['type_connexion'] === "tuteur") { + setis_tuteur_connexion("1"); + setCookie("tokenmysytuteurrhid", result['apprenant_id']); + + } else { + setis_tuteur_connexion("0"); + setCookie("tokenmysychapprenant", result['apprenant_id']); + + } + + setCookie("tokenmysych", result['message']); + setCookie("tokenmysytypeconnexion", result['type_connexion']); + setCookie("tokenmysychconnecteduserid", result['user_account_id']); + + setselected_apprenant_id(result['apprenant_id']) + + // Verification vers quelle page les renvoyer + if (obj === "training" && String(objid).length > 0) { + // redirection vers l'affichage d'une formation + history.push("/Display-Detail-formation/" + objid); + } + else { + // Redirection par defaut vers les formations de l'apprenant - ENT + history.push({ + pathname: "/mysy-student-ent/" + String(result['apprenant_id']) + "/mes_formations", + state: { + firstconnexion: String(result['firstconnexion']), + apprenant_id: String(result['apprenant_id']), + type_connexion: result['type_connexion'], + liste_apprenant: result['tab_apprenant_tutored'], + + } + }); + } + } + + else { + setisconnected("false"); + setmyApimyApiMessage(result['message']); + } + }) + .catch((error) => { + console.error('Error:', error); + setisconnected("false"); + setmyApimyApiMessage("Le service est momentanément indisponible, merci de ressayer plus tard. "); + + }); + } + + + const location = useLocation(); + + useEffect(() => { + + const stored_cookie = getCookie('tokenmysypart'); + + if (stored_cookie) { + var acces_right_token_name = stored_cookie + "_uar"; + + removeCookie(acces_right_token_name,); + } + + removeCookie("tokenmysychapprenant"); + removeCookie("tokenmysych"); + removeCookie("tokenmysychconnecteduserid"); + removeCookie("tokenmysytypeconnexion"); + + removeCookie("__stripe_sid"); + removeCookie("__stripe_mid"); + + + removeCookie("tokenmysypart"); + removeCookie("mysy_session_display_view",); + removeCookie("mysy_menu_gauche_reduit",); + removeCookie("mysy_catalog_data_row_grouped_by",); + removeCookie("tokenmysytuteurrhid"); + removeCookie("tokenmysychclient"); + + setmenucompte("partner"); + + const listener = event => { + if (event.code === "Enter" || event.code === "NumpadEnter") { + + event.preventDefault(); + + onSubmit(); + } + }; + document.addEventListener("keydown", listener); + + if (String(menucompte) === String("user")) { + menu_user_account(); + } + else { + menu_parter_account(); + } + + if (location && location.state && location.state.mysy_arg && String(location.state.mysy_arg) === "partner") { + menu_parter_account(); + } + + + }, []); + + + + function menu_parter_account() { + //alert(" menu_parter_account = "+String(menucompte)); + setmenucompte("partner"); + + if (document.getElementsByName("partner_account") && document.getElementsByName("partner_account")[0]) + document.getElementsByName("partner_account")[0].style.backgroundColor = "#81BC3A"; + + if (document.getElementsByName("user_account") && document.getElementsByName("user_account")[0]) + document.getElementsByName("user_account")[0].style.backgroundColor = "#ffffff"; + + + } + + function menu_user_account() { + + setmenucompte("user"); + + if (document.getElementsByName("user_account") && document.getElementsByName("user_account")[0]) + document.getElementsByName("user_account")[0].style.backgroundColor = "#81BC3A"; + + + } + + + function resetpasswd_ok(e) { + + var total = " ?? "; + if (document.getElementsByName("sommerandom")[0].value) { + total = document.getElementsByName("sommerandom")[0].value; + } + var calcaul_total = parseInt(random1) + parseInt(random2); + if (parseInt(total) != parseInt(calcaul_total)) { + document.getElementsByName("pasrobot")[0].style.backgroundColor = "red"; + + alert(" Le total dans la zone 'je ne suis pas un robot' est incohérent. Recommencez svp :) !!!"); + return; + } + + + // Controle du mail + var mymail = document.getElementsByName("resetemailvalue")[0].value; + //alert(" le mail de reset = "+mymail); + var re = /\S+@\S+\.\S+/; + if (re.test(mymail) === false) { + alert("l'adresse email est incorrecte"); + return; + } + + var form = new FormData(); + + form.append("email", mymail); + + + // Controle du type de compte + if (String(typecompte) !== "partner" && String(typecompte) !== "user") { + alert("Le type de compte est inconnu"); + document.getElementsByName("is_user_or_pro")[0].style.backgroundColor = "orangered"; + return; + } + form.append("account_type", typecompte); + + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/InitUserPasswd/"; + + //alert("myurl = "+myurl); + axios.post(myurl, form).then(res => { + setclosepopup(1); + setinitpasswd("true"); + if (String(res.data.status) != String("false")) { + //console.log(" In test res.data.status = " + res.data.status); + //console.log(" In test res.data.message = " + res.data.message); + setmyApiResponse("true"); + + setResult(res.data.message); + + } + else { + //console.log(" In test res.data.status = " + res.data.status); + //console.log(" In test res.data.message = " + res.data.message); + setmyApiResponse("false"); + setResult(res.data.message); + } + + + }).catch((error) => { + console.warn('Not good man :( mysearchtext = '); + setmyApiResponse("false"); + setinitpasswd("false"); + //setmyApimyApiMessage("") + }) + + + } + + function resetpasswd(e) { + confirmAlert({ + title: 'Reinitialisation Mot de Passe?', + message: 'Confirmez la reinitialisation', + buttons: [ + { + label: 'Oui', + onClick: () => resetpasswd_ok() + }, + { + label: 'Non', + onClick: () => { return } + + }, + + ], + closeOnEscape: false, + closeOnClickOutside: false, + keyCodeForClose: [8, 32], + willUnmount: () => { }, + afterClose: () => { }, + onClickOutside: () => { }, + onKeypress: () => { }, + onKeypressEscape: () => { }, + }); + + } + + + function closepopupinitpwd() { + setclosepopup("1"); + } + + // Cette fonction permet de cacher le mot de passer et eviter les + // autocompletion + const [realpwdvalue, setrealpwdvalue] = useState(""); + const [realpwdhidenvalue, setrealpwdhidenvalue] = useState(""); + function realpwd(e) { + const val = e.target.value; + const last = val.charAt(val.length - 1); + var new_val = realpwdvalue; + var new_val_hiden = realpwdhidenvalue; + + //alert(" new_val avant saisie= "+new_val); + new_val = new_val + last; + new_val_hiden = new_val_hiden + "*"; + + //alert(" - new_val apres sisie = "+new_val+" new_val_hiden = "+new_val_hiden); + setrealpwdhidenvalue(new_val_hiden); + setrealpwdvalue(new_val); + + //setrealpwdvalue(val); + //document.getElementById("cle_secrete").value = new_val_hiden; + + } + + /* function displayvlaue(){ + alert(" la valeur secrete = "+realpwdvalue); + }*/ + + + const handleClickShowPassword = () => { + if (currentpawdvisible == false) { + document.getElementsByName("pwd")[0].type = "text"; + setcurrentpawdvisible(true); + } + else if (currentpawdvisible == true) { + document.getElementsByName("pwd")[0].type = "password"; + setcurrentpawdvisible(false); + } + }; + + return ( + +
+
+
+ +
+
+ + +

+ Bienvenue sur votre{" "}
+ Espace Numérique de Travail +

+ +

+ Accédez à vos parcours, vos ressources et votre suivi pédagogique + dans une interface simple, moderne et rassurante. + +

+ +
+ +
+ +
+ +
+
+
+
+

Connexion sécurisée

+ +
+ + +
+ +
+
+ + +
+ +
+
+ + + {String(initpasswd) !== String("true") && String(closepopup) !== String("1") + && Mot de passe oublié} + position="center" className="signin popup-reset-pwd"> +
+
Modifier le mot de passe
+
+ + +
+ + +
+ + + +
+ Je ne suis pas un robot
+
+ + +
{random1} + {random2} = + + {errors.sommerandom && ( + la sommes est incorrect + )} +
+
+
+ +       + +
+ +
+ } +
+ + +
+ + + + +
+
+
+ + + +
+

Connexion rapide

+

Un accès clair à vos contenus, documents et convocations.

+
+ +
+

Suivi centralisé

+

Retrouvez vos informations utiles en un seul endroit.

+
+ +
+

Interface responsive

+

Une expérience fluide sur ordinateur, tablette et mobile.

+
+
+
+ + +
+ + + +
+ ); + +} + +export default Module_Connexion_Ent_Student_V2; + +const local_css = ` + +* { + box-sizing: border-box; +} + +body { + margin: 0; + font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", + sans-serif; + background: #f4f7f6; + color: #1e293b; +} + +a { + text-decoration: none; +} + +.ent-page { + min-height: 100vh; + position: relative; + overflow: hidden; + background: + radial-gradient(circle at top left, rgba(34, 197, 94, 0.12), transparent 30%), + radial-gradient(circle at bottom right, rgba(16, 185, 129, 0.10), transparent 30%), + linear-gradient(135deg, #f8fafc 0%, #edf7f1 50%, #f8fafc 100%); + padding: 40px 20px; +} + +.ent-bg-shape { + position: absolute; + border-radius: 999px; + filter: blur(70px); + z-index: 0; +} + +.ent-bg-shape-1 { + width: 320px; + height: 320px; + background: rgba(16, 185, 129, 0.14); + top: -80px; + left: -80px; +} + +.ent-bg-shape-2 { + width: 360px; + height: 360px; + background: rgba(132, 204, 22, 0.12); + bottom: -100px; + right: -100px; +} + +.ent-container { +font-family: 'DM Sans'; + position: relative; + z-index: 1; + max-width: 700px; + margin: 0 auto; + min-height: calc(100vh - 80px); + display: grid; + + gap: 32px; + align-items: center; +} + +.ent-left, +.ent-right { + background: rgba(255, 255, 255, 0.72); + backdrop-filter: blur(14px); + -webkit-backdrop-filter: blur(14px); + border: 1px solid rgba(255, 255, 255, 0.65); + border-radius: 32px; + box-shadow: 0 24px 60px rgba(15, 23, 42, 0.10); +} + +.ent-left { + padding: 48px; +} + +.ent-right { + padding: 40px; +} + +.ent-badge { + display: inline-flex; + align-items: center; + gap: 10px; + padding: 10px 16px; + border-radius: 999px; + background: #ffffff; + color: #047857; + font-size: 14px; + font-weight: 600; + box-shadow: 0 8px 24px rgba(15, 23, 42, 0.06); + margin-bottom: 24px; +} + +.ent-badge-dot { + width: 10px; + height: 10px; + border-radius: 50%; + background: #10b981; +} + +.ent-title { + margin: 0; + font-size: 52px; + line-height: 1.08; + font-weight: 700; + color: #0f172a; + max-width: 680px; +} + +.ent-title span { + color: #047857; +} + +.ent-subtitle { + margin-top: 20px; + font-size: 18px; + line-height: 1.7; + color: #475569; + max-width: 620px; +} + +.ent-features { + display: grid; + gap: 16px; + margin-top: 40px; +} + +.ent-feature-card { + background: rgba(255, 255, 255, 0.92); + border: 1px solid #e2e8f0; + border-radius: 22px; + padding: 22px 24px; + box-shadow: 0 10px 30px rgba(15, 23, 42, 0.05); +} + +.ent-feature-card h3 { + margin: 0 0 8px; + font-size: 18px; + color: #0f172a; +} + +.ent-feature-card p { + margin: 0; + color: #64748b; + line-height: 1.6; + font-size: 15px; +} + +.ent-login-card { + background: #ffffff; + border-radius: 28px; + padding: 30px; + box-shadow: 0 20px 40px rgba(16, 185, 129, 0.10); + border: 1px solid #ecfdf5; +} + +.ent-login-header { + display: flex; + justify-content: space-between; + align-items: center; + gap: 16px; + margin-bottom: 24px; +} + +.ent-login-label { + margin: 0 0 6px; + font-size: 14px; + color: #64748b; +} + +.ent-login-header h2 { + margin: 0; + font-size: 26px; + color: #0f172a; +} + +.ent-lock-icon { + width: 52px; + height: 52px; + border-radius: 18px; + display: flex; + align-items: center; + justify-content: center; + background: #ecfdf5; + font-size: 22px; +} + +.ent-form { + display: grid; + gap: 18px; +} + +.ent-field label { + display: block; + margin-bottom: 10px; + font-size: 14px; + font-weight: 600; + color: #334155; +} + +.ent-field input { + width: 100%; + border: 1px solid #dbe4ee; + background: #f8fafc; + border-radius: 16px; + padding: 16px 18px; + font-size: 15px; + outline: none; + transition: 0.2s ease; +} + +.ent-field input:focus { + border-color: #10b981; + background: #ffffff; + box-shadow: 0 0 0 4px rgba(16, 185, 129, 0.12); +} + +.ent-field-top { + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; +} + +.mdp_oublie { + font-size: 14px; + font-weight: 600; + color: #059669; + cursor: pointer; +} + +.mdp_oublie:hover { + color: #047857; +} + +.ent-options { + display: flex; + justify-content: space-between; + align-items: center; + gap: 16px; + flex-wrap: wrap; +} + +.ent-remember { + display: inline-flex; + align-items: center; + gap: 10px; + color: #475569; + font-size: 14px; +} + +.ent-status { + display: inline-flex; + align-items: center; + padding: 8px 12px; + background: #ecfdf5; + color: #047857; + border-radius: 999px; + font-size: 13px; + font-weight: 700; +} + +.ent-submit { + border: none; + border-radius: 18px; + padding: 16px 20px; + background: linear-gradient(135deg, #059669, #10b981); + color: #ffffff; + font-size: 16px; + font-weight: 700; + cursor: pointer; + transition: transform 0.2s ease, box-shadow 0.2s ease; + box-shadow: 0 16px 30px rgba(16, 185, 129, 0.24); +} + +.ent-submit:hover { + transform: translateY(-1px); + box-shadow: 0 18px 34px rgba(16, 185, 129, 0.30); +} + +.ent-footer-links { + margin-top: 22px; + display: flex; + flex-wrap: wrap; + gap: 14px 22px; +} + +.ent-footer-links a { + color: #64748b; + font-size: 14px; +} + +.ent-footer-links a:hover { + color: #0f172a; +} + +@media (max-width: 980px) { + .ent-container { + max-width: 600px; + grid-template-columns: 1fr; + } + + .ent-title { + font-size: 24px; + } +} + + +.bloc_image_centrale{ +@media (max-width: 640px) { + width: 70%; + margin: auto; +} + @media only screen and (min-width: 601px) and (max-width: 991px) { + width: 70%; + margin: auto; +} + + @media only screen and (min-width: 992px){ + width: 70%; + margin: auto; + } +} + + +@media (max-width: 640px) { + .ent-page { + padding: 20px 14px; + } + + + .ent-feature-card h3 { + margin: 0 0 8px; + font-size: 16px; + color: #0f172a; +} + +.ent-feature-card p { + margin: 0; + color: #64748b; + line-height: 1.6; + font-size: 13px; +} + + + .ent-left, + .ent-right { + padding: 24px; + border-radius: 24px; + } + + .ent-title { + font-size: 24px; + } + + .ent-subtitle { + font-size: 14px; + } + + .ent-login-card { + padding: 0px; + box-shadow: 0 2px 4px rgba(16, 185, 129, 0.10); + } + + .ent-login-header h2 { + font-size: 22px; + } + + .ent-field-top { + flex-direction: row; + align-items: flex-start; + } + + .ent-feature-card { + + padding: 2px 4px; + +} +} +`; diff --git a/src/components/Module_Ent_Mes_Formations.js b/src/components/Module_Ent_Mes_Formations.js index bbe3dcc..1f4a9bd 100644 --- a/src/components/Module_Ent_Mes_Formations.js +++ b/src/components/Module_Ent_Mes_Formations.js @@ -2109,7 +2109,7 @@ const Module_Ent_Mes_Formations = (props) => {
} {tuteur_apprenant_selected_id && tuteur_apprenant_selected_id.length > 5 && tuteur_apprenant_selected_prenom.length > 2 && -
+
Vous consultez actuellement les données de {String(tuteur_apprenant_selected_prenom)[0].toUpperCase() + String(tuteur_apprenant_selected_prenom).slice(1)}   {String(tuteur_apprenant_selected_nom).toUpperCase()}
} diff --git a/src/components/Module_Session_Planification.js b/src/components/Module_Session_Planification.js index aae1237..1e0ee81 100644 --- a/src/components/Module_Session_Planification.js +++ b/src/components/Module_Session_Planification.js @@ -4406,112 +4406,114 @@ const Module_Session_Planification = (props) => {
-
UE / Matière +
+ } +
Groupe apprenants + + {New_Getall_Partner_Groupe_Inscrit_result && New_Getall_Partner_Groupe_Inscrit_result.length > 0 && (data)._id === String(p_detail_sequence_groupe_apprenant_id))[0].label} + options={New_Getall_Partner_Groupe_Inscrit_result} + onChange={(event, value) => { + if (value && value._id) { + setp_detail_sequence_groupe_apprenant_id(value._id); + } else { + setp_detail_sequence_groupe_apprenant_id(""); + } + + }} + + renderInput={(params) => + } + />} + +
+ + +
Titre {
-
Debut +
Debut
{
-
Fin +
Fin
{
- -
UE / Matière +
Titre {
-
Debut +
Debut
+ { /> +
-
Fin +
Fin
{
}
- +
); } export default Module_Session_Planification; + +const local_css = ` +.react-datepicker-wrapper{ +width: 100%; + + } +`; diff --git a/src/components/New_Sidebar_ENT_Student_2025.js b/src/components/New_Sidebar_ENT_Student_2025.js index d74a6d0..3faaeba 100644 --- a/src/components/New_Sidebar_ENT_Student_2025.js +++ b/src/components/New_Sidebar_ENT_Student_2025.js @@ -30,6 +30,7 @@ const New_Sidebar_ENT_Student_2025 = () => { const history = useHistory(); const stored_apprenant_id = getCookie('tokenmysychapprenant'); + const stored_tuteur_id = getCookie('tokenmysytuteurrhid'); const [cookie, setCookie, removeCookie] = useCookies(['tokenmysych']); const [cookie_part, setCookie_part, removeCookie_part] = useCookies(['tokenmysypart']); @@ -60,30 +61,30 @@ const New_Sidebar_ENT_Student_2025 = () => { history.push("/ent_student"); } - const stored_cookie = getCookie('tokenmysypart'); + const stored_cookie = getCookie('tokenmysypart'); - if (stored_cookie) { - var acces_right_token_name = stored_cookie + "_uar"; + if (stored_cookie) { + var acces_right_token_name = stored_cookie + "_uar"; - removeCookie(acces_right_token_name,); - } + removeCookie(acces_right_token_name,); + } - removeCookie("tokenmysychapprenant"); - removeCookie("tokenmysych"); - removeCookie("tokenmysychconnecteduserid"); - removeCookie("tokenmysytypeconnexion"); + removeCookie("tokenmysychapprenant"); + removeCookie("tokenmysych"); + removeCookie("tokenmysychconnecteduserid"); + removeCookie("tokenmysytypeconnexion"); - removeCookie("__stripe_sid"); - removeCookie("__stripe_mid"); + removeCookie("__stripe_sid"); + removeCookie("__stripe_mid"); - removeCookie("tokenmysypart"); - removeCookie("mysy_session_display_view",); - removeCookie("mysy_menu_gauche_reduit",); - removeCookie("mysy_catalog_data_row_grouped_by",); - removeCookie("tokenmysytuteurrhid"); - removeCookie("tokenmysychclient"); - + removeCookie("tokenmysypart"); + removeCookie("mysy_session_display_view",); + removeCookie("mysy_menu_gauche_reduit",); + removeCookie("mysy_catalog_data_row_grouped_by",); + removeCookie("tokenmysytuteurrhid"); + removeCookie("tokenmysychclient"); + } @@ -229,7 +230,157 @@ const New_Sidebar_ENT_Student_2025 = () => { // Pass on our props
- {String(environnment) === "PROD" && + {String(environnment) === "PROD" && stored_tokenmysytypeconnexion !== "tuteur" && + + + Formations + + Planning + Notes + Documents + + Emails    { + // monactivite_func(); + }}> + + + + + {String(someoneconnected) !== String("1") && + + } + + {String(someoneconnected) === String("1") && + Mon compte + } + {typeof (stored_partner) !== "undefined" && + /* Connexion partner active */ + + } + + {typeof (stored_user) != "undefined" && + /* Connexion utilisateur active */ + + } + } + + {String(environnment) === "PROD" && stored_tokenmysytypeconnexion === "tuteur" && + + + Formations + + {String(someoneconnected) !== String("1") && + + } + + {String(someoneconnected) === String("1") && + Mon compte + } + {typeof (stored_partner) !== "undefined" && + /* Connexion partner active */ + + } + + {typeof (stored_user) != "undefined" && + /* Connexion utilisateur active */ + + } + } + + + {(String(environnment) === "REC" || String(environnment) === "DEM") && stored_tokenmysytypeconnexion !== "tuteur" && + + + Formations + + Planning + Notes + + Documents + + Emails    { + // monactivite_func(); + }}> + + + + + {String(someoneconnected) !== String("1") && + + } + + {String(someoneconnected) === String("1") && + Mon compte + } + {typeof (stored_partner) !== "undefined" && + /* Connexion partner active */ + + } + + {typeof (stored_user) != "undefined" && + /* Connexion utilisateur active */ + + } + } + + {(String(environnment) === "REC" || String(environnment) === "DEM") && stored_tokenmysytypeconnexion === "tuteur" && + + + Formations + + + + {String(someoneconnected) !== String("1") && + + } + + {String(someoneconnected) === String("1") && + Mon compte + } + {typeof (stored_partner) !== "undefined" && + /* Connexion partner active */ + + } + + {typeof (stored_user) != "undefined" && + /* Connexion utilisateur active */ + + } + } + + + + {String(environnment) === "DEV" && stored_tokenmysytypeconnexion !== "tuteur" && Formations @@ -274,24 +425,10 @@ const New_Sidebar_ENT_Student_2025 = () => { } } - {(String(environnment) === "REC" || String(environnment) === "DEM") && + {String(environnment) === "DEV" && stored_tokenmysytypeconnexion === "tuteur" && - Formations - - Planning - Notes - - Documents - - Emails    { - // monactivite_func(); - }}> - - - - + Formations {String(someoneconnected) !== String("1") && } - - - {String(environnment) === "DEV" && - - - Formations - - Planning - Notes - - - - Documents - - Emails    { - // monactivite_func(); - }}> - - - - - {String(someoneconnected) !== String("1") && - - } - - {String(someoneconnected) === String("1") && - Mon compte } {typeof (stored_partner) !== "undefined" && diff --git a/src/components/Partner.js b/src/components/Partner.js index f6c2689..9a3e6b2 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -31,6 +31,9 @@ import Abonnement from "./Abonnement"; import { useLocation } from "react-router-dom"; import { useParams } from 'react-router-dom'; import CheckOut from "./CheckOut"; + + + import { FaHandPointRight } from "react-icons/fa"; import OrderConfirmation from "./OrderConfirmation"; import Partner_Client from "./Partner_Client"; diff --git a/src/components/TestUrl.js b/src/components/TestUrl.js index d26878c..a0c5f9e 100644 --- a/src/components/TestUrl.js +++ b/src/components/TestUrl.js @@ -41,7 +41,7 @@ import { Editor } from '@tinymce/tinymce-react'; import { ImMobile2, ImWhatsapp, ImHome, ImOffice } from "react-icons/im"; import { BsMailbox } from "react-icons/bs"; import { Elements } from '@stripe/react-stripe-js'; -import { loadStripe } from '@stripe/stripe-js'; + import { PaymentElement } from '@stripe/react-stripe-js'; import Popup from 'reactjs-popup'; import 'reactjs-popup/dist/index.css'; @@ -102,8 +102,6 @@ import { es } from 'date-fns/esm/locale'; import steph_img from "../mysy_img/spteph.jpg"; -// pour le payement stripe : https://stripe.com/docs/payments/quickstart?client=react&lang=python -const stripePromise = loadStripe('pk_test_51LUUfAAbmaEugrFTI25uZBD3IFjbtaL6jUfRV83diDf7nco8worna4NGKhMHbPP71WCwT5EHFRdDNatxPrJWwgZ300kgH5EO4p'); const datagridSx = { borderRadius: 2, diff --git a/src/components/header_automatic_files/Header_ENT_Student.jsx b/src/components/header_automatic_files/Header_ENT_Student.jsx index ea38b0a..e23c3b2 100644 --- a/src/components/header_automatic_files/Header_ENT_Student.jsx +++ b/src/components/header_automatic_files/Header_ENT_Student.jsx @@ -89,6 +89,8 @@ const Header_ENT_Student = () => { const stored_user = getCookie('tokenmysych'); const stored_part = getCookie('tokenmysypart'); const stored_apprenant_id = getCookie('tokenmysychapprenant'); + const stored_tuteur_id = getCookie('tokenmysytuteurrhid'); + const stored_tokenmysytypeconnexion = getCookie('tokenmysytypeconnexion'); const [cookie, setCookie, removeCookie] = useCookies(['tokenmysych'], { path: '/' }); const [partcookie, setpartCookie, removepartCookie] = useCookies(['tokenmysypart'], { path: '/' }); @@ -403,7 +405,7 @@ const Header_ENT_Student = () => { } {stored_tokenmysytypeconnexion === "tuteur" && } diff --git a/src/index.js b/src/index.js index d2a58e3..82a1981 100644 --- a/src/index.js +++ b/src/index.js @@ -3,16 +3,13 @@ import ReactDOM from 'react-dom/client'; import 'bootstrap/dist/css/bootstrap.min.css'; import "./styles/index.scss" import App from './App'; -import { Elements } from '@stripe/react-stripe-js'; -import { loadStripe } from '@stripe/stripe-js'; window.ela_tocken = ""; -const stripePromise_PROD = loadStripe('pk_live_51LUUfAAbmaEugrFTyfNe4Dj0vbxc5qXQqNs0rztjAKy8oSlc5EEQyJGjA8Z5kXmP2gvUMcYLUBYCIyWWzLCw59RY00PtGInkVf'); + const root = ReactDOM.createRoot(document.getElementById('root')); root.render( - - + ); diff --git a/src/index_ORIG.js b/src/index_ORIG.js index bc6e0a5..d3e84fe 100644 --- a/src/index_ORIG.js +++ b/src/index_ORIG.js @@ -5,20 +5,17 @@ import "./styles/index.scss" import App from './App'; import Footer from "./pages/footer"; -import { Elements } from '@stripe/react-stripe-js'; -import { loadStripe } from '@stripe/stripe-js'; -const stripePromise = loadStripe('pk_test_51LUUfAAbmaEugrFTI25uZBD3IFjbtaL6jUfRV83diDf7nco8worna4NGKhMHbPP71WCwT5EHFRdDNatxPrJWwgZ300kgH5EO4p'); -const stripePromise_PROD = loadStripe('pk_live_51LUUfAAbmaEugrFTyfNe4Dj0vbxc5qXQqNs0rztjAKy8oSlc5EEQyJGjA8Z5kXmP2gvUMcYLUBYCIyWWzLCw59RY00PtGInkVf'); + window.ela_tocken = ""; const root = ReactDOM.createRoot(document.getElementById('root')); root.render( - + - + ); diff --git a/src/styles/components/_addclassmanual.scss b/src/styles/components/_addclassmanual.scss index b950f81..228d6d1 100644 --- a/src/styles/components/_addclassmanual.scss +++ b/src/styles/components/_addclassmanual.scss @@ -65,6 +65,8 @@ .css-1v4ccyo { height: 3rem !important; + + } padding-top: 0.5rem; diff --git a/src/styles/components/_module_connexion_intranet_client.scss b/src/styles/components/_module_connexion_intranet_client.scss index 60b44aa..e2cf459 100644 --- a/src/styles/components/_module_connexion_intranet_client.scss +++ b/src/styles/components/_module_connexion_intranet_client.scss @@ -487,7 +487,7 @@ /*style petites-moyennes tablettes */ .bloc_image_centrale { - width: 70%; + width: 50% !important; text-align: center; margin: auto; } @@ -1101,8 +1101,9 @@ @media only screen and (min-width: 992px) and (max-width: 1199px) { .bloc_image_centrale { - width: 50%; + width: 40%; float: left; + padding-top: 1rem; } @@ -1690,8 +1691,9 @@ @media only screen and (min-width: 1200px) { .bloc_image_centrale { - width: 50%; + width: 40%; float: left; + padding-top: 2rem; } diff --git a/src/styles/components/_module_ent_mes_formations.scss b/src/styles/components/_module_ent_mes_formations.scss index 929c302..261f0e7 100644 --- a/src/styles/components/_module_ent_mes_formations.scss +++ b/src/styles/components/_module_ent_mes_formations.scss @@ -998,7 +998,8 @@ display: flex; flex-direction: row; gap: 24px; - width: 100%; + width: 90%; + margin: auto; flex-wrap: wrap; justify-content: center; } diff --git a/src/styles/components/_modulesessionplanification.scss b/src/styles/components/_modulesessionplanification.scss index fcb1a5e..8c057a9 100644 --- a/src/styles/components/_modulesessionplanification.scss +++ b/src/styles/components/_modulesessionplanification.scss @@ -24,7 +24,7 @@ z-index: 1; top: 0px; opacity: 80%; - left: 0px; + left: 0px; } .spinner { diff --git a/src/styles/components/_mon_intranet_public.scss b/src/styles/components/_mon_intranet_public.scss index 4704b71..c606b55 100644 --- a/src/styles/components/_mon_intranet_public.scss +++ b/src/styles/components/_mon_intranet_public.scss @@ -3,7 +3,7 @@ width: 100%; float: left; - min-height: calc(100vh - 5rem); + .css-1nmdiq5-menu { background: transparent !important; @@ -15,7 +15,7 @@ background: transparent !important; } - + .h1_transparent { color: transparent; //color: red; @@ -23,6 +23,8 @@ } @media only screen and (max-width: 600px) { + min-height: calc(100vh + 2rem); + .calage { display: none; } @@ -758,7 +760,7 @@ /* Background Header */ position: absolute; width: 100%; - height: 350px; + height: 150px; left: 0px; top: 0px; @@ -2327,8 +2329,8 @@ .bloc_connexion { width: 100%; float: left; - min-height: 120vh; - margin-top: 10rem; + min-height: 15vh; + margin-top: 9rem; } .bloc_milieu_text { @@ -2581,6 +2583,8 @@ @media only screen and (min-width: 601px) and (max-width: 991px) { /*style petites-moyennes tablettes */ + min-height: calc(100vh - 5rem); + .div_row { float: left; //border:0px solid black; @@ -3500,7 +3504,7 @@ .Partner_Catalog_Background_Header { position: absolute; width: 100%; - height: 380px; + height: 280px; left: 0px; top: 0px; @@ -5722,7 +5726,7 @@ width: 100%; float: left; min-height: 40vh; - margin-top: 20rem; + margin-top: 15rem; margin-bottom: 5rem; } @@ -5872,6 +5876,7 @@ @media only screen and (min-width: 992px) and (max-width: 1199px) { /*style grande tablettes & Pc portable */ + min-height: calc(100vh - 5rem); .div_row { float: left; @@ -6777,7 +6782,7 @@ .Partner_Catalog_Background_Header { position: absolute; width: 100%; - height: 452px; + height: 252px; left: 0px; top: 0px; @@ -9142,6 +9147,7 @@ } @media only screen and (min-width: 1200px) and (max-width: 1919px) { + min-height: calc(100vh - 5rem); /* Ordi de bureau et grands ecrans*/ .align_gauche { @@ -10048,7 +10054,7 @@ .Partner_Catalog_Background_Header { // position: absolute; width: 100%; - height: 452px; + height: 252px; left: 0px; top: 0px; @@ -12246,7 +12252,7 @@ width: 100%; float: left; min-height: 40vh; - padding-top: 3rem; + padding-top: 0px; } .bloc_milieu_text { @@ -12440,6 +12446,8 @@ } @media only screen and (min-width: 1920px) { + min-height: calc(100vh - 5rem); + .calage { width: 2%; } @@ -13358,7 +13366,7 @@ .Partner_Catalog_Background_Header { // position: absolute; width: 100%; - height: 452px; + height: 252px; left: 0px; top: 0px; @@ -15578,7 +15586,7 @@ width: 100%; float: left; min-height: 40vh; - padding-top: 3rem; + } .bloc_milieu_text {