From a45c193eb12ab876da6e5cffc972dfd1adf34d55 Mon Sep 17 00:00:00 2001 From: Matt Huntington Date: Mon, 2 Nov 2015 14:49:24 -0500 Subject: [PATCH] setting up initial angular --- app/assets/javascripts/spa.js | 5 +++++ app/views/layouts/spa.html.erb | 8 ++++---- config/initializers/assets.rb | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 app/assets/javascripts/spa.js diff --git a/app/assets/javascripts/spa.js b/app/assets/javascripts/spa.js new file mode 100644 index 0000000..ab1fd0f --- /dev/null +++ b/app/assets/javascripts/spa.js @@ -0,0 +1,5 @@ +var app = angular.module('SinsApp', []); + +app.controller('MainController', function(){ + this.foo = 'bar' +}); diff --git a/app/views/layouts/spa.html.erb b/app/views/layouts/spa.html.erb index 99d48ae..9ca8400 100644 --- a/app/views/layouts/spa.html.erb +++ b/app/views/layouts/spa.html.erb @@ -1,15 +1,15 @@ - + TheSinsWeCommit <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> - <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> <%= csrf_meta_tags %> - - + + {{main.foo}} <%= yield %> + <%= javascript_include_tag 'spa', 'data-turbolinks-track' => true %> diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 88c82b0..17f7650 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -8,4 +8,4 @@ Rails.application.config.assets.version = '1.0' # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. -Rails.application.config.assets.precompile += %w( login_signup.js ) +Rails.application.config.assets.precompile += %w( login_signup.js, spa.js )