}
-
-
+
+
{result && myApiResponse == "True" && fin == 0 && !newresult &&
result.slice(0, PageSize).map((formation) => (
diff --git a/src/components/SignIn.js b/src/components/SignIn.js
index 1300343..a776b7a 100644
--- a/src/components/SignIn.js
+++ b/src/components/SignIn.js
@@ -70,7 +70,7 @@ function SignIn() {
message: 'Confirmez la deconnexion compte PRO',
buttons: [
{
- label: 'Yes',
+ label: 'Oui',
onClick: () => logout_partner_confirmation()
},
@@ -89,11 +89,11 @@ function SignIn() {
message: 'Confirmez la deconnexion utilisateur',
buttons: [
{
- label: 'Yes',
+ label: 'Oui',
onClick: () => logout_user_confirmation()
},
/* {
- label: 'No',
+ label: 'Non',
onClick: () => retnull()
}*/
@@ -342,11 +342,11 @@ function SignIn() {
message: 'Confirmez la reinitialisation',
buttons: [
{
- label: 'Yes',
+ label: 'Oui',
onClick: () => resetpasswd_ok()
},
{
- label: 'No',
+ label: 'Non',
onClick: () => { return }
},
diff --git a/src/components/UserSignInFirst.js b/src/components/UserSignInFirst.js
index fe3a13c..5924592 100644
--- a/src/components/UserSignInFirst.js
+++ b/src/components/UserSignInFirst.js
@@ -61,7 +61,7 @@ function SignIn() {
message: 'Confirmez la deconnexion compte PRO',
buttons: [
{
- label: 'Yes',
+ label: 'Oui',
onClick: () => logout_partner_confirmation()
},
@@ -80,11 +80,11 @@ function SignIn() {
message: 'Confirmez la deconnexion utilisateur',
buttons: [
{
- label: 'Yes',
+ label: 'Oui',
onClick: () => logout_user_confirmation()
},
/* {
- label: 'No',
+ label: 'Non',
onClick: () => retnull()
}*/
@@ -312,11 +312,11 @@ function SignIn() {
message: 'Confirmez la reinitialisation',
buttons: [
{
- label: 'Yes',
+ label: 'Oui',
onClick: () => resetpasswd_ok()
},
{
- label: 'No',
+ label: 'Non',
onClick: () => { return }
},
diff --git a/src/components/sidebar.js b/src/components/sidebar.js
index 9813140..d3ee19b 100644
--- a/src/components/sidebar.js
+++ b/src/components/sidebar.js
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
import { slide as Menu } from "react-burger-menu";
import { NavLink } from "react-router-dom";
import { getCookie } from 'react-use-cookie';
@@ -15,7 +15,7 @@ import { useCookies } from "react-cookie";
const SideBar = () => {
const stored_cookie = getCookie('tokenmysych');
const history = useHistory();
-
+
const [cookie, setCookie, removeCookie] = useCookies(['tokenmysych']);
const [cookie_part, setCookie_part, removeCookie_part] = useCookies(['tokenmysypart']);
@@ -51,11 +51,11 @@ const SideBar = () => {
message: 'Confirmez la deconnexion',
buttons: [
{
- label: 'Yes',
+ label: 'Oui',
onClick: () => logout_confirmation()
},
{
- label: 'No',
+ label: 'Non',
}
],
@@ -64,29 +64,69 @@ const SideBar = () => {
keyCodeForClose: [8, 32],
willUnmount: () => { },
afterClose: () => { },
- onClickOutside: () => {},
- onKeypress: () => {},
- onKeypressEscape: () => {},
+ onClickOutside: () => { },
+ onKeypress: () => { },
+ onKeypressEscape: () => { },
+ overlayClassName: "overlay-custom-class-name"
});
}
+ const [someoneconnected, setsomeoneconnected] = useState("0");
+ const [partnerconnected, setpartnerconnected] = useState("0");
+ const [userconnected, setuserconnected] = useState("0");
+
+ const stored_part = getCookie('tokenmysypart');
+
+
+ function whosisconnected() {
+ var local_user_connect = 0;
+ var local_part_connect = 0;
+
+ if (typeof (stored_user) === "undefined" || String(stored_user) === '') {
+ setuserconnected("0");
+ local_user_connect = 0;
+ } else {
+ setuserconnected("1");
+ setsomeoneconnected("1");
+ local_user_connect = 1;
+ //alert(" user connected OK");
+ }
+
+ if (typeof (stored_part) === "undefined" || String(stored_part) === '') {
+ setpartnerconnected("0");
+ local_part_connect = 0;
+ } else {
+ setpartnerconnected("1");
+ setsomeoneconnected("1");
+ local_part_connect = 1;
+ //alert(" partner connected OK");
+ }
+ }
+
+ useEffect(() => {
+ whosisconnected();
+ }, []);
return (
// Pass on our props
-
+
{String(environnment) === "PROD" &&
}
+
+ {String(environnment) === "REC" &&
+ }
@@ -150,18 +226,24 @@ const SideBar = () => {
{String(environnment) === "DEV" &&
}
diff --git a/src/mysy_img2/mysy_consulting.jpg b/src/mysy_img2/mysy_consulting.jpg
new file mode 100644
index 0000000..06a98c3
Binary files /dev/null and b/src/mysy_img2/mysy_consulting.jpg differ
diff --git a/src/mysy_img2/mysy_datacenter.png b/src/mysy_img2/mysy_datacenter.png
new file mode 100644
index 0000000..4c008ea
Binary files /dev/null and b/src/mysy_img2/mysy_datacenter.png differ
diff --git a/src/mysy_img2/mysy_e_learning.jpg b/src/mysy_img2/mysy_e_learning.jpg
new file mode 100644
index 0000000..fc3817a
Binary files /dev/null and b/src/mysy_img2/mysy_e_learning.jpg differ
diff --git a/src/mysy_img2/mysy_search.jpg b/src/mysy_img2/mysy_search.jpg
new file mode 100644
index 0000000..9de1fba
Binary files /dev/null and b/src/mysy_img2/mysy_search.jpg differ
diff --git a/src/styles/components/_navigation.scss b/src/styles/components/_navigation.scss
index 6d6c695..08ecad8 100644
--- a/src/styles/components/_navigation.scss
+++ b/src/styles/components/_navigation.scss
@@ -20,10 +20,12 @@
color: blue;
}
+
+
.nav-active{
&::after {
content: '';
- width: 100px;
+ width: 100%;
height: 5px;
background-color: aqua;
position: absolute;
@@ -93,7 +95,7 @@
.nav-active{
&::after {
content: '';
- width: 100px;
+ width: 100%;
height: 5px;
background-color: aqua;
position: absolute;
diff --git a/src/styles/components/_produitsservices.scss b/src/styles/components/_produitsservices.scss
index 3726c18..87e8277 100644
--- a/src/styles/components/_produitsservices.scss
+++ b/src/styles/components/_produitsservices.scss
@@ -519,6 +519,36 @@
color: white;
}
+ .height_publication {
+ height: 8rem !important;
+ }
+
+ .height_publication_header {
+ height: auto;
+ margin-bottom: 0.5rem;
+ margin-top: 1rem;
+ background: #073462;
+ color: white;
+ }
+
+ .bton_envoyer {
+ border-radius: 5px;
+ font-size: medium;
+ padding: 0.3rem;
+ width: 100%;
+ background: #81BC3A;
+ }
+
+ .bton_envoyer_precision {
+ border-radius: 5rem;
+ font-size: medium;
+ padding: 0.3rem;
+ width: 100%;
+ background: #81BC3A;
+ color: white;
+ }
+
+
}
@media only screen and (min-width: 601px) and (max-width: 991px) {
@@ -1021,7 +1051,7 @@
color: white;
}
-
+
.height_support {
height: 3rem !important;
}
@@ -1039,13 +1069,69 @@
height: 8rem !important;
}
+ .height_publication_header {
+ height: auto;
+ margin-bottom: 0.5rem;
+ margin-top: 1rem;
+ background: #073462;
+ color: white;
+ }
+
+
+ //-----
+ .height_e_learning {
+ height: 11rem !important;
+ }
+
+
+ .height_intranet {
+ height: 5rem !important;
+ }
+
+
+ .height_gestion_admin {
+ height: 13rem !important;
+ }
+
+ .height_appel_offre {
+ height: 7rem !important;
+ }
+
+ .height_affichage_ftion {
+ height: 9rem !important;
+ }
+
+ .height_price_1 {
+ height: 5rem !important;
+ }
+
+ .height_e_learning_persona {
+ height: 7rem !important;
+ }
+
+ .height_gestion_crm {
+ height: 9rem !important;
+ }
+
+
+
+ //----------
+
.bton_envoyer {
border-radius: 5px;
- font-size: small;
+ font-size: medium;
padding: 0.3rem;
width: 80%;
background: #81BC3A;
}
+ .bton_envoyer_precision {
+ border-radius: 5rem;
+ font-size: medium;
+ padding: 0.3rem;
+ width: 100%;
+ background: #81BC3A;
+ color: white;
+ }
}
@@ -1553,7 +1639,7 @@
color: white;
}
-
+
.height_support {
height: 3rem !important;
}
@@ -1570,14 +1656,71 @@
height: 9rem !important;
}
+ .height_publication_header {
+ height: auto;
+ margin-bottom: 0.5rem;
+ margin-top: 1rem;
+ background: #073462;
+ color: white;
+ }
+
+
+ //-----
+ .height_e_learning {
+ height: 11rem !important;
+ }
+
+
+ .height_intranet {
+ height: 5rem !important;
+ }
+
+
+ .height_gestion_admin {
+ height: 11rem !important;
+ }
+
+ .height_appel_offre {
+ height: 6rem !important;
+ }
+
+ .height_affichage_ftion {
+ height: 7rem !important;
+ }
+
+ .height_price_1 {
+ height: 5rem !important;
+ }
+
+ .height_e_learning_persona {
+ height: 5rem !important;
+ }
+
+ .height_gestion_crm {
+ height: 9rem !important;
+ }
+
+
+
+ //----------
+
.bton_envoyer {
border-radius: 5px;
- font-size: small;
+ font-size: medium;
padding: 0.3rem;
width: 80%;
background: #81BC3A;
}
+
+ .bton_envoyer_precision {
+ border-radius: 5rem;
+ font-size: medium;
+ padding: 0.3rem;
+ width: 100%;
+ background: #81BC3A;
+ color: white;
+ }
}
@media only screen and (min-width: 1200px) {
@@ -1780,7 +1923,7 @@
.height_support {
- height: 3rem !important;
+ height: 7rem !important;
}
.height_leads {
@@ -1788,16 +1931,64 @@
}
.height_Reporting {
- height: 8rem !important;
+ height: 5rem !important;
}
.height_publication {
height: 8rem !important;
}
+ .height_publication_header {
+ height: auto;
+ margin-bottom: 0.5rem;
+ margin-top: 1rem;
+ background: #073462;
+ color: white;
+ }
+
+
+ //-----
+ .height_e_learning {
+ height: 11rem !important;
+ }
+
+
+ .height_intranet {
+ height: 5rem !important;
+ }
+
+
+ .height_gestion_admin {
+ height: 11rem !important;
+ }
+
+ .height_appel_offre {
+ height: 6rem !important;
+ }
+
+ .height_affichage_ftion {
+ height: 7rem !important;
+ }
+
+ .height_price_1 {
+ height: 5rem !important;
+ }
+
+ .height_e_learning_persona {
+ height: 5rem !important;
+ }
+
+ .height_gestion_crm {
+ height: 9rem !important;
+ }
+
+
+
+ //----------
+
.bton_envoyer {
border-radius: 5px;
- font-size: small;
+ font-size: medium;
padding: 0.3rem;
width: 60%;
background: #81BC3A;
@@ -2107,5 +2298,14 @@
background: red !important;
}
+ .bton_envoyer_precision {
+ border-radius: 5rem;
+ font-size: medium;
+ padding: 0.3rem;
+ width: 100%;
+ background: #81BC3A;
+ color: white;
+ }
+
}
}
\ No newline at end of file
diff --git a/src/styles/components/_reherche_new_v2.scss b/src/styles/components/_reherche_new_v2.scss
index 4123e1d..4b0e1ab 100644
--- a/src/styles/components/_reherche_new_v2.scss
+++ b/src/styles/components/_reherche_new_v2.scss
@@ -858,7 +858,7 @@
width: 97%;
//height: 1486px;
left: 1%;
- top: 580px;
+ top: 495px;
}
.pieddepage_v2 {
@@ -3106,13 +3106,12 @@
flex-direction: column;
align-items: center;
padding: 0px;
- gap: 40px;
-
+ gap: 10px;
position: absolute;
width: 96%;
height: 204px;
left: 2%;
- top: 590px;
+ top: 500px;
}
@@ -3791,12 +3790,12 @@
.nos_serv_list {
display: flex;
flex-direction: row;
- justify-content: center;
+ justify-content: start;
align-items: center;
padding: 0px;
- gap: 56px;
+ gap: 15px;
- width: 95%;
+ width: 100%;
height: 116px;
@@ -3816,7 +3815,7 @@
padding: 0px;
gap: 16px;
- width: 28%;
+ width: 31%;
height: 116px;
@@ -5039,6 +5038,7 @@
opacity: 1;
border-radius: 1rem;
margin-top: 1rem;
+ display: none;
}
.service1_title_desc {
@@ -5053,7 +5053,7 @@
padding: 0px;
gap: 4px;
- width: 70%;
+ width: 100%;
height: 116px;
@@ -5100,6 +5100,7 @@
font-weight: 500;
font-size: 14px;
line-height: 20px;
+ width: 100%;
/* or 143% */
@@ -5224,7 +5225,7 @@
width: 100%;
height: 10px;
-
+
border-radius: 8px;
/* Inside auto layout */
@@ -5237,7 +5238,20 @@
padding-left: 1rem;
}
-
+ .bton_ensavoir_plus {
+ border-radius: 5rem;
+ font-size: medium;
+ background: #81BC3A !important;
+ text-align: center;
+ height: 2.5rem;
+ width: 100%;
+ color: white;
+ margin-left: 10px;
+ margin-right: 10px;
+ padding-top: 10px;
+ cursor: pointer;
+ }
+
}
@media only screen and (min-width: 992px) and (max-width: 1199px) {
@@ -6061,13 +6075,14 @@
flex-direction: column;
align-items: center;
padding: 0px;
- gap: 40px;
+ gap: 10px;
position: absolute;
- width: 96%;
+ width: 97%;
height: 204px;
- left: 2%;
- top: 580px;
+ left: 20px;
+ top: 510px;
+ background: white;
}
@@ -8173,7 +8188,7 @@
width: 100%;
height: 10px;
-
+
border-radius: 8px;
/* Inside auto layout */
@@ -8186,10 +8201,23 @@
padding-left: 1rem;
}
+ .bton_ensavoir_plus {
+ border-radius: 5rem;
+ font-size: medium;
+ background: #81BC3A !important;
+ text-align: center;
+ height: 2.5rem;
+ width: 90%;
+ color: white;
+ margin-left: 10px;
+ margin-right: 10px;
+ padding-top: 10px;
+ cursor: pointer;
+ }
}
- @media only screen and (min-width: 1201px) and (max-width: 1919px) {
+ @media only screen and (min-width: 1200px) and (max-width: 1919px) {
/* Ordi de bureau et grands ecrans*/
.align_gauche {
@@ -9011,13 +9039,13 @@
flex-direction: column;
align-items: center;
padding: 0px;
- gap: 40px;
+ gap: 20px;
position: absolute;
width: 96%;
height: 204px;
left: 2%;
- top: 590px;
+ top: 510px;
}
@@ -9032,7 +9060,7 @@
width: 96%;
//height: 2574px;
left: 2%;
- top: 800px;
+ top: 850px;
}
.logo {
@@ -10970,7 +10998,7 @@
.service1_title {
width: 100%;
- height: 32px;
+ //height: 32px;
text-align: left;
font-family: 'Albert Sans';
font-style: normal;
@@ -11140,7 +11168,21 @@
margin-bottom: 2rem !important;
text-align: left;
padding-left: 1rem;
- }
+ }
+
+ .bton_ensavoir_plus {
+ border-radius: 5rem;
+ font-size: medium;
+ background: #81BC3A !important;
+ text-align: center;
+ height: 2.5rem;
+ width: 100%;
+ color: white;
+ margin-left: 10px;
+ margin-right: 10px;
+ padding-top: 10px;
+ cursor: pointer;
+ }
}
@@ -11974,13 +12016,13 @@
flex-direction: column;
align-items: center;
padding: 0px;
- gap: 40px;
+ gap: 30px;
position: absolute;
width: 96%;
height: 204px;
left: 2%;
- top: 550px;
+ top: 510px;
}
@@ -14102,9 +14144,24 @@
flex-grow: 0;
margin-bottom: 1rem;
text-align: left;
-
+
}
+
+ .bton_ensavoir_plus {
+ border-radius: 5rem;
+ font-size: medium;
+ background: #81BC3A !important;
+ text-align: center;
+ height: 2.5rem;
+ width: 100%;
+ color: white;
+ margin-left: 10px;
+ margin-right: 10px;
+ padding-top: 10px;
+ cursor: pointer;
+ }
+
}
// end media
diff --git a/src/styles/components/_signup.scss b/src/styles/components/_signup.scss
index d8ee907..a7a33fc 100644
--- a/src/styles/components/_signup.scss
+++ b/src/styles/components/_signup.scss
@@ -39,6 +39,20 @@
}
@media only screen and (max-width: 600px) {
+
+ .ch,
+ .form-control {
+ border-radius: 10rem !important;
+ padding: 0px;
+ padding-left: 0.5rem;
+ height: 3rem !important;
+ }
+
+
+ .css-1pysi21-MuiFormLabel-root-MuiInputLabel-root{
+ font-size: small !important;
+ }
+
/*style smartphones et petites tablettes en portrait*/
.img_logo {
display: block;
@@ -224,6 +238,11 @@
text-decoration: underline;
}
+ .overlay-custom-class-name {
+ z-index: 101;
+ }
+
+
.div_001 {
width: 90%;
margin-left: auto;
@@ -401,7 +420,7 @@
font-size: x-small !important;
font-family: "verdana", "Quicksand", "Signika", sans-serif;
margin: 0.4rem !important;
- height: 1.8rem !important;
+ height: 4rem !important;
}
.css-1ptx2yq-MuiInputBase-root-MuiInput-root {
diff --git a/src/styles/components/_test_page.scss b/src/styles/components/_test_page.scss
index c732e54..16df237 100644
--- a/src/styles/components/_test_page.scss
+++ b/src/styles/components/_test_page.scss
@@ -85,7 +85,7 @@
.ch_burger_menu {
left: 2px !important;
top: 3px !important;
- max-height: 500px !important;
+ height: auto !important;
}
@@ -103,13 +103,25 @@
/* Our sidebar item styling */
text-decoration: none;
margin-bottom: 10px;
- color: black;
transition: color 0.2s;
+ text-align: left;
+ letter-spacing: 1px;
+ font-family: "Albert Sans";
+ font-style: normal;
+ font-weight: 600;
+ font-size: medium;
+ line-height: 25px;
+ font-feature-settings: "liga" off;
+ color: #3E6EE3;
+
}
/* Change color on hover */
.bm-item:hover {
- color: white;
+ font-style: italic;
+ line-height: 30px;
+ font-weight: 700;
+ color: #619E31 !important;
}
/* The rest copied directly from react-burger-menu docs */
@@ -130,6 +142,61 @@
}
+
+ .bton_suppr {
+ background: transparent;
+ color: red;
+ border-radius: 5rem;
+ font-size: small;
+ text-align: center;
+ height: 2.5rem;
+ width: 100%;
+ margin-left: 10px;
+ margin-right: 10px;
+ }
+
+ .overlay-custom-class-name {
+ z-index: 101;
+}
+
+
+ .bton_enreg {
+ border-radius: 5rem;
+ font-size: small;
+ background: #81BC3A !important;
+ text-align: center;
+ height: 2.5rem;
+ width: 100%;
+ color: white;
+ margin-left: 10px;
+ margin-right: 10px;
+ }
+
+ .bton_edit {
+ border-radius: 5rem;
+ font-size: small;
+ background: black !important;
+ text-align: right;
+ height: 2.5rem;
+ width: 100%;
+ color: white;
+ margin-left: 10px;
+ margin-right: 10px;
+ }
+
+ .bton_annule {
+ border-radius: 5rem;
+ font-size: small;
+ background: lightgray !important;
+ text-align: right;
+ height: 2.5rem;
+ width: 100%;
+ color: black;
+ margin-left: 10px;
+ margin-right: 10px;
+ }
+
+
position: fixed;
width: 36px;
height: 20px;
@@ -185,6 +252,7 @@
/* Wrapper for item list */
.bm-item-list {
color: #b8b7ad;
+ height: auto !important;
}
/* Styling of overlay */