Large diffs are not rendered by default.

@@ -27,6 +27,7 @@
"body-parser": "^1.12.0",
"express": "^4.12.2",
"jwt-simple": "^0.2.0",
"mongoose": "^3.8.24"
"mongoose": "^3.8.24",
"multer": "^0.1.8"
}
}
@@ -1,7 +1,9 @@
var express = require('express');
var bodyParser = require('body-parser');
var multer = require('multer');

var app = express();
// var done=false;

// app.use(require('./auth'))
app.use('/test', require('./auth'))
@@ -12,20 +14,36 @@ app.use(function(req, res, next) {
next();
});



app.use(express.static('templates'));
app.use(express.static(__dirname + '/js'))

app.use(multer({ dest: './uploads/',
rename: function (fieldname, filename) {
return filename + Date.now();
},
onFileUploadStart: function (file) {
console.log(file.originalname + ' is starting ...')
},
onFileUploadComplete: function (file) {
console.log(file.fieldname + ' uploaded to ' + file.path)
// done=true;
}
}));


app.get('/', function(req, res){
// res.json(blog);
res.sendfile('templates/main.html')
res.sendfile('templates/main.html')
// Post.find(function(err, posts) {
// if (err) { return next(err) }
// res.json(posts)
// })
});

app.get('/test', function(req, res){
res.sendfile('templates/test.html')
res.sendfile('templates/test.html')
});

app.get('/blog/all', function(req, res){
@@ -49,6 +67,7 @@ var Post = mongoose.model('Post', {
username: { type: String, required: true },
title: { type: String, required: true },
body: { type: String, required: true },
imgpath: { type: String, required: true },
date: { type: Date, required: true, default: Date.now }
})

@@ -67,15 +86,25 @@ app.post('/blog', function(req,res) {
return res.send('Error 400: Post syntax incorrect');
}

//post one
// if(done==true){
// console.log(req.body)
// console.log(req.files);
// console.log(req.files.userPhoto.path);
// // res.end("File uploaded.");
// }

var post = new Post({
username : 'default',
title : req.body.title,
body : req.body.text
body : req.body.text,
imgpath : req.files.userPhoto.name
})

console.log(post);

post.save(function (err, post){
if (err) {
console.log(err);
return next(err)
}
res.json(201, post)
@@ -7,19 +7,28 @@
<header>
<nav class="navbar navbar-default">
<div class="container">
<ul class="navbar-header">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Sheldon CMS</a>
</div>
<ul class="nav navbar-nav">
<li><a href="/#/login">Login</a></li>
<li><a href="/#/register">Register</a></li>
<li><a href="/#/posts">Posts</a></li>
</ul>
</div>
</div>
</nav>
</header>

<body >
<div class='col-md-2'></div>
<div class='container col-md-8' ng-view></div>
<!-- <div class='col-md-2'></div>
<div class='container col-md-8' ng-view></div> -->
<div class='jumbotron' ng-view></div>
</body>

<script src="/main.js"></script>
@@ -1,20 +1,30 @@
<div ng-controller="PostsCtrl">
<!-- <div ng-controller="PostsCtrl"> -->
<h1>Posts</h1>
<form role='form'>
<form role='form' enctype = "multipart/form-data" method = "post" action = "/blog">
<div class='form-group'>
<div class="input-group">
<input ng-model="postBody" class='form-control'>
<label for="title">Post Title:</title>
<input name="title" class='form-control'>
</div>
<div class="input-group">
<label for="title">Post Content:</title>
<input name="text" class='form-control'>
</div>
<div class="input-group">
<label for="userPhoto">Photo with blog:</title>
<input type="file" name="userPhoto">
</div>
<span class='input-group-btn'>
<button ng-click='addPost()' class='btn btn-default'>Add Post</button>
<input type="submit">
<!-- <button ng-click='addPost()' class='btn btn-default'>Add Post</button> -->
</span>
</div>
</div>
</form>

<!-- </div> -->
<!-- <ul class='posts list-group'>
<li ng-repeat="post in posts | orderBy:'-date'" class='list-group-item'>
<strong>@{{ post.username }}</strong>
<span>{{ post.body }}</span>
</li>
</ul> -->
</div>
@@ -7,5 +7,5 @@
<label>Password</label>
<input class="form-control" type="password" ng-model="password">
</div>
<input class="btn btn-success btn-lg btn-block" type="submit" value="Register">
<input class="btn btn-success btn-lg" type="submit" value="Register">
</form>
BIN +63 KB uploads/Thumbs.db
Binary file not shown.