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

Fixed problem with ejs templates and dependencies update #9

Open
wants to merge 13 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
20 changes: 11 additions & 9 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
var express = require('express');
var cookieSession = require('cookie-session')
var morgan = require('morgan')
var errorhandler = require('errorhandler')
var compression = require('compression')
var public = require('./routes/public');
var admin = require('./routes/admin');
var rest = require('./routes/rest');
Expand Down Expand Up @@ -32,20 +36,18 @@ app.use(function (req, res, next) {
}
});

app.use(express.cookieParser('asdaggftyuoplfgd'));
app.use(express.cookieSession());
app.use(express.favicon());
app.use(express.logger('dev'));
app.use(cookieSession({
keys: ['asdaggftyuoplfgd']
}));
app.use(morgan('tiny'));
app.use(express.json());
app.use(express.urlencoded());
app.use(express.methodOverride());
app.use(app.router);
app.use(express.urlencoded({ extended: true }));
app.use(compression())
app.use(express.static(path.join(__dirname, 'public')));


// development only
if ('development' == app.get('env')) {
app.use(express.errorHandler());
app.use(errorhandler());
}

app.get('/', public.index);
Expand Down
2 changes: 1 addition & 1 deletion config.js.template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var config = {};

config.nuve_host = '';
config.nuve_host = ''; // Like http://x.x.x.x:3000/
config.service = {};
config.service.id ='';
config.service.key = '';
Expand Down
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
"start": "node app.js"
},
"dependencies": {
"express": "3.4.4",
"express": "4.17.1",
"cookie-session": "1.4.0",
"morgan": "1.10.0",
"errorhandler": "1.5.1",
"compression": "1.7.4",
"ejs": "*"
}
}
}
Binary file added public/assets/loader.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/mute48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/sound48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 54 additions & 0 deletions public/assets/star.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/demos/webinar/webinar.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/fonts/glyphicons-halflings-regular.eot
Binary file not shown.
Loading