Skip to content

feat(app): implement oauth-buttons directive #1156

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 8, 2015
Merged

feat(app): implement oauth-buttons directive #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f37089a
feat(app): implement oauth-buttons directive
kingcody Aug 10, 2015
8e21ce9
fix(app): add `jasmine` to `.jshintrc` globals
kingcody Sep 8, 2015
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
3 changes: 2 additions & 1 deletion app/templates/Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,8 @@ module.exports = function (grunt) {
'/es5-shim/'<% if(!filters.css) { %>,
/font-awesome\.css/<% if(filters.bootstrap) { %>,
/bootstrap\.css/<% if(filters.sass) { %>,
/bootstrap-sass-official/<% }}} %>
/bootstrap-sass-official/<% } if(filters.oauth) { %>,
/bootstrap-social\.css/<% }}} %>
]
},
client: {
Expand Down
3 changes: 2 additions & 1 deletion app/templates/_bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"json3": "~3.3.1",
"es5-shim": "~3.0.1",<% if(filters.bootstrap) { if (filters.sass) { %>
"bootstrap-sass-official": "~3.1.1",<% } %>
"bootstrap": "~3.1.1",<% } %>
"bootstrap": "~3.1.1",<% if(filters.oauth) { %>
"bootstrap-social": "~4.9.1",<% }} %>
"angular-resource": "~1.4.0",
"angular-cookies": "~1.4.0",
"angular-sanitize": "~1.4.0",<% if (filters.ngroute) { %>
Expand Down
3 changes: 2 additions & 1 deletion app/templates/client/.jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"console": true,
"$": true,
"_": true,
"moment": true,
"moment": true,<% if (filters.jasmine) { %>
"jasmine": true,<% } %>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be in a separate commit

"describe": true,
"beforeEach": true,
"module": true,
Expand Down
18 changes: 6 additions & 12 deletions app/templates/client/app/account(auth)/login/login(html).html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,12 @@ <h1>Login</h1>
Register
</a>
</div>
<% if (filters.oauth) {%>
<hr>
<div><% if (filters.facebookAuth) {%>
<a class="btn btn-facebook" href="" ng-click="loginOauth('facebook')">
<i class="fa fa-facebook"></i> Connect with Facebook
</a><% } %><% if (filters.googleAuth) {%>
<a class="btn btn-google-plus" href="" ng-click="loginOauth('google')">
<i class="fa fa-google-plus"></i> Connect with Google+
</a><% } %><% if (filters.twitterAuth) {%>
<a class="btn btn-twitter" href="" ng-click="loginOauth('twitter')">
<i class="fa fa-twitter"></i> Connect with Twitter
</a><% } %>
<% if (filters.oauth) { %>
<hr/>
<div class="row">
<div class="col-sm-4 col-md-3">
<oauth-buttons classes="btn-block"></oauth-buttons>
</div>
</div><% } %>
</form>
</div>
Expand Down
16 changes: 4 additions & 12 deletions app/templates/client/app/account(auth)/login/login(jade).jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,8 @@ navbar
<% if (filters.oauth) {%>
hr

div<% if (filters.facebookAuth) {%>
a.btn.btn-facebook(href='', ng-click='loginOauth("facebook")')
i.fa.fa-facebook
| Connect with Facebook
= ' '<% } %><% if (filters.googleAuth) {%>
a.btn.btn-google-plus(href='', ng-click='loginOauth("google")')
i.fa.fa-google-plus
| Connect with Google+
= ' '<% } %><% if (filters.twitterAuth) {%>
a.btn.btn-twitter(href='', ng-click='loginOauth("twitter")')
i.fa.fa-twitter
| Connect with Twitter<% } %><% } %>
.row
.col-sm-4.col-md-3
oauth-buttons(classes='btn-block')
<% } %>
hr
30 changes: 0 additions & 30 deletions app/templates/client/app/account(auth)/login/login(less).less
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions app/templates/client/app/account(auth)/login/login(sass).scss
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions app/templates/client/app/account(auth)/login/login(stylus).styl
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions app/templates/client/app/account(auth)/login/login.controller(coffee).coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

angular.module '<%= scriptAppName %>'
.controller 'LoginCtrl', ($scope, Auth<% if (filters.ngroute) { %>, $location<% } %><% if (filters.uirouter) { %>, $state<% } %><% if (filters.oauth) {%>, $window<% } %>) ->
.controller 'LoginCtrl', ($scope, Auth<% if (filters.ngroute) { %>, $location<% } %><% if (filters.uirouter) { %>, $state<% } %>) ->
$scope.user = {}
$scope.errors = {}
$scope.login = (form) ->
Expand All @@ -18,6 +18,3 @@ angular.module '<%= scriptAppName %>'

.catch (err) ->
$scope.errors.other = err.message
<% if (filters.oauth) {%>
$scope.loginOauth = (provider) ->
$window.location.href = '/auth/' + provider<% } %>
7 changes: 2 additions & 5 deletions app/templates/client/app/account(auth)/login/login.controller(js).js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

angular.module('<%= scriptAppName %>')
.controller('LoginCtrl', function($scope, Auth<% if (filters.ngroute) { %>, $location<% } %><% if (filters.uirouter) { %>, $state<% } %><% if (filters.oauth) { %>, $window<% } %>) {
.controller('LoginCtrl', function($scope, Auth<% if (filters.ngroute) { %>, $location<% } %><% if (filters.uirouter) { %>, $state<% } %>) {
$scope.user = {};
$scope.errors = {};

Expand All @@ -22,8 +22,5 @@ angular.module('<%= scriptAppName %>')
});
}
};
<% if (filters.oauth) {%>
$scope.loginOauth = function(provider) {
$window.location.href = '/auth/' + provider;
};<% } %>

});
18 changes: 6 additions & 12 deletions app/templates/client/app/account(auth)/signup/signup(html).html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,12 @@ <h1>Sign up</h1>
Login
</a>
</div>
<% if (filters.oauth) {%>
<hr>
<div><% if (filters.facebookAuth) {%>
<a class="btn btn-facebook" href="" ng-click="loginOauth('facebook')">
<i class="fa fa-facebook"></i> Connect with Facebook
</a><% } %><% if (filters.googleAuth) {%>
<a class="btn btn-google-plus" href="" ng-click="loginOauth('google')">
<i class="fa fa-google-plus"></i> Connect with Google+
</a><% } %><% if (filters.twitterAuth) {%>
<a class="btn btn-twitter" href="" ng-click="loginOauth('twitter')">
<i class="fa fa-twitter"></i> Connect with Twitter
</a><% } %>
<% if (filters.oauth) { %>
<hr/>
<div class="row">
<div class="col-sm-4 col-md-3">
<oauth-buttons classes="btn-block"></oauth-buttons>
</div>
</div><% } %>
</form>
</div>
Expand Down
17 changes: 4 additions & 13 deletions app/templates/client/app/account(auth)/signup/signup(jade).jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,11 @@ navbar
= ' '
a.btn.btn-default.btn-lg.btn-login(<% if (filters.uirouter) { %>ui-sref='login'<% } else { %>href='/login'<% } %>)
| Login

<% if (filters.oauth) {%>
hr

div<% if (filters.facebookAuth) {%>
a.btn.btn-facebook(href='', ng-click='loginOauth("facebook")')
i.fa.fa-facebook
| Connect with Facebook
= ' '<% } %><% if (filters.googleAuth) {%>
a.btn.btn-google-plus(href='', ng-click='loginOauth("google")')
i.fa.fa-google-plus
| Connect with Google+
= ' '<% } %><% if (filters.twitterAuth) {%>
a.btn.btn-twitter(href='', ng-click='loginOauth("twitter")')
i.fa.fa-twitter
| Connect with Twitter<% } %><% } %>
.row
.col-sm-4.col-md-3
oauth-buttons(classes='btn-block')
<% } %>
hr
5 changes: 1 addition & 4 deletions app/templates/client/app/account(auth)/signup/signup.controller(coffee).coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

angular.module '<%= scriptAppName %>'
.controller 'SignupCtrl', ($scope, Auth<% if (filters.ngroute) { %>, $location<% } %><% if (filters.uirouter) { %>, $state<% } %><% if (filters.oauth) {%>, $window<% } %>) ->
.controller 'SignupCtrl', ($scope, Auth<% if (filters.ngroute) { %>, $location<% } %><% if (filters.uirouter) { %>, $state<% } %>) ->
$scope.user = {}
$scope.errors = {}
$scope.register = (form) ->
Expand Down Expand Up @@ -31,6 +31,3 @@ angular.module '<%= scriptAppName %>'
angular.forEach err.fields, (field) ->
form[field].$setValidity 'mongoose', false
$scope.errors[field] = err.message<% } %>
<% if (filters.oauth) {%>
$scope.loginOauth = (provider) ->
$window.location.href = '/auth/' + provider<% } %>
7 changes: 2 additions & 5 deletions app/templates/client/app/account(auth)/signup/signup.controller(js).js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

angular.module('<%= scriptAppName %>')
.controller('SignupCtrl', function($scope, Auth<% if (filters.ngroute) { %>, $location<% } %><% if (filters.uirouter) { %>, $state<% } %><% if (filters.oauth) { %>, $window<% } %>) {
.controller('SignupCtrl', function($scope, Auth<% if (filters.ngroute) { %>, $location<% } %><% if (filters.uirouter) { %>, $state<% } %>) {
$scope.user = {};
$scope.errors = {};

Expand Down Expand Up @@ -38,8 +38,5 @@ angular.module('<%= scriptAppName %>')
});
}
};
<% if (filters.oauth) {%>
$scope.loginOauth = function(provider) {
$window.location.href = '/auth/' + provider;
};<% } %>

});
5 changes: 3 additions & 2 deletions app/templates/client/app/app(less).less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<% if (filters.bootstrap) { %>@import '../bower_components/bootstrap/less/bootstrap.less';<% } %>
@import '../bower_components/font-awesome/less/font-awesome.less';
<% if (filters.bootstrap) { %>@import '../bower_components/bootstrap/less/bootstrap.less';
<% if(filters.oauth) { %>@import '../bower_components/bootstrap-social/bootstrap-social.less';
<% }} %>@import '../bower_components/font-awesome/less/font-awesome.less';

<% if (filters.bootstrap) { %>@icon-font-path: '../bower_components/bootstrap/fonts/';<% } %>
@fa-font-path: '../bower_components/font-awesome/fonts';
Expand Down
8 changes: 4 additions & 4 deletions app/templates/client/app/app(sass).scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<% if (filters.bootstrap) { %>$icon-font-path: "../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";<% } %>
$fa-font-path: "../bower_components/font-awesome/fonts";
<% if (filters.bootstrap) { %>
@import '../bower_components/bootstrap-sass-official/vendor/assets/stylesheets/bootstrap';<% } %>
<% if (filters.bootstrap) { %>$icon-font-path: "../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";
@import '../bower_components/bootstrap-sass-official/vendor/assets/stylesheets/bootstrap';
<% if(filters.oauth) { %>@import '../bower_components/bootstrap-social/bootstrap-social.scss';
<% }} %>$fa-font-path: "../bower_components/font-awesome/fonts";
@import '../bower_components/font-awesome/scss/font-awesome';

/**
Expand Down
3 changes: 2 additions & 1 deletion app/templates/client/app/app(stylus).styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@import "../bower_components/font-awesome/css/font-awesome.css"
<% if (filters.bootstrap) { %>@import "../bower_components/bootstrap/dist/css/bootstrap.css"

<% if (filters.oauth) { %>@import "../bower_components/bootstrap-social/bootstrap-social.css"
<% } %>
//
// Bootstrap Fonts
//
Expand Down
12 changes: 12 additions & 0 deletions app/templates/client/components/oauth-buttons(oauth)/oath-buttons(html).html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<% if(filters.facebookAuth) { %><a ng-class="classes" ng-click="OauthButtons.loginOauth('facebook')" class="btn<% if (filters.bootstrap) { %> btn-social<% } %> btn-facebook">
<i class="fa fa-facebook"></i>
Connect with Facebook
</a>
<% } if (filters.googleAuth) { %><a ng-class="classes" ng-click="OauthButtons.loginOauth('google')" class="btn<% if (filters.bootstrap) { %> btn-social<% } %> btn-google">
<i class="fa fa-google-plus"></i>
Connect with Google+
</a>
<% } if (filters.twitterAuth) { %><a ng-class="classes" ng-click="OauthButtons.loginOauth('twitter')" class="btn<% if (filters.bootstrap) { %> btn-social<% } %> btn-twitter">
<i class="fa fa-twitter"></i>
Connect with Twitter
</a><% } %>
19 changes: 8 additions & 11 deletions ...nt/app/account(auth)/login/login(css).css → ...uth-buttons(oauth)/oauth-buttons(css).css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
<% if (filters.oauth) { %><% if (filters.facebookAuth) { %>.btn-facebook {
<% if (!filters.bootstrap) { if (filters.facebookAuth) { %>.btn-facebook {
color: #fff;
background-color: #3B5998;
border-color: #133783;
}
<% } if (filters.twitterAuth) { %>
.btn-twitter {
color: #fff;
background-color: #2daddc;
border-color: #0271bf;
}
<% } if (filters.googleAuth) { %>
.btn-google-plus {
<% } if (filters.googleAuth) { %>.btn-google {
color: #fff;
background-color: #dd4b39;
border-color: #c53727;
}
<% } %>
.btn-github {
<% } if (filters.twitterAuth) { %>.btn-twitter {
color: #fff;
background-color: #2daddc;
border-color: #0271bf;
}
<% } %>.btn-github {
color: #fff;
background-color: #fafafa;
border-color: #ccc;
Expand Down
14 changes: 14 additions & 0 deletions app/templates/client/components/oauth-buttons(oauth)/oauth-buttons(jade).jade
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<% if(filters.facebookAuth) { %>a.btn<% if (filters.bootstrap) { %>.btn-social<% } %>.btn-facebook(ng-class='classes'
ng-click='OauthButtons.loginOauth("facebook")')
i.fa.fa-facebook
| Connect with Facebook

<% } if(filters.googleAuth) { %>a.btn<% if (filters.bootstrap) { %>.btn-social<% } %>.btn-google(ng-class='classes'
ng-click='OauthButtons.loginOauth("google")')
i.fa.fa-google-plus
| Connect with Google+

<% } if(filters.twitterAuth) { %>a.btn<% if (filters.bootstrap) { %>.btn-social<% } %>.btn-twitter(ng-class='classes'
ng-click='OauthButtons.loginOauth("twitter")')
i.fa.fa-twitter
| Connect with Twitter<% } %>
20 changes: 20 additions & 0 deletions app/templates/client/components/oauth-buttons(oauth)/oauth-buttons(less).less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<% if (!filters.bootstrap) { if (filters.facebookAuth) { %>.btn-facebook {
color: #fff;
background-color: #3B5998;
border-color: #133783;
}
<% } if (filters.googleAuth) { %>.btn-google {
color: #fff;
background-color: #dd4b39;
border-color: #c53727;
}
<% } if (filters.twitterAuth) { %>.btn-twitter {
color: #fff;
background-color: #2daddc;
border-color: #0271bf;
}
<% } %>.btn-github {
color: #fff;
background-color: #fafafa;
border-color: #ccc;
}<% } %>
Loading