From 90602a4374a2c5a85f5b2cc1d4dbd65b647bf5fd Mon Sep 17 00:00:00 2001 From: Jimmy Huynh Date: Mon, 9 Jan 2017 15:46:31 -0800 Subject: [PATCH] fk working for database feature model --- npm-debug.log | 24 ------------------- package.json | 1 + src/client/app/components/app.jsx | 2 +- .../app/components/projects/viewProject.jsx | 4 +++- src/server/database.js | 2 +- src/server/models/MessageModel.js | 6 ++--- src/server/models/ProjectModel.js | 3 +++ 7 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 npm-debug.log diff --git a/npm-debug.log b/npm-debug.log deleted file mode 100644 index def2c7f..0000000 --- a/npm-debug.log +++ /dev/null @@ -1,24 +0,0 @@ -0 info it worked if it ends with ok -1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'run', 'buil' ] -2 info using npm@3.10.9 -3 info using node@v6.9.2 -4 verbose stack Error: missing script: buil -4 verbose stack at run (/usr/local/lib/node_modules/npm/lib/run-script.js:151:19) -4 verbose stack at /usr/local/lib/node_modules/npm/lib/run-script.js:61:5 -4 verbose stack at /usr/local/lib/node_modules/npm/node_modules/read-package-json/read-json.js:356:5 -4 verbose stack at checkBinReferences_ (/usr/local/lib/node_modules/npm/node_modules/read-package-json/read-json.js:320:45) -4 verbose stack at final (/usr/local/lib/node_modules/npm/node_modules/read-package-json/read-json.js:354:3) -4 verbose stack at then (/usr/local/lib/node_modules/npm/node_modules/read-package-json/read-json.js:124:5) -4 verbose stack at /usr/local/lib/node_modules/npm/node_modules/read-package-json/read-json.js:311:12 -4 verbose stack at /usr/local/lib/node_modules/npm/node_modules/graceful-fs/graceful-fs.js:78:16 -4 verbose stack at tryToString (fs.js:455:3) -4 verbose stack at FSReqWrap.readFileAfterClose [as oncomplete] (fs.js:442:12) -5 verbose cwd /Users/Christopher/Desktop/Codesmith/squadoosh -6 error Darwin 15.4.0 -7 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "run" "buil" -8 error node v6.9.2 -9 error npm v3.10.9 -10 error missing script: buil -11 error If you need help, you may report this error at: -11 error -12 verbose exit [ 1, true ] diff --git a/package.json b/package.json index b23b45d..acf3dae 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "cookie-parser": "^1.4.3", "express": "^4.14.0", "jquery": "^3.1.1", + "jws": "^3.1.4", "pg": "^6.1.2", "pg-hstore": "^2.3.2", "radium": "^0.18.1", diff --git a/src/client/app/components/app.jsx b/src/client/app/components/app.jsx index 1d110ab..b13e78e 100644 --- a/src/client/app/components/app.jsx +++ b/src/client/app/components/app.jsx @@ -13,7 +13,7 @@ class App extends Component { constructor(props) { super(props); this.state = { - page: 2, + page: 0, name: '', username: '', password: '', diff --git a/src/client/app/components/projects/viewProject.jsx b/src/client/app/components/projects/viewProject.jsx index 6a6b674..f575639 100644 --- a/src/client/app/components/projects/viewProject.jsx +++ b/src/client/app/components/projects/viewProject.jsx @@ -29,6 +29,7 @@ class ViewProject extends Component { } addFeature(e) { + console.log(this.props); let newState; if(e.key === 'Enter') { e.preventDefault(); @@ -38,13 +39,14 @@ class ViewProject extends Component { axios.post('/addFeature', { featureName: e.target.value, + projectId: this.props.projectData.id, }).then((res) => { // GET FEATURES }).catch((error) => { console.log(error); }) - this.props.getFeatures(); + this.getFeatures(); e.target.value = ''; } diff --git a/src/server/database.js b/src/server/database.js index 4e57d5a..f763b0d 100644 --- a/src/server/database.js +++ b/src/server/database.js @@ -1,6 +1,6 @@ const Sequelize = require('sequelize'); -const sequelize = new Sequelize('postgres://ebanrqqz:sE13dKoNZ3qr17M8SqoQYTg8-Tkqv_Ry@elmer.db.elephantsql.com:5432/ebanrqqz'); +const sequelize = new Sequelize(' postgres://wzixuzdg:iaWmxsKOVuXH0Qyd5cMysSvZSUXt8ZDM@elmer.db.elephantsql.com:5432/wzixuzdg'); sequelize.authenticate().then(function() { console.log('Connected!'); diff --git a/src/server/models/MessageModel.js b/src/server/models/MessageModel.js index c7a2dfc..b73192d 100644 --- a/src/server/models/MessageModel.js +++ b/src/server/models/MessageModel.js @@ -3,17 +3,17 @@ const sequelize = require('./../database'); const Messages = sequelize.define('messages', { author: { - type: Sequelize.string(1000), + type: Sequelize.STRING(1000), field: 'message_author', }, message: { - type: Sequelize.string(1000), + type: Sequelize.STRING(1000), field: 'message_message', }, }, { freezeTableName: true }); -Messages.sync(); +sequelize.sync(); module.exports = Messages; diff --git a/src/server/models/ProjectModel.js b/src/server/models/ProjectModel.js index cf3569c..3ddf908 100644 --- a/src/server/models/ProjectModel.js +++ b/src/server/models/ProjectModel.js @@ -13,6 +13,9 @@ const Projects = sequelize.define('projects', { }, }); +Projects.hasMany(Features); +Features.belongsTo(Projects); // projectId to model + sequelize.sync(); module.exports = Projects;