|
@@ -1,43 +1,35 @@
|
|
|
-import React, { Component } from "react";
|
|
|
+import React, { Component, Fragment } from "react";
|
|
|
import { bindActionCreators } from "redux";
|
|
|
import { connect } from "react-redux";
|
|
|
|
|
|
-import { Button, Icon } from "antd";
|
|
|
-
|
|
|
import * as actions from "../actions/todo";
|
|
|
+import List from "../components/list";
|
|
|
+import LoadForm from "../components/loadForm";
|
|
|
|
|
|
class App extends Component {
|
|
|
+ state = {
|
|
|
+ openAddForm: false
|
|
|
+ };
|
|
|
+
|
|
|
+ openFormHandler = () => this.setState(prevState => ({ openAddForm: !prevState.openAddForm }));
|
|
|
+
|
|
|
render() {
|
|
|
const { list } = this.props;
|
|
|
+ const { openAddForm } = this.state;
|
|
|
return (
|
|
|
- <div className="todo">
|
|
|
- <div className="list">
|
|
|
- {list.map(el => (
|
|
|
- <div key={el.id} className="list__item">
|
|
|
- <div className="list__info">
|
|
|
- <div className="list__address">
|
|
|
- <span className="list__origin">{el.origin}</span>
|
|
|
- <Icon type="arrow-right" />
|
|
|
- <span className="list__destination">{el.destination}</span>
|
|
|
- </div>
|
|
|
- <div className="list__driver">
|
|
|
- <span className="list__driver-name">Контактное лицо: {el.contactName}</span>
|
|
|
- <span className="list__driver-night">Тип рейса: {el.night ? "Ночьной" : "Дневной"}</span>
|
|
|
- <span className="list__driver-body">Тип кузова: {el.bodyType}</span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div className="list__buttons">
|
|
|
- <Button size="small" type="primary">
|
|
|
- <Icon type="edit" />
|
|
|
- </Button>
|
|
|
- <Button size="small" type="danger">
|
|
|
- <Icon type="close" />
|
|
|
- </Button>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- ))}
|
|
|
+ <Fragment>
|
|
|
+ <h1 className="h1-tag">
|
|
|
+ Доставка грузов "to-do list" -{" "}
|
|
|
+ <span onClick={this.openFormHandler} className="h1-tag h1-tag--add">
|
|
|
+ Добавить груз
|
|
|
+ </span>
|
|
|
+ </h1>
|
|
|
+ <div className="todo">
|
|
|
+ <List list={list} />
|
|
|
+
|
|
|
+ {openAddForm && <LoadForm />}
|
|
|
</div>
|
|
|
- </div>
|
|
|
+ </Fragment>
|
|
|
);
|
|
|
}
|
|
|
}
|