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

Feature/daniel/profile model #17

Open
wants to merge 70 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
5d48ee1
integrated tailwind and antdesign
justiceotuya Apr 20, 2019
f4d5f33
removed taiwindcss and rewrote the readme
justiceotuya Apr 21, 2019
7884570
Merge pull request #2 from team-helpme/feature/justiceotuya/integrate…
uimarshall Apr 21, 2019
24daa0b
finished the Landing Page
justiceotuya Apr 24, 2019
e6f1ab5
added next.config.js to .eslintignore
justiceotuya Apr 24, 2019
a1abd99
fixed linting errors for the front page
justiceotuya Apr 24, 2019
d8e3395
deletes hound.yml and make changes to travis.yml
uimarshall Apr 24, 2019
3cf3911
Merge pull request #4 from team-helpme/feature/marshall/delete-hound
justiceotuya Apr 25, 2019
501acef
fixed Landing page Bug reported by travis ci
justiceotuya Apr 25, 2019
8235020
Merge pull request #3 from team-helpme/feature/justiceotuya/finished-…
uimarshall Apr 25, 2019
d375028
fixed Landing page linting
justiceotuya Apr 26, 2019
c3851a1
Merge pull request #5 from team-helpme/fix/justiceotuya/fixed-linting…
uimarshall Apr 26, 2019
976ce3c
add basic expess server set up and database set up in mlab
uimarshall Apr 27, 2019
08ade0b
remove Uche Nnadi as author in package.json file
uimarshall Apr 27, 2019
2cfa498
Merge pull request #6 from team-helpme/feature/marshall/basic-express…
uimarshall Apr 29, 2019
0995fc0
Merge branch 'master' of https://github.com/team-helpme/helpme
uimarshall May 2, 2019
ad478aa
creates the user model and tests for basic crud operation
uimarshall May 2, 2019
f521f69
deleted test/package.json
uimarshall May 2, 2019
a55ecf8
add jest-mongodb-config file for jest testing
uimarshall May 4, 2019
45222d2
created the profile model and routes for creating and updating profile
cimthog May 4, 2019
86c7285
creates the user api-routes
uimarshall May 4, 2019
cc6171c
make module.exports = User = mongoose.model('users', UserSchema); int…
uimarshall May 9, 2019
cf2e827
modified User.js to create a new PR
uimarshall May 9, 2019
78a5a1d
created user profile routes
cimthog May 11, 2019
8c6102b
added ds_store to gitignore
justiceotuya May 13, 2019
27e3f21
refactored the landing page
justiceotuya May 13, 2019
3c1c139
refactored landing page and layout
justiceotuya May 14, 2019
2ee7d8a
made changes to file
justiceotuya May 15, 2019
7649664
made changes to file
justiceotuya May 15, 2019
474bbe7
made changes to file
justiceotuya May 15, 2019
0f4a222
made changes to file
justiceotuya May 15, 2019
78a2893
made changes to file
justiceotuya May 15, 2019
7cd2e3e
Merge pull request #14 from team-helpme/feature/justiceotuya/refactor…
uimarshall May 15, 2019
ad9aa00
finished login page
justiceotuya May 15, 2019
972f579
finished login page
justiceotuya May 15, 2019
7bbd73c
finished login page
justiceotuya May 15, 2019
325d9f0
finished login
justiceotuya May 15, 2019
adc1db5
finised the signup page
justiceotuya May 15, 2019
191d425
changed constants to capital letters
justiceotuya May 15, 2019
59c1b65
finished CRUD operation for profile model
cimthog May 16, 2019
a546e93
made few changes
cimthog May 16, 2019
06e4274
removed unnecessary console.log
cimthog May 16, 2019
4a8b49c
Merge branch 'master' of https://github.com/team-helpme/helpme
uimarshall May 17, 2019
0eb9aab
Merge branch 'master' into feature/marshall/create-user-model
uimarshall May 17, 2019
25351ec
fixed errors in the login and signup pages"
justiceotuya May 17, 2019
1dfd1ea
resolved eslint confilicts
cimthog May 17, 2019
7f30d46
removed empty test file
cimthog May 17, 2019
247a07a
modified User model and remove test folder
uimarshall May 17, 2019
8c841d8
Merge pull request #9 from team-helpme/feature/marshall/create-user-m…
justiceotuya May 17, 2019
40e9c73
Merge branch 'master' of https://github.com/team-helpme/helpme into f…
justiceotuya May 17, 2019
b1770c4
changed booleans to question format, added propTypes checking to Logi…
justiceotuya May 17, 2019
e7b11db
fix doc indent
justiceotuya May 18, 2019
38f6aa6
created user registration route in the user-api-routes
uimarshall May 21, 2019
a7136f6
Merge branch 'feature/marshall/create-user-api-routes' of https://git…
uimarshall May 21, 2019
eb6e663
fixed linting errors
uimarshall May 21, 2019
c8a4a94
refactored the forms
justiceotuya May 21, 2019
11bc109
remove duplicate lines of code in server/index.js and destructure req…
uimarshall May 21, 2019
ed0535d
refactored the forms
justiceotuya May 21, 2019
f1129a6
fixed minor indentation and naming issue
justiceotuya May 22, 2019
61ef2d3
put destructuring on line 13 in routes/api/users.js and modified erro…
uimarshall May 22, 2019
2abd7fa
Merge pull request #19 from team-helpme/feature/marshall/create-user-…
justiceotuya May 22, 2019
f840f32
merged package.json
justiceotuya May 22, 2019
a822058
Merge pull request #17 from team-helpme/feature/justiceotuya/signup
uimarshall May 22, 2019
6483de4
fixed path
cimthog May 22, 2019
e64dbd3
merged files
cimthog May 22, 2019
d6f70cd
removed conflicting file
cimthog May 22, 2019
a8ff5f4
resolve conflicts
cimthog May 22, 2019
301091d
resolved conflicts
cimthog May 22, 2019
81359aa
resolved conflicts
cimthog May 22, 2019
1bfba61
resolved conflicts
cimthog May 22, 2019
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
Prev Previous commit
Next Next commit
fixed linting errors
uimarshall committed May 21, 2019
commit eb6e66343fdc653773021206edc9e30d92e14b7d
3 changes: 2 additions & 1 deletion server/index.js
Original file line number Diff line number Diff line change
@@ -35,7 +35,8 @@ nextApp.prepare().then(() => {

app.get(
'*',
(req, res) => handle(req, res) // next should handle all other routes except the ones specified.
// next should handle all other routes except the ones specified.
(req, res) => handle(req, res)
);

app.listen(PORT, err => {