RomanR 4 lat temu
rodzic
commit
1cec5cdf2f

+ 11 - 13
src/App.js

@@ -18,8 +18,8 @@ import RegisterForm from "./components/RegisterForm";
 import LoginForm from "./components/LoginForm";
 import Lib from "./components/Library";
 
-const PrivateRoute = (props ) => {
-  console.log(props)
+const PrivateRoute = (props) => {
+  console.log(props);
   const { children, ...rest } = props;
 
   return (
@@ -45,17 +45,15 @@ export default () => {
   return (
     <Provider store={store}>
       <div className="App">
-        {/* <div className="wrapper"> */}
-          <Router history={history}>
-            <Switch>
-              <Route exact path="/" component={RegisterForm} />
-              <Route path="/login" component={LoginForm} />
-              <PrivateRoute path="/private">
-                <Lib />
-              </PrivateRoute>
-            </Switch>
-          </Router>
-        {/* </div> */}
+        <Router history={history}>
+          <Switch>
+            <Route exact path="/" component={RegisterForm} />
+            <Route path="/login" component={LoginForm} />
+            <PrivateRoute path="/private">
+              <Lib />
+            </PrivateRoute>
+          </Switch>
+        </Router>
       </div>
     </Provider>
   );

+ 1 - 3
src/actions/playerActions.js

@@ -25,9 +25,7 @@ export const getTracks = () => async (dispatch) => {
             }`,
       { query: JSON.stringify([{}]) }
     );
-    // setTracks(response.data.TrackFind)
-    // console.log(tracks)
-    // console.log('connected')
+
     console.log(response);
 
     dispatch(setTracks(response.data.TrackFind));

+ 1 - 32
src/components/LoginForm.js

@@ -61,14 +61,10 @@ const LoginForm = ({ store, history, doLogin, isLoggedIn }) => {
 
   return (
     <div className="registerForm">
-      {/* <div className="wrapperRegisterForm"> */}
       <div>
         <Form
           name="basic"
           form={form}
-          // initialValues={{
-          //   remember: true,
-          // }}
           onFinish={onFinish}
           onFinishFailed={onFinishFailed}
         >
@@ -109,27 +105,16 @@ const LoginForm = ({ store, history, doLogin, isLoggedIn }) => {
               prefix={<LockOutlined className="site-form-item-icon" />}
             />
           </Form.Item>
-          {/* 
-        <Form.Item name="remember" valuePropName="checked">
-          <Checkbox>Remember me</Checkbox>
-        </Form.Item> */}
+
 
           <Form.Item>
             <Button 
             type="primary" 
             htmlType="submit" 
-            // disabled = {!onLogin ? true : false}
             onClick={onLogin}
             >
               Submit
             </Button>
-            {/* <Button
-              onClick={() => {
-                history.push("/library");
-              }}
-            >
-              Library
-            </Button> */}
             <Link to="/" className="link-approval">Registration</Link>
           </Form.Item>
         </Form>
@@ -148,19 +133,3 @@ const mapDispatchToProps = (dispatch) => ({
 
 export default connect(mapStateToProps, mapDispatchToProps)(LoginForm);
 
-// if(type == 'PROMISE') {
-//   {
-//     status PENDING ||
-//           FULFILED ||
-//           REJECTED
-//   }
-// }
-// action PENDING = () => (
-//   {type: 'promise', status: 'PENDING', payload: 'null', error: 'null'}
-// )
-// action FULFILED =() => (
-//   {type: 'SET_STATUS', status: 'RESOLVED', payload, error: null }
-// )
-// action REJECTED =() => (
-//   {type: 'SET_STATUS', status: 'REJECTED', payload: null, error}
-// )

+ 0 - 13
src/components/RegisterForm.js

@@ -29,14 +29,10 @@ export default ({store, history}) => {
 
   return (
     <div className="registerForm">
-      {/* <div className="wrapperRegisterForm"> */}
       <div>
         <Form
           name="basic"
           form={form}
-          // initialValues={{
-          //   remember: true,
-          // }}
           onFinish={onFinish}
           onFinishFailed={onFinishFailed}
         >
@@ -54,7 +50,6 @@ export default ({store, history}) => {
             <Input
               prefix={<UserOutlined className="site-form-item-icon" />}
               onChange={(e) => {
-                // console.log(e.target.value);
                 form.setFieldsValue({ username: e.target.value });
               }}
             />
@@ -83,8 +78,6 @@ export default ({store, history}) => {
               {
                 required: true,
                 message: "Please input your password!",
-                // validator: 
-                // value: 
               },
             ]}
           >
@@ -92,10 +85,6 @@ export default ({store, history}) => {
               prefix={<LockOutlined className="site-form-item-icon" />}
             />
           </Form.Item>
-          {/* 
-        <Form.Item name="remember" valuePropName="checked">
-          <Checkbox>Remember me</Checkbox>
-        </Form.Item> */}
 
           <Form.Item>
             <Button type="primary" htmlType="submit"
@@ -111,9 +100,7 @@ export default ({store, history}) => {
                 console.log(data);
                 if (!data.errors && login && password) {
                   history.push("/login");
-                  // window.location.assign("http://localhost:3000/login");
                 } else {
-                //   setError(() => true);// если поле не заполнено, то формируем ошибку
                 }
               });
             }