add new

mobile/Project/Dashboard.js

+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+DashSchema = new Schema({
+	
+  income : {
+		type : Number,
+		required : true
+	},
+	
+	due : {
+		type : Number,
+		required:true
+	}
+
+})
+module.exports = mongoose.model('dashboard',DashSchema)

mobile/Project/Payment.js

+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+
+
+PaymentSchema = new Schema({
+	id : {
+		type : Number,
+		required : true
+	},
+	username : {
+		type : String,
+		required : true
+	},
+	payment : {
+		type : Number,
+		required : true
+	},
+	sub_id : {
+		type : [String],
+		required : true
+	}
+})
+
+module.exports = mongoose.model('payments', PaymentSchema)

mobile/Project/Things.js

-Schema = require('mongoose').Schema
-ThingSchema = new Schema({
-	Name : {
-		type : String,
-		required : true
-	},
-	Data : {
-		type : [{
-			Value : {
-				type : Number,
-				min : 0
-			},
-			Time : {
-				type : Date
-			}
-		}]
-	},
-	userId : {
-		type : Schema.Types.ObjectId
-	}
-})
-module.exports = mongoose.model('Things', ThingSchema)

mobile/Project/Users.js

-Schema = require('mongoose').Schema
-bcrypt = require('bcrypt')
-SALT_WORK_FACTOR = 10
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+
 
 UserSchema = new Schema({
+	id : {
+		type : Number,
+		required : true
+	},
 	username : {
 		type : String,
 		required : true
@@ -10,33 +14,19 @@ UserSchema = new Schema({
 	password : {
 		type : String,
 		required : true
+	},
+	Email : {
+		type : String,
+		required : true
+	},
+	payment : {
+		type : Number,
+		required : true
+	},
+	sub_id : {
+		type : [String],
+		required : true
 	}
 })
 
-UserSchema.pre('save', function(next) {
-	user = this
-
-	if (!user.isModified('password'))
-		return next()
-
-	bcrypt.genSalt(SALT_WORK_FACTOR, function(err, salt) {
-		if (err) return next (err)
-
-		bcrypt.hash(user.password, salt, function(err, hash) {
-			if (err) return next (err)
-
-			user.password = hash
-			next()
-		})
-	})
-})
-
-UserSchema.methods.comparePassword = function(candidate, cb) {
-	bcrypt.compare(candidate, this.password, function(err, isMatch) {
-		if (err) return cb (err)
-		cb(null, isMatch)
-	})
-}
-
-
 module.exports = mongoose.model('Users', UserSchema)

mobile/Project/config.js

+module.exports = {
+    'secret': 'Student',
+    'database': 'mongodb://localhost/StdManageAPI'
+  }
+  
\ No newline at end of file

mobile/Project/mongoose.js

-mongoose = require('mongoose')
-Things = require('./Things')
-Users = require('./Users')
-
-mongoose.connect('mongodb://localhost:27017/Students',{useNewUrlParser:true});
-
-add_User = new Users({
-	username: 'test',
-	password: 'pass'
-})
-
-add_User.save(function(err) {
-	if (err) throw err
-console.log('save USer completed.')
-})
-

mobile/Project/package-lock.json

-{
-  "name": "project",
-  "version": "1.0.0",
-  "lockfileVersion": 1
-}

mobile/Project/package.json

-{
-  "name": "project",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC"
-}

mobile/package.json

@@ -13,7 +13,7 @@
     "body-parser": "^1.18.3",
     "express": "^4.16.4",
     "jsonwebtoken": "^8.3.0",
-    "mongoose": "^5.3.7",
+    "mongoose": "^5.3.11",
     "morgan": "^1.9.1",
     "passport": "^0.4.0",
     "passport-jwt": "^4.0.0",

mobile/week01/Dashboard.js

+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+DashSchema = new Schema({
+	
+  income : {
+		type : Number,
+		required : true
+	}
+})
+
+
+module.exports = mongoose.model('Dashboard',DashSchema)

mobile/week01/Payment.js

+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+
+
+PaymentSchema = new Schema({
+	id : {
+		type : Number,
+		required : true
+	},
+	username : {
+		type : String,
+		required : true
+	},
+	payment : {
+		type : Number,
+		required : true
+	},
+	sub_id : {
+		type : [String],
+		required : true
+	}
+})
+
+module.exports = mongoose.model('payments', PaymentSchema)

mobile/week01/testmongoose.js

@@ -2,11 +2,12 @@ mongoose = require('mongoose')
 Things = require('./Things')
 Users = require('./Users')
 
-mongoose.connect('mongodb://localhost:27017/TestAPI',{useNewUrlParser:true});
+mongoose.connect('mongodb://localhost:27017/StdManageAPI',{useNewUrlParser:true});
 
 testUser = new Users({
-	username: 'test',
-	password: 'pass'
+	username: 'Admin',
+	password: '1234',
+	admin:true
 })
 
 testUser.save(function(err) {

mobile/week02/config.js

 module.exports = {
     'secret': 'KolenCompation',
-    'database': 'mongodb://localhost/Kolen'
+    'database': 'mongodb://localhost/StdManageAPI'
   }
   
\ No newline at end of file

mobile/week02/server.js

@@ -36,8 +36,8 @@ app.get('/', function(req, res) {
 
 app.get('/setup', function(req, res) {
   demo = new User({
-    username: 'demouser',
-    password: 'password',   // TODO: encrypt password with bcrypt
+    username: 'admin',
+    password: '1234',   // TODO: encrypt password with bcrypt
     admin: true
   });