diff --git a/app/assets/javascripts/spa.js b/app/assets/javascripts/spa.js index ab1fd0f..f0cc2be 100644 --- a/app/assets/javascripts/spa.js +++ b/app/assets/javascripts/spa.js @@ -1,5 +1,8 @@ var app = angular.module('SinsApp', []); -app.controller('MainController', function(){ - this.foo = 'bar' -}); +app.controller('HeaderController', ['$http', function($http){ + var controller = this; + $http.get('/session').success(function(data){ + controller.current_user = data.current_user; + }); +}]); diff --git a/app/views/layouts/spa.html.erb b/app/views/layouts/spa.html.erb index 9ca8400..2e69c7c 100644 --- a/app/views/layouts/spa.html.erb +++ b/app/views/layouts/spa.html.erb @@ -6,10 +6,8 @@ <%= csrf_meta_tags %> - - {{main.foo}} + <%= yield %> - <%= javascript_include_tag 'spa', 'data-turbolinks-track' => true %> diff --git a/app/views/spa.html.erb b/app/views/spa.html.erb index 2918a56..0c4c43d 100644 --- a/app/views/spa.html.erb +++ b/app/views/spa.html.erb @@ -1 +1,11 @@ -oh hai! +
+

Welcome page

+

+ Welcome {{header.current_user.email}} +

+

+
+
+