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.

Sign up for GitHub

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

Jump to bottom

Feature/daniel/profile model #17

Open
wants to merge 70 commits into
base: master
Choose a base branch
from
Open

Feature/daniel/profile model #17

wants to merge 70 commits into from

Conversation

cimthog
Copy link

@cimthog cimthog commented May 17, 2019

No description provided.

justiceotuya and others added 30 commits April 21, 2019 00:38
@justiceotuya
integrated tailwind and antdesign
5d48ee1
@justiceotuya
removed taiwindcss and rewrote the readme
f4d5f33
@uimarshall
Merge pull request #2 from team-helpme/feature/justiceotuya/integrate…
7884570 
…-antd

Feature/justiceotuya/integrate antd
@justiceotuya
finished the Landing Page
24daa0b
@justiceotuya
added next.config.js to .eslintignore
e6f1ab5
@justiceotuya
fixed linting errors for the front page
a1abd99
@uimarshall
deletes hound.yml and make changes to travis.yml
d8e3395
@justiceotuya
Merge pull request #4 from team-helpme/feature/marshall/delete-hound
3cf3911 
deletes hound.yml and make changes to travis.yml
@justiceotuya
fixed Landing page Bug reported by travis ci
501acef
@uimarshall
Merge pull request #3 from team-helpme/feature/justiceotuya/finished-…
8235020 
…landing-page

finished the Landing Page
@justiceotuya
fixed Landing page linting
d375028
@uimarshall
Merge pull request #5 from team-helpme/fix/justiceotuya/fixed-linting…
c3851a1 
…-error

fixed Landing page linting
@uimarshall
add basic expess server set up and database set up in mlab
976ce3c
@uimarshall
remove Uche Nnadi as author in package.json file
08ade0b
@uimarshall
Merge pull request #6 from team-helpme/feature/marshall/basic-express…
2cfa498 
…-setup

add basic expess server set up and database set up in mlab
@uimarshall
Merge branch 'master' of https://github.com/team-helpme/helpme
0995fc0
@uimarshall
creates the user model and tests for basic crud operation
ad478aa
@uimarshall
deleted test/package.json
f521f69
@uimarshall
add jest-mongodb-config file for jest testing
a55ecf8
@cimthog
created the profile model and routes for creating and updating profile
45222d2
@uimarshall
creates the user api-routes
86c7285
@uimarshall
make module.exports = User = mongoose.model('users', UserSchema); int…
cc6171c 
…o one line
@uimarshall
modified User.js to create a new PR
cf2e827
@cimthog
created user profile routes
78a5a1d
@justiceotuya
added ds_store to gitignore
8c6102b
@justiceotuya
refactored the landing page
27e3f21
@justiceotuya
refactored landing page and layout
3c1c139
@justiceotuya
made changes to file
2ee7d8a
@justiceotuya
made changes to file
7649664
@justiceotuya
made changes to file
474bbe7
cimthog and others added 30 commits May 17, 2019 00:47
@cimthog
made few changes
a546e93
@cimthog
removed unnecessary console.log
06e4274
@uimarshall
Merge branch 'master' of https://github.com/team-helpme/helpme
4a8b49c
@uimarshall
Merge branch 'master' into feature/marshall/create-user-model
0eb9aab
@justiceotuya
fixed errors in the login and signup pages"
25351ec
@cimthog
resolved eslint confilicts
1dfd1ea
@cimthog
removed empty test file
7f30d46
@uimarshall
modified User model and remove test folder
247a07a
@justiceotuya
Merge pull request #9 from team-helpme/feature/marshall/create-user-m…
8c841d8 
…odel

Feature/marshall/create user model
@justiceotuya
Merge branch 'master' of https://github.com/team-helpme/helpme into f…
40e9c73 
…eature/justiceotuya/signup
@justiceotuya
changed booleans to question format, added propTypes checking to Logi…
b1770c4 
…nInputItemGenerator.jsx and fixed comments indentation
@justiceotuya
fix doc indent
e7b11db
@uimarshall
created user registration route in the user-api-routes
38f6aa6
@uimarshall
Merge branch 'feature/marshall/create-user-api-routes' of https://git…
a7136f6 
…hub.com/team-helpme/helpme into feature/marshall/create-user-api-routes
@uimarshall
fixed linting errors
eb6e663
@justiceotuya
refactored the forms
c8a4a94
@uimarshall
remove duplicate lines of code in server/index.js and destructure req…
11bc109 
….body in routes/api/users.js
@justiceotuya
refactored the forms
ed0535d
@justiceotuya
fixed minor indentation and naming issue
f1129a6
@uimarshall
put destructuring on line 13 in routes/api/users.js and modified erro…
61ef2d3 
…r message for already used email
@justiceotuya
Merge pull request #19 from team-helpme/feature/marshall/create-user-…
2abd7fa 
…api-routes

Feature/marshall/create user api routes
@justiceotuya
merged package.json
f840f32
@uimarshall
Merge pull request #17 from team-helpme/feature/justiceotuya/signup
a822058 
Feature/justiceotuya/signup
@cimthog
fixed path
6483de4
@cimthog
merged files
e64dbd3
@cimthog
removed conflicting file
d6f70cd
@cimthog
resolve conflicts
a8ff5f4
@cimthog
resolved conflicts
301091d
@cimthog
resolved conflicts
81359aa
@cimthog
resolved conflicts
1bfba61
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cimthog @justiceotuya @uimarshall