diff --git a/config/config.json b/config/config.json index 6d852d5..985e80c 100644 --- a/config/config.json +++ b/config/config.json @@ -1,22 +1,26 @@ { "development": { "username": "root", +<<<<<<< HEAD + "password": "F1labslab!1", +======= "password": null, +>>>>>>> 15b71565c101125658cf36ded665f67901794be1 "database": "scriptz_db", "host": "127.0.0.1", "dialect": "mysql" }, "test": { "username": "root", - "password": null, - "database": "database_test", + "password": "F1labslab!1", + "database": "scriptz_db", "host": "127.0.0.1", "dialect": "mysql" }, "production": { "username": "root", - "password": null, - "database": "database_production", + "password": "F1labslab!1", + "database": "scriptz_db", "host": "127.0.0.1", "dialect": "mysql" } diff --git a/models/models.js b/models/models.js new file mode 100644 index 0000000..0e8b475 --- /dev/null +++ b/models/models.js @@ -0,0 +1,16 @@ +module.exports = function(sequelize, DataTypes) { + var scriptz = sequelize.define("scriptz", { + prescription_name: { + type: DataTypes.STRING, + allowNull: false, + // validate: { + // len: [1] + // } + }, + dose:{ + type: DataTypes.INTEGER, + allowNull: false + } + }); + return scriptz; +}; \ No newline at end of file diff --git a/models/user.js b/models/user.js index 20e9d9f..334e1ca 100644 --- a/models/user.js +++ b/models/user.js @@ -1,4 +1,40 @@ module.exports = function(sequelize, DataTypes) { +<<<<<<< HEAD + var user = sequelize.define("user", { + USER_name: { + type: DataTypes.STRING, + allowNull: false, + // validate: { + // len: [1] + // } + }, + FIRST_NAME:{ + type: DataTypes.STRING, + allowNull: false + }, + + LAST_NAME: { + type: DataTypes.STRING, + allowNull: false + // validate: { + // len: [1] + // } + }, + + email:{ + type: DataTypes.STRING, + allowNull: false + }, + password:{ + type: DataTypes.STRING, + allowNull: false + } + }); + + + return user; +}; +======= var user = sequelize.define("user", { user_name: { type: DataTypes.STRING, @@ -18,4 +54,5 @@ module.exports = function(sequelize, DataTypes) { } }); return user; - }; \ No newline at end of file + }; +>>>>>>> 15b71565c101125658cf36ded665f67901794be1 diff --git a/package-lock.json b/package-lock.json index 9183069..1e48bc2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -68,6 +68,11 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, + "bignumber.js": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.0.4.tgz", + "integrity": "sha512-LDXpJKVzEx2/OqNbG9mXBNvHuiRL4PzHCGfnANHMJ+fv68Ads3exDVJeGDJws+AoNEuca93bU3q+S0woeUaCdg==" + }, "bluebird": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", @@ -147,6 +152,30 @@ "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=" }, + "cli": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz", + "integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=", + "requires": { + "exit": "0.1.2", + "glob": "7.1.2" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } + } + }, "cliui": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", @@ -281,6 +310,11 @@ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=" + }, "express": { "version": "4.16.3", "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz", @@ -359,6 +393,11 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -509,9 +548,15 @@ "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" }, "lru-cache": { +<<<<<<< HEAD + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz", + "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==", +======= "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", +>>>>>>> 15b71565c101125658cf36ded665f67901794be1 "requires": { "pseudomap": "1.0.2", "yallist": "2.1.2" @@ -581,16 +626,59 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, +<<<<<<< HEAD + "mysql": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.15.0.tgz", + "integrity": "sha512-C7tjzWtbN5nzkLIV+E8Crnl9bFyc7d3XJcBAvHKEVkjrYjogz3llo22q6s/hw+UcsE4/844pDob9ac+3dVjQSA==", + "requires": { + "bignumber.js": "4.0.4", + "readable-stream": "2.3.3", + "safe-buffer": "5.1.1", + "sqlstring": "2.3.0" + } + }, + "mysql2": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-1.5.2.tgz", + "integrity": "sha512-976p3FxXdNMRRiF6Qe/FCOwaUYw3KXVJiIYu5iE5shM7ggIASgF6G/9gd9rhpBqP8V6MVa3KQJ6Ao1xBeGBljw==", +======= "mysql2": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-1.5.3.tgz", "integrity": "sha512-Oov36YQSeciNP9SeqE7je4eWgeGADOorXLmsqhtxOJmPGUOJSNJT0s6/eq1Byy4nhXTRQUvlMHsI4Q/eMEs88Q==", +>>>>>>> 15b71565c101125658cf36ded665f67901794be1 "requires": { "cardinal": "1.0.0", "denque": "1.2.3", "generate-function": "2.0.0", "iconv-lite": "0.4.19", "long": "4.0.0", +<<<<<<< HEAD + "lru-cache": "4.1.2", + "named-placeholders": "1.1.1", + "object-assign": "4.1.1", + "readable-stream": "2.3.2", + "safe-buffer": "5.1.1", + "seq-queue": "0.0.5", + "sqlstring": "2.3.0" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz", + "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + } +======= "lru-cache": "4.1.1", "named-placeholders": "1.1.1", "object-assign": "4.1.1", @@ -598,6 +686,7 @@ "safe-buffer": "5.1.1", "seq-queue": "0.0.5", "sqlstring": "2.3.1" +>>>>>>> 15b71565c101125658cf36ded665f67901794be1 } }, "named-placeholders": { @@ -687,9 +776,15 @@ "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=" }, "process-nextick-args": { +<<<<<<< HEAD + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" +======= "version": "2.0.0", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" +>>>>>>> 15b71565c101125658cf36ded665f67901794be1 }, "promise": { "version": "7.3.1", @@ -735,14 +830,24 @@ } }, "readable-stream": { +<<<<<<< HEAD + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", +======= "version": "2.3.5", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz", "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==", +>>>>>>> 15b71565c101125658cf36ded665f67901794be1 "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", "isarray": "1.0.0", +<<<<<<< HEAD + "process-nextick-args": "1.0.7", +======= "process-nextick-args": "2.0.0", +>>>>>>> 15b71565c101125658cf36ded665f67901794be1 "safe-buffer": "5.1.1", "string_decoder": "1.0.3", "util-deprecate": "1.0.2" @@ -878,9 +983,15 @@ } }, "sqlstring": { +<<<<<<< HEAD + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.0.tgz", + "integrity": "sha1-UluKT9Jtb3GqYegipsr5dtMa0qg=" +======= "version": "2.3.1", "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz", "integrity": "sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A=" +>>>>>>> 15b71565c101125658cf36ded665f67901794be1 }, "statuses": { "version": "1.4.0", diff --git a/package.json b/package.json index 9ab0f0a..3039d1b 100644 --- a/package.json +++ b/package.json @@ -24,9 +24,16 @@ "dependencies": { "body-parser": "^1.18.2", "chai": "^4.1.2", + "cli": "^1.0.1", "express": "^4.16.3", "express-handlebars": "^3.0.0", +<<<<<<< HEAD + "mysql": "^2.15.0", + "mysql2": "^1.5.2", +======= "mysql2": "^1.5.3", +>>>>>>> 15b71565c101125658cf36ded665f67901794be1 "sequelize": "^4.37.1" - } + }, + "devDependencies": {} } diff --git a/routes/api-routes.js b/routes/api-routes.js new file mode 100644 index 0000000..f2ebb73 --- /dev/null +++ b/routes/api-routes.js @@ -0,0 +1,20 @@ +var express = require("express"); +var db = require("../models") + +var router = express.Router(); +// var orm = require("../config/orm.js"); + + +router.get("/", function(req, res) { + res.render("index"); +}); + +router.get("/scriptz", function(req, res) { + // express callback response by calling burger.selectAllBurger + db.scriptz.findAll().then(function(scriptzWeFound) { + console.log('these are our perscriptions', scriptzWeFound); + }); +}); + + +module.exports = router; \ No newline at end of file diff --git a/server.js b/server.js index 628b8eb..b5c8c0d 100644 --- a/server.js +++ b/server.js @@ -1,5 +1,16 @@ var express = require("express"); var bodyParser = require("body-parser"); + +var mysql = require("mysql"); +var db = require("./models") + + +// var bars = require("express-handlebars") + +var app = express(); +var PORT = process.env.PORT || 8080; + + var path = require("path") var app = express(); var PORT = process.env.PORT || 8080; @@ -8,16 +19,38 @@ var db = require("./models"); app.use(express.static(path.join(__dirname, "public"))); + app.use(bodyParser.json()); app.use(bodyParser.urlencoded({ extended: true })); app.use(bodyParser.text()); -app.use(bodyParser.json({ type: "application/vnd.api+json" })); +app.use(bodyParser.json({ type: "application/vnd.api+json" })) + +app.use(express.static("app/public")); +app.use(express.static("public")); + + var exphbs = require("express-handlebars"); app.engine("handlebars", exphbs({ defaultLayout: "main" })); app.set("view engine", "handlebars"); + +// app.get("/", function(req, res){ +// res.render("index") +// }) + +var routes = require("./routes/api-routes.js") +app.use(routes) +// var connection = require("./config/connection.js") + + +db.sequelize.sync().then(function() { + app.listen(PORT, function() { + console.log("App listening on PORT " + PORT); +}); + + require("./routes/html-routes.js")(app); db.sequelize.sync({ force: true }).then(function() {