Skip to content
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
60 changes: 30 additions & 30 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,46 +1,47 @@
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 express = require("express");
const path = require("path");
const favicon = require("serve-favicon");
const logger = require("morgan");
const cookieParser = require("cookie-parser");
const bodyParser = require("body-parser");

var routes = require('./routes/index');
var users = require('./routes/users');
var todos = require('./routes/todos');
const routes = require("./routes/index");
const users = require("./routes/users");
const todos = require("./routes/todos");

// load mongoose package
var mongoose = require('mongoose');
const mongoose = require("mongoose");

// Use native Node promises
mongoose.Promise = global.Promise;

// connect to MongoDB
mongoose.connect('mongodb://localhost/todo-api')
.then(() => console.log('connection succesful'))
mongoose
.connect("mongodb://localhost/todo-api")
.then(() => console.log("connection succesful"))
.catch((err) => console.error(err));

var app = express();
const app = express();

// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'ejs');
app.set("views", path.join(__dirname, "views"));
app.set("view engine", "ejs");

// uncomment after placing your favicon in /public
//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
app.use(logger('dev'));
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(express.static(path.join(__dirname, "public")));

app.use('/', routes);
app.use('/users', users);
app.use('/todos', todos);
app.use("/", routes);
app.use("/users", users);
app.use("/todos", todos);

// catch 404 and forward to error handler
app.use(function(req, res, next) {
var err = new Error('Not Found');
app.use(function (req, res, next) {
const err = new Error("Not Found");
err.status = 404;
next(err);
});
Expand All @@ -49,25 +50,24 @@ app.use(function(req, res, next) {

// development error handler
// will print stacktrace
if (app.get('env') === 'development') {
app.use(function(err, req, res, next) {
if (app.get("env") === "development") {
app.use(function (err, req, res, next) {
res.status(err.status || 500);
res.render('error', {
res.render("error", {
message: err.message,
error: err
error: err,
});
});
}

// production error handler
// no stacktraces leaked to user
app.use(function(err, req, res, next) {
app.use(function (err, req, res, next) {
res.status(err.status || 500);
res.render('error', {
res.render("error", {
message: err.message,
error: {}
error: {},
});
});


module.exports = app;
40 changes: 18 additions & 22 deletions bin/www
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,37 @@
* Module dependencies.
*/

var app = require('../app');
var debug = require('debug')('todo-api:server');
var http = require('http');
const app = require("../app");
const debug = require("debug")("todo-api:server");
const http = require("http");

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

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

/**
* Create HTTP server.
*/

var server = http.createServer(app);
const server = http.createServer(app);

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

server.listen(port);
server.on('error', onError);
server.on('listening', onListening);
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);
const port = parseInt(val, 10);

if (isNaN(port)) {
// named pipe
Expand All @@ -54,22 +54,20 @@ function normalizePort(val) {
*/

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

var bind = typeof port === 'string'
? 'Pipe ' + port
: 'Port ' + port;
const 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');
case "EACCES":
console.error(bind + " requires elevated privileges");
process.exit(1);
break;
case 'EADDRINUSE':
console.error(bind + ' is already in use');
case "EADDRINUSE":
console.error(bind + " is already in use");
process.exit(1);
break;
default:
Expand All @@ -82,9 +80,7 @@ function onError(error) {
*/

function onListening() {
var addr = server.address();
var bind = typeof addr === 'string'
? 'pipe ' + addr
: 'port ' + addr.port;
debug('Listening on ' + bind);
const addr = server.address();
const bind = typeof addr === "string" ? "pipe " + addr : "port " + addr.port;
debug("Listening on " + bind);
}
8 changes: 4 additions & 4 deletions models/Todo.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
var mongoose = require('mongoose');
const mongoose = require("mongoose");

var TodoSchema = new mongoose.Schema({
const TodoSchema = new mongoose.Schema({
name: String,
completed: Boolean,
note: String
note: String,
});

module.exports = mongoose.model('Todo', TodoSchema);
module.exports = mongoose.model("Todo", TodoSchema);
8 changes: 4 additions & 4 deletions routes/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
var express = require('express');
var router = express.Router();
const express = require("express");
const router = express.Router();

/* GET home page. */
router.get('/', function(req, res, next) {
res.render('index', { title: 'ngTodo' });
router.get("/", function (req, res, next) {
res.render("index", { title: "ngTodo" });
});

module.exports = router;
26 changes: 13 additions & 13 deletions routes/todos.js
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
var express = require('express');
var router = express.Router();
const express = require("express");
const router = express.Router();

var Todo = require('../models/Todo.js');
const Todo = require("../models/Todo.js");

/* GET /todos listing. */
router.get('/', function(req, res, next) {
Todo.find(function (err, todos) {
router.get("/", async (req, res, next) => {
Todo.find((err, todos) => {
if (err) return next(err);
res.json(todos);
});
});

/* POST /todos */
router.post('/', function(req, res, next) {
Todo.create(req.body, function (err, post) {
router.post("/", async (req, res, next) => {
Todo.create(req.body, (err, post) => {
if (err) return next(err);
res.json(post);
});
});

/* GET /todos/id */
router.get('/:id', function(req, res, next) {
Todo.findById(req.params.id, function (err, post) {
router.get("/:id", async (req, res, next) => {
Todo.findById(req.params.id, (err, post) => {
if (err) return next(err);
res.json(post);
});
});

/* PUT /todos/:id */
router.put('/:id', function(req, res, next) {
Todo.findByIdAndUpdate(req.params.id, req.body, function (err, post) {
router.put("/:id", async (req, res, next) => {
Todo.findByIdAndUpdate(req.params.id, req.body, (err, post) => {
if (err) return next(err);
res.json(post);
});
});

/* DELETE /todos/:id */
router.delete('/:id', function(req, res, next) {
Todo.findByIdAndRemove(req.params.id, req.body, function (err, post) {
router.delete("/:id", async (req, res, next) => {
Todo.findByIdAndRemove(req.params.id, req.body, (err, post) => {
if (err) return next(err);
res.json(post);
});
Expand Down
8 changes: 4 additions & 4 deletions routes/users.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
var express = require('express');
var router = express.Router();
const express = require("express");
const router = express.Router();

/* GET users listing. */
router.get('/', function(req, res, next) {
res.send('respond with a resource');
router.get("/", function (req, res, next) {
res.send("respond with a resource");
});

module.exports = router;