forked from qgriffith-zz/OpenEats
-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Feature/redux (#274) * adding redux packages * saving * hacking away * getting loading to work * saving * saving * updating lists * updating readability * saving * updating prop types * fixing up list footer container * fixing up list header container * using redux for store in navbar * cleaning up list item * cleaning up list item * remove state when calling init * adding save * moving around some actions * fixing some things * saving * saving * saving * renaming * fixing up reducers * moving data loading to containers * using promises * adding proper filters * updating components * removing old lists and udpating tests * removing bound item * adding error form * updating prop types * adding error reducer * updating footer height * removing my lists from mobile layout * fixing error constants * adding loading * store items in lists * removing immutable * redirect if the route is bad * removing unneeded code * removing unneeded code * updating gitignore * adding id to load when selcting from the menu * fixing items being wipped on list reload * Feature/node upgrade (#267) * updating 3rd party packages * using const and removing debug * removing react.craeteclass and react.proptypes * adding back public path * adding auth check to each module * upgrading react router * upgrading to react 16 * adding some comments * package updates * Feature/redux recipe (#271) * saing * updating components * splitting the components up more * else if * pass a round function to do dynmaic serving * cleaning components * adding connecting component * adding prop types * fixing tests * adding more tests * adding more tests * adding more tests and some test data * more tests! * make sure the count is updated when adding items to a list * saving * updating spacing the ings * adding it to a good spot * adding working checkboxes * adding server connection * adding a spinner for loading * adding logic for a spinner * saving * saving * saving * adding ing reducers * moving buttoms to there own class * updating tests * updating prop types * updating translations * cleaning up actions * fixing version issues * fixing Ui tests again * clear the checkboxes after adding to a list * Feature/recicpe servings redux (#273) * adding servings to the redux store * updating the reducers maintain all the store * adding clear servings button * updating tests * cleaning up the ings reducers * more clean up for reducers * append -> push * hide the add button when the user in not logged it * Fixing an issue with adding null quantity or measurements (#276) * Feature/pretty checkboxes (#278) * adding better looking checkboxes to the recipe page * fixing more issues with firefox * fixing tests * updating docs and env file (#281)
- Loading branch information
Showing
122 changed files
with
6,907 additions
and
3,064 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| { | ||
| "presets": [ | ||
| "es2015", | ||
| "stage-0", | ||
| "react" | ||
| ], | ||
| "plugins": [ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM node:8.3.0-alpine | ||
| FROM node:8.6.0-alpine | ||
|
|
||
| # Create app directory | ||
| RUN mkdir /code | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| import React from 'react'; | ||
| import renderer from 'react-test-renderer'; | ||
| import { IntlProvider } from 'react-intl'; | ||
| import { MemoryRouter } from 'react-router-dom' | ||
|
|
||
| const createComponentWithIntl = (children, props = { locale: 'en' }) => { | ||
| return renderer.create( | ||
| <IntlProvider {...props}> | ||
| <MemoryRouter> | ||
| { children } | ||
| </MemoryRouter> | ||
| </IntlProvider> | ||
| ); | ||
| }; | ||
|
|
||
| export default createComponentWithIntl; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import React from 'react'; | ||
| import renderer from 'react-test-renderer'; | ||
| import { MemoryRouter } from 'react-router-dom' | ||
|
|
||
| const createComponentWithRouter = ( children ) => { | ||
| return renderer.create( | ||
| <MemoryRouter> | ||
| { children } | ||
| </MemoryRouter> | ||
| ); | ||
| }; | ||
|
|
||
| export default createComponentWithRouter; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| import React from 'react' | ||
| import { | ||
| injectIntl, | ||
| defineMessages | ||
| } from 'react-intl'; | ||
|
|
||
|
|
||
| const Alert = ({ intl }) => { | ||
| const messages = defineMessages({ | ||
| title: { | ||
| id: 'login.alert.unable_to_login', | ||
| description: 'Fail to login header', | ||
| defaultMessage: 'Unable to login!', | ||
| }, | ||
| message: { | ||
| id: 'login.alert.confirm', | ||
| description: 'Fail to login message', | ||
| defaultMessage: 'Please confirm that the username and password are correct.', | ||
| } | ||
| }); | ||
|
|
||
| return ( | ||
| <div className="alert alert-danger"> | ||
| <strong>{ intl.formatMessage(messages.title) }</strong> | ||
| { intl.formatMessage(messages.message) } | ||
| </div> | ||
| ) | ||
| }; | ||
|
|
||
| export default injectIntl(Alert) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.