Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: RyanNoelk/OpenEats
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.1.1
Choose a base ref
...
head repository: RyanNoelk/OpenEats
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 13 commits
  • 61 files changed
  • 2 contributors

Commits on Dec 15, 2017

  1. Merge pull request #301 from RyanNoelk/master

    Master back to dve
    RyanNoelk authored Dec 15, 2017
    Copy the full SHA
    0a07f65 View commit details

Commits on Jan 10, 2018

  1. Merge pull request #311 from RyanNoelk/master

    master to dev (for doc updates)
    RyanNoelk authored Jan 10, 2018
    Copy the full SHA
    01ad021 View commit details
  2. Private recipes (#307)

    * Add public attribute to recipe model and update views.
    
    * Add frontend control for public/private option
    
    * Restrict each count view.
    
    * Don't chain filters.
    dougnd authored and RyanNoelk committed Jan 10, 2018
    Copy the full SHA
    1c11204 View commit details

Commits on Jan 20, 2018

  1. Copy the full SHA
    72594ec View commit details

Commits on Jan 24, 2018

  1. Feature/browse redux (#316)

    * poring browse to redux
    
    * fixing up search
    
    * adding dynamic count
    
    * adding correct logic for pagination
    
    * adding some css for pagination
    
    * fixing up mini-browse
    
    * make sure the qs has the defaults
    
    * moving search and filter to there other component
    
    * adding a reset button and better styles for the filters
    
    * removing debug
    
    * removing loading page from browse container
    
    * adding ordering
    
    * removing totals from sorting
    
    * adding custom reducer to browse
    
    * loading state as a history object
    
    * saving cache
    
    * centering pagination
    
    * updating code quility
    
    * adding dynamic link generation
    
    * removing onClick func
    
    * fixing searching
    
    * refactoring search bar
    
    * adding history to filter stores
    
    * updating filter Ui and fixing pagination
    
    * adding loading to reducers
    
    * saving browse section overhall
    
    * fixing issue with apis being called when they shouldnt
    
    * fixing up browse
    
    * adding active links to pagination
    
    * adding basic multi select support
    
    * fixing issue with flashing UI
    
    * adding multi select to filters
    
    * saving
    
    * fixing algorithm for multi select
    
    * adding flag for multi select filters
    
    * updating merge conflicts
    
    * cleaning up the filters more
    
    * adding css styles for mobile
    
    * adding prop types to browse
    
    * adding some basic tests
    
    * fixing list recipes locaiton in mini browse
    
    * more tests
    
    * creating some place holder tests
    
    * up
    
    * removing bad tests
    
    * more back the side bar
    
    * getting more side bar stuff working
    
    * configuring bootstrap columns
    
    * redesigning filters
    
    * redesigning filters
    
    * adding mobile dropdown
    
    * adding state to dropdown menu
    
    * adding bootstrap cols for mobile layout
    
    * fixing issues causing the filters to flash
    
    * cleaning up the placement of the clear search button and recipe count
    
    * saving
    
    * fixing up desktop UI
    
    * adding reset filter for mobile
    RyanNoelk authored Jan 24, 2018
    Copy the full SHA
    9acbda5 View commit details
  2. Feature/image backup (#320)

    * Update sample_env_file_for_docker.list (#314)
    
    * Create backups.md
    
    * adding healthcheck to docker compose files and adding docs on how to take image backups
    
    * updating quickstart with image backup
    
    * updating gitignore
    RyanNoelk authored Jan 24, 2018
    Copy the full SHA
    b772cdf View commit details
  3. Copy the full SHA
    02e25a9 View commit details
  4. Merge pull request #321 from RyanNoelk/dev

    Dev
    RyanNoelk authored Jan 24, 2018
    Copy the full SHA
    c9a7dd8 View commit details

Commits on Jan 25, 2018

  1. Fix/pagination (#324)

    * fixing some pagination and adding more test data
    
    * scroll to the top of the page when loading data
    
    * removing offset everytime a query is done
    RyanNoelk authored Jan 25, 2018
    Copy the full SHA
    3f5dec4 View commit details
  2. Merge pull request #325 from RyanNoelk/dev

    Fix/pagination (#324)
    RyanNoelk authored Jan 25, 2018
    Copy the full SHA
    a7e86df View commit details
  3. adding deletion of recipes on the UI (#326)

    * adding deletion of recipes on the UI
    
    * fixing tests and adding icons for editing
    RyanNoelk authored Jan 25, 2018
    Copy the full SHA
    b6e2a17 View commit details
  4. Merge pull request #327 from RyanNoelk/dev

    adding deletion of recipes on the UI (#326)
    RyanNoelk authored Jan 25, 2018
    Copy the full SHA
    718ce7f View commit details

Commits on Mar 18, 2018

  1. Update README.md

    RyanNoelk authored Mar 18, 2018
    Copy the full SHA
    dd01557 View commit details
Showing with 1,805 additions and 831 deletions.
  1. +2 −0 .gitignore
  2. +3 −16 README.md
  3. +487 −1 api/v1/fixtures/recipe_data.json
  4. +25 −0 api/v1/recipe/migrations/0012_auto_20180106_1113.py
  5. +1 −0 api/v1/recipe/models.py
  6. +1 −1 api/v1/recipe/urls.py
  7. +42 −11 api/v1/recipe/views.py
  8. +16 −8 api/v1/recipe_groups/views.py
  9. +1 −1 docker-compose.yml
  10. +7 −2 docker-prod.yml
  11. +7 −2 docker-stage.yml
  12. 0 docs/{creating_a_proxy_server_for_docker.md → Creating_a_proxy_server_for_docker.md}
  13. +1 −4 docs/Running_the_App.md
  14. +18 −0 docs/Taking_Backups.md
  15. +1 −1 docs/sample_env_file_for_docker.list
  16. +0 −98 frontend/modules/browse/actions/BrowseActions.js
  17. +96 −0 frontend/modules/browse/actions/FilterActions.js
  18. +34 −0 frontend/modules/browse/actions/SearchActions.js
  19. +0 −233 frontend/modules/browse/components/Browse.js
  20. +41 −93 frontend/modules/browse/components/Filter.js
  21. +33 −35 frontend/modules/browse/components/ListRecipes.js
  22. +18 −0 frontend/modules/browse/components/Loading.js
  23. +34 −0 frontend/modules/browse/components/NoResults.js
  24. +48 −62 frontend/modules/browse/components/Pagination.js
  25. +36 −0 frontend/modules/browse/components/Results.js
  26. +59 −0 frontend/modules/browse/components/Search.js
  27. +33 −19 frontend/modules/browse/components/SearchBar.js
  28. +243 −0 frontend/modules/browse/components/SearchMenu.js
  29. +9 −0 frontend/modules/browse/constants/FilterConstants.js
  30. +5 −0 frontend/modules/browse/constants/SearchConstants.js
  31. +162 −0 frontend/modules/browse/containers/Browse.js
  32. +5 −18 frontend/modules/browse/{components → containers}/MiniBrowse.js
  33. +7 −0 frontend/modules/browse/css/browse.scss
  34. +51 −4 frontend/modules/browse/css/filter.scss
  35. +36 −0 frontend/modules/browse/reducers/FilterReducer.js
  36. +11 −0 frontend/modules/browse/reducers/Reducer.js
  37. +23 −0 frontend/modules/browse/reducers/SearchReducer.js
  38. +0 −51 frontend/modules/browse/stores/BrowseStore.js
  39. +0 −62 frontend/modules/browse/stores/FilterStores.js
  40. +11 −0 frontend/modules/browse/tests/Loading.test.js
  41. +11 −0 frontend/modules/browse/tests/NoResults.test.js
  42. +61 −0 frontend/modules/browse/tests/__snapshots__/Loading.test.js.snap
  43. +26 −0 frontend/modules/browse/tests/__snapshots__/NoResults.test.js.snap
  44. +0 −67 frontend/modules/common/Api.js
  45. +0 −16 frontend/modules/common/AppDispatcher.js
  46. +2 −1 frontend/modules/common/components/FormComponents.js
  47. +8 −3 frontend/modules/common/css/checkbox.scss
  48. +2 −0 frontend/modules/common/reducer.js
  49. +1 −1 frontend/modules/index.js
  50. +1 −1 frontend/modules/news/components/News.js
  51. +11 −0 frontend/modules/recipe/actions/RecipeActions.js
  52. +21 −8 frontend/modules/recipe/components/RecipeFooter.js
  53. +1 −0 frontend/modules/recipe/components/RecipeScheme.js
  54. +1 −1 frontend/modules/recipe/components/RecipeView.js
  55. +1 −0 frontend/modules/recipe/constants/RecipeConstants.js
  56. +5 −0 frontend/modules/recipe/css/recipe.scss
  57. +15 −5 frontend/modules/recipe/tests/__snapshots__/RecipeFooter.test.js.snap
  58. +1 −1 frontend/modules/recipe_form/actions/RecipeFormActions.js
  59. +14 −1 frontend/modules/recipe_form/components/RecipeForm.js
  60. +0 −3 frontend/package.json
  61. +16 −1 quick-start.py
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@ static-files/
database/
frontend/build/
frontend/jest/
site-media/
openeats.sql

servies/static-files/
servies/side-media/
19 changes: 3 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
# OpenEats Project
# OpenEats has moved

[![Build Status](https://travis-ci.org/RyanNoelk/OpenEats.svg?branch=master)](https://travis-ci.org/RyanNoelk/OpenEats)
Please see https://github.com/open-eats/OpenEats for the new repo location!

OpenEats is a recipe management site that allows users to create, share, and store their personal collection of recipes. This fork uses Django Rest Framework as a backend and React (with flux) as a front end.

The usage for the app is intended for a single user or a small group. For my personal use, I would be an admin user and a few (about 5-6) friends and family would be normal users. Admin users can add other users to the project (no open sign-ups), make changes to the available Cuisines and Courses, and add to the homepage banner. Normal users just have the ability to add recipes. Below are a few of the core features the app provides.

- Creating, viewing, and editing recipes.
- Browsing and searching for recipes.
- Creating grocery lists
- Quickly print recipe.
- Linking recipes and ingredient grouping

### [Read the docs on getting started here!](https://github.com/RyanNoelk/OpenEats/blob/master/docs/Running_the_App.md)

# Contributing
Please read the [contribution guidelines](https://github.com/RyanNoelk/OpenEats/blob/master/CONTRIBUTING.md) in order to make the contribution process easy and effective for everyone involved.
The docker setup has been streamlined, but is the same. If you have a custom script to setup your containers, they will still work.
Loading