Merge branch 'master' of ssh://vault48.org:22522/opt/git/vault

src/containers/dialogs/LoginDialog/index.tsx

@@ -1,4 +1,4 @@
-import React, {FC, FormEvent, useCallback, useEffect, useState} from 'react';
+import React, { FC, FormEvent, useCallback, useEffect, useState } from 'react';
 import { ScrollDialog } from '../ScrollDialog';
 import { IDialogProps } from '~/redux/modal/constants';
 import { useCloseOnEscape } from '~/utils/hooks';
@@ -7,9 +7,9 @@ import { InputText } from '~/components/input/InputText';
 import { Button } from '~/components/input/Button';
 import { Padder } from '~/components/containers/Padder';
 import * as styles from './styles.scss';
-import {selectAuthLogin} from "~/redux/auth/selectors";
+import { selectAuthLogin } from "~/redux/auth/selectors";
 import * as ACTIONS from '~/redux/auth/actions';
-import {connect} from "react-redux";
+import { connect } from "react-redux";
 
 const mapStateToProps = selectAuthLogin;
 
@@ -20,7 +20,7 @@ const mapDispatchToProps = {
 
 type IProps = ReturnType<typeof mapStateToProps> & typeof mapDispatchToProps & IDialogProps & {};
 
-const LoginDialogUnconnected: FC<IProps> = ({ onRequestClose, error , userSendLoginRequest, userSetLoginError }) => {
+const LoginDialogUnconnected: FC<IProps> = ({ onRequestClose, error, userSendLoginRequest, userSetLoginError }) => {
   const [username, setUserName] = useState('');
   const [password, setPassword] = useState('');
 
@@ -47,7 +47,7 @@ const LoginDialogUnconnected: FC<IProps> = ({ onRequestClose, error , userSendLo
 
   return (
     <form onSubmit={onSubmit}>
-      <ScrollDialog buttons={buttons} width={260}>
+      <ScrollDialog buttons={buttons} width={260} error={error}>
         <Padder>
           <div className={styles.wrap}>
             <Group>
@@ -56,7 +56,7 @@ const LoginDialogUnconnected: FC<IProps> = ({ onRequestClose, error , userSendLo
               <div />
               <div />
 
-              <InputText title="Логин" handler={setUserName} value={username} error={error} />
+              <InputText title="Логин" handler={setUserName} value={username} />
               <InputText title="Пароль" handler={setPassword} value={password} />
             </Group>
           </div>

src/containers/dialogs/ScrollDialog/index.tsx

@@ -12,6 +12,7 @@ interface IProps {
   width?: number;
   onOverlayClick?: MouseEventHandler<HTMLDivElement>;
   onRefCapture?: (ref: any) => void;
+  error?: string;
 
   top_sticky?: ReactChild;
   top_sticky_offset?: number;
@@ -24,7 +25,7 @@ const ScrollDialog: FC<IProps> = ({
   width = 800,
   top_sticky,
   top_sticky_offset,
-
+  error,
   onOverlayClick,
   onRefCapture
 }) => {
@@ -94,6 +95,8 @@ const ScrollDialog: FC<IProps> = ({
         {!!buttons && (
           <div className={styles.bottom}>
             <div className={styles.wrap} style={{ flexBasis: width }}>
+              <div className={classNames(styles.error, { active: error })}>{error}</div>
+
               <div className={styles.pan}>{buttons}</div>
             </div>
           </div>

src/containers/dialogs/ScrollDialog/styles.scss

@@ -54,7 +54,10 @@
   height: 10px;
   top: 0;
 
-  &:global(.has_buttons) { height: 60px; top: 15px;}
+  &:global(.has_buttons) {
+    height: 60px;
+    top: 15px;
+  }
 
   .wrap {
     display: flex;
@@ -75,6 +78,7 @@
 .wrap {
   flex: 0 1 800px;
   height: 100%;
+  position: relative;
 }
 
 .scroll_wrap {
@@ -126,3 +130,27 @@
     bottom: -$gap;
   }
 }
+
+.error {
+  background: linear-gradient(transparentize($red, 1), $red);
+  position: absolute;
+  width: 100%;
+  height: auto;
+  bottom: 100%;
+  left: 0;
+  padding: $gap * 2 $gap;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font: $font_14_regular;
+  border-radius: 0 0 $radius $radius;
+  pointer-events: none;
+  touch-action: none;
+  opacity: 0;
+  transition: opacity 0.25s;
+
+  &:global(.active) {
+    opacity: 1;
+  }
+}

src/redux/modal/reducer.ts

@@ -10,7 +10,7 @@ export interface IModalState {
 
 const INITIAL_STATE: IModalState = {
   is_shown: true,
-  dialog: DIALOGS.EDITOR,
+  dialog: DIALOGS.LOGIN,
 };
 
 export default createReducer(INITIAL_STATE, MODAL_HANDLERS);

src/redux/store.ts

@@ -24,7 +24,7 @@ import { IState } from "~/redux/store";
 
 const authPersistConfig: PersistConfig = {
   key: "auth",
-  whitelist: ["token"],
+  whitelist: ["token", "user"],
   storage
 };