Skip to content

Commit

Permalink
dpd-passport solved
Browse files Browse the repository at this point in the history
  • Loading branch information
rgolea committed May 20, 2015
1 parent 18329ac commit 07bc016
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# angular-deployd-admin
---
This is an Angular.js & Deployd admin system. It's been maintained by [@rgolea](https://github.com/rgolea) and [@vaesergio](https://github.com/vaesergio).
This is an Angular.js & Deployd admin system. It's been maintained by [@rgolea](https://github.com/rgolea), [@andreialecu](https://github.com/andreialecu) and [@vaesergio](https://github.com/vaesergio).

---
###Download
Expand Down
2 changes: 1 addition & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var deployd = require('deployd');
// configure database etc.
var server = deployd({
port: process.env.PORT || 2403,
env: 'development',
env: process.env.ENV || 'development',
db: {
connectionString: 'mongodb://localhost:27017/interface'
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
},
"dependencies": {
"deployd": "^0.8.2",
"dpd-passport": "^0.3.0"
"dpd-passport": "git://github.com/rgolea/dpd-passport.git#master"
}
}
4 changes: 1 addition & 3 deletions public/app/users/controllers/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ app.controller('usersCtrl', ['$scope', 'Users', '$state', '$rootScope', '$timeou

// Save form

$scope.socialLogin = function(provider){
window.location.href = '/auth/' + provider + '?redirectURL=http://localhost:2403';
};
$scope.redirectURL = BASE_URL;

$scope.save = function () {
var i = $scope.users.indexOf($scope.newUser);
Expand Down
6 changes: 3 additions & 3 deletions public/app/users/partials/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ <h3>Cardiomed</h3>
<md-button flex type="button" class="md-raised md-warn" ng-click="logout()">Logout</md-button>
</md-content>
<md-content ng-show="socialMedia" layout="column" layout-padding layout-align="center center">
<md-button style="background-color:#3b5998; color:white; width:100%;" class="md-raised" ng-click="socialLogin('facebook')">Facebook</md-button>
<md-button style="background-color:#00aced; color:white; width:100%;" class="md-raised" ng-click="socialLogin('twitter')">Twitter</md-button>
<md-button style="background-color:#dd4b39; color:white; width:100%;" class="md-raised" ng-click="socialLogin('google')">Google</md-button>
<md-button style="background-color:#3b5998; color:white; width:100%;" class="md-raised" ng-href="/auth/facebook/callback?returnTo={{redirectURL}}">Facebook</md-button>
<md-button style="background-color:#00aced; color:white; width:100%;" class="md-raised" ng-href="/auth/twitter/callback?returnTo={{redirectURL}}">Twitter</md-button>
<md-button style="background-color:#dd4b39; color:white; width:100%;" class="md-raised" ng-href="/auth/google/callback?returnTo={{redirectURL}}">Google</md-button>
</md-content>
</md-card>
</md-content>
2 changes: 1 addition & 1 deletion resources/auth/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"SALT_LEN": "",
"baseURL": "http://localhost:2403/",
"allowedRedirectURLs": "^http://localhost:2403.*$",
"disableSessionId": false,
"disableSessionId": true,
"allowLocal": false,
"allowTwitter": true,
"allowFacebook": true,
Expand Down

0 comments on commit 07bc016

Please sign in to comment.