From 2fbcc720290b38c4088153666122316d7f816379 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Fri, 7 Apr 2023 11:57:39 +0300 Subject: [PATCH 1/5] Web: Accounts: fixed profile menu styles --- .../Body/sub-components/main-profile/index.js | 327 +++++++++++--- .../main-profile/languagesCombo.js | 156 ------- .../main-profile/styled-main-profile.js | 404 +++++++++--------- 3 files changed, 464 insertions(+), 423 deletions(-) delete mode 100644 packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/languagesCombo.js diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js index 80e0de38ec..5c350abb24 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js @@ -1,18 +1,22 @@ import SendClockReactSvgUrl from "PUBLIC_DIR/images/send.clock.react.svg?url"; import PencilOutlineReactSvgUrl from "PUBLIC_DIR/images/pencil.outline.react.svg?url"; import DefaultUserAvatarMax from "PUBLIC_DIR/images/default_user_photo_size_200-200.png"; -import React from "react"; +import React, { useState, useEffect } from "react"; import { ReactSVG } from "react-svg"; import { useTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import Avatar from "@docspace/components/avatar"; import Text from "@docspace/components/text"; +import Link from "@docspace/components/link"; +import ComboBox from "@docspace/components/combobox"; import IconButton from "@docspace/components/icon-button"; +import { isMobileOnly } from "react-device-detect"; +import toastr from "@docspace/components/toast/toastr"; -import { getUserRole } from "@docspace/common/utils"; +import { getUserRole, convertLanguage } from "@docspace/common/utils"; -import LanguagesCombo from "./languagesCombo"; +import { Trans } from "react-i18next"; //import TimezoneCombo from "./timezoneCombo"; import { @@ -22,14 +26,20 @@ import { ChangeNameDialog, } from "SRC_DIR/components/dialogs"; -import { StyledWrapper, StyledInfo } from "./styled-main-profile"; +import { StyledWrapper, StyledInfo, StyledLabel } from "./styled-main-profile"; import { HelpButton, Tooltip } from "@docspace/components"; +import withCultureNames from "@docspace/common/hoc/withCultureNames"; const MainProfile = (props) => { const { t } = useTranslation(["Profile", "Common"]); const { + theme, profile, + culture, + helpLink, + cultureNames, + setIsLoading, changeEmailVisible, setChangeEmailVisible, changePasswordVisible, @@ -41,8 +51,27 @@ const MainProfile = (props) => { withActivationBar, sendActivationLink, currentColorScheme, + updateProfileCulture, } = props; + const [horizontalOrientation, setHorizontalOrientation] = useState(false); + + useEffect(() => { + checkWidth(); + window.addEventListener("resize", checkWidth); + return () => window.removeEventListener("resize", checkWidth); + }, []); + + const checkWidth = () => { + if (!isMobileOnly) return; + + if (!isSmallTablet()) { + setHorizontalOrientation(true); + } else { + setHorizontalOrientation(false); + } + }; + const role = getUserRole(profile); const sendActivationLinkAction = () => { @@ -53,6 +82,57 @@ const MainProfile = (props) => { ? profile.avatarMax : DefaultUserAvatarMax; + const supportEmail = "documentation@onlyoffice.com"; + + const tooltipLanguage = ( + + + "In case you cannot find your language in the list of the available + ones, feel free to write to us at + + {{ supportEmail }} + + to take part in the translation and get up to 1 year free of charge." + {" "} + + {t("Common:LearnMore")} + + + ); + + const isMobileHorizontalOrientation = isMobileOnly && horizontalOrientation; + + const { cultureName, currentCulture } = profile; + const language = convertLanguage(cultureName || currentCulture || culture); + + const selectedLanguage = cultureNames.find((item) => item.key === language) || + cultureNames.find((item) => item.key === culture) || { + key: language, + label: "", + }; + + const onLanguageSelect = (language) => { + if (profile.cultureName === language.key) return; + + setIsLoading(true); + updateProfileCulture(profile.id, language.key) + .then(() => setIsLoading(false)) + .then(() => location.reload()) + .catch((error) => { + toastr.error(error && error.message ? error.message : error); + setIsLoading(false); + }); + }; + return ( { currentColorScheme={currentColorScheme} >
-
-
- +
+ {t("Common:Name")} + + + {t("Common:Email")} + + + + {t("Common:Password")} + + + + {t("Common:Language")} + + +
+ +
+
+ + {profile.displayName} + + setChangeNameVisible(true)} + /> +
+
+
+ + {profile.email} + + {withActivationBar && ( + ( + {dataTip} + )} + effect="float" + place="bottom" + /> + )} + setChangeEmailVisible(true)} + /> +
+ {withActivationBar && ( +
+ + + {t("SendAgain")} + +
+ )} +
+
+ ******** + setChangePasswordVisible(true)} + /> +
+
+ +
+
+
+
+
+
+ {t("Common:Name")} - + {profile.displayName}
@@ -85,9 +285,9 @@ const MainProfile = (props) => { onClick={() => setChangeNameVisible(true)} />
-
-
- +
+
+ {t("Common:Email")}
@@ -96,48 +296,26 @@ const MainProfile = (props) => { data-for="emailTooltip" data-tip={t("EmailNotVerified")} as="div" - className={"email-text-container"} + className="email-text-container" fontWeight={600} > {profile.email} - {withActivationBar && ( - ( - {dataTip} - )} - effect="float" - place="bottom" - /> - )} - - setChangeEmailVisible(true)} - />
{withActivationBar && ( -
- - - {t("SendAgain")} - -
+ ( + {dataTip} + )} + effect="float" + place="bottom" + /> )}
- {withActivationBar && (
{ )}
setChangeEmailVisible(true)} />
-
-
- +
+
+ {t("Common:Password")} - ******** + + ******** +
{ onClick={() => setChangePasswordVisible(true)} />
+ +
+ + {t("Common:Language")} + + + +
- {/* */} @@ -212,11 +425,9 @@ const MainProfile = (props) => { }; export default inject(({ auth, peopleStore }) => { - const { targetUserStore } = peopleStore; - const { withActivationBar, sendActivationLink } = auth.userStore; - - const { currentColorScheme } = auth.settingsStore; + const { theme, helpLink, culture, currentColorScheme } = auth.settingsStore; + const { setIsLoading } = peopleStore.loadingStore; const { targetUser: profile, @@ -228,10 +439,15 @@ export default inject(({ auth, peopleStore }) => { setChangeNameVisible, changeAvatarVisible, setChangeAvatarVisible, - } = targetUserStore; + updateProfileCulture, + } = peopleStore.targetUserStore; return { + theme, profile, + culture, + helpLink, + setIsLoading, changeEmailVisible, setChangeEmailVisible, changePasswordVisible, @@ -243,5 +459,6 @@ export default inject(({ auth, peopleStore }) => { withActivationBar, sendActivationLink, currentColorScheme, + updateProfileCulture, }; -})(observer(MainProfile)); +})(withCultureNames(observer(MainProfile))); diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/languagesCombo.js b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/languagesCombo.js deleted file mode 100644 index 84f4ed9542..0000000000 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/languagesCombo.js +++ /dev/null @@ -1,156 +0,0 @@ -import React, { useEffect, useState } from "react"; -import { inject, observer } from "mobx-react"; -import { Trans } from "react-i18next"; - -import ComboBox from "@docspace/components/combobox"; -import Text from "@docspace/components/text"; -import Link from "@docspace/components/link"; -import HelpButton from "@docspace/components/help-button"; -import toastr from "@docspace/components/toast/toastr"; - -import { convertLanguage } from "@docspace/common/utils"; -import withCultureNames from "@docspace/common/hoc/withCultureNames"; - -import { isMobileOnly } from "react-device-detect"; - -import { StyledRow } from "./styled-main-profile"; -import { isSmallTablet } from "@docspace/components/utils/device"; - -const LanguagesCombo = (props) => { - const { - t, - profile, - updateProfileCulture, - setIsLoading, - culture, - cultureNames, - helpLink, - theme, - } = props; - const { cultureName, currentCulture } = profile; - const [horizontalOrientation, setHorizontalOrientation] = useState(false); - - const language = convertLanguage(cultureName || currentCulture || culture); - const selectedLanguage = cultureNames.find((item) => item.key === language) || - cultureNames.find((item) => item.key === culture) || { - key: language, - label: "", - }; - - useEffect(() => { - checkWidth(); - window.addEventListener("resize", checkWidth); - return () => window.removeEventListener("resize", checkWidth); - }, []); - - const onLanguageSelect = (language) => { - console.log("onLanguageSelect", language); - - if (profile.cultureName === language.key) return; - - setIsLoading(true); - updateProfileCulture(profile.id, language.key) - .then(() => setIsLoading(false)) - .then(() => location.reload()) - .catch((error) => { - toastr.error(error && error.message ? error.message : error); - setIsLoading(false); - }); - }; - - const supportEmail = "documentation@onlyoffice.com"; - - const tooltipLanguage = ( - - - "In case you cannot find your language in the list of the available - ones, feel free to write to us at - - {{ supportEmail }} - - to take part in the translation and get up to 1 year free of charge." - {" "} - - {t("Common:LearnMore")} - - - ); - - const checkWidth = () => { - if (!isMobileOnly) return; - - if (!isSmallTablet()) { - setHorizontalOrientation(true); - } else { - setHorizontalOrientation(false); - } - }; - - const isMobileHorizontalOrientation = isMobileOnly && horizontalOrientation; - - return ( - - - {t("Common:Language")} - - - - - ); -}; - -export default withCultureNames( - inject(({ auth, peopleStore }) => { - const { loadingStore, targetUserStore } = peopleStore; - const { settingsStore } = auth; - - const { setIsLoading } = loadingStore; - const { updateProfileCulture, targetUser: profile } = targetUserStore; - - const { culture, helpLink, theme } = settingsStore; - - return { - setIsLoading, - updateProfileCulture, - culture, - profile, - helpLink, - theme, - }; - })(observer(LanguagesCombo)) -); diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/styled-main-profile.js b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/styled-main-profile.js index d44dc4688b..41ed642f15 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/styled-main-profile.js +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/styled-main-profile.js @@ -1,10 +1,11 @@ import styled, { css } from "styled-components"; import { hugeMobile, + mobile, smallTablet, - desktop, tablet, } from "@docspace/components/utils/device"; +import Text from "@docspace/components/text"; export const StyledWrapper = styled.div` width: 100%; @@ -34,72 +35,81 @@ export const StyledWrapper = styled.div` export const StyledInfo = styled.div` width: 100%; max-width: 100%; - box-sizing: border-box; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - display: flex; flex-direction: column; gap: 11px; + padding-top: 5px; @media ${tablet} { gap: 7px; } - padding-top: 5px; - - @media ${smallTablet} { - width: 100%; - gap: 16px; - } - - .label { - min-width: 75px; - max-width: 75px; - white-space: nowrap; - color: ${(props) => props.theme.profile.main.descriptionTextColor}; - } - .rows-container { - display: flex; - flex-direction: column; - gap: 16px; - + display: grid; + grid-template-columns: minmax(75px, auto) 1fr; + gap: 24px; max-width: 100%; - @media ${hugeMobile} { - gap: 8px; - } - } - - .row { - display: flex; - align-items: baseline; - gap: 8px; - line-height: 20px; - max-width: 100%; - - @media ${desktop} { - height: auto; - } - - @media ${smallTablet} { - align-items: center; - } - - .field { + .profile-block { display: flex; - gap: 16px; - align-items: baseline; - max-width: calc(100% - 28px); + flex-direction: column; - & > p { - padding-left: 8px; + .profile-block-field { + display: flex; + gap: 8px; + height: 20px; + align-items: baseline; + line-height: 20px; + } + + .email-container { + margin-top: 16px; + + .send-again-desktop { + display: flex; + } + } + .language-combo-box-wrapper { + display: flex; + height: 28px; + align-items: center; + margin-top: 11px; + + @media ${tablet} { + height: 36px; + margin-top: 7px; + } + + .language-combo-box { + .combo-button { + margin-left: -16px; + } + } } } + } + + .mobile-profile-block { + display: none; + } + + .edit-button { + min-width: 12px; + + svg path { + fill: ${(props) => props.theme.isBase && `#657077`}; + } + } + + .email-edit-container { + display: flex; + align-items: center; + padding-right: 16px; + line-height: 20px; .email-text-container { ${(props) => @@ -109,190 +119,160 @@ export const StyledInfo = styled.div` `} } - .send-again-container { - flex-grow: 1; - - max-width: 50%; - cursor: pointer; - - align-items: center; - - cursor: pointer; - - height: 18px; - - .send-again-text { - margin-left: 5px; - - line-height: 15px; - - color: ${(props) => props.currentColorScheme.main.accent}; - - border-bottom: 1px solid - ${(props) => props.currentColorScheme.main.accent}; - - margin-top: 2px; - } - - .send-again-icon { - display: block; - - width: 12px; - height: 12px; - - display: flex; - align-items: center; - justify-content: center; - - div { - width: 12px; - height: 12px; - } - - svg { - width: 12px; - height: 12px; - - path { - fill: ${(props) => props.currentColorScheme.main.accent}; - } - } - } - } - - .send-again-desktop { - display: flex; - } - - .send-again-mobile { - display: none; - } - - .edit-button { - min-width: 12px; - - svg path { - fill: ${(props) => props.theme.isBase && `#657077`}; - } - } - .email-edit-button { display: block; padding-left: 8px; } + } - .email-edit-container { + .send-again-container { + display: flex; + flex-grow: 1; + max-width: 50%; + cursor: pointer; + align-items: center; + cursor: pointer; + height: 18px; + + .send-again-text { + margin-left: 5px; + line-height: 15px; + color: ${(props) => props.currentColorScheme.main.accent}; + border-bottom: 1px solid + ${(props) => props.currentColorScheme.main.accent}; + margin-top: 2px; + } + + .send-again-icon { + display: block; + width: 12px; + height: 12px; display: flex; align-items: center; - padding-right: 16px; - } + justify-content: center; - .email-container { - padding-left: 8px; - display: flex; - flex-wrap: wrap; - align-items: baseline; - } + div { + width: 12px; + height: 12px; + } - .email-edit-button-mobile { - display: none; - } + svg { + width: 12px; + height: 12px; - @media ${smallTablet} { - gap: 8px; - background: ${(props) => props.theme.profile.main.background}; - padding: 12px 16px; - border-radius: 6px; - - .field { - flex-direction: column; - gap: 2px; - - .email-container { - padding-left: 0px; - } - - & > p { - padding-left: 0; - font-size: 12px !important; - line-height: 16px !important; - max-width: 100%; + path { + fill: ${(props) => props.currentColorScheme.main.accent}; } } - - .label { - min-width: 100%; - max-width: 100%; - font-size: 12px !important; - line-height: 16px !important; - } - - .email-edit-button-mobile { - display: block; - } - - .email-edit-button { - display: none; - } - - .edit-button { - margin-left: auto; - min-width: 12px; - } - - .send-again-desktop { - display: none; - - margin-left: 8px; - } - - .send-again-mobile { - display: flex; - } } } -`; - -export const StyledRow = styled.div` - display: flex; - gap: 16px; - - @media ${desktop} { - height: 28px; - align-items: center; - } - - .label { - display: flex; - align-items: center; - gap: 4px; - min-width: 75px; - max-width: 75px; - white-space: nowrap; - } - - .language-combo-box { - margin-left: -8px; - } @media ${smallTablet} { - width: 100%; - flex-direction: column; - gap: 4px; - - .label { - font-weight: 600; - color: ${(props) => props.theme.profile.main.textColor}; + .rows-container { + display: none; } - .combo { - & > div { - padding-left: 8px !important; + .mobile-profile-block { + display: flex; + flex-direction: column; + gap: 16px; + max-width: 100%; + + .mobile-profile-row { + gap: 8px; + background: rgb(248, 249, 249); + padding: 12px 16px; + border-radius: 6px; + display: flex; + align-items: center; + line-height: 20px; + max-width: 100%; + + .mobile-profile-field { + display: flex; + align-items: baseline; + max-width: calc(100% - 28px); + flex-direction: column; + gap: 2px; + } + + .mobile-profile-label { + min-width: 100%; + max-width: 100%; + font-size: 12px !important; + line-height: 16px !important; + white-space: nowrap; + color: rgb(163, 169, 174); + } + + .mobile-profile-label-field { + padding-left: 0px; + max-width: 100%; + font-size: 12px !important; + line-height: 16px; + } + + .email-container { + padding-left: 0px; + + display: flex; + flex-wrap: wrap; + align-items: baseline; + } + + .edit-button { + margin-left: auto; + min-width: 12px; + + svg path { + fill: ${(props) => props.theme.isBase && `#657077`}; + } + } + + .mobile-profile-password { + max-width: 100%; + font-size: 12px !important; + line-height: 16px !important; + } } - } - .language-combo-box { - margin-left: 0; + .mobile-language { + display: flex; + width: 100%; + flex-direction: column; + gap: 4px; + + @media ${mobile} { + margin-top: 8px; + } + + .mobile-profile-label { + display: flex; + align-items: center; + gap: 4px; + min-width: 75px; + max-width: 75px; + white-space: nowrap; + } + } + + @media ${hugeMobile} { + gap: 8px; + } } } `; + +export const StyledLabel = styled(Text)` + display: flex; + align-items: center; + gap: 4px; + + min-width: 100%; + width: 100%; + line-height: 20px; + white-space: nowrap; + color: ${(props) => props.theme.profile.main.descriptionTextColor}; + + margin-top: ${({ marginTopProp }) => (marginTopProp ? marginTopProp : 0)}; +`; From b2fd048ba0cb7824f8fabde60e8cfb37d31afebe Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Fri, 7 Apr 2023 12:39:01 +0300 Subject: [PATCH 2/5] Web: Profile: fixed isSmallTablet crash --- .../Profile/Section/Body/sub-components/main-profile/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js index 5c350abb24..58bdeb301e 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js @@ -29,6 +29,7 @@ import { import { StyledWrapper, StyledInfo, StyledLabel } from "./styled-main-profile"; import { HelpButton, Tooltip } from "@docspace/components"; import withCultureNames from "@docspace/common/hoc/withCultureNames"; +import { isSmallTablet } from "@docspace/components/utils/device"; const MainProfile = (props) => { const { t } = useTranslation(["Profile", "Common"]); From aa709d103640615388a7cad1f49167e7fd03f0e2 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Fri, 7 Apr 2023 14:00:28 +0300 Subject: [PATCH 3/5] Web: Profiles: fixed styles --- .../Section/Body/sub-components/main-profile/index.js | 6 +++++- .../sub-components/main-profile/styled-main-profile.js | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js index 58bdeb301e..afec0224c7 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js @@ -164,7 +164,11 @@ const MainProfile = (props) => { {t("Common:Password")} - + {t("Common:Language")} props.theme.profile.main.descriptionTextColor}; + overflow: hidden; + text-overflow: ellipsis; + margin-top: ${({ marginTopProp }) => (marginTopProp ? marginTopProp : 0)}; `; From eb755a32071cf812b063d2dfa7eade0da15e6818 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Fri, 7 Apr 2023 14:05:01 +0300 Subject: [PATCH 4/5] Web: Common: moved supportEmail to SettingsStore --- .../Body/sub-components/main-profile/index.js | 16 +++++++++++----- packages/common/store/SettingsStore.js | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js index afec0224c7..87e497c435 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js @@ -53,6 +53,7 @@ const MainProfile = (props) => { sendActivationLink, currentColorScheme, updateProfileCulture, + documentationEmail, } = props; const [horizontalOrientation, setHorizontalOrientation] = useState(false); @@ -83,19 +84,17 @@ const MainProfile = (props) => { ? profile.avatarMax : DefaultUserAvatarMax; - const supportEmail = "documentation@onlyoffice.com"; - const tooltipLanguage = ( "In case you cannot find your language in the list of the available ones, feel free to write to us at - {{ supportEmail }} + {{ supportEmail: documentationEmail }} to take part in the translation and get up to 1 year free of charge." {" "} @@ -431,7 +430,13 @@ const MainProfile = (props) => { export default inject(({ auth, peopleStore }) => { const { withActivationBar, sendActivationLink } = auth.userStore; - const { theme, helpLink, culture, currentColorScheme } = auth.settingsStore; + const { + theme, + helpLink, + culture, + currentColorScheme, + documentationEmail, + } = auth.settingsStore; const { setIsLoading } = peopleStore.loadingStore; const { @@ -465,5 +470,6 @@ export default inject(({ auth, peopleStore }) => { sendActivationLink, currentColorScheme, updateProfileCulture, + documentationEmail, }; })(withCultureNames(observer(MainProfile))); diff --git a/packages/common/store/SettingsStore.js b/packages/common/store/SettingsStore.js index 6db8d1e451..44a06bdb48 100644 --- a/packages/common/store/SettingsStore.js +++ b/packages/common/store/SettingsStore.js @@ -122,6 +122,7 @@ class SettingsStore { tenantStatus = null; helpLink = null; + documentationEmail = null; hotkeyPanelVisible = false; frameConfig = null; From 9f12057baea0417da3f962ce3afe40ee957fdec7 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Fri, 7 Apr 2023 14:24:49 +0300 Subject: [PATCH 5/5] Web: Common: renamed documentationEmail to bookTrainingEmail --- .../Body/sub-components/main-profile/index.js | 12 ++++++------ .../main-profile/styled-main-profile.js | 4 ++++ packages/common/store/SettingsStore.js | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js index 87e497c435..67e1d27b13 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js @@ -53,7 +53,7 @@ const MainProfile = (props) => { sendActivationLink, currentColorScheme, updateProfileCulture, - documentationEmail, + bookTrainingEmail, } = props; const [horizontalOrientation, setHorizontalOrientation] = useState(false); @@ -90,11 +90,11 @@ const MainProfile = (props) => { "In case you cannot find your language in the list of the available ones, feel free to write to us at - {{ supportEmail: documentationEmail }} + {{ supportEmail: bookTrainingEmail }} to take part in the translation and get up to 1 year free of charge." {" "} @@ -233,7 +233,7 @@ const MainProfile = (props) => {
)}
-
+
******** { helpLink, culture, currentColorScheme, - documentationEmail, + bookTrainingEmail, } = auth.settingsStore; const { setIsLoading } = peopleStore.loadingStore; @@ -470,6 +470,6 @@ export default inject(({ auth, peopleStore }) => { sendActivationLink, currentColorScheme, updateProfileCulture, - documentationEmail, + bookTrainingEmail, }; })(withCultureNames(observer(MainProfile))); diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/styled-main-profile.js b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/styled-main-profile.js index da98c6930f..9b72b2cf19 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/styled-main-profile.js +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/styled-main-profile.js @@ -66,6 +66,10 @@ export const StyledInfo = styled.div` line-height: 20px; } + .profile-block-password { + margin-top: 16px; + } + .email-container { margin-top: 16px; diff --git a/packages/common/store/SettingsStore.js b/packages/common/store/SettingsStore.js index 44a06bdb48..48cb8e5069 100644 --- a/packages/common/store/SettingsStore.js +++ b/packages/common/store/SettingsStore.js @@ -122,7 +122,7 @@ class SettingsStore { tenantStatus = null; helpLink = null; - documentationEmail = null; + bookTrainingEmail = null; hotkeyPanelVisible = false; frameConfig = null;