IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0

Browse Source
This commit is contained in:
Tatiana Lopaeva 2023-03-15 18:08:07 +03:00
commit ca18f997c3
5 changed files with 161 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/pages/Home/InfoPanel/Body/styles/accounts.js
View File

@ -70,6 +70,8 @@ const StyledAccountsItemTitle = styled.div`
StyledAccountsItemTitle.defaultProps = { theme: Base };
const StyledAccountContent = styled.div`
margin: 80px auto 0;
.data__header {
width: 100%;
padding: 24px 0;

3
packages/client/src/pages/Home/InfoPanel/Body/styles/severalItems.js
View File

@ -1,13 +1,12 @@
import styled from "styled-components";
const StyledSeveralItemsContainer = styled.div`
margin: 80px auto 0;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 32px;
padding-top: ${(props) => (props.isAccounts ? "80px" : "0")};
padding-top: 80px;
img {
width: 75px;

129
packages/common/components/Loaders/ProfileViewLoader/MobileView.js
View File

@ -90,11 +90,13 @@ const MobileViewLoader = ({ ...rest }) => {
animate={animate}
/>
</div>
<div className="block">
<div className="notifications">
<RectangleLoader
title={title}
width="78"
height="20"
width="101"
height="22"
className="title"
borderRadius={borderRadius}
backgroundColor={backgroundColor}
foregroundColor={foregroundColor}
@ -115,22 +117,13 @@ const MobileViewLoader = ({ ...rest }) => {
animate={animate}
/>
</div>
<div className="block">
<div className="theme">
<RectangleLoader
title={title}
width="78"
height="20"
borderRadius={borderRadius}
backgroundColor={backgroundColor}
foregroundColor={foregroundColor}
backgroundOpacity={backgroundOpacity}
foregroundOpacity={foregroundOpacity}
speed={speed}
animate={animate}
/>
<RectangleLoader
title={title}
height="32"
className="theme-title"
width="129"
height="22"
borderRadius={borderRadius}
backgroundColor={backgroundColor}
foregroundColor={foregroundColor}
@ -139,6 +132,108 @@ const MobileViewLoader = ({ ...rest }) => {
speed={speed}
animate={animate}
/>
<div className="flex">
<RectangleLoader
title={title}
width="16"
height="16"
className="check-box"
borderRadius={borderRadius}
backgroundColor={backgroundColor}
foregroundColor={foregroundColor}
backgroundOpacity={backgroundOpacity}
foregroundOpacity={foregroundOpacity}
speed={speed}
animate={animate}
/>
<RectangleLoader
title={title}
width="124"
height="20"
borderRadius={borderRadius}
backgroundColor={backgroundColor}
foregroundColor={foregroundColor}
backgroundOpacity={backgroundOpacity}
foregroundOpacity={foregroundOpacity}
speed={speed}
animate={animate}
/>
</div>
<div className="theme-selection">
<RectangleLoader
title={title}
width="291"
height="32"
className="theme-description"
borderRadius={borderRadius}
backgroundColor={backgroundColor}
foregroundColor={foregroundColor}
backgroundOpacity={backgroundOpacity}
foregroundOpacity={foregroundOpacity}
speed={speed}
animate={animate}
/>
<div className="check-box-container">
<div className="flex">
<CircleLoader
title={title}
className="check-box"
x="8"
y="8"
radius="8"
backgroundColor={backgroundColor}
foregroundColor={foregroundColor}
backgroundOpacity={backgroundOpacity}
foregroundOpacity={foregroundOpacity}
speed={speed}
animate={animate}
/>
<RectangleLoader
title={title}
width="124"
height="20"
borderRadius={borderRadius}
backgroundColor={backgroundColor}
foregroundColor={foregroundColor}
backgroundOpacity={backgroundOpacity}
foregroundOpacity={foregroundOpacity}
speed={speed}
animate={animate}
/>
</div>
<div className="flex">
<CircleLoader
title={title}
className="check-box"
x="8"
y="8"
radius="8"
backgroundColor={backgroundColor}
foregroundColor={foregroundColor}
backgroundOpacity={backgroundOpacity}
foregroundOpacity={foregroundOpacity}
speed={speed}
animate={animate}
/>
<RectangleLoader
title={title}
width="124"
height="20"
borderRadius={borderRadius}
backgroundColor={backgroundColor}
foregroundColor={foregroundColor}
backgroundOpacity={backgroundOpacity}
foregroundOpacity={foregroundOpacity}
speed={speed}
animate={animate}
/>
</div>
</div>
</div>
</div>
</MobileView>
);

45
packages/common/components/Loaders/ProfileViewLoader/StyledProfileView.js
View File

@ -152,7 +152,50 @@ const MobileView = styled.div`
display: flex;
flex-direction: column;
gap: 4px;
margin-bottom: 16px;
margin-bottom: 32px;
}
.notifications {
.title {
padding-bottom: 10px;
}
margin-bottom: 32px;
}
.theme {
.theme-title {
padding-bottom: 12px;
}
.flex {
display: flex;
}
.check-box {
padding-right: 7px;
}
.theme-selection {
display: flex;
flex-direction: column;
padding-top: 4px;
padding-left: 22px;
.theme-description {
padding-bottom: 12px;
}
.check-box {
width: 16px;
height: 16px;
}
.check-box-container {
display: flex;
flex-direction: column;
gap: 12px;
}
}
}
`;

3
packages/login/src/client/components/sub-components/LoginForm.tsx
View File

@ -156,8 +156,9 @@ const LoginForm: React.FC<ILoginFormProps> = ({
const session = !isChecked;
login(user, hash, session)
.then((res: string | object) => {
const isConfirm = typeof res === "string" && res.includes("confirm");
const redirectPath = sessionStorage.getItem("referenceUrl");
if (redirectPath) {
if (redirectPath && !isConfirm) {
sessionStorage.removeItem("referenceUrl");
window.location.href = redirectPath;
return;