11// Load environment variables
2- var dotenv = require ( 'dotenv' ) ;
3- dotenv . load ( ) ;
2+ require ( 'dotenv' ) . load ( ) ;
3+
44var cloudinary = require ( 'cloudinary' ) . v2 ;
5+
56if ( typeof ( process . env . CLOUDINARY_URL ) === 'undefined' ) {
67 console . warn ( '!! cloudinary config is undefined !!' ) ;
78 console . warn ( 'export CLOUDINARY_URL or set dotenv file' ) ;
@@ -11,19 +12,17 @@ if (typeof (process.env.CLOUDINARY_URL) === 'undefined') {
1112}
1213console . log ( '-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --' ) ;
1314var path = require ( 'path' ) ;
14- // Start express server
15- var schema = require ( './config/schema' ) ;
1615var express = require ( 'express' ) ;
1716var engine = require ( 'ejs-locals' ) ;
18- var app = express ( ) ;
1917var bodyParser = require ( 'body-parser' ) ;
2018var methodOverride = require ( 'method-override' ) ;
19+ require ( './config/schema' ) ;
20+
21+ // Start express server
22+ var app = express ( ) ;
2123app . use ( bodyParser . json ( ) ) ;
2224app . use ( bodyParser . urlencoded ( { extended : false } ) ) ;
23-
2425app . use ( methodOverride ( ) ) ;
25-
26-
2726app . use ( express . static ( path . join ( __dirname , '/public' ) ) ) ;
2827app . set ( 'views' , path . join ( __dirname , '/views/' ) ) ;
2928app . use ( '/node_modules' , express . static ( path . join ( __dirname , '/node_modules' ) ) ) ;
@@ -34,13 +33,14 @@ app.set('view engine', 'ejs');
3433wirePreRequest ( app ) ;
3534// Wire request controllers
3635var photosController = require ( './controllers/photos_controller' ) ;
36+
3737photosController . wire ( app ) ;
3838
3939// Wire request 'post' actions
4040wirePostRequest ( app ) ;
4141
42- function wirePreRequest ( app ) {
43- app . use ( function ( req , res , next ) {
42+ function wirePreRequest ( application ) {
43+ application . use ( function ( req , res , next ) {
4444 console . log ( req . method + " " + req . url ) ;
4545 res . locals . req = req ;
4646 res . locals . res = res ;
@@ -55,18 +55,19 @@ function wirePreRequest(app) {
5555 } ) ;
5656}
5757
58- function wirePostRequest ( app ) {
59- app . use ( function ( err , req , res , next ) {
60- if ( err . message && ( ~ err . message . indexOf ( 'not found' ) || ( ~ err . message . indexOf ( 'Cast to ObjectId failed' ) ) ) ) {
58+ function wirePostRequest ( application ) {
59+ application . use ( function ( err , req , res , next ) {
60+ if ( err . message && ( err . message . indexOf ( 'not found' ) !== - 1 || err . message . indexOf ( 'Cast to ObjectId failed' ) !== - 1 ) ) {
6161 return next ( ) ;
6262 }
6363 console . log ( 'error (500) ' + err . message ) ;
6464 console . log ( err . stack ) ;
65- if ( ~ err . message . indexOf ( 'CLOUDINARY_URL' ) ) {
65+ if ( err . message . indexOf ( 'CLOUDINARY_URL' ) !== - 1 ) {
6666 res . status ( 500 ) . render ( 'errors/dotenv' , { error : err } ) ;
6767 } else {
6868 res . status ( 500 ) . render ( 'errors/500' , { error : err } ) ;
6969 }
70+ return undefined ;
7071 } ) ;
7172}
7273
@@ -75,7 +76,7 @@ app.use(function (req, res, next) {
7576 console . log ( 'error (404)' ) ;
7677 res . status ( 404 ) . render ( 'errors/404' , {
7778 url : req . url ,
78- error : 'Not found'
79+ error : 'Not found' ,
7980 } ) ;
8081} ) ;
8182
0 commit comments