From 2cda405172a5cc094bd7aca499b481308bfb49b1 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 19 Mar 2018 21:16:28 -0600 Subject: [PATCH 1/3] tables --- config/config.json | 12 +-- models/index.js | 2 +- models/models.js | 16 ++++ models/user.js | 35 +++++++ package-lock.json | 218 +++++++++++++++++++++++++++++++++++++++++++ package.json | 6 +- routes/api-routes.js | 20 ++++ server.js | 37 ++++++++ 8 files changed, 338 insertions(+), 8 deletions(-) create mode 100644 models/models.js create mode 100644 models/user.js create mode 100644 routes/api-routes.js diff --git a/config/config.json b/config/config.json index 0f858c6..7ed51da 100644 --- a/config/config.json +++ b/config/config.json @@ -1,22 +1,22 @@ { "development": { "username": "root", - "password": null, - "database": "database_development", + "password": "F1labslab!1", + "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/index.js b/models/index.js index f21f80d..5662f10 100644 --- a/models/index.js +++ b/models/index.js @@ -5,7 +5,7 @@ var path = require('path'); var Sequelize = require('sequelize'); var basename = path.basename(__filename); var env = process.env.NODE_ENV || 'development'; -var config = require(__dirname + '/..\config\config.json')[env]; +var config = require(__dirname + '/../config/config.json')[env]; var db = {}; if (config.use_env_variable) { 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 new file mode 100644 index 0000000..9c9c192 --- /dev/null +++ b/models/user.js @@ -0,0 +1,35 @@ +module.exports = function(sequelize, DataTypes) { + 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; +}; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 8a02d6a..d10914c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,6 +38,11 @@ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, + "ansicolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz", + "integrity": "sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8=" + }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -63,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", @@ -105,6 +115,15 @@ "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", "optional": true }, + "cardinal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-1.0.0.tgz", + "integrity": "sha1-UOIcGwqjdyn5N33vGWtanOyTLuk=", + "requires": { + "ansicolors": "0.2.1", + "redeyed": "1.0.1" + } + }, "center-align": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", @@ -133,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", @@ -186,6 +229,11 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -217,6 +265,11 @@ "object-keys": "1.0.11" } }, + "denque": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/denque/-/denque-1.2.3.tgz", + "integrity": "sha512-BOjyD1zPf7gqgXlXBCnCsz84cbRNfqpQNvWOUiw3Onu9s7a2afW2LyHzctoie/2KELfUoZkNHTnW02C3hCU20w==" + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -247,11 +300,21 @@ "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" }, + "esprima": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.0.0.tgz", + "integrity": "sha1-U88kes2ncxPlUcOqLnM0LT+099k=" + }, "etag": { "version": "1.8.1", "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", @@ -330,11 +393,21 @@ "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", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, + "generate-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", + "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=" + }, "generic-pool": { "version": "3.4.2", "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.4.2.tgz", @@ -440,6 +513,11 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -459,11 +537,25 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" }, + "long": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", + "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" + }, "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" }, + "lru-cache": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz", + "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==", + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -528,11 +620,77 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "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==", + "requires": { + "cardinal": "1.0.0", + "denque": "1.2.3", + "generate-function": "2.0.0", + "iconv-lite": "0.4.19", + "long": "4.0.0", + "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" + } + } + } + }, + "named-placeholders": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.1.tgz", + "integrity": "sha1-O3oNJiA910s6nfTJz7gnsvuQfmQ=", + "requires": { + "lru-cache": "2.5.0" + }, + "dependencies": { + "lru-cache": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz", + "integrity": "sha1-2COIrpyWC+y+oMc7uet5tsbOmus=" + } + } + }, "negotiator": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=" }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, "object-keys": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", @@ -594,6 +752,11 @@ "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=" }, + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + }, "promise": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", @@ -611,6 +774,11 @@ "ipaddr.js": "1.6.0" } }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + }, "qs": { "version": "6.5.1", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", @@ -632,6 +800,28 @@ "unpipe": "1.0.0" } }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "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" + } + }, + "redeyed": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-1.0.1.tgz", + "integrity": "sha1-6WwZO0DAgWsArshCaY5hGF5VSYo=", + "requires": { + "esprima": "3.0.0" + } + }, "repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", @@ -685,6 +875,11 @@ "statuses": "1.4.0" } }, + "seq-queue": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz", + "integrity": "sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4=" + }, "sequelize": { "version": "4.37.1", "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.37.1.tgz", @@ -748,11 +943,24 @@ "amdefine": "1.0.1" } }, + "sqlstring": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.0.tgz", + "integrity": "sha1-UluKT9Jtb3GqYegipsr5dtMa0qg=" + }, "statuses": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, "terraformer": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.8.tgz", @@ -818,6 +1026,11 @@ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -862,6 +1075,11 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + }, "yargs": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", diff --git a/package.json b/package.json index 2cdcc65..9040aab 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,12 @@ "dependencies": { "body-parser": "^1.18.2", "chai": "^4.1.2", + "cli": "^1.0.1", "express": "^4.16.3", "express-handlebars": "^3.0.0", + "mysql": "^2.15.0", + "mysql2": "^1.5.2", "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 e69de29..f01914c 100644 --- a/server.js +++ b/server.js @@ -0,0 +1,37 @@ +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; + +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(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); +}); + +}); \ No newline at end of file From 87992212df1605d81f69e961f05b88fad105c426 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 21 Mar 2018 18:27:23 -0600 Subject: [PATCH 2/3] ll --- server.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/server.js b/server.js index a166df2..4a98bbf 100644 --- a/server.js +++ b/server.js @@ -1,6 +1,6 @@ var express = require("express"); var bodyParser = require("body-parser"); -<<<<<<< HEAD + var mysql = require("mysql"); var db = require("./models") @@ -10,7 +10,7 @@ var db = require("./models") var app = express(); var PORT = process.env.PORT || 8080; -======= + var path = require("path") var app = express(); var PORT = process.env.PORT || 8080; @@ -19,23 +19,23 @@ var db = require("./models"); app.use(express.static(path.join(__dirname, "public"))); ->>>>>>> 15b71565c101125658cf36ded665f67901794be1 + app.use(bodyParser.json()); app.use(bodyParser.urlencoded({ extended: true })); app.use(bodyParser.text()); app.use(bodyParser.json({ type: "application/vnd.api+json" })); -<<<<<<< HEAD + app.use(express.static("app/public")); app.use(express.static("public")); -======= ->>>>>>> 15b71565c101125658cf36ded665f67901794be1 + + var exphbs = require("express-handlebars"); app.engine("handlebars", exphbs({ defaultLayout: "main" })); app.set("view engine", "handlebars"); -<<<<<<< HEAD + // app.get("/", function(req, res){ // res.render("index") // }) @@ -50,12 +50,11 @@ db.sequelize.sync().then(function() { console.log("App listening on PORT " + PORT); }); -======= + require("./routes/html-routes.js")(app); db.sequelize.sync({ force: true }).then(function() { app.listen(PORT, function() { console.log("App listening on PORT " + PORT); }); ->>>>>>> 15b71565c101125658cf36ded665f67901794be1 }); \ No newline at end of file From c37a67bd1441812d370ff8ad86dfa33a9c928653 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 21 Mar 2018 18:34:40 -0600 Subject: [PATCH 3/3] .. --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 4a98bbf..b5c8c0d 100644 --- a/server.js +++ b/server.js @@ -23,7 +23,7 @@ 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"));