From e4a948b48954a7a4984c1e1157d4692d4069d33c Mon Sep 17 00:00:00 2001 From: cchchoi1986 Date: Fri, 20 Mar 2015 15:22:59 +0800 Subject: [PATCH] fixed bugs on master before branching out sorr --- .../controllers/pages/home_controller.js.erb | 12 +- .../pages/recipe_finder_controller.js.erb | 2 +- app/assets/stylesheets/home.css.scss | 26 +++-- app/assets/templates/pages/home.html | 6 +- lib/tasks/get_jamie.rake | 108 ++++++++++++++++++ 5 files changed, 134 insertions(+), 20 deletions(-) create mode 100644 lib/tasks/get_jamie.rake diff --git a/app/assets/javascripts/angular/controllers/pages/home_controller.js.erb b/app/assets/javascripts/angular/controllers/pages/home_controller.js.erb index 756efd6..aade9a9 100644 --- a/app/assets/javascripts/angular/controllers/pages/home_controller.js.erb +++ b/app/assets/javascripts/angular/controllers/pages/home_controller.js.erb @@ -89,11 +89,8 @@ app.controller('HomeCtrl', ['$interval','$scope', '$http', '$routeParams', 'User "01/32/83/1328348", "00/52/81/528166", "00/67/20/672061", - "00/02/94/29499" - ]; - - var recipeImages2 = [ - "00/99/18/991834", + "00/02/94/29499", + "00/99/18/991834", "00/88/82/888276", "00/98/02/980270", "00/97/22/972222", @@ -123,7 +120,10 @@ app.controller('HomeCtrl', ['$interval','$scope', '$http', '$routeParams', 'User "00/58/59/585933", "00/01/76/17672", "00/84/53/845365", - "01/12/17/1121794", + "01/12/17/1121794" + ]; + + var recipeImages2 = [ "01/11/00/1110083", "00/58/21/582109", "00/39/39/393923", diff --git a/app/assets/javascripts/angular/controllers/pages/recipe_finder_controller.js.erb b/app/assets/javascripts/angular/controllers/pages/recipe_finder_controller.js.erb index bc38ebb..43b611d 100644 --- a/app/assets/javascripts/angular/controllers/pages/recipe_finder_controller.js.erb +++ b/app/assets/javascripts/angular/controllers/pages/recipe_finder_controller.js.erb @@ -249,6 +249,6 @@ app.controller('RecipeFinderCtrl', ['$scope', '$http', '$routeParams', '$rootSco } }); // initial slider values - $("#amount").val(timeConversion(0) + " to " + timeConversion(1440) ); }; + $("#amount").val(timeConversion(0) + " to " + timeConversion(1440) ); }]); diff --git a/app/assets/stylesheets/home.css.scss b/app/assets/stylesheets/home.css.scss index 365162e..d5a4051 100644 --- a/app/assets/stylesheets/home.css.scss +++ b/app/assets/stylesheets/home.css.scss @@ -20,14 +20,20 @@ display: inline-block; overflow: hidden; // opacity: 0.9; + .splash-animate { + height: 100%; + width: 100%; + } } - .splash-item.ng-move { - -webkit-transition:5s linear all; - -moz-transition:5s linear all; - -o-transition:5s linear all; - transition:5s linear all; - opacity:0; - } + + + // .splash-item.ng-move { + // -webkit-transition:5s linear all; + // -moz-transition:5s linear all; + // -o-transition:5s linear all; + // transition:5s linear all; + // opacity:0; + // } } } @@ -106,13 +112,13 @@ } } -.splash-animate.ng-enter { +.splash-item.ng-enter { transition: 3s; opacity: 0; } -.splash-animate.ng-enter-active { - opacity: 1; +.splash-item.ng-enter-active { + opacity: 0.9; } @media (max-width: 768px) { diff --git a/app/assets/templates/pages/home.html b/app/assets/templates/pages/home.html index 09af6e6..22ad622 100644 --- a/app/assets/templates/pages/home.html +++ b/app/assets/templates/pages/home.html @@ -5,8 +5,8 @@
-
- +
+
@@ -20,7 +20,7 @@

- or -

- +
diff --git a/lib/tasks/get_jamie.rake b/lib/tasks/get_jamie.rake new file mode 100644 index 0000000..c68ff19 --- /dev/null +++ b/lib/tasks/get_jamie.rake @@ -0,0 +1,108 @@ +desc "scrape all the recipes from JamieOliver.com" +task :scrape => :environment do + require 'open-uri' + require 'nokogiri' + + parameters = { + ingredients = [ + "/recipes/beef-recipes", + "/recipes/bread-recipes", + "/recipes/cheese-recipes", + "/recipes/chicken-recipes", + "/recipes/chocolate-recipes", + "/recipes/duck-recipes", + "/recipes/eggs-recipes", + "/recipes/fish-recipes", + "/recipes/fruit-recipes", + "/recipes/game-recipes", + "/recipes/gin-recipes", + "/recipes/goose-recipes", + "/recipes/lamb-recipes", + "/recipes/martini-recipes", + "/recipes/pasta-recipes", + "/recipes/pork-recipes", + "/recipes/red-wine-recipes", + "/recipes/rice-recipes", + "/recipes/rum-recipes", + "/recipes/seafood-recipes", + "/recipes/tequila-recipes", + "/recipes/turkey-recipes", + "/recipes/vegetables-recipes", + "/recipes/vodka-recipes", + "/recipes/whiskey-recipes" + ], + dish_types = [ + "/recipes/category/dishtype/antipasti", + "/recipes/category/dishtype/bbq-food", + "/recipes/category/dishtype/bread-doughs", + "/recipes/category/dishtype/cakes-tea-time-treats", + "/recipes/category/dishtype/curry", + "/recipes/category/dishtype/drinks", + "/recipes/category/dishtype/pasta-risotto", + "/recipes/category/dishtype/pies-pastries", + "/recipes/category/dishtype/pizza", + "/recipes/category/dishtype/puddings-desserts", + "/recipes/category/dishtype/roast", + "/recipes/category/dishtype/salad", + "/recipes/category/dishtype/sandwiches-wraps", + "/recipes/category/dishtype/sauces-condiments", + "/recipes/category/dishtype/soup", + "/recipes/category/dishtype/stew", + "/recipes/category/dishtype/vegetable-sides" + ], + courses = [ + "/recipes/category/course/breakfast", + "/recipes/category/course/cheap-cheerful", + "/recipes/category/course/desserts", + "/recipes/category/course/drinks", + "/recipes/category/course/healthy-meals", + "/recipes/category/course/jamie-s-table-with-woolworths", + "/recipes/category/course/leftovers", + "/recipes/category/course/light-meals", + "/recipes/category/course/mains", + "/recipes/category/course/meals-for-one", + "/recipes/category/course/one-pan-recipes", + "/recipes/category/course/quick-fixes", + "/recipes/category/course/sauces", + "/recipes/category/course/sides", + "/recipes/category/course/snacks", + "/recipes/category/course/starters" + ], + special_occasions = [ + "/recipes/category/occasion/burns-night-specials", + "/recipes/category/occasion/christmas", + "/recipes/category/occasion/dinner-for-two", + "/recipes/category/occasion/dinner-party", + "/recipes/category/occasion/drinks-tube", + "/recipes/category/occasion/easter-treats", + "/recipes/category/occasion/father-s-day", + "/recipes/category/occasion/gorgeous-winter-soups", + "/recipes/category/occasion/halloween-bonfire-night", + "/recipes/category/occasion/lighter-new-year", + "/recipes/category/occasion/mother-s-day", + "/recipes/category/occasion/new-year-party-picks", + "/recipes/category/occasion/pancake-day", + "/recipes/category/occasion/party-food", + "/recipes/category/occasion/romantic-meals", + "/recipes/category/occasion/st-george-s-day", + "/recipes/category/occasion/sunday-lunch", + "/recipes/category/occasion/thanksgiving", + "/recipes/category/occasion/the-big-feastival-2013" + ], + cuisines = [ + "/recipes/category/world/american", + "/recipes/category/world/asian", + "/recipes/category/world/british", + "/recipes/category/world/chinese", + "/recipes/category/world/french", + "/recipes/category/world/greek", + "/recipes/category/world/indian", + "/recipes/category/world/italian", + "/recipes/category/world/mexican", + "/recipes/category/world/moroccan", + "/recipes/category/world/other-world-flavours", + "/recipes/category/world/spanish" + ] + } + +end \ No newline at end of file