diff --git a/client/.eslintcache b/client/.eslintcache index 91ed707..681d8b6 100644 --- a/client/.eslintcache +++ b/client/.eslintcache @@ -1 +1 @@ -[{"/Users/jgo/Documents/Sonobi/fe-code-challenge/client/src/index.js":"1","/Users/jgo/Documents/Sonobi/fe-code-challenge/client/src/App.js":"2"},{"size":219,"mtime":1606160019328,"results":"3","hashOfConfig":"4"},{"size":528,"mtime":1606155683575,"results":"5","hashOfConfig":"4"},{"filePath":"6","messages":"7","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1qz3yvt",{"filePath":"8","messages":"9","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/jgo/Documents/Sonobi/fe-code-challenge/client/src/index.js",[],"/Users/jgo/Documents/Sonobi/fe-code-challenge/client/src/App.js",[]] \ No newline at end of file +[{"/home/bruno/fe-code-challenge/client/src/App.js":"1","/home/bruno/fe-code-challenge/client/src/index.js":"2"},{"size":2155,"mtime":1606199973499,"results":"3","hashOfConfig":"4"},{"size":220,"mtime":1606186125964,"results":"5","hashOfConfig":"4"},{"filePath":"6","messages":"7","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"67sdn0",{"filePath":"8","messages":"9","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/home/bruno/fe-code-challenge/client/src/App.js",["10"],"/home/bruno/fe-code-challenge/client/src/index.js",[],{"ruleId":"11","severity":1,"message":"12","line":5,"column":5,"nodeType":"13","messageId":"14","endLine":5,"endColumn":16},"no-unused-vars","'buttonStyle' is assigned a value but never used.","Identifier","unusedVar"] \ No newline at end of file diff --git a/client/package-lock.json b/client/package-lock.json index 6ea42f2..2cddc42 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -2818,6 +2818,14 @@ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.1.1.tgz", "integrity": "sha512-5Kgy8Cz6LPC9DJcNb3yjAXTu3XihQgEdnIg50c//zOC/MyLP0Clg+Y8Sh9ZjjnvBrDZU4DgXS9C3T9r4/scGZQ==" }, + "axios": { + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz", + "integrity": "sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==", + "requires": { + "follow-redirects": "^1.10.0" + } + }, "axobject-query": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", diff --git a/client/package.json b/client/package.json index ebaaec3..6bf9868 100644 --- a/client/package.json +++ b/client/package.json @@ -6,6 +6,7 @@ "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", + "axios": "^0.21.0", "react": "^17.0.1", "react-dom": "^17.0.1", "react-scripts": "4.0.1", diff --git a/client/src/App.js b/client/src/App.js index 3784575..3f2e950 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -1,23 +1,84 @@ -import logo from './logo.svg'; import './App.css'; +import axios from 'axios'; +import React from 'react'; + +var buttonStyle = { + margin: '10px 10px 10px 0' +}; + + +class Inv extends React.Component { + constructor(props) { + super(props); + this.submitRecord = this.submitRecord.bind(this); + this.nameChange = this.nameChange.bind(this); + this.typeChange = this.typeChange.bind(this); + this.urlChange = this.urlChange.bind(this); + this.state = { list: [], name: "", type: "", url: "" }; + } + + nameChange(event) { this.setState({ name: event.target.value }); } + typeChange(event) { this.setState({ type: event.target.value }); } + urlChange(event) { this.setState({ url: event.target.value }); } + + submitRecord(event) { + + let payload = { + name: this.state.name, + type: this.state.type, + url: this.state.url + } + + axios.post('http://localhost:3001/inventoryset', payload) + .then((response) => { + console.log(response); + this.getInv(); + }) + .catch((error) => { + console.log(error); + }); + + event.preventDefault(); + } + + getInv() { + axios.get('http://localhost:3001/inventoryget') + .then((response) => { + let temp = [] + for (let x of response.data.result) + temp.push(
  • {x.id}, {x.name}, {x.type}, {x.url}
    • ); + console.log(temp); + this.setState({ list: temp }) + }) + .catch((error) => { + console.log(error); + this.setState({ list: [
  • Could not grab inventory
    • ] }) + }) + } + + componentDidMount() { + this.getInv(); + } + + render() { + return
    +
    + + + + +
    + +
    ; + } +} + + function App() { return (
    -
    - logo -

    - Edit src/App.js and save to reload. -

    - - Learn React - -
    +
    ); } diff --git a/client/src/index.js b/client/src/index.js index 6832e78..9b451d9 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -3,6 +3,7 @@ import ReactDOM from 'react-dom'; import './index.css'; import App from './App'; + ReactDOM.render( diff --git a/server/database/db.sqlite b/server/database/db.sqlite index ed1e828..929478c 100644 Binary files a/server/database/db.sqlite and b/server/database/db.sqlite differ diff --git a/server/package-lock.json b/server/package-lock.json index b30e21a..f3bb27e 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -234,6 +234,15 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", diff --git a/server/package.json b/server/package.json index 68c8a71..82f0800 100644 --- a/server/package.json +++ b/server/package.json @@ -10,6 +10,7 @@ "author": "", "license": "ISC", "dependencies": { + "cors": "^2.8.5", "express": "^4.17.1", "sequelize": "^6.3.5", "sqlite3": "^5.0.0" diff --git a/server/src/routes/index.js b/server/src/routes/index.js index 24a9b7e..4b9c60f 100644 --- a/server/src/routes/index.js +++ b/server/src/routes/index.js @@ -1,7 +1,12 @@ const express = require('express'); +const cors = require('cors'); //needed to make sure it runs locally const app = express(); const port = 3001; +app.use(cors()) +app.use(express.urlencoded({ extened: true })) +app.use(express.json()) + const inventory = require('./inventory.route'); module.exports = function routes(sequelize) { diff --git a/server/src/routes/inventory.route.js b/server/src/routes/inventory.route.js index b28b912..b4c4909 100644 --- a/server/src/routes/inventory.route.js +++ b/server/src/routes/inventory.route.js @@ -1,9 +1,19 @@ module.exports = function inventoryRoute(app, sequelize) { - app.get('/inventory', async (req, res) => { + app.get('/inventoryget', async (req, res) => { const inventories = await sequelize.models.Inventory.findAll(); res.statusCode = 200; res.send({ result: inventories }); }); + + app.post('/inventoryset', async (req, res) => { + const inventories = await sequelize.models.Inventory.create({ + name: req.body.name, + type: req.body.type, + url: req.body.url + }); + res.statusCode = 200; + res.send(); + }) };