tables

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"
   }

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;
+};

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;
-  };
+  };
+>>>>>>> 15b71565c101125658cf36ded665f67901794be1

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": {}
 }

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;