Skip to content
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.

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

Updating #119

Open
wants to merge 64 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
b1c5bf6
add backend user model unit test
nikrb Feb 10, 2018
1617151
update fetch-mock and lock file
nikrb Feb 10, 2018
09da6f9
add user actions unit test
nikrb Feb 10, 2018
f4d2968
fix: profile prop-types
nikrb Feb 11, 2018
53b0c14
fix: user types import
nikrb Feb 11, 2018
3079b43
add user reducer unit tests
nikrb Feb 11, 2018
ae47685
refactor login actions
nikrb Feb 11, 2018
7b63c39
add login actions unit tests
nikrb Feb 11, 2018
1381244
fix: remove duplicate search redux actions
nikrb Feb 11, 2018
0e6839d
fix: rename user reducer unit test file
nikrb Feb 11, 2018
05c4cbc
rename userReducer import to user to match other reducers in combineR…
nikrb Feb 11, 2018
eea26a0
fix: card missing image url
nikrb Feb 13, 2018
052209d
fix: refactor image url creator
nikrb Feb 13, 2018
e338bba
fix: reject with missing url instead of console error log
nikrb Feb 13, 2018
b9187b1
Merge pull request #98 from chingu-voyage3/fix/house-image-delete
nikrb Feb 14, 2018
08a68c3
Merge pull request #95 from chingu-voyage3/add-user-unit-test
nikrb Feb 14, 2018
e1d1504
Started refactoring
Mortuie Mar 12, 2018
5809875
Deleting unecessary files
Mortuie Mar 12, 2018
6cef2c0
Refactoring the USER REDUX stuff
Mortuie Mar 26, 2018
e641b01
Refactoring the User Tests
Mortuie Mar 26, 2018
848daa8
Removing an unecessary line
Mortuie Mar 26, 2018
5cdcb73
Added an index.js file
Mortuie Mar 26, 2018
05b4de6
Fixed a bug on the auto complete scrolling
Mortuie Mar 26, 2018
2cdf779
Added minor changes
Mortuie Mar 26, 2018
b3da5c2
Pushing refactor of the actions, but have now broken tests
Mortuie Mar 31, 2018
a60a42c
Removed the cross fetch nonsense
Mortuie Apr 1, 2018
b126b7e
Moved all the tests back after reading an article
Mortuie Apr 1, 2018
3519f95
Fixing the code I broke...
Mortuie Apr 1, 2018
2382039
Fixed the styling of the register box
Mortuie Apr 1, 2018
bd6c08b
Removed the stuff for pre and post pull/pushing or well just commente…
Mortuie Apr 1, 2018
efe209c
fix: credentials is required on fetch for login
nikrb Apr 10, 2018
3c22f92
Merge pull request #112 from chingu-voyage3/leon/refactor
Mortuie Apr 12, 2018
bdd71fa
Merge pull request #118 from chingu-voyage3/master
Mortuie Oct 6, 2018
738e657
fix: display default avatar pic
nikrb Oct 7, 2018
052e5d6
Merge pull request #120 from chingu-voyage3/fix/default-avatar-pic
Mortuie Oct 7, 2018
c0d9cfc
Fixing the register error handling
Mortuie Oct 7, 2018
31b8ee3
Merge pull request #121 from chingu-voyage3/fix/userActions
Mortuie Oct 7, 2018
e0e52de
WIP.
vivekimsit Oct 9, 2018
2d6a8c1
Add error handling.
vivekimsit Oct 10, 2018
65a57d1
Catch validation errors.
vivekimsit Oct 10, 2018
d0dae2f
WIP.
vivekimsit Oct 14, 2018
f1a65f0
WIP.
vivekimsit Oct 17, 2018
96fdb20
Fix auth route and login flow.
vivekimsit Oct 20, 2018
ed03b37
Fix logout logic.
vivekimsit Oct 20, 2018
c022d7a
More fixes.
vivekimsit Oct 20, 2018
e3c622b
Fix login.
vivekimsit Oct 21, 2018
7538de7
Revert to Mongo for now.
vivekimsit Oct 22, 2018
48d9619
Initial commit for the prettier config
Mortuie Oct 22, 2018
9e31c89
Prettier running on all files
Mortuie Oct 22, 2018
05086ba
Adding the last files...
Mortuie Oct 22, 2018
6ee3b0a
Fixing last linting issues and removing the unecessary shell script
Mortuie Oct 22, 2018
e793369
Merge pull request #123 from chingu-voyage3/feature/prettier
Mortuie Oct 22, 2018
0d9c0ea
Initial commit
Mortuie Oct 23, 2018
034b8f8
Added hook
Mortuie Oct 23, 2018
579ffc7
Ran Prettier
Mortuie Oct 23, 2018
707e37e
Revert "Feature/prettier"
Mortuie Oct 23, 2018
bdee79a
Merge pull request #126 from chingu-voyage3/revert-123-feature/prettier
vivekimsit Oct 23, 2018
716eaea
Merge pull request #125 from chingu-voyage3/fixes/prettier
vivekimsit Oct 23, 2018
3740588
Address comments.
vivekimsit Oct 23, 2018
606d475
Lint.
vivekimsit Oct 23, 2018
9727cc2
Merge pull request #122 from chingu-voyage3/fixes/error-handling
vivekimsit Oct 25, 2018
c322860
Edited .gitignore
Mortuie Dec 20, 2018
350b852
Adding the using of the new Url parser
Mortuie Dec 20, 2018
741d32a
Merge pull request #127 from chingu-voyage3/fix/removeDeprecationWarning
Mortuie Dec 20, 2018
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
22 changes: 10 additions & 12 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"root": true,
"parser": "babel-eslint",
"extends": ["eslint:recommended", "plugin:react/recommended"],
"parserOptions": {
"ecmaVersion": 7,
"sourceType": "module",
Expand All @@ -10,19 +9,18 @@
"experimentalObjectRestSpread": true
}
},
"env": {
"browser": true,
"commonjs": true,
"node": true,
"mocha": true,
"es6": true
},
"plugins": ["prettier", "react"],
"rules": {
"prettier/prettier": "error",
"no-console": 1,
"react/display-name": "warn",
"react/prop-types": "warn"
},
"plugins": [
"react"
]
}
"env": {
"es6": true,
"node": true,
"mocha": true,
"commonjs": true,
"browser": true
}
}
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ npm-debug.log
uploads/
frontend/public/images/
web/images/


# yarn
yarn.lock
1 change: 1 addition & 0 deletions .prettierrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
singleQuote: true
Loading