diff --git a/app/assets/javascripts/angular/controllers/.gitkeep b/app/assets/javascripts/angular/controllers/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/app/assets/javascripts/angular/controllers/homes.coffee b/app/assets/javascripts/angular/controllers/homes.coffee new file mode 100644 index 00000000..d1809beb --- /dev/null +++ b/app/assets/javascripts/angular/controllers/homes.coffee @@ -0,0 +1 @@ +class @HomesController diff --git a/app/assets/javascripts/angular/filters/.gitkeep b/app/assets/javascripts/angular/filters/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/app/assets/javascripts/angular/services/.gitkeep b/app/assets/javascripts/angular/services/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/app/assets/javascripts/angular/widgets/.gitkeep b/app/assets/javascripts/angular/widgets/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 9097d830..26ba2d30 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,3 +13,6 @@ //= require jquery //= require jquery_ujs //= require_tree . +//= require angular.min +//= require angle-up +//= require_tree ./angular diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss index a0813cba..64f6d6d5 100644 --- a/app/assets/stylesheets/base.scss +++ b/app/assets/stylesheets/base.scss @@ -1,7 +1,7 @@ // https://kuler.adobe.com/#themeID/1080677 // http://colorschemedesigner.com/ -$master-background = #E9E7C2; -$master-highlight = #787C39; -$master-highlight-2 = #908221; -$master-dark = #2C2C2A; -$master-dark-2 = #584B28; \ No newline at end of file +$master-background: #E9E7C2; +$master-highlight: #787C39; +$master-highlight-2: #908221; +$master-dark: #2C2C2A; +$master-dark-2: #584B28; \ No newline at end of file diff --git a/app/assets/templates/.gitkeep b/app/assets/templates/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 4974036d..bfc644e4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,14 +1,56 @@ - + QubarSite <%= stylesheet_link_tag "application", :media => "all" %> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> + + + -<%= yield %> + + +
+

{{hello}} bitches!

+ + + +

Total number of phones: {{phones.length}}

+ + + + +
row number
{{i+1}}
+