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

Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2

Browse Source
This commit is contained in:
Vlada Gazizova 2022-04-19 14:20:19 +03:00
commit f60cdb970d
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/images/view-rows.react.svg
View File

@ -1,3 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M0 15C0 15.5523 0.447715 16 1 16H15C15.5523 16 16 15.5523 16 15V14.7143C16 14.162 15.5523 13.7143 15 13.7143H1C0.447715 13.7143 0 14.162 0 14.7143V15ZM0 8.14286C0 8.69514 0.447715 9.14286 1 9.14286H15C15.5523 9.14286 16 8.69514 16 8.14286V7.85714C16 7.30486 15.5523 6.85714 15 6.85714H1C0.447715 6.85714 0 7.30486 0 7.85714V8.14286ZM1 2.28571C0.447715 2.28571 0 1.838 0 1.28571V1C0 0.447716 0.447715 0 1 0H15C15.5523 0 16 0.447716 16 1V1.28571C16 1.838 15.5523 2.28571 15 2.28571H1Z" fill="#A3A9AE"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 2.5C2 2.22386 1.77614 2 1.5 2H0.5C0.223858 2 0 2.22386 0 2.5V3.5C0 3.77614 0.223858 4 0.5 4H1.5C1.77614 4 2 3.77614 2 3.5V2.5ZM16 2.5C16 2.22386 15.7761 2 15.5 2H4.5C4.22386 2 4 2.22386 4 2.5V3.5C4 3.77614 4.22386 4 4.5 4L15.5 4C15.7761 4 16 3.77614 16 3.5V2.5ZM2 7.5C2 7.22386 1.77614 7 1.5 7H0.5C0.223858 7 0 7.22386 0 7.5V8.5C0 8.77614 0.223858 9 0.5 9H1.5C1.77614 9 2 8.77614 2 8.5V7.5ZM16 7.5C16 7.22386 15.7761 7 15.5 7H4.5C4.22386 7 4 7.22386 4 7.5V8.5C4 8.77614 4.22386 9 4.5 9H15.5C15.7761 9 16 8.77614 16 8.5V7.5ZM0 12.5C0 12.2239 0.223858 12 0.5 12H1.5C1.77614 12 2 12.2239 2 12.5V13.5C2 13.7761 1.77614 14 1.5 14H0.5C0.223858 14 0 13.7761 0 13.5V12.5ZM4 12.5C4 12.2239 4.22386 12 4.5 12L15.5 12C15.7761 12 16 12.2239 16 12.5V13.5C16 13.7761 15.7761 14 15.5 14L4.5 14C4.22386 14 4 13.7761 4 13.5V12.5Z" fill="white"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 653 B

After

Width:  |  Height:  |  Size: 984 B

2
public/images/view-tiles.react.svg
View File

@ -1,3 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M1 0C0.447715 0 0 0.447715 0 0.999999V5.85714C0 6.40943 0.447715 6.85714 1 6.85714H5.85714C6.40943 6.85714 6.85714 6.40943 6.85714 5.85714V1C6.85714 0.447715 6.40943 0 5.85714 0H1ZM1 9.14286C0.447715 9.14286 0 9.59057 0 10.1429V15C0 15.5523 0.447715 16 1 16H5.85714C6.40943 16 6.85714 15.5523 6.85714 15V10.1429C6.85714 9.59057 6.40943 9.14286 5.85714 9.14286H1ZM9.14286 0.999999C9.14286 0.447715 9.59057 0 10.1429 0H15C15.5523 0 16 0.447715 16 1V5.85714C16 6.40943 15.5523 6.85714 15 6.85714H10.1429C9.59057 6.85714 9.14286 6.40943 9.14286 5.85714V0.999999ZM10.1429 9.14286C9.59057 9.14286 9.14286 9.59057 9.14286 10.1429V15C9.14286 15.5523 9.59057 16 10.1429 16H15C15.5523 16 16 15.5523 16 15V10.1429C16 9.59057 15.5523 9.14286 15 9.14286H10.1429Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 1C1.44772 1 1 1.44772 1 2V6C1 6.55228 1.44772 7 2 7H6C6.55228 7 7 6.55228 7 6V2C7 1.44772 6.55228 1 6 1H2ZM3.5 5C3.22386 5 3 4.77614 3 4.5V3.5C3 3.22386 3.22386 3 3.5 3H4.5C4.77614 3 5 3.22386 5 3.5V4.5C5 4.77614 4.77614 5 4.5 5H3.5ZM2 9C1.44772 9 1 9.44771 1 10V14C1 14.5523 1.44772 15 2 15H6C6.55228 15 7 14.5523 7 14V10C7 9.44771 6.55228 9 6 9H2ZM3.5 13C3.22386 13 3 12.7761 3 12.5V11.5C3 11.2239 3.22386 11 3.5 11H4.5C4.77614 11 5 11.2239 5 11.5V12.5C5 12.7761 4.77614 13 4.5 13H3.5ZM9 2C9 1.44772 9.44771 1 10 1H14C14.5523 1 15 1.44772 15 2V6C15 6.55228 14.5523 7 14 7H10C9.44771 7 9 6.55228 9 6V2ZM11.5 3C11.2239 3 11 3.22386 11 3.5V4.5C11 4.77614 11.2239 5 11.5 5H12.5C12.7761 5 13 4.77614 13 4.5V3.5C13 3.22386 12.7761 3 12.5 3H11.5ZM10 9C9.44771 9 9 9.44771 9 10V14C9 14.5523 9.44771 15 10 15H14C14.5523 15 15 14.5523 15 14V10C15 9.44771 14.5523 9 14 9H10ZM11.5 13C11.2239 13 11 12.7761 11 12.5V11.5C11 11.2239 11.2239 11 11.5 11H12.5C12.7761 11 13 11.2239 13 11.5V12.5C13 12.7761 12.7761 13 12.5 13H11.5Z" fill="#A3A9AE"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 918 B

After

Width:  |  Height:  |  Size: 1.2 KiB

11
web/ASC.Web.Login/src/Login.jsx
View File

@ -223,6 +223,7 @@ const Form = (props) => {
if (!userName) {
hasError = true;
setIdentifierValid(false);
setIsEmailErrorShow(true);
}
const pass = password.trim();
@ -252,6 +253,7 @@ const Form = (props) => {
} else history.push(url, { user, hash });
})
.catch((error) => {
setIsEmailErrorShow(true);
setErrorText(error);
setPasswordValid(!error);
setIsLoading(false);
@ -357,7 +359,7 @@ const Form = (props) => {
};
const onBlurEmail = () => {
setIsEmailErrorShow(true);
!identifierValid && setIsEmailErrorShow(true);
};
//console.log("Login render");
@ -411,7 +413,7 @@ const Form = (props) => {
className="form-field"
isVertical={true}
labelVisible={false}
hasError={(isEmailErrorShow && !identifierValid) || errorText}
hasError={isEmailErrorShow}
errorMessage={
errorText ? t(`Common:${errorText}`) : t("Common:RequiredField")
} //TODO: Add wrong login server error
@ -420,10 +422,7 @@ const Form = (props) => {
id="login"
name="login"
type="email"
hasError={
(isEmailErrorShow && !identifierValid) ||
(errorText && errorText.length > 0)
}
hasError={isEmailErrorShow}
value={identifier}
placeholder={t("RegistrationEmailWatermark")}
size="large"