diff --git a/Gemfile b/Gemfile index 588f8e3c..df74fcb3 100644 --- a/Gemfile +++ b/Gemfile @@ -22,6 +22,7 @@ gem 'coffee-rails', '~> 4.2' # gem 'therubyracer', platforms: :ruby gem 'simple_form' gem 'bootstrap', '~> 4.0.0.alpha3' +gem "font-awesome-rails" # Use jquery as the JavaScript library diff --git a/Gemfile.lock b/Gemfile.lock index ec778c00..de4cf841 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,6 +67,8 @@ GEM faker (1.7.3) i18n (~> 0.5) ffi (1.9.18) + font-awesome-rails (4.7.0.1) + railties (>= 3.2, < 5.1) globalid (0.3.7) activesupport (>= 4.1.0) i18n (0.8.1) @@ -198,6 +200,7 @@ DEPENDENCIES database_cleaner factory_girl_rails (~> 4.0) faker + font-awesome-rails jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index cbd46a7a..e9c6748c 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1 +1,8 @@ @import "bootstrap"; +@import "font-awesome"; + +/* Show it is fixed to the top */ +body { + min-height: 75rem; + padding-top: 4.5rem; +} diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss deleted file mode 100644 index 4ce42667..00000000 --- a/app/assets/stylesheets/scaffolds.scss +++ /dev/null @@ -1,89 +0,0 @@ -body { - background-color: #fff; - color: #333; - font-family: verdana, arial, helvetica, sans-serif; - font-size: 13px; - line-height: 18px; - margin: 33px; -} - -p, ol, ul, td { - font-family: verdana, arial, helvetica, sans-serif; - font-size: 13px; - line-height: 18px; - margin: 33px; -} - -pre { - background-color: #eee; - padding: 10px; - font-size: 11px; -} - -a { - color: #000; - - &:visited { - color: #666; - } - - &:hover { - color: #fff; - background-color: #000; - } -} - -th { - padding-bottom: 5px; -} - -td { - padding-bottom: 7px; - padding-left: 5px; - padding-right: 5px; -} - -div { - &.field, &.actions { - margin-bottom: 10px; - } -} - -#notice { - color: green; -} - -.field_with_errors { - padding: 2px; - background-color: red; - display: table; -} - -#error_explanation { - width: 450px; - border: 2px solid red; - padding: 7px; - padding-bottom: 0; - margin-bottom: 20px; - background-color: #f0f0f0; - - h2 { - text-align: left; - font-weight: bold; - padding: 5px 5px 5px 15px; - font-size: 12px; - margin: -7px; - margin-bottom: 0; - background-color: #c00; - color: #fff; - } - - ul li { - font-size: 12px; - list-style: square; - } -} - -label { - display: block; -} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index dd40fa29..0970a8e1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,6 +1,11 @@ + + + + + Film Buff <%= csrf_meta_tags %> @@ -10,11 +15,9 @@ <%= render 'layouts/header' %> -
- <% flash.each do |name, msg| %> - <%= content_tag(:div, msg, class: "alert alert-info") %> - <% end %> - <%= yield %> +
+ <%= yield %> +
diff --git a/app/views/layouts/header.html.erb b/app/views/layouts/header.html.erb deleted file mode 100644 index 418f02e7..00000000 --- a/app/views/layouts/header.html.erb +++ /dev/null @@ -1,16 +0,0 @@ - diff --git a/config/routes.rb b/config/routes.rb index 1975bbab..6d65834f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,10 +1,14 @@ Rails.application.routes.draw do - + root 'home#index' + #Login for Web + post 'authenticate' => 'home#create' + delete 'authenticate' => 'home/destroy' + namespace :api, :defaults => { :format => 'json' } do #Session Login and Logout - post 'autheticate' => "autheticate#create" - delete 'autheticate' => "autheticate#destroy" + post 'authenticate' => "autheticate#create" + delete 'authenticate' => "autheticate#destroy" namespace :restaurant do get 'zones' => "zones#index"