Revert "Move owner's page under main route"
This reverts commit ee4eb418ef
.
This commit is contained in:
parent
5229dc9fef
commit
95c91786ac
|
@ -39,7 +39,6 @@ Router.map ->
|
||||||
@route 'repositories', path: '/'
|
@route 'repositories', path: '/'
|
||||||
|
|
||||||
@resource 'main', path: '/', ->
|
@resource 'main', path: '/', ->
|
||||||
@resource 'owner', path: '/:owner'
|
|
||||||
@resource 'getting_started'
|
@resource 'getting_started'
|
||||||
@route 'recent'
|
@route 'recent'
|
||||||
@route 'repositories'
|
@route 'repositories'
|
||||||
|
@ -72,6 +71,8 @@ Router.map ->
|
||||||
@resource 'account', path: '/:login'
|
@resource 'account', path: '/:login'
|
||||||
@route 'info', path: '/info'
|
@route 'info', path: '/info'
|
||||||
|
|
||||||
|
@resource 'owner', path: '/:owner'
|
||||||
|
|
||||||
@route 'error404', path: '/*path'
|
@route 'error404', path: '/*path'
|
||||||
|
|
||||||
`export default Router`
|
`export default Router`
|
||||||
|
|
|
@ -9,15 +9,6 @@ Route = TravisRoute.extend
|
||||||
titleToken: (model) ->
|
titleToken: (model) ->
|
||||||
"#{model.name}"
|
"#{model.name}"
|
||||||
|
|
||||||
renderTemplate: ->
|
|
||||||
@render 'owner', into: 'main'
|
|
||||||
|
|
||||||
activate: ->
|
|
||||||
@controllerFor('home').set('ownersPage', true)
|
|
||||||
|
|
||||||
deactivate: ->
|
|
||||||
@controllerFor('home').set('ownersPage', false)
|
|
||||||
|
|
||||||
model: (params) ->
|
model: (params) ->
|
||||||
owner = {}
|
owner = {}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div {{bind-attr class=":wrapper view.sidebarVisible:non-centered:centered"}}>
|
<div {{bind-attr class=":wrapper auth.signedIn:non-centered:centered"}}>
|
||||||
|
|
||||||
<header id="top" class="top">
|
<header id="top" class="top">
|
||||||
{{render "top"}}
|
{{render "top"}}
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<aside id="left" {{bind-attr class="view.sidebarVisible:visible:hidden"}}>
|
<aside id="left" {{bind-attr class="auth.signedIn::hidden"}}>
|
||||||
{{outlet "left"}}
|
{{outlet "left"}}
|
||||||
</aside>
|
</aside>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -3,8 +3,4 @@
|
||||||
View = BasicView.extend
|
View = BasicView.extend
|
||||||
layoutName: 'layouts/landing-page'
|
layoutName: 'layouts/landing-page'
|
||||||
|
|
||||||
sidebarVisible: (->
|
|
||||||
@get('auth.signedIn') && !@get('controller.ownersPage')
|
|
||||||
).property('auth.signedIn', 'controller.ownersPage')
|
|
||||||
|
|
||||||
`export default View`
|
`export default View`
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
`import Ember from 'ember'`
|
`import Ember from 'ember'`
|
||||||
|
|
||||||
View = Ember.View.extend
|
View = Ember.View.extend
|
||||||
|
layoutName: 'layouts/profile'
|
||||||
classNames: ['owner']
|
classNames: ['owner']
|
||||||
|
|
||||||
`export default View`
|
`export default View`
|
||||||
|
|
Loading…
Reference in New Issue
Block a user