mergefix

src/components/Auth/authButtons.js

@@ -5,8 +5,9 @@ class Authbuttons extends Component {
   render() {
     return (
         <div className="auth__button">
-          <Link to="/auth">Войти</Link>
-          <Link to="/registration">Зарегистрироваться</Link>
+        
+          <Link to="/auth"  > <button className = "button btn1">Войти</button></Link>
+          <Link to="/registration" > <button className = "button btn2">Зарегистрироваться</button></Link>
         </div>
     )
   }

src/components/Auth/authorisation.js

@@ -11,8 +11,10 @@ const Form = props => {
   }
     return (
       <div>
-        <Authbuttons />
+        
         <form className="auth__form" onSubmit={handleSubmit(submit)}>
+        
+        <Authbuttons />
           <div>
             <Field
               name="email"
@@ -30,7 +32,9 @@ const Form = props => {
               placeholder ="Пароль"  
             />
           </div>
+
           <button className="auth__submit-button">Войти</button>
+
         </form>
       </div>
     );

src/components/Auth/registration.js

@@ -18,9 +18,11 @@ const RegistrForm = props => {
 }
   return (
     <div>
-      <Authbuttons />
+     
       <form onSubmit={handleSubmit(submit)} className="form">
-        <div>
+      <div>
+      <Authbuttons />
+        <div> 
           <div>
             <Field
               name="login"
@@ -77,6 +79,7 @@ const RegistrForm = props => {
             Очистить поля
           </button>
         </div>
+        </div>
         </form>
       </div>
 

src/components/FormAddNewStaff/SendingStaffForm.js

@@ -2,16 +2,21 @@ import React from 'react'
 import { Field, reduxForm } from 'redux-form'
 
 
-
+const massive = [{
+  title: "Инструменты",
+  value : 1
+},
+{
+  title: "Техника",
+  value : 2
+}]
 
 const SendingForm = props => {
   const { handleSubmit, pristine, reset, submitting, AddNewStaff } = props
   const submit = values => {
    values.img = "http://site.com"
    values.staff = "Машина"
-   values.state = 1
    values.userId = 1
-   values.categoryId = 1
    AddNewStaff(values)
 
 };
@@ -25,6 +30,7 @@ const SendingForm = props => {
             component="input"
             type="text"
             placeholder="Название"
+            className="input"
           />
         </div>
       </div>
@@ -33,12 +39,30 @@ const SendingForm = props => {
         <div>
           <Field
             name="description"
-            component="input"
+            component="textarea"
             type="text"
             placeholder="Описание"
+            className="input"
           />
         </div>
       </div>
+      <div>
+       
+        <div >
+          <label ><Field name="state" component = "input" type="radio" value="0" className="radio"/> Новое</label>
+          <label><Field name="state" component = "input" type="radio" value="1"/> б/у</label>
+        </div>
+      </div>
+      <div>
+        <label>Favorite Color</label>
+        <div>
+          <Field name="categoryId" component = "select" className="button">
+           {massive.map((el,key)=> (<option key={key} value={el.value}>{el.title}</option>))}
+            
+            
+          </Field>
+        </div>
+      </div>
       <div> 
         <div>
           <Field
@@ -46,14 +70,15 @@ const SendingForm = props => {
             component="input"
             type="number"
             placeholder="Цена"
+            className="input"
           />
         </div>
       </div>
       <div>
-        <button type="submit" disabled={pristine || submitting}>
+        <button type="submit" disabled={pristine || submitting} className="button">
           Submit
         </button>
-        <button type="button" disabled={pristine || submitting} onClick={reset}>
+        <button type="button" disabled={pristine || submitting} onClick={reset} className="button">
           Clear Values
         </button>
       </div>

src/components/FormAddNewStaff/index.js

@@ -13,7 +13,7 @@ class FormAddNewStaff extends Component {
             <div>
                <Form {...this.props}/>
                {isFetching===true ? <div><MDSpinner size={100} duration={1000} /></div> : null}
-                {staffData.map((el,key)=>(<div key={key}> {el.description} {el.title} </div>))}
+                {staffData.map((el,key)=>(<div key={key}> {el.description} {el.title} {el.price} </div>))}
  
             </div>
         );

src/components/LeftMenu/DrawCategory.js

@@ -47,7 +47,7 @@ class DrawCategory extends Component {
         return (
             <div>
                 {this.caty.map((el,key)=>
-                    <Menu theme="dark" defaultSelectedKeys={['1']} mode="inline">    
+                    <Menu theme="light" defaultSelectedKeys={['1']} mode="inline">    
 
                         <SubMenu key="sub1"
                             title={<span key={key}><Icon type={el.description} /><span >{el.title}</span></span>}

src/components/LeftMenu/index.js

@@ -94,11 +94,11 @@ class LeftMenu extends Component {
         return (
 
             <div>
-                <Layout style={{ minHeight: '100vh' }}>
+                <Layout style={{ minHeight: '100vh', 'background': 'red' }}>
                     <Sider collapsible
                         collapsed={this.state.collapsed}
                         onCollapse={this.onCollapse}
-
+                        style={{ minHeight: '100vh'}}
                     >
                         <DrawCategory />
                        

src/container/AddNewStaff.js

@@ -21,7 +21,7 @@ class AddNewStaff extends Component {
             	<div>          
               		<FormAddNewStaff {...this.props}/>
             	</div>
-				<EditModal visible={showModal}
+					<EditModal visible={showModal}
 					onOk={this.closeEditModal} 
 					onCancel={this.closeEditModal} 
 					error={error} />     

src/container/MainPage.js

@@ -16,7 +16,7 @@ class MainPage extends Component {
         
     }
       render() {
-      console.log(this.props, 'qwewqrwqr')  
+      
         return (
 
             <Fragment>

src/style/base/_base.scss

@@ -85,7 +85,7 @@ body {
 	line-height: 1.7;
 	box-sizing: border-box;
 	background: $color-backgtound;
-	background-color: aqua;
+	background-color: #f6f8f9;
 	min-width: 320px;
 	max-width: 1350px;
 }

src/style/components/_allStaff.scss

@@ -39,9 +39,9 @@
     text-align:center;
     color: #fff;
     border: none;
-    box-shadow: 0 0 0 0 #f0f0f0, 0 0 0 0 rgba(227, 115, 14, 0.7);
+    box-shadow: 0 0 0 0 #f0f0f0, 0 0 0 0 #FD7F71;
     border-radius: 25px;
-    background: #e3730e;
+    background: #FD7F71;
     cursor: pointer;
     transform: translate3d(0, 0, 0);
     animation: pulse 1.25s infinite cubic-bezier(0.66, 0.33, 0, 1);

src/style/components/auth.scss

@@ -18,17 +18,19 @@ h1 {
 
 .form {
   box-sizing: border-box;
-  width: 260px;
+  width: 460px;
   margin: 100px auto 0;
   box-shadow: 2px 2px 5px 1px rgba(0,0,0,0.2);
   padding-bottom: 40px;
   border-radius: 3px;
 
+
+
 }
 
 .input {
   margin: 20px 25px;
-  width: 200px;
+  width: 80%;
   display: block;
   border: none;
   padding: 10px 0;
@@ -60,7 +62,7 @@ h1 {
   border-radius: 3px;
   padding: 6px;
   margin-bottom: 10px;
-  width: 200px;
+  width: 80%;
   color: white;
   margin-left: 25px;
   box-shadow: 0 3px 6px 0 rgba(0,0,0,0.2);
@@ -111,4 +113,28 @@ h1 {
 }
 .sider{
   background-color: #FD7F71
+}
+
+
+.auth__button{
+
+  width: 100%;
+  display : flex;
+  padding-top: 30px;
+  padding-bottom: 30px;
+  
+}
+.btn1{
+  width: 180px;
+    margin-left: 0px;
+    border-radius: 0px;
+    padding-bottom: 10px;
+    padding-top: 10px;
+}
+.btn2{
+  width: 180px;
+    margin-left: 0px;
+    border-radius: 0px;
+    padding-bottom: 10px;
+    padding-top: 10px;
 }

src/style/components/searchLine.scss

@@ -87,3 +87,8 @@ color: darken($color,1%);
         @media (min-width: $breakpoint) {
           width: 32px;
           height: 32px; } }
+          
+          
+         
+          
+        

src/utils/validate.js

@@ -0,0 +1,15 @@
+export default values => {
+    const { email, password } = values;
+    const error = {};
+    console.log(values)
+
+    if(!email) {
+        error.email = "Required"
+    }
+
+    if(!password) {
+        error.password = "Required"
+    }
+
+    return error;
+};