diff --git a/assets/scripts/app/auth.coffee b/assets/scripts/app/auth.coffee index aa384cfc..ec0228e1 100644 --- a/assets/scripts/app/auth.coffee +++ b/assets/scripts/app/auth.coffee @@ -49,7 +49,7 @@ @set('state', if user then 'signed-in' else 'signed-out') @set('user', if user then user else undefined) if Travis.app && (router = Travis.app.get('router')) - router.send('authenticate') + router.send('after_signin') storeToken: (token) -> sessionStorage.setItem('travis.token', token) diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index 07160706..b1eeb40f 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -147,34 +147,25 @@ Travis.Router = Ember.Router.extend needsAuth: (path) -> path.indexOf('/profile') == 0 - authenticate: -> - @app.get('router').transitionTo('authenticated') + after_signin: -> + after_signin_path = sessionStorage.getItem('travis.after_signin_path') + sessionStorage.removeItem('travis.after_signin_path') + @transitionTo('root') + @route(after_signin_path || '/') loading: Ember.Route.extend routePath: (router, path) -> router.saveLineNumberHash(path) - - sessionStorage.setItem('travis.path', path) if !router.signedIn() && router.needsAuth(path) + sessionStorage.setItem('travis.after_signin_path', path) router.transitionTo('root.auth') Travis.app.signIn() else - router.transitionTo('authenticated') - - authenticated: Ember.Route.extend - authenticate: (->) - connectOutlets: (router) -> - path = sessionStorage.getItem('travis.path') - sessionStorage.removeItem('travis.path') - router.transitionTo('root') - if path + router.transitionTo('root') router.route(path) - else - router.route('/') root: Ember.Route.extend route: '/' - authenticate: (->) loading: Ember.State.extend() auth: Ember.Route.extend diff --git a/assets/styles/auth.sass b/assets/styles/auth.sass new file mode 100644 index 00000000..ccec8f42 --- /dev/null +++ b/assets/styles/auth.sass @@ -0,0 +1,27 @@ +@import "_mixins/all" + +#auth + #page + display: block + + #main + top: 200px + margin: 0 auto 0 auto + padding: 25px 50px + + width: 300px + min-width: auto + border: 10px solid #bbb + @include border-radius(8px) + + h1 + margin-bottom: 1em + color: #333 + + p + color: #333 + + a:hover + text-decoration: underline + + diff --git a/public/scripts/app.js b/public/scripts/app.js index 9d8ef832..8b230acd 100644 --- a/public/scripts/app.js +++ b/public/scripts/app.js @@ -29619,4 +29619,4 @@ var _require=function(){function c(a,c){document.addEventListener?a.addEventList ++g&&setTimeout(c,0)})}}(); (function(){!window.WebSocket&&window.MozWebSocket&&(window.WebSocket=window.MozWebSocket);if(window.WebSocket)Pusher.Transport=window.WebSocket,Pusher.TransportType="native";var c=(document.location.protocol=="http:"?Pusher.cdn_http:Pusher.cdn_https)+Pusher.VERSION,a=[];window.JSON||a.push(c+"/json2"+Pusher.dependency_suffix+".js");if(!window.WebSocket)window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION=!0,a.push(c+"/flashfallback"+Pusher.dependency_suffix+".js");var b=function(){return window.WebSocket?function(){Pusher.ready()}: function(){window.WebSocket?(Pusher.Transport=window.WebSocket,Pusher.TransportType="flash",window.WEB_SOCKET_SWF_LOCATION=c+"/WebSocketMain.swf",WebSocket.__addTask(function(){Pusher.ready()}),WebSocket.__initialize()):(Pusher.Transport=null,Pusher.TransportType="none",Pusher.ready())}}(),e=function(a){var b=function(){document.body?a():setTimeout(b,0)};b()},g=function(){e(b)};a.length>0?_require(a,g):g()})(); -;minispade.register('app', "(function() {(function() {\nminispade.require('auth');\nminispade.require('controllers');\nminispade.require('helpers');\nminispade.require('models');\nminispade.require('pusher');\nminispade.require('routes');\nminispade.require('slider');\nminispade.require('store');\nminispade.require('tailing');\nminispade.require('templates');\nminispade.require('views');\nminispade.require('config/locales');\nminispade.require('data/sponsors');\n\n Travis.reopen({\n App: Em.Application.extend({\n autoinit: false,\n currentUserBinding: 'auth.user',\n authStateBinding: 'auth.state',\n init: function() {\n this._super.apply(this, arguments);\n this.store = Travis.Store.create();\n this.store.loadMany(Travis.Sponsor, Travis.SPONSORS);\n this.set('auth', Travis.Auth.create({\n app: this,\n endpoint: Travis.config.api_endpoint\n }));\n this.slider = new Travis.Slider();\n this.pusher = new Travis.Pusher(Travis.config.pusher_key);\n return this.tailing = new Travis.Tailing();\n },\n signIn: function() {\n return this.get('auth').signIn();\n },\n signOut: function() {\n this.get('auth').signOut();\n return this.get('router').send('showRoot');\n },\n receive: function() {\n return this.store.receive.apply(this.store, arguments);\n },\n toggleSidebar: function() {\n var element;\n $('body').toggleClass('maximized');\n element = $('');\n $('#top .profile').append(element);\n Em.run.later((function() {\n return element.remove();\n }), 10);\n element = $('');\n $('#repo').append(element);\n return Em.run.later((function() {\n return element.remove();\n }), 10);\n }\n })\n });\n\n}).call(this);\n\n})();\n//@ sourceURL=app");minispade.register('auth', "(function() {(function() {\n\n this.Travis.Auth = Ember.Object.extend({\n iframe: $('