Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tester and routing done #3

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
.env
60 changes: 60 additions & 0 deletions Controllers/blog-controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
const Blogs = require('../Models/blog.js')

function addBlog (req,res,next){
Blogs.create({
title:req.body.title,
blog: req.body.blog
},function(err,result){
res.send(result)
})
}

function listBlogs (req,res,next){
Blogs.find({},function(err,result){
res.send(result)
})
}

function getBlog (req,res,next){
Blogs.findOne({
_id: req.params.id
},function(err,result){
res.send(result)
})
}

// function userBlogs (req,res,next){
// // Blogs.find({
// // user_id:
// // },function(err,result){
// // res.send(result)
// // })
// }

function deleteBlog(req,res,next){
Blogs.remove({
_id:req.params.id
},function(err,result){
res.send(`Delete Success!`)
})
}

function updateBlog (req,res,next){
Blogs.findOne({
_id:req.params.id
},function(err,result){
Blogs.updateOne({
_id:req.params.id
},{
title:req.body.title || result.title,
blog: req.body.blog || result.blog
},function(err,result){
res.send(`Update Succes!`)
})
})
}


module.exports={
addBlog,listBlogs,deleteBlog,getBlog,updateBlog
}
80 changes: 80 additions & 0 deletions Controllers/user-controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
const Users = require('../Models/user.js')
const jwt = require('jsonwebtoken')
const bcrypt = require('bcrypt')
const saltRounds = 10
const salt = bcrypt.genSaltSync(saltRounds)
require('dotenv').config()


function signup (req,res,next){
let hash = bcrypt.hashSync(req.body.password,salt)
Users.create({
username:req.body.username,
password: hash,
email: req.body.email
},function(err,result){
res.send(result)
})
}

function login (req,res,next){
Users.findOne({
username: req.body.username
},function(err,result){
if(result.length < 1){
res.send('invalid username!')
}
else{
if(bcrypt.compare(req.body.password,result.password)){
let token = jwt.sign({_id:result._id,username:result.username,email:result.email},process.env.SECRET)
res.send(token)
}
else{
res.send('invalid password!')
}
}
})
}

function deleteUser (req,res,next){
Users.remove({
_id: req.params.id
},function(err,result){
res.send(result)
})
}

function updateUser (req,res,next){
let hash = bcrypt.hashSync(req.body.password,salt)
Users.findOne({
_id: req.params.id
},function(err,result){
Users.updateOne({
_id: req.params.id
},{
username: req.body.username || result.username,
password: hash || result.password,
email: req.body.email || result.email
},function(err,result){
res.send(result)
})
})
}

function getUser (req,res,next){
Users.findOne({
_id:req.params.id
},function(err,result){
res.send(result)
})
}

function listUsers (req,res,next){
Users.find({},function(err,result){
res.send(result)
})
}

module.exports = {
getUser,updateUser,deleteUser,login,signup,listUsers
}
12 changes: 12 additions & 0 deletions Models/blog.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
const mongoose = require('mongoose')
const Schema = mongoose.Schema

var blogSchema = new Schema({
title: String,
blog: String,
user_id: {type:Schema.Types.ObjectId,ref:'User'}
})

var blog = mongoose.model('Blogs',blogSchema)

module.exports = blog
12 changes: 12 additions & 0 deletions Models/user.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
const mongoose = require('mongoose')
const Schema = mongoose.Schema

var userSchema = new Schema ({
username: String,
password: String,
email: String
})

var User = mongoose.model('Users',userSchema)

module.exports = User
60 changes: 60 additions & 0 deletions app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
var express = require('express');
var path = require('path');
var favicon = require('serve-favicon');
var logger = require('morgan');
var cookieParser = require('cookie-parser');
var bodyParser = require('body-parser');
const cors = require('cors')
const mongoose = require('mongoose')
var index = require('./routes/index');
var users = require('./routes/users');
var app = express();
var db_config = {
development:'mongodb://blog:[email protected]:63181/blog-tdd',
test: 'mongodb://blog:[email protected]:63181/blog-tdd-test'
}
var current_env = app.settings.env //developnent / test / production
mongoose.connect(db_config[current_env],function(err,res){
if(err){
console.log('error database',err);
}
else{
console.log('connected to database', db_config[current_env]);
}
})
// var db = mongoose.createConnection(db_config)
// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'jade');

