Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { Component } from "react";
import { BrowserRouter, Route } from "react-router-dom";

import Home from "./pages/Home";
// import NewProduct from "./pages/NewProduct";
import NewProduct from "./pages/NewProduct";

import * as api from "./api";

Expand Down Expand Up @@ -228,13 +228,8 @@ class App extends Component {
}

render() {
const {
cartItems,
products,
isLoading,
hasError,
loadingError,
} = this.state;
const { cartItems, products, isLoading, hasError, loadingError } =
this.state;

return (
<BrowserRouter>
Expand All @@ -258,7 +253,18 @@ class App extends Component {
/>
)}
/>
{/* route path="/new-product" <NewProduct ...stuff /> */}
<Route
path="/new-product"
exact
render={(routeProps) => {
return (
<NewProduct
{...routeProps}
saveNewProduct={this.saveNewProduct}
/>
);
}}
></Route>
</BrowserRouter>
);
}
Expand Down
31 changes: 20 additions & 11 deletions src/components/NewProductForm/NewProductForm.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from "react";
// import { Redirect } from "react-router-dom";
import { Redirect } from "react-router-dom";
import { v4 as uuid } from "uuid";
import { Formik } from "formik";

Expand Down Expand Up @@ -35,17 +35,26 @@ function addProductDetails(product) {

// eslint-disable-next-line react/prefer-stateless-function
class NewProductForm extends Component {
// ...
// state: {
// submitted: false
// }
// ...
constructor(props) {
super(props);
this.state = {
submitted: false,
};
this.setSubmitted = this.setSubmitted.bind(this);
}
setSubmitted() {
setTimeout(() => {
this.setState({
submitted: true,
});
}, 500);
}
render() {
// const { submitted } = this.state;
const { submitted } = this.state;
const { saveNewProduct } = this.props;

return (
<>
<React.Fragment>
<Formik
initialValues={{
title: "",
Expand All @@ -63,7 +72,7 @@ class NewProductForm extends Component {
const newProduct = addProductDetails(values);
saveNewProduct(newProduct);
setSubmitting(true);
// this.setSubmitted();
this.setSubmitted();
}}
>
{({
Expand Down Expand Up @@ -183,8 +192,8 @@ class NewProductForm extends Component {
</form>
)}
</Formik>
{/* {submitted && <Redirect to="/" />} */}
</>
{submitted && <Redirect to="/" />}
</React.Fragment>
);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Home/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function Home({
handleChange,
}) {
return (
<>
<React.Fragment>
<AppHeader />
<Main className="container-fluid">
<div className="row">
Expand Down Expand Up @@ -72,7 +72,7 @@ function Home({
</div>
</Main>
<Footer />
</>
</React.Fragment>
);
}

Expand Down
5 changes: 2 additions & 3 deletions src/pages/NewProduct/NewProduct.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import React from "react";

import AppHeader from "../../components/AppHeader";
import Footer from "../../components/Footer";
import Main from "../../components/Main";
import NewProductForm from "../../components/NewProductForm";

function NewProduct({ saveNewProduct }) {
return (
<>
<React.Fragment>
<AppHeader />
<Main className="container">
<div className="row justify-content-center">
Expand All @@ -28,7 +27,7 @@ function NewProduct({ saveNewProduct }) {
</div>
</Main>
<Footer />
</>
</React.Fragment>
);
}

Expand Down