From 83c39fe209d791ae71e5fef0793ed33c536acf7a Mon Sep 17 00:00:00 2001 From: digi0ps Date: Sat, 29 Jun 2019 10:17:35 +0530 Subject: [PATCH 1/8] Fix error with dev server. And small changes in component. --- src/components/home/container.jsx | 2 +- webpack.config.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/home/container.jsx b/src/components/home/container.jsx index 0c0fa17..f526abe 100644 --- a/src/components/home/container.jsx +++ b/src/components/home/container.jsx @@ -14,7 +14,7 @@ class Fetch extends React.Component { } } - componentWillMount() { + componentDidMount() { fetch('http://127.0.0.1:3000/api/v1/package/all') .then(res => res.json()) .then(pkg_output => { diff --git a/webpack.config.js b/webpack.config.js index cef4c24..2619a1e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -14,6 +14,7 @@ module.exports = { output: { filename: 'app.[hash].js', path: path.resolve(__dirname, 'build'), + publicPath: '/', }, resolve: { From b5fcaaee1e1a403425a8ee00b8db4efadc20a08b Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 2 Jul 2019 16:54:08 +0530 Subject: [PATCH 2/8] making separate file for api --- src/components/category/container.jsx | 11 +++++------ src/components/common/api.jsx | 18 ++++++++++++++++++ src/components/home/container.jsx | 8 ++++---- src/components/package/container.jsx | 5 ++--- 4 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 src/components/common/api.jsx diff --git a/src/components/category/container.jsx b/src/components/category/container.jsx index 9a2b7db..6a995f8 100644 --- a/src/components/category/container.jsx +++ b/src/components/category/container.jsx @@ -1,6 +1,7 @@ import React from 'react' import Loader from '../common/loader' import Error from '../common/error' +import { getCategoryId } from '../common/api' class Category extends React.Component { constructor() { @@ -13,12 +14,10 @@ class Category extends React.Component { componentWillMount() { const id = this.props.match.params.id - fetch(`http://127.0.0.1:3000/api/v1/category/${id}`) - .then(res => res.json()) - .then(output => { - this.setState({ category: output, isloading: false }) - console.log(output) - }) + getCategoryId(id).then(output => { + this.setState({ category: output, isloading: false }) + console.log(output) + }) } render() { diff --git a/src/components/common/api.jsx b/src/components/common/api.jsx new file mode 100644 index 0000000..846c022 --- /dev/null +++ b/src/components/common/api.jsx @@ -0,0 +1,18 @@ +import React from 'react' + +const BASE_Url = 'http://127.0.0.1:3000/api/v1' + +export function getPackage() { + return fetch(`${BASE_Url}/package/all`).then(res => res.json()) +} + +export function getCategory() { + return fetch(`${BASE_Url}/category/all`).then(res => res.json()) +} +export function getPackageId(id) { + return fetch(`${BASE_Url}/package/${id}`).then(res => res.json()) +} + +export function getCategoryId(id) { + return fetch(`${BASE_Url}/category/${id}`).then(res => res.json()) +} diff --git a/src/components/home/container.jsx b/src/components/home/container.jsx index f526abe..4eeb750 100644 --- a/src/components/home/container.jsx +++ b/src/components/home/container.jsx @@ -2,6 +2,8 @@ import React from 'react' import Loader from '../common/loader' import { Link } from 'react-router-dom' import ErrorComponent from '../common/error' +import { getPackage } from '../common/api' +import { getCategory } from '../common/api' class Fetch extends React.Component { constructor() { @@ -15,16 +17,14 @@ class Fetch extends React.Component { } componentDidMount() { - fetch('http://127.0.0.1:3000/api/v1/package/all') - .then(res => res.json()) + getPackage() .then(pkg_output => { this.setState({ pkg: pkg_output, isloading: false }) console.log(pkg_output) }) .catch(error => this.setState({ error, isloading: false })) - fetch('http://127.0.0.1:3000/api/v1/category/all') - .then(res => res.json()) + getCategory() .then(category_output => { this.setState({ category: category_output, isloading: false }) console.log(category_output) diff --git a/src/components/package/container.jsx b/src/components/package/container.jsx index abe5cce..6e2b8bf 100644 --- a/src/components/package/container.jsx +++ b/src/components/package/container.jsx @@ -1,7 +1,7 @@ import React from 'react' import Loader from '../common/loader' import Error from '../common/error' - +import { getPackageId } from '../common/api' class Package extends React.Component { constructor(props) { super(props) @@ -15,8 +15,7 @@ class Package extends React.Component { componentDidMount() { const id = this.props.match.params.id - fetch(`http://127.0.0.1:3000/api/v1/package/${id}`) - .then(res => res.json()) + getPackageId(id) .then(output => { this.setState({ pkg: output, isloading: false }) console.log(output) From 01d3c8f88f3439e3c4c27af9068cb963b6ba604c Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 2 Jul 2019 17:14:08 +0530 Subject: [PATCH 3/8] small changes and made a new folder for api --- src/components/category/container.jsx | 2 +- src/components/home/container.jsx | 7 +++---- src/components/package/container.jsx | 2 +- src/{components/common/api.jsx => helpers/api.js} | 6 ++---- 4 files changed, 7 insertions(+), 10 deletions(-) rename src/{components/common/api.jsx => helpers/api.js} (81%) diff --git a/src/components/category/container.jsx b/src/components/category/container.jsx index 6a995f8..5ec233c 100644 --- a/src/components/category/container.jsx +++ b/src/components/category/container.jsx @@ -1,7 +1,7 @@ import React from 'react' import Loader from '../common/loader' import Error from '../common/error' -import { getCategoryId } from '../common/api' +import { getCategoryId } from '../../helpers/api' class Category extends React.Component { constructor() { diff --git a/src/components/home/container.jsx b/src/components/home/container.jsx index 4eeb750..678fb30 100644 --- a/src/components/home/container.jsx +++ b/src/components/home/container.jsx @@ -2,8 +2,7 @@ import React from 'react' import Loader from '../common/loader' import { Link } from 'react-router-dom' import ErrorComponent from '../common/error' -import { getPackage } from '../common/api' -import { getCategory } from '../common/api' +import { getAllPackage, getAllCategory } from '../../helpers/api' class Fetch extends React.Component { constructor() { @@ -17,14 +16,14 @@ class Fetch extends React.Component { } componentDidMount() { - getPackage() + getAllPackage() .then(pkg_output => { this.setState({ pkg: pkg_output, isloading: false }) console.log(pkg_output) }) .catch(error => this.setState({ error, isloading: false })) - getCategory() + getAllCategory() .then(category_output => { this.setState({ category: category_output, isloading: false }) console.log(category_output) diff --git a/src/components/package/container.jsx b/src/components/package/container.jsx index 6e2b8bf..f0121d6 100644 --- a/src/components/package/container.jsx +++ b/src/components/package/container.jsx @@ -1,7 +1,7 @@ import React from 'react' import Loader from '../common/loader' import Error from '../common/error' -import { getPackageId } from '../common/api' +import { getPackageId } from '../../helpers/api' class Package extends React.Component { constructor(props) { super(props) diff --git a/src/components/common/api.jsx b/src/helpers/api.js similarity index 81% rename from src/components/common/api.jsx rename to src/helpers/api.js index 846c022..302f3f2 100644 --- a/src/components/common/api.jsx +++ b/src/helpers/api.js @@ -1,12 +1,10 @@ -import React from 'react' - const BASE_Url = 'http://127.0.0.1:3000/api/v1' -export function getPackage() { +export function getAllPackage() { return fetch(`${BASE_Url}/package/all`).then(res => res.json()) } -export function getCategory() { +export function getAllCategory() { return fetch(`${BASE_Url}/category/all`).then(res => res.json()) } export function getPackageId(id) { From 9069f49c45e1a5f68d93624033995889886b3fdb Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 12 Jul 2019 01:23:04 +0530 Subject: [PATCH 4/8] post request --- package-lock.json | 35 +++++++++++++++- package.json | 1 + src/components/home/container.jsx | 3 ++ src/components/home/index.js | 7 +--- src/components/login/index.js | 3 ++ src/components/login/postform.jsx | 69 +++++++++++++++++++++++++++++++ src/components/router.jsx | 2 + 7 files changed, 112 insertions(+), 8 deletions(-) create mode 100644 src/components/login/index.js create mode 100644 src/components/login/postform.jsx diff --git a/package-lock.json b/package-lock.json index 85c3330..6549ead 100644 --- a/package-lock.json +++ b/package-lock.json @@ -554,6 +554,38 @@ "webpack-log": "^1.2.0" } }, + "axios": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz", + "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==", + "requires": { + "follow-redirects": "1.5.10", + "is-buffer": "^2.0.2" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.0" + } + }, + "is-buffer": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", + "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==" + } + } + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -4040,8 +4072,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "multicast-dns": { "version": "6.2.3", diff --git a/package.json b/package.json index 4dafa95..db08514 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "dependencies": { "@types/react": "^16.8.19", "@types/react-dom": "^16.8.4", + "axios": "^0.19.0", "react": "^16.8.6", "react-dom": "^16.8.6", "react-router-dom": "^5.0.1" diff --git a/src/components/home/container.jsx b/src/components/home/container.jsx index 678fb30..40be650 100644 --- a/src/components/home/container.jsx +++ b/src/components/home/container.jsx @@ -3,6 +3,7 @@ import Loader from '../common/loader' import { Link } from 'react-router-dom' import ErrorComponent from '../common/error' import { getAllPackage, getAllCategory } from '../../helpers/api' +import Postform from '../login' class Fetch extends React.Component { constructor() { @@ -61,6 +62,8 @@ class Fetch extends React.Component { ))} + + ) } diff --git a/src/components/home/index.js b/src/components/home/index.js index 2c12da4..460e293 100644 --- a/src/components/home/index.js +++ b/src/components/home/index.js @@ -1,8 +1,3 @@ -import React from 'react' import Home from './container' -export default class Home extends React.Component { - render() { - return - } -} +export default Home diff --git a/src/components/login/index.js b/src/components/login/index.js new file mode 100644 index 0000000..1657227 --- /dev/null +++ b/src/components/login/index.js @@ -0,0 +1,3 @@ +import Postform from './postform' + +export default Postform diff --git a/src/components/login/postform.jsx b/src/components/login/postform.jsx new file mode 100644 index 0000000..5d60cf4 --- /dev/null +++ b/src/components/login/postform.jsx @@ -0,0 +1,69 @@ +import React, { Component } from 'react' +import axios from 'axios' + +class postform extends Component { + constructor(props) { + super(props) + this.state = { + username: '', + title: '', + } + } + + changeHandler = event => { + this.setState({ [event.target.name]: event.target.value }) + } + + submitHandler = event => { + event.preventDefault() + const user = { + username: this.state.username, + title: this.state.title, + } + let config = { + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + Accept: 'application/json', + }, + } + + axios.post('http://127.0.0.1:3000/api/v1', user, config).then(res => { + console.log(res) + }) + } + + render() { + const { username, title } = this.state + return ( +
+
+
+ +
+ +
+ +
+ +
+ +
+
+
+ ) + } +} + +export default postform diff --git a/src/components/router.jsx b/src/components/router.jsx index a075148..60a38cf 100644 --- a/src/components/router.jsx +++ b/src/components/router.jsx @@ -3,6 +3,7 @@ import { Switch, BrowserRouter as Router, Route } from 'react-router-dom' import Home from './home' import Package from './package' import Category from './category' +import Postform from './login' class Routing extends React.Component { render() { @@ -12,6 +13,7 @@ class Routing extends React.Component { + {/* TODO: */} From c2f87ba79ca17be5525ac01d1901c4f94569e6d9 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 13 Jul 2019 12:49:28 +0530 Subject: [PATCH 5/8] postform changes --- src/components/login/postform.jsx | 78 ++++++++++++++++++++++--------- src/components/router.jsx | 4 +- 2 files changed, 59 insertions(+), 23 deletions(-) diff --git a/src/components/login/postform.jsx b/src/components/login/postform.jsx index 5d60cf4..da5db72 100644 --- a/src/components/login/postform.jsx +++ b/src/components/login/postform.jsx @@ -1,12 +1,15 @@ import React, { Component } from 'react' import axios from 'axios' -class postform extends Component { +class Postform extends Component { constructor(props) { super(props) this.state = { - username: '', - title: '', + first_name: 'akkkkkk', + last_name: 'sdfsdfsd', + email: 'aksucks@gmail.com', + phone: '9876543210', + password: 'akakakakak', } } @@ -14,34 +17,39 @@ class postform extends Component { this.setState({ [event.target.name]: event.target.value }) } - submitHandler = event => { + submitHandler = async event => { event.preventDefault() + const { first_name, last_name, email, password, phone } = this.state const user = { - username: this.state.username, - title: this.state.title, - } - let config = { - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - Accept: 'application/json', - }, + first_name, + last_name, + email, + phone, + password, } - axios.post('http://127.0.0.1:3000/api/v1', user, config).then(res => { - console.log(res) + const response = await axios({ + method: 'POST', + url: 'http://localhost:3000/api/v1/user', + data: user, }) + // const { status, data } = response + // if (status == 200 && data && data.success) { + // console.log('Reg suc') + // } + // } } - render() { - const { username, title } = this.state + const { first_name, last_name, email, password, phone } = this.state return (
@@ -49,8 +57,36 @@ class postform extends Component {
+
+
+ +
+
+ +
+
+
@@ -66,4 +102,4 @@ class postform extends Component { } } -export default postform +export default Postform diff --git a/src/components/router.jsx b/src/components/router.jsx index 60a38cf..81392a4 100644 --- a/src/components/router.jsx +++ b/src/components/router.jsx @@ -3,7 +3,7 @@ import { Switch, BrowserRouter as Router, Route } from 'react-router-dom' import Home from './home' import Package from './package' import Category from './category' -import Postform from './login' +// import Postform from './login' class Routing extends React.Component { render() { @@ -13,7 +13,7 @@ class Routing extends React.Component { - + {/* */} {/* TODO: */} From 043b240dc828cfe60f1ad42b1158eca51e657c4c Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 14 Jul 2019 01:17:01 +0530 Subject: [PATCH 6/8] checking post --- src/components/login/index.js | 4 +-- .../login/{postform.jsx => signup.jsx} | 27 ++++++++++++------- src/components/router.jsx | 1 - src/index.js | 4 +-- 4 files changed, 21 insertions(+), 15 deletions(-) rename src/components/login/{postform.jsx => signup.jsx} (82%) diff --git a/src/components/login/index.js b/src/components/login/index.js index 1657227..5ee522f 100644 --- a/src/components/login/index.js +++ b/src/components/login/index.js @@ -1,3 +1,3 @@ -import Postform from './postform' +import SignUp from './signup' -export default Postform +export default SignUp diff --git a/src/components/login/postform.jsx b/src/components/login/signup.jsx similarity index 82% rename from src/components/login/postform.jsx rename to src/components/login/signup.jsx index da5db72..81e1207 100644 --- a/src/components/login/postform.jsx +++ b/src/components/login/signup.jsx @@ -1,15 +1,16 @@ import React, { Component } from 'react' import axios from 'axios' +import Home from '../home' class Postform extends Component { constructor(props) { super(props) this.state = { - first_name: 'akkkkkk', - last_name: 'sdfsdfsd', - email: 'aksucks@gmail.com', - phone: '9876543210', - password: 'akakakakak', + first_name: 'aravind', + last_name: 'krishnan', + email: 'abcde@gmail.com', + phone: '987654321', + password: 'hbdfufenifnernfin', } } @@ -32,12 +33,18 @@ class Postform extends Component { method: 'POST', url: 'http://localhost:3000/api/v1/user', data: user, + }).then(res => { + const output = res.data.success + // console.log(output) + + if ((status = 200 && response.data && output == true)) { + console.log('reg success') + } else { + console.log('faile') + } }) - // const { status, data } = response - // if (status == 200 && data && data.success) { - // console.log('Reg suc') - // } - // } + + // console.log(response.body) } render() { const { first_name, last_name, email, password, phone } = this.state diff --git a/src/components/router.jsx b/src/components/router.jsx index 81392a4..bea8926 100644 --- a/src/components/router.jsx +++ b/src/components/router.jsx @@ -3,7 +3,6 @@ import { Switch, BrowserRouter as Router, Route } from 'react-router-dom' import Home from './home' import Package from './package' import Category from './category' -// import Postform from './login' class Routing extends React.Component { render() { diff --git a/src/index.js b/src/index.js index 2cd9dbc..28bb806 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,6 @@ import React from 'react' import ReactDOM from 'react-dom' -import Router from './components/router' +import Login from './components/login' const targetEl = document.getElementById('root') -ReactDOM.render(, targetEl) +ReactDOM.render(, targetEl) From 8340ad2523a21dbcaf8de99e1d74ae135409d31b Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 14 Jul 2019 01:17:46 +0530 Subject: [PATCH 7/8] chescking post part 2 --- src/components/login/signup.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/login/signup.jsx b/src/components/login/signup.jsx index 81e1207..7b9201f 100644 --- a/src/components/login/signup.jsx +++ b/src/components/login/signup.jsx @@ -37,7 +37,7 @@ class Postform extends Component { const output = res.data.success // console.log(output) - if ((status = 200 && response.data && output == true)) { + if ((status = 200 && output == true)) { console.log('reg success') } else { console.log('faile') From 5a5d590f39f5cbae84c068efdee62541c6b331ba Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 27 Jul 2019 22:28:47 +0530 Subject: [PATCH 8/8] history changes --- package-lock.json | 49 ++++++++----------------------- package.json | 1 + src/components/home/container.jsx | 3 -- src/components/login/history.js | 3 ++ src/components/login/signup.jsx | 40 ++++++++++++++++++------- src/components/router.jsx | 2 ++ src/helpers/postUser.jsx | 37 +++++++++++++++++++++++ src/helpers/postform.js | 8 +++++ 8 files changed, 94 insertions(+), 49 deletions(-) create mode 100644 src/components/login/history.js create mode 100644 src/helpers/postUser.jsx create mode 100644 src/helpers/postform.js diff --git a/package-lock.json b/package-lock.json index 6549ead..1a0bf2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3743,9 +3743,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "version": "4.17.14", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", + "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==", "dev": true }, "log-symbols": { @@ -4012,9 +4012,9 @@ } }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { "for-in": "^1.0.2", @@ -5496,9 +5496,9 @@ "dev": true }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -6262,38 +6262,15 @@ } }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "uniq": { diff --git a/package.json b/package.json index db08514..b86073a 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "@types/react": "^16.8.19", "@types/react-dom": "^16.8.4", "axios": "^0.19.0", + "history": "^4.9.0", "react": "^16.8.6", "react-dom": "^16.8.6", "react-router-dom": "^5.0.1" diff --git a/src/components/home/container.jsx b/src/components/home/container.jsx index 40be650..678fb30 100644 --- a/src/components/home/container.jsx +++ b/src/components/home/container.jsx @@ -3,7 +3,6 @@ import Loader from '../common/loader' import { Link } from 'react-router-dom' import ErrorComponent from '../common/error' import { getAllPackage, getAllCategory } from '../../helpers/api' -import Postform from '../login' class Fetch extends React.Component { constructor() { @@ -62,8 +61,6 @@ class Fetch extends React.Component {
))} - - ) } diff --git a/src/components/login/history.js b/src/components/login/history.js new file mode 100644 index 0000000..e5987c4 --- /dev/null +++ b/src/components/login/history.js @@ -0,0 +1,3 @@ +import { createBrowserHistory } from 'history' + +export default createBrowserHistory() diff --git a/src/components/login/signup.jsx b/src/components/login/signup.jsx index 7b9201f..38abeca 100644 --- a/src/components/login/signup.jsx +++ b/src/components/login/signup.jsx @@ -1,10 +1,14 @@ import React, { Component } from 'react' -import axios from 'axios' +// import history from './history' +import { withRouter } from 'react-router-dom' + import Home from '../home' +import { PostUser } from '../../helpers/postform' class Postform extends Component { constructor(props) { super(props) + this.state = { first_name: 'aravind', last_name: 'krishnan', @@ -18,8 +22,10 @@ class Postform extends Component { this.setState({ [event.target.name]: event.target.value }) } - submitHandler = async event => { + submitHandler = event => { event.preventDefault() + const { history } = this.props + console.log(history) const { first_name, last_name, email, password, phone } = this.state const user = { first_name, @@ -29,25 +35,39 @@ class Postform extends Component { password, } - const response = await axios({ - method: 'POST', - url: 'http://localhost:3000/api/v1/user', - data: user, - }).then(res => { + PostUser(user).then(res => { const output = res.data.success - // console.log(output) + console.log(output) if ((status = 200 && output == true)) { console.log('reg success') + // console.log(props.history) + // this.props.history.push('/') } else { console.log('faile') } }) - - // console.log(response.body) } + // const response = await axios({ + // method: 'POST', + // url: 'http://localhost:3000/api/v1/user', + // data: user, + // }).then(res => { + // const output = res.data.success + // // console.log(output) + + // if ((status = 200 && output == true)) { + // console.log('reg success') + // } else { + // console.log('faile') + // } + // }) + + // console.log(response.body) + render() { const { first_name, last_name, email, password, phone } = this.state + return (
diff --git a/src/components/router.jsx b/src/components/router.jsx index bea8926..b238ca1 100644 --- a/src/components/router.jsx +++ b/src/components/router.jsx @@ -1,6 +1,7 @@ import React from 'react' import { Switch, BrowserRouter as Router, Route } from 'react-router-dom' import Home from './home' +import Login from './login/signup' import Package from './package' import Category from './category' @@ -9,6 +10,7 @@ class Routing extends React.Component { return ( + } /> diff --git a/src/helpers/postUser.jsx b/src/helpers/postUser.jsx new file mode 100644 index 0000000..ceb672f --- /dev/null +++ b/src/helpers/postUser.jsx @@ -0,0 +1,37 @@ +// import axios from 'axios' +// import React from 'react' + +// // const response = await axios({ +// // method: 'POST', +// // url: 'http://localhost:3000/api/v1/user', +// // data: user, +// // }).then(res => { +// // const output = res.data.success +// // console.log(output) + +// // +// // }) + +// class Postuser extends React.Component { +// constructor(props) { +// super(props) +// } +// PostUser(data) { +// axios({ +// method: 'POST', +// url: 'http://localhost:3000/api/v1/user', +// data: data, +// }).then(res => { +// const output = res.data.success +// // console.log(output) +// if ((status = 200 && output == true)) { +// console.log('reg success') +// this.props.history.push('/') +// } else { +// console.log('faile') +// } +// }) +// } +// } + +// export default Postuser diff --git a/src/helpers/postform.js b/src/helpers/postform.js new file mode 100644 index 0000000..64c375c --- /dev/null +++ b/src/helpers/postform.js @@ -0,0 +1,8 @@ +import axios from 'axios' +export function PostUser(user) { + return axios({ + method: 'POST', + url: 'http://localhost:3000/api/v1/user', + data: user, + }) +}