// uncomment after placing your favicon in /public
//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
app.use(cors())
app.use(logger('dev'));
app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: false }));
app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public')));

app.use('/', index);
app.use('/users', users);

// catch 404 and forward to error handler
app.use(function(req, res, next) {
var err = new Error('Not Found');
err.status = 404;
next(err);
});

// error handler
app.use(function(err, req, res, next) {
// set locals, only providing error in development
res.locals.message = err.message;
res.locals.error = req.app.get('env') === 'development' ? err : {};

// render the error page
res.status(err.status || 500);
res.render('error');
});

module.exports = app;
90 changes: 90 additions & 0 deletions bin/www
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
#!/usr/bin/env node

/**
* Module dependencies.
*/

var app = require('../app');
var debug = require('debug')('blog-tdd:server');
var http = require('http');

/**
* Get port from environment and store in Express.
*/

var port = normalizePort(process.env.PORT || '3000');
app.set('port', port);

/**
* Create HTTP server.
*/

var server = http.createServer(app);

/**
* Listen on provided port, on all network interfaces.
*/

server.listen(port);
server.on('error', onError);
server.on('listening', onListening);

/**
* Normalize a port into a number, string, or false.
*/

function normalizePort(val) {
var port = parseInt(val, 10);

if (isNaN(port)) {
// named pipe
return val;
}

if (port >= 0) {
// port number
return port;
}

return false;
}

/**
* Event listener for HTTP server "error" event.
*/

function onError(error) {
if (error.syscall !== 'listen') {
throw error;
}

var bind = typeof port === 'string'
? 'Pipe ' + port
: 'Port ' + port;

// handle specific listen errors with friendly messages
switch (error.code) {
case 'EACCES':
console.error(bind + ' requires elevated privileges');
process.exit(1);
break;
case 'EADDRINUSE':
console.error(bind + ' is already in use');
process.exit(1);
break;
default:
throw error;
}
}

/**
* Event listener for HTTP server "listening" event.
*/

function onListening() {
var addr = server.address();
var bind = typeof addr === 'string'
? 'pipe ' + addr
: 'port ' + addr.port;
debug('Listening on ' + bind);
}
40 changes: 40 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"name": "blog-tdd",
"version": "0.0.0",
"private": true,
"scripts": {
"start": "nodemon ./bin/www"
},
"dependencies": {
"bcrypt": "^1.0.2",
"body-parser": "~1.17.1",
"chai": "^4.0.1",
"chai-http": "^3.0.0",
"cookie-parser": "~1.4.3",
"cors": "^2.8.3",
"debug": "~2.6.3",
"dotenv": "^4.0.0",
"express": "~4.15.2",
"jade": "~1.11.0",
"jsonwebtoken": "^7.4.1",
"mocha": "^3.4.2",
"mongoose": "^4.10.4",
"morgan": "~1.8.1",
"serve-favicon": "~2.4.2"
},
"description": "",
"main": "app.js",
"directories": {
"test": "test"
},
"repository": {
"type": "git",
"url": "git+https://github.com/stedyyulius/blog-tdd.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/stedyyulius/blog-tdd/issues"
},
"homepage": "https://github.com/stedyyulius/blog-tdd#readme"
}
8 changes: 8 additions & 0 deletions public/stylesheets/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
body {
padding: 50px;
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
}

a {
color: #00B7FF;
}
13 changes: 13 additions & 0 deletions routes/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
var express = require('express');
var router = express.Router();
const BlogController = require('../Controllers/blog-controller.js')

/* GET home page. */
router.get('/blog',BlogController.listBlogs)
router.post('/blog',BlogController.addBlog)
router.delete('/blog/:id',BlogController.deleteBlog)
router.put('/blog/:id',BlogController.updateBlog)
router.get('/blog/:id',BlogController.getBlog)
// router.get('/blog/user',BlogController.userBlogs)

module.exports = router;
Loading