Add welcome index

Innocent Amadi · Innocent Amadi · commit 28ff3162cb44 · 2015-08-04T16:07:46.000+01:00
diff --git a/Gemfile b/Gemfile
@@ -7,6 +7,10 @@ gem 'rails', '4.2.3'
 gem 'sqlite3'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
+
+# Use materialize
+gem 'materialize-sass'
+
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -102,6 +102,8 @@ GEM
     lumberjack (1.0.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
+    materialize-sass (0.97.0)
+      sass (~> 3.3)
     method_source (0.8.2)
     mime-types (2.6.1)
     mini_portile (0.6.2)
@@ -234,6 +236,7 @@ DEPENDENCIES
   guard-rspec
   jbuilder (~> 2.0)
   jquery-rails
+  materialize-sass
   rails (= 4.2.3)
   rspec-rails
   sass-rails (~> 5.0)
@@ -244,6 +247,3 @@ DEPENDENCIES
   tzinfo-data
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
-
-BUNDLED WITH
-   1.10.5
diff --git a/Guardfile b/Guardfile
@@ -24,7 +24,7 @@
 #  * zeus: 'zeus rspec' (requires the server to be started separately)
 #  * 'just' rspec: 'rspec'
 #guard :rspec, cmd: "bin/rspec", all_on_start: true do
-guard :rspec, cmd: "bundle exec rspec", all_on_start: true  do
+guard :rspec, cmd: "bundle exec rspec" do
   require "guard/rspec/dsl"
   dsl = Guard::RSpec::Dsl.new(self)
 
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -13,4 +13,5 @@
 //= require jquery
 //= require jquery_ujs
 //= require turbolinks
+//= require materialize-sprockets
 //= require_tree .
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
@@ -0,0 +1,3 @@
+$( document ).ready(function() {
+	$(".dropdown-button").dropdown();
+});
diff --git a/app/assets/javascripts/welcome.coffee b/app/assets/javascripts/welcome.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -13,3 +13,4 @@
  *= require_tree .
  *= require_self
  */
+ 
diff --git a/app/assets/stylesheets/welcome.scss b/app/assets/stylesheets/welcome.scss
@@ -0,0 +1,4 @@
+// Place all the styles related to the Welcome controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+@import "materialize";
diff --git a/app/controllers/foods_controller.rb b/app/controllers/foods_controller.rb
@@ -45,7 +45,7 @@ def destroy
     if @admin
       food = Food.find(food_params[:id])
       if !food.nil?
-        render html: food.destroy! ? flash[:notice]: "Food deleted successfully" : "Error! #{food.errors.messages}"
+        render html: food.destroy! ? flash[:notice]="Food deleted successfully" : "Error! #{food.errors.messages}"
       else
         render html: "Food with id: #{food_params[:id]} doesn't exist!"
       end
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
@@ -0,0 +1,4 @@
+class WelcomeController < ApplicationController
+  def index
+  end
+end
diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
@@ -0,0 +1,2 @@
+module WelcomeHelper
+end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -7,8 +7,8 @@
   <%= csrf_meta_tags %>
 </head>
 <body>
-
-<%= yield %>
-
+	<div class="container main">
+    <%= yield %>
+  </div><!-- end of container main-->
 </body>
 </html>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
@@ -0,0 +1,27 @@
+<header>
+
+		<ul id="dropdown1" class="dropdown-content">
+		  <li><a href="#!">one</a></li>
+		  <li><a href="#!">two</a></li>
+		  <li class="divider"></li>
+		  <li><a href="#!">three</a></li>
+		</ul>
+		<nav>
+		  <div class="nav-wrapper">
+		    <a href="#!" class="brand-logo">Logo</a>
+		    <ul class="right hide-on-med-and-down">
+
+        <li><a href="sass.html"><i class="material-icons">search</i></a></li>
+        <li><a href="badges.html"><i class="material-icons">view_module</i></a></li>
+        <li><a href="collapsible.html"><i class="material-icons">refresh</i></a></li>
+        <li><a href="mobile.html"><i class="material-icons">more_vert</i></a></li
+					
+		      <li><a href="sass.html">Sass</a></li>
+		      <li><a href="badges.html">Components</a></li>
+		      <!-- Dropdown Trigger -->
+		      <li><a class="dropdown-button" href="#!" data-activates="dropdown1">Dropdown<i class="material-icons right">arrow_drop_down</i></a></li>
+		    </ul>
+		  </div>
+		</nav>
+	</div>
+</header>
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,11 +1,13 @@
 Rails.application.routes.draw do
+  get 'welcome/index'
+
   resources :foods
 
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".
 
   # You can have the root of your site routed with "root"
-  # root 'welcome#index'
+   root 'welcome#index'
 
   # Example of regular route:
   #   get 'products/:id' => 'catalog#view'
diff --git a/spec/controllers/welcome_controller_spec.rb b/spec/controllers/welcome_controller_spec.rb
@@ -0,0 +1,12 @@
+require 'rails_helper'
+
+RSpec.describe WelcomeController, type: :controller do
+
+  describe "GET #index" do
+    it "returns http success" do
+      get :index
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+end
diff --git a/spec/helpers/welcome_helper_spec.rb b/spec/helpers/welcome_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the WelcomeHelper. For example:
+#
+# describe WelcomeHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe WelcomeHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/welcome/index.html.erb_spec.rb b/spec/views/welcome/index.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "welcome/index.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+$( document ).ready(function() {`
	`2`	`+ $(".dropdown-button").dropdown();`
	`3`	`+});`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Place all the behaviors and hooks related to the matching controller here.`
	`2`	`+# All this logic will automatically be available in application.js.`
	`3`	`+# You can use CoffeeScript in this file: http://coffeescript.org/`