summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-14Merge pull request #30 from tuckerevans/recipe_card_cssHEADmastergatelyjm
Fix recipe cards are now three wide w/ max width
2019-12-14Fix recipe cards are now three wide w/ max widthTucker Evans
2019-12-14Fix changes made for demoTucker Evans
Changes reloading times so recipes are successfully added/deleted. Adds checked/cart_index to Ingredient on DataModel
2019-12-12Merge pull request #29 from tuckerevans/fixed-editTucker Evans
Fixed edit ingredients/steps indexing
2019-12-12fixed stuffschencej
2019-12-12Merge pull request #28 from tuckerevans/elimTucker Evans
Elim
2019-12-12Merge pull request #27 from tuckerevans/cart_update_ingredientsschencej
Fix Ingredients can now be removed from cart
2019-12-12Merge pull request #26 from tuckerevans/edit_pass_recipeschencej
Fix use passService for recipe to edit
2019-12-12added main pageschencej
2019-12-12Fix Ingredients can now be removed from cartTucker Evans
2019-12-12merged with masterschencej
2019-12-11got rid of commented linesschencej
2019-12-11added styling to cook pagesschencej
2019-12-11Fix use passService for recipe to editTucker Evans
2019-12-11Merge pull request #25 from tuckerevans/importsTucker Evans
Add routing and imports for shopping cart
2019-12-11Add routing and imports for shopping cartChris Undercoffer
2019-12-11Merge pull request #24 from tuckerevans/ingredient_addchrisundercoffer
Fix adding ingredients
2019-12-11Merge pull request #23 from tuckerevans/shoppingcartTucker Evans
Shopping Cart base functionality added.
2019-12-11Fix units form control nameTucker Evans
2019-12-11Fix adding ingredientsTucker Evans
Ingredients form array is now indexed based on for loop, not just set to 0.
2019-12-11add shoppingcart base functionalityChris Undercoffer
can add items but not remove, not able to print list yet
2019-12-10Fix add AddRecipeComponent to importsTucker Evans
This must have been missed during a merge conflict.
2019-12-10Merge pull request #22 from tuckerevans/elimTucker Evans
Elim
2019-12-10Merge branch 'master' into elimTucker Evans
2019-12-10Fix removes testing value for timeLeft on step-cardTucker Evans
2019-12-10Revert steps.instructions -> step.instructionTucker Evans
For compatibility with backend JSON.
2019-12-10fixed recipe pass serviceschencej
2019-12-10added ingredient scaling and styling to pre cook pageschencej
2019-12-10added funcitonality to cook-pageschencej
2019-12-10Merge pull request #21 from tuckerevans/top_barschencej
Add toolbar to main app template
2019-12-10Merge branch 'master' into top_barschencej
2019-12-10Merge pull request #20 from tuckerevans/edit-pageschencej
Add edit-recipe form/page
2019-12-10Merge pull request #18 from tuckerevans/add_pageschencej
Add page now redirects on submission
2019-12-10Merge pull request #17 from tuckerevans/backend_jsonschencej
Fix ingredient unit type to be same across frontend & backend
2019-12-10Add edit-recipe form/pageTucker Evans
Mostly copied from add recipe page. Updates recipe successfully, but doesn't pull ingredients/steps into form, and doesn't use pass service to get recipe.
2019-12-10Fix blank tags/photos not added to RecipeTucker Evans
2019-12-10Fix intructions -> intruction for backend jsonTucker Evans
Now the same as frontend data models.
2019-12-10Add toolbar to main app templateTucker Evans
2019-12-09Merge pull request #19 from tuckerevans/elimTucker Evans
Elim
2019-12-09Fix array indexing of formData.stepsTucker Evans
2019-12-09Add routing to main page after sumbittingTucker Evans
2019-12-09Merge branch 'master' of https://github.com/tuckerevans/recipe_buddy into elimschencej
2019-12-09added pre cooking pageschencej
2019-12-09added additional functionality to cook pageschencej
2019-12-09made all data model member variables publicschencej
2019-12-09Fix ingredient unit type to be same across frontend & backendTucker Evans
2019-12-09Merge pull request #16 from tuckerevans/backend_readme_updateTucker Evans
Fix backend readme to have correct JSON schema
2019-12-09Merge branch 'master' into shoppingcartChris Undercoffer
2019-12-09Merge pull request #14 from tuckerevans/add_pagechrisundercoffer
Add Recipe Page
2019-12-09Fix backend readme to have correct JSON schemaTucker Evans
generated by cgit v1.1 at 2024-04-29 16:10:41 +0000