From 905d5477018e58d7adbbc98dfc606fd5bb1b4031 Mon Sep 17 00:00:00 2001 From: Martins Untals Date: Thu, 22 Aug 2013 22:31:10 +0300 Subject: [PATCH 1/7] added isSelected function for nav selection --- public/js/controllers/header.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/public/js/controllers/header.js b/public/js/controllers/header.js index c26d48f6..19df8c6f 100644 --- a/public/js/controllers/header.js +++ b/public/js/controllers/header.js @@ -11,4 +11,10 @@ function HeaderController($scope, $location, Global) { $scope.init = function() { }; + + $scope.isSelected = function(item) { + if ($location.path() == "/"+item.link) { + return "active" + } else return "" + } } \ No newline at end of file From e56693954b368a4616a547d05fdfd3def023dc5c Mon Sep 17 00:00:00 2001 From: Yutaka Yamaguchi Date: Mon, 26 Aug 2013 22:05:45 +0900 Subject: [PATCH 2/7] Use twitter.id_str instead of twitter.id because project.id is returned string explicitly by the following change https://github.com/jaredhanson/passport-twitter/commit/d9112c4c0575c64243692a732c2590e8d158bdcf --- config/passport.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/passport.js b/config/passport.js index e71d7045..968a1ffa 100755 --- a/config/passport.js +++ b/config/passport.js @@ -56,7 +56,7 @@ module.exports = function(passport, config) { }, function(token, tokenSecret, profile, done) { User.findOne({ - 'twitter.id': profile.id + 'twitter.id_str': profile.id }, function(err, user) { if (err) { return done(err); From aaa597b7036cf188f44945f3635c6e1b5c693841 Mon Sep 17 00:00:00 2001 From: Lior Kesos Date: Tue, 27 Aug 2013 13:18:17 +0300 Subject: [PATCH 3/7] Update README.md Added explanation of how to deploy to heroku --- README.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 449e6ebc..f920de30 100644 --- a/README.md +++ b/README.md @@ -34,11 +34,21 @@ MEAN is a boilerplate that provides a nice starting point for [MongoDB](http://w When not using grunt you can use: $ node server - - Then open a browser and go to: + Then open a browser and go to: + http://localhost:3000 +## Quick Deployment +4 commands to deploy your mean app to heroku (make sure you have heroku toolbelt installed... + +git init +git add . +git commit -m "initial version" +heroku apps:create +git push heroku master + + ## Configuration All configuration is specified in the [config](config/) folder, particularly the [config.js](config/config.js) file. Here you will need to specify your application name, database name, as well as hook up any social app keys if you want integration with Twitter, Facebook, GitHub or Google. From ddaecff486d06ec1ea9eca60052c0a95025f6d17 Mon Sep 17 00:00:00 2001 From: Lior Kesos Date: Tue, 27 Aug 2013 13:23:06 +0300 Subject: [PATCH 4/7] Update README.md Added syntax highlighting --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f920de30..c1a1df1e 100644 --- a/README.md +++ b/README.md @@ -42,12 +42,13 @@ MEAN is a boilerplate that provides a nice starting point for [MongoDB](http://w ## Quick Deployment 4 commands to deploy your mean app to heroku (make sure you have heroku toolbelt installed... +```bash git init git add . git commit -m "initial version" heroku apps:create git push heroku master - +``` ## Configuration All configuration is specified in the [config](config/) folder, particularly the [config.js](config/config.js) file. Here you will need to specify your application name, database name, as well as hook up any social app keys if you want integration with Twitter, Facebook, GitHub or Google. From 2bf84d780acada5cb4bad01af22c5437d4f1fe87 Mon Sep 17 00:00:00 2001 From: Lior Kesos Date: Tue, 27 Aug 2013 13:26:29 +0300 Subject: [PATCH 5/7] Update README.md fixed wording and added mongohq reference to heroku deployment --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c1a1df1e..5ca02823 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ MEAN is a boilerplate that provides a nice starting point for [MongoDB](http://w http://localhost:3000 ## Quick Deployment -4 commands to deploy your mean app to heroku (make sure you have heroku toolbelt installed... +4 commands to deploy your mean app to heroku (make sure you have heroku toolbelt installed and an accessible mongo db instance (you can try mongohq which have an easy setup ) ```bash git init From cbc337b5cc0b0b0706b457e01a66bd07a4f7d540 Mon Sep 17 00:00:00 2001 From: Lior Kesos Date: Tue, 27 Aug 2013 13:27:06 +0300 Subject: [PATCH 6/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5ca02823..a2f5eb76 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ MEAN is a boilerplate that provides a nice starting point for [MongoDB](http://w http://localhost:3000 ## Quick Deployment -4 commands to deploy your mean app to heroku (make sure you have heroku toolbelt installed and an accessible mongo db instance (you can try mongohq which have an easy setup ) +4 commands to deploy your mean app to heroku (make sure you have heroku toolbelt installed and an accessible mongo db instance (you can try mongohq which have an easy setup ) ```bash git init From 2955fdf629b23a425cb78a5661fb0ce3258312da Mon Sep 17 00:00:00 2001 From: Lior Kesos Date: Tue, 27 Aug 2013 13:27:53 +0300 Subject: [PATCH 7/7] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a2f5eb76..279dbb3d 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,8 @@ MEAN is a boilerplate that provides a nice starting point for [MongoDB](http://w http://localhost:3000 ## Quick Deployment -4 commands to deploy your mean app to heroku (make sure you have heroku toolbelt installed and an accessible mongo db instance (you can try mongohq which have an easy setup ) +4 commands to deploy your mean app to heroku, +Before you start make sure you have heroku toolbelt installed and an accessible mongo db instance - you can try mongohq which have an easy setup ) ```bash git init