diff --git a/client/src/components/ItemDisplayComp.js b/client/src/components/ItemDisplayComp.js index 2284fe6..581e75e 100644 --- a/client/src/components/ItemDisplayComp.js +++ b/client/src/components/ItemDisplayComp.js @@ -14,10 +14,10 @@ class ItemDisplayComp extends React.Component { var self = this; axios .get("api/items") - .then(function(response) { + .then(function (response) { self.setState({ items: response.data }); }) - .catch(function(error) { + .catch(function (error) { console.log(error); }); } @@ -38,7 +38,7 @@ class ItemDisplayComp extends React.Component { href={"/#/viewItem/" + item._id + "/#"} className="card-img-top-new" > - +
{item.name}
@@ -52,7 +52,7 @@ class ItemDisplayComp extends React.Component {

- diff --git a/client/src/components/LoginFormComp.js b/client/src/components/LoginFormComp.js index b3d28f4..fe0be15 100644 --- a/client/src/components/LoginFormComp.js +++ b/client/src/components/LoginFormComp.js @@ -1,25 +1,25 @@ import React, { Component } from "react"; import axios from "axios"; import Facebook from "./Facebook"; +import authService from "./services/AuthServices"; class LoginFormComp extends Component { constructor(props) { super(props); this.state = {}; - this.onValuChange = this.onValuChange.bind(this); - this.onSubmit = this.onSubmit.bind(this); } - onValuChange(e) { + onValuChange=(e)=> { this.setState({ [e.target.name]: e.target.value }); } - onSubmit(e) { + onSubmit=(e)=> { e.preventDefault(); axios .post("/api/auth/login", this.state) .then(res => { console.log(res); + authService.setAuthDetail(res.data) sessionStorage.setItem( "user", JSON.stringify({ jwtToken: res.data.token, userId: res.data.userId, name:res.data.name }) diff --git a/client/src/components/services/AuthServices.js b/client/src/components/services/AuthServices.js new file mode 100644 index 0000000..83ff044 --- /dev/null +++ b/client/src/components/services/AuthServices.js @@ -0,0 +1,20 @@ + +class AuthService { + + setAuthDetail(data) { + sessionStorage.setItem('token', data.token); + sessionStorage.setItem('id', data.user.id); + sessionStorage.setItem('name',data.user.username) + } + getAuthToken() { + const token = sessionStorage.getItem('token'); + return token; + } + getLoggedUser(){ + const id = sessionStorage.getItem('id'); + const name = sessionStorage.getItem('name'); + return {Id:id,Name:name}; + } +} +const authService = new AuthService(); +export default authService; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 14de017..9d9530b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -709,9 +709,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.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash.includes": { "version": "4.3.0",