Skip to content

fixed bugs on master before branching out sorr #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cchchoi1986 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed bugs on master before branching out sorr #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/assets/javascripts/angular/controllers/pages/home_controller.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/angular/controllers/pages/recipe_finder_controller.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) );
}]);
26 changes: 16 additions & 10 deletions app/assets/stylesheets/home.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
// }
}
}

Expand Down Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions app/assets/templates/pages/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

<div class="jumbo row">
<div class="col-xs-12">
<div class="splash-animate" ng-repeat="image in recipeImages1">
<img class="splash-item img-responsive col-xs-2 col-sm-1" ng-src="http://images.media-allrecipes.com/userphotos/140x140/{{ image }}.jpg">
<div class="splash-item col-xs-2 col-sm-1" ng-repeat="image in recipeImages1">
<img class="splash-animate img-responsive" ng-src="http://images.media-allrecipes.com/userphotos/140x140/{{ image }}.jpg">
</div>
</div>
</div>
Expand All @@ -20,7 +20,7 @@
<div class="other-links-separator row"><p class="col-xs-12"> - or -</p></div>
<div class="row home-other-links">
<div class="col-xs-5 col-sm-offset-1 col-sm-4 col-md-offset-2 col-md-3 other-links-buttons">
<a href="/#/search" ><button class="col-xs-12 btn btn-default home-recipe-finder">Advanced Search <i class="fa fa-search"></i></button></a>
<a href="/#/search" ><button class="col-xs-12 btn btn-default home-recipe-finder">Adv. Search <i class="fa fa-search"></i></button></a>
</div>
<div class="col-xs-offset-2 col-xs-5 col-sm-offset-2 col-sm-4 col-md-offset-2 col-md-3 other-links-buttons">
<a href="/#/myrecipes/{{user.userID}}" ><button class="col-xs-12 btn btn-default home-myrecipes"><i class="fa fa-heart"></i> My Recipes</button></a>
Expand Down
108 changes: 108 additions & 0 deletions lib/tasks/get_jamie.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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