Skip to content

Commit 7167023

Browse files
author
DSivachinskiy
committed
dummy authorization and blueprints
1 parent bc6ac05 commit 7167023

31 files changed

Lines changed: 233 additions & 173 deletions

File tree

‎app/components/signout-link.js‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,9 @@
11
import Ember from 'ember';
22

33
export default Ember.Component.extend({
4-
currentUserObserver: function() {
5-
if(this.get('currentUser')){
6-
var currentUser = this.get('currentUser');
7-
if(this.get('avatarAttribute.thumb_url')){
8-
this.setProperties({
9-
isAvatarPresent: !Ember.isEmpty(currentUser.get(this.get('avatarAttribute'))),
10-
avatarUrl: currentUser.get(this.get('avatarAttribute.thumb_url'))
11-
});
12-
}
13-
if (this.get('nameAttribute')){
14-
this.set('username', currentUser.get(this.get('nameAttribute')));
15-
}
16-
}
17-
}.observes('currentUser'),
4+
isAvatarEmpty: Ember.computed.empty('currentUser.avatarAttribute'),
185
actions:{
196
signout: function(){
207
this.sendAction('signoutAction');
218
}
22-
}
23-
});
9+
}

‎app/templates/components/signout-link.hbs‎

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
1-
{{#if currentUser}}
2-
{{#if isAvatarPresent}}
3-
<ul class="nav navbar-nav navbar-right">
4-
<li class="dropdown">
5-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
6-
<img {{bind-attr src=avatarUrl}} class="profile-image img-circle avatar"> {{username}} <b class="caret"></b></a>
7-
<ul class="dropdown-menu">
8-
<li>{{#link-to 'users.edit' currentUser}}<i class="glyphicon glyphicon-cog"></i> Account{{/link-to}}</li>
9-
<li class="divider"></li>
10-
<li><a {{ action 'signout' }} href="#"><i class="glyphicon glyphicon-log-out"></i> Sign-out</a></li>
11-
</ul>
12-
</li>
13-
</ul>
1+
{{#if session.isAuthenticated}}
2+
{{#unless isAvatarEmpty}}
3+
<div class="upper">
4+
<ul class="nav navbar-nav navbar-right">
5+
<li class="dropdown">
6+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
7+
<img src={{currentUser.avatar.thumb_url}} class="profile-image img-circle avatar"> {{currentUser.name}} <b class="caret"></b></a>
8+
<ul class="dropdown-menu">
9+
<li>{{#link-to 'users.edit' currentUser.id}}<i class="glyphicon glyphicon-cog"></i> Account{{/link-to}}</li>
10+
<li class="divider"></li>
11+
<li><a {{ action 'signout' }} href="#"><i class="glyphicon glyphicon-log-out"></i> Sign-out</a></li>
12+
</ul>
13+
</li>
14+
</ul>
15+
</div>
1416
{{else}}
15-
<p class="navbar-text navbar-right">
16-
<a {{ action 'signout' }} href="#">
17-
Signout
18-
<i class="glyphicon glyphicon-log-out"></i>
19-
</a>
20-
</p>
21-
<p class="navbar-text navbar-right">
22-
Signed in as&nbsp;
23-
<span class='username'>{{username}}</span>
24-
</p>
25-
{{/if}}
26-
{{/if}}
17+
<div class="upper2">
18+
<p class="nav navbar-right navbar-nav">
19+
<a {{ action 'signout' }} href="#">
20+
Sign-out
21+
<i class="glyphicon glyphicon-log-out"></i>
22+
</a>
23+
</p>
24+
<p class="nav navbar-right navbar-nav">
25+
Signed in as&nbsp;
26+
{{#link-to 'users.edit' currentUser.id}}<span class='username'>{{currentUser.name}}</span><i class="glyphicon glyphicon-cog"></i>{{/link-to}}
27+
&nbsp;
28+
</p>
29+
</div>
30+
{{/unless}}
31+
{{/if}}

‎blueprints/ember-cli-admin-auth/files/app/components/signout-link.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import Ember from 'ember';
2+
3+
export default Ember.Component.extend({
4+
session: Ember.inject.service('session'),
5+
store: Ember.inject.service(),
6+
currentUser: Ember.computed(function() {
7+
let id = this.get('session.data.authenticated.id');
8+
return this.get('store').find('user', id)
9+
}),
10+
isAvatarEmpty: Ember.computed.empty('currentUser.avatar'),
11+
actions:{
12+
signout: function(){
13+
this.get('session').invalidate();
14+
}
15+
}
16+
});

‎blueprints/ember-cli-admin-auth/files/app/controllers/login.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import LoginControllerMixin from 'simple-auth/mixins/login-controller-mixin';
21
import Ember from 'ember';
32

4-
export default Ember.Controller.extend(LoginControllerMixin, {
5-
authenticator: 'simple-auth-authenticator:devise'
6-
});
3+
export default Ember.Controller.extend();

‎blueprints/ember-cli-admin-auth/files/app/initializers/init-shared.js‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎blueprints/ember-cli-admin-auth/files/app/initializers/user-in-route.js‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎blueprints/ember-cli-admin-auth/files/app/routes/login.js‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
import Ember from 'ember';
2-
import authMixin from 'simple-auth/mixins/application-route-mixin';
2+
import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
33

4-
export default Ember.Route.extend(authMixin, {
5-
redirect: function(){
6-
if(this.get('session.isAuthenticated')){
7-
this.transitionTo('/');
8-
}
9-
},
10-
11-
renderTemplate: function(){
12-
this.render('login', {outlet: 'login'});
13-
}
14-
});
4+
export default Ember.Route.extend(UnauthenticatedRouteMixin);

‎blueprints/ember-cli-admin-auth/files/app/styles/components/signout.scss‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
.upper{
2+
position: relative;
3+
z-index: 3000;
4+
color: white;
5+
top: -20px;
6+
}
7+
.upper a{
8+
color: white;
9+
}
10+
.upper2 a{
11+
position: relative;
12+
z-index: 3000;
13+
color: white;
14+
top: -5px;
15+
}

‎blueprints/ember-cli-admin-auth/files/app/templates/admin/navigation.hbs‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎blueprints/ember-cli-admin-auth/files/app/templates/components/signout-link.hbs‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{{#if session.isAuthenticated}}
2+
{{#unless isAvatarEmpty}}
3+
<div class="upper">
4+
<ul class="nav navbar-nav navbar-right">
5+
<li class="dropdown">
6+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
7+
<img src={{currentUser.avatar.thumb_url}} class="profile-image img-circle avatar"> {{currentUser.name}} <b class="caret"></b></a>
8+
<ul class="dropdown-menu">
9+
<li>{{#link-to 'users.edit' currentUser.id}}<i class="glyphicon glyphicon-cog"></i> Account{{/link-to}}</li>
10+
<li class="divider"></li>
11+
<li><a {{ action 'signout' }} href="#"><i class="glyphicon glyphicon-log-out"></i> Sign-out</a></li>
12+
</ul>
13+
</li>
14+
</ul>
15+
</div>
16+
{{else}}
17+
<div class="upper2">
18+
<p class="nav navbar-right navbar-nav">
19+
<a {{ action 'signout' }} href="#">
20+
Sign-out
21+
<i class="glyphicon glyphicon-log-out"></i>
22+
</a>
23+
</p>
24+
<p class="nav navbar-right navbar-nav">
25+
Signed in as&nbsp;
26+
{{#link-to 'users.edit' currentUser.id}}<span class='username'>{{currentUser.name}}</span><i class="glyphicon glyphicon-cog"></i>{{/link-to}}
27+
&nbsp;
28+
</p>
29+
</div>
30+
{{/unless}}
31+
{{/if}}

0 commit comments

Comments
 (0)