bumped up to my version of foundation rails 5.0.3, moved js tag out o…

…f body, wrote auxiliary rake task

Gemfile

@@ -19,9 +19,8 @@ gem 'rmagick'
 
 gem 'jquery-turbolinks'
 
-# gem 'zurb-foundation'
-# gem 'foundation-rails', github: 'ahacking/foundation-rails'
-gem 'foundation-rails'
+gem 'foundation-rails', github: 'Jeloi/foundation-rails'
+# gem 'foundation-rails'  # use this when commented xlarge columns is resolved
 gem 'omniauth-facebook', '1.4.0'
 gem 'friendly_id', '5.0.0.beta4'
 # gem 'nested_form'

Gemfile.lock

@@ -5,11 +5,19 @@ GIT
     compass-rails (1.1.2)
       compass (>= 0.12.2)
 
+GIT
+  remote: git://github.com/Jeloi/foundation-rails.git
+  revision: d2c3d9717d1f30fbe6f5723646d91121d866a995
+  specs:
+    foundation-rails (5.0.3.1)
+      railties (>= 3.1.0)
+      sass (>= 3.2.0)
+
 GIT
   remote: git@github.com:capistrano/rvm.git
-  revision: 7a35d1124e5cf4dcec1079acf3941b8be54307fd
+  revision: 6aa7cb9d75361c802f466b54d0e345b7237ea3bb
   specs:
-    capistrano-rvm (0.1.0)
+    capistrano-rvm (0.1.1)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
 
@@ -62,7 +70,7 @@ GEM
     capistrano-rails (1.1.0)
       capistrano (>= 3.0.0)
       capistrano-bundler (>= 1.0.0)
-    capybara (2.2.0)
+    capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -118,25 +126,22 @@ GEM
       railties (>= 3.0.0)
     faker (1.2.0)
       i18n (~> 0.5)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.3)
     formatador (0.2.4)
-    foundation-rails (5.0.2.0)
-      railties (>= 3.1.0)
-      sass (>= 3.2.0)
     friendly_id (5.0.0.beta4)
       activerecord (~> 4.0.0)
     fssm (0.2.10)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    guard (2.2.5)
+    guard (2.3.0)
       formatador (>= 0.2.4)
       listen (~> 2.1)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (4.2.3)
+    guard-rspec (4.2.4)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     guard-zeus (0.0.1)
@@ -156,7 +161,7 @@ GEM
       railties (>= 3.1.0)
       turbolinks
     json (1.8.1)
-    jwt (0.1.8)
+    jwt (0.1.11)
       multi_json (>= 1.5)
     launchy (2.4.2)
       addressable (~> 2.3)
@@ -172,9 +177,9 @@ GEM
     mime-types (1.25.1)
     mini_portile (0.5.2)
     minitest (4.7.5)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     multi_test (0.0.3)
-    multipart-post (1.2.0)
+    multipart-post (2.0.0)
     mysql2 (0.3.14)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
@@ -187,9 +192,9 @@ GEM
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       rack (~> 1.2)
-    omniauth (1.1.4)
+    omniauth (1.2.1)
       hashie (>= 1.2, < 3)
-      rack
+      rack (~> 1.0)
     omniauth-facebook (1.4.0)
       omniauth-oauth2 (~> 1.0.2)
     omniauth-oauth2 (1.0.3)
@@ -264,7 +269,7 @@ GEM
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
     shoulda-context (1.1.6)
-    shoulda-matchers (2.4.0)
+    shoulda-matchers (2.5.0)
       activesupport (>= 3.0.0)
     slop (3.4.7)
     sprockets (2.10.1)
@@ -330,7 +335,7 @@ DEPENDENCIES
   database_cleaner (= 1.0.1)
   factory_girl_rails
   faker
-  foundation-rails
+  foundation-rails!
   friendly_id (= 5.0.0.beta4)
   guard-rspec
   guard-zeus

app/assets/javascripts/application.js

@@ -11,6 +11,7 @@
 // about supported directives.
 //
 //= require jquery
+//= require jquery.turbolinks
 //= require jquery_ujs
 //= require foundation
 //= require turbolinks

app/assets/stylesheets/styling.css.scss

@@ -28,7 +28,7 @@ header#header {
 		}
 	}
 	.logo {
-		width: 250px;
+		// width: 250px;
 		margin-top: 30px;
 		margin-bottom: 20px;
 	}

app/views/layouts/application.html.erb

@@ -6,16 +6,16 @@
 
     <title><%= content_for?(:title) ? yield(:title) : "middbites" %></title>
 
+    <%= javascript_include_tag "application" %>
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "vendor/modernizr" %>
     <%= csrf_meta_tags %>
+
     <script type="text/javascript" src="//use.typekit.net/fgh0qas.js"></script>
     <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
   </head>
 
   <body id="<%= params[:controller] + '-' + params[:action] %>" >
-    <%= javascript_include_tag "application" %>
-
     <!-- Main Content, i.e not off-canvas -->
     <header id="header" class="show-for-large-up">
        <%= link_to(root_path, class: "logo clrfix") do %>
@@ -94,7 +94,7 @@
         <span class="nav-sep"></span>
         <li><%= link_to "Home", root_path %><span class="nav-sep">・</span></li>
         <li class="hide-small"><%= link_to "Create", new_recipe_path %><span class="nav-sep">・</span></li>
-        <li class="hide-small"><%= link_to "Tags", root_path %><span class="nav-sep">・</span></li>
+        <li class="hide-small"><%= link_to "Tags", tags_path %><span class="nav-sep">・</span></li>
         <li class="hide-small"><%= link_to "Ingredients", all_items_path %><span class="nav-sep">・</span></li>
         <li><%= link_to "About", recipes_path %><span class="nav-sep">・</span></li>
         <li><%= link_to "Contact", recipes_path %></li>

lib/tasks/import.rake

@@ -17,4 +17,15 @@ task :import_tags => [:environment] do
 			end
 		end
 	end
+end
+
+desc "Delete unneccessary tag categories"
+task :delete_tag_categories => [:environment] do
+	TagCategory.where(name: "Miscellaneous").each do |tag_cat|
+		tag_cat.tags.each do |tag|
+			tag.tag_category = TagCategory.first
+			tag.save
+		end
+		tag_cat.destroy
+	end
 end

tags.csv

@@ -0,0 +1,121 @@
+Meals,Type of Dish,Timing,Season,Health & Diet,Food Descriptors,Other,World Cuisine
+Appetizer,Baked Good ,Easy,Autumn,Allergies,Acidic,Proctor,African 
+Breakfast,Beverage ,Quick,Spring,Gluten-Free,Acrid,Ross,Asian 
+Dessert,Bread ,,Summer,Healthy,Aged,Atwater,Australian 
+High Tea,Cake ,,Winter,Low-Carb,Bitter,Battell,British 
+Lunch,Candy ,,,Low-Sugar,Bittersweet,Gifford,Canadian 
+Main Dish,Casserole ,,,Meatless,Bland,Hepburn,Chinese 
+Side Dish,Condiments ,,,Vegan,Burnt,Post-Game,European 
+Supper,Cookie ,,,Vegetarian,Buttery,Post-Workout,French 
+Dinner,Crackers ,,,Organic,Chalky,Pre-Game,German 
+,Jams & Preserved Foods ,,,,Cheesy,Pregame,Greek 
+,Panini,,,,Crusty,Alcoholic,Indian 
+,Pasta ,,,,Chewy,Pikachu,Italian 
+,Pizza ,,,,Chocolaty,Panther,Japanese 
+,Restaurant,,,,Citrusy,Pearsons,Latin American 
+,Rice,,,,Doughy,Lib,Mediterranean 
+,Sandwich ,,,,Cool,Finals,Mexican 
+,Sauce ,,,,Creamy,Feb,Middle Eastern 
+,Snack,,,,Crispy,Reg,Moroccan 
+,Soup ,,,,Crumbly,J-Term,Portuguese 
+,Spice Mix ,,,,Crunchy,ADK,Spanish 
+,Salad,,,,Dry,Road,Thai 
+,Drink,,,,Earthy,Allen,Vietnamese 
+,,,,,Eggy,,
+,,,,,Fatty,,
+,,,,,Fermented,,
+,,,,,Fiery,,
+,,,,,Fishy,,
+,,,,,Fizzy,,
+,,,,,Flakey,,
+,,,,,Flat,,
+,,,,,Flavorful,,
+,,,,,Fresh,,
+,,,,,Fried,,
+,,,,,Fruity,,
+,,,,,Full-bodied,,
+,,,,,,,
+,,,,,Garlicky,,
+,,,,,Gelatinous,,
+,,,,,Gingery,,
+,,,,,Glazed,,
+,,,,,Grainy,,
+,,,,,Greasy,,
+,,,,,Gooey,,
+,,,,,Gritty,,
+,,,,,Harsh,,
+,,,,,Hearty,,
+,,,,,Heavy,,
+,,,,,Herbal,,
+,,,,,Hot,,
+,,,,,Icy,,
+,,,,,Infused,,
+,,,,,Juicy,,
+,,,,,Lean,,
+,,,,,Light,,
+,,,,,Lemony,,
+,,,,,Malty,,
+,,,,,Mashed,,
+,,,,,Meaty,,
+,,,,,Mellow,,
+,,,,,Mild,,
+,,,,,Minty,,
+,,,,,Moist,,
+,,,,,Mushy,,
+,,,,,Nutty,,
+,,,,,Oily,,
+,,,,,Oniony,,
+,,,,,Overripe,,
+,,,,,Pasty,,
+,,,,,Peppery,,
+,,,,,Pickled,,
+,,,,,Plain,,
+,,,,,Powdery,,
+,,,,,Raw,,
+,,,,,Refreshing,,
+,,,,,Rich,,
+,,,,,Ripe,,
+,,,,,Roasted,,
+,,,,,Robust,,
+,,,,,Rubbery,,
+,,,,,Runny,,
+,,,,,Salty,,
+,,,,,Saut�ed,,
+,,,,,Savory,,
+,,,,,Seared,,
+,,,,,Seasoned,,
+,,,,,Sharp,,
+,,,,,Silky,,
+,,,,,Slimy,,
+,,,,,Smokey,,
+,,,,,Smothered,,
+,,,,,Smooth,,
+,,,,,Soggy,,
+,,,,,Soupy,,
+,,,,,Sour,,
+,,,,,Spicy,,
+,,,,,Spongy,,
+,,,,,Stale,,
+,,,,,Sticky,,
+,,,,,Stale,,
+,,,,,Stringy,,
+,,,,,Strong,,
+,,,,,Sweet,,
+,,,,,Sweet-and-sour,,
+,,,,,Syrupy,,
+,,,,,Tangy,,
+,,,,,Tart,,
+,,,,,Tasteless,,
+,,,,,Tender,,
+,,,,,Toasted,,
+,,,,,Tough,,
+,,,,,Unflavored,,
+,,,,,Unseasoned,,
+,,,,,Velvety,,
+,,,,,Vinegary,,
+,,,,,Watery,,
+,,,,,Whipped,,
+,,,,,Woody,,
+,,,,,Yeasty,,
+,,,,,Zesty,,
+,,,,,Zingy,,