Skip to content

Commit

Permalink
Merge c137ce0 into 87cee0f
Browse files Browse the repository at this point in the history
  • Loading branch information
Vlad committed Jul 29, 2016
2 parents 87cee0f + c137ce0 commit 5ecf92a
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 15 deletions.
2 changes: 1 addition & 1 deletion examples/nodejs-api/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var authenticate = jwt({
app.use(cors());
// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'jade');
app.set('view engine', 'pug');

// uncomment after placing your favicon in /public
//app.use(favicon(__dirname + '/public/favicon.ico'));
Expand Down
10 changes: 5 additions & 5 deletions examples/nodejs-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"start": "node ./bin/www"
},
"dependencies": {
"body-parser": "~1.15.0",
"cookie-parser": "~1.4.1",
"body-parser": "^1.15.1",
"cookie-parser": "^1.4.3",
"cors": "^2.7.1",
"debug": "~2.2.0",
"dotenv": "^2.0.0",
"express": "~4.13.4",
"express-jwt": "^3.3.0",
"jade": "~1.11.0",
"express": "^4.14.0",
"express-jwt": "^3.4.0",
"morgan": "~1.7.0",
"pug": "~2.0.0-beta3",
"serve-favicon": "~2.3.0"
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/nodejs-regular-webapp/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var app = express();

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

// uncomment after placing your favicon in /public
//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
Expand Down
2 changes: 1 addition & 1 deletion examples/nodejs-regular-webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dotenv": "^1.2.0",
"express": "~4.13.1",
"express-session": "^1.11.3",
"jade": "~1.11.0",
"pug": "~2.0.0-beta3",
"morgan": "~1.6.1",
"passport": "^0.3.0",
"passport-auth0": "^0.5.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ extends layout

block content
script(src="https://cdn.auth0.com/js/lock/10.0/lock.min.js")

h1= title
p Welcome to #{title}
br
Expand All @@ -19,5 +19,3 @@ block content
function signin() {
lock.show();
}


Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,4 @@ block content
scope: 'openid name email picture'
}
}});
lock.show();


lock.show();
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
extends layout

block content
img(src="#{user.picture}")
img(src=user.picture)
h2 Welcome #{user.nickname}!
br
a(href='/logout') Logout

0 comments on commit 5ecf92a

Please sign in to comment.