-
Notifications
You must be signed in to change notification settings - Fork 7
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
Develop <> master3 #56
Open
Mnickii
wants to merge
64
commits into
master
Choose a base branch
from
develop
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
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
* chore(eslint) add eslint dev dependencies add eslint config airbnbbase and eslint import pligin dependencies [Start #167313388] * chore(eslint) add .eslintrc file [Continue #167313388] * chore(eslint) delete unwanted folders [Continue #167313388] * chore(eslint) delete unwanted files [Continue #167313388] * chore(eslint) add eslint dev dependencies add eslint config airbnbbase and eslint import pligin dependencies [Start #167313388] * chore(eslint) add .eslintrc file [Continue #167313388] * chore(eslint) delete unwanted files [Continue #167313388]
* chore(setup-travis-ci):Integrate TravisCI with readme badge [Finishes #167313386] * chore(setup-travis-ci):Fix the failing travis [Finishes #167313386] * chore(setup-travis-ci):Integrate travis CI with README [Finishes #167313386] * chore(setup-travis-ci):Change npm install to npm ci [Finishes #167313386] * chore(setup-travis-ci):Update the lock file [Finishes #167313386]
Instlled sequelize created src folder with config, migrations, models, seeds folders configured postgres created User model Configured babel [Finishes #167313387] [Finishes #167595103]
* chore(api-doc): Setup API documentation using swagger * chore(api documentation): Setup api documentation using swagger - create entry point of application in src/app.js - create swagger specification implementation in src/swagger.js - create api documentation endpoint in src/routes/api/inde.route.js - create 404 error route handler - create 500 error route handler - create pull request template [Finishes #167313394]
* chore(houndci):added .hound.yml[finished#1167313389] * chore(houndci):added houndci badge[finishes#1167313389] * chore(houndci):added added new line .hound.yml[finishes#1167313389]
* What does this PR do? Setup unit testing for the backend Tasks to be accomplished - Add required dependancies for running tests - Create test directory with general test setup module - Update test running script - Test the index route How to test the test setup - Clone this repo and run git checkout -b ch-api-test-setup-167313391 - Run git pull ch-api-test-setup-167313391 - Run npm test Usage To add tests, - Open/Create a file for the given tests in the test directory, es test users - Import {chai, app} from ./test-setuo - Ensure that required modules/functions not in the test-setup package are imported from their respective sources - Write the test suite(s)/cases Pivotal tracker story [finishes #167313391](https://www.pivotaltracker.com/story/show/167313391) * What does this PR do? Setup unit testing for the backend Tasks to be accomplished - Add required dependancies for running tests - Create test directory with general test setup module - Update test running script - Test the index route How to test the test setup - Clone this repo and run git checkout -b ch-api-test-setup-167313391 - Run git pull ch-api-test-setup-167313391 - Run npm test Usage To add tests, - Open/Create a file for the given tests in the test directory, es test users - Import {chai, app} from ./test-setuo - Ensure that required modules/functions not in the test-setup package are imported from their respective sources - Write the test suite(s)/cases Pivotal tracker story [finishes #167313391](https://www.pivotaltracker.com/story/show/167313391) * rename imported server * fix index route response property name error and stream line server name * Update package.json * Update package.json * modify test script to report coverage * What does this PR do? Setup unit testing for the backend Tasks to be accomplished - Add required dependancies for running tests - Create test directory with general test setup module - Update test running script - Test the index route How to test the test setup - Clone this repo and run git checkout -b ch-api-test-setup-167313391 - Run git pull ch-api-test-setup-167313391 - Run npm test Usage To add tests, - Open/Create a file for the given tests in the test directory, es test users - Import {chai, app} from ./test-setuo - Ensure that required modules/functions not in the test-setup package are imported from their respective sources - Write the test suite(s)/cases Pivotal tracker story [finishes #167313391](https://www.pivotaltracker.com/story/show/167313391) * What does this PR do? Setup unit testing for the backend Tasks to be accomplished - Add required dependancies for running tests - Create test directory with general test setup module - Update test running script - Test the index route How to test the test setup - Clone this repo and run git checkout -b ch-api-test-setup-167313391 - Run git pull ch-api-test-setup-167313391 - Run npm test Usage To add tests, - Open/Create a file for the given tests in the test directory, es test users - Import {chai, app} from ./test-setuo - Ensure that required modules/functions not in the test-setup package are imported from their respective sources - Write the test suite(s)/cases Pivotal tracker story [finishes #167313391](https://www.pivotaltracker.com/story/show/167313391) * rename imported server * fix index route response property name error and stream line server name * Update package.json * modify test script to report coverage * #167313389 Integrated HoundCi (#5) * chore(houndci):added .hound.yml[finished#1167313389] * chore(houndci):added houndci badge[finishes#1167313389] * chore(houndci):added added new line .hound.yml[finishes#1167313389] * What does this PR do? Setup unit testing for the backend Tasks to be accomplished - Add required dependancies for running tests - Create test directory with general test setup module - Update test running script - Test the index route How to test the test setup - Clone this repo and run git checkout -b ch-api-test-setup-167313391 - Run git pull ch-api-test-setup-167313391 - Run npm test Usage To add tests, - Open/Create a file for the given tests in the test directory, es test users - Import {chai, app} from ./test-setuo - Ensure that required modules/functions not in the test-setup package are imported from their respective sources - Write the test suite(s)/cases Pivotal tracker story [finishes #167313391](https://www.pivotaltracker.com/story/show/167313391) * What does this PR do? Setup unit testing for the backend Tasks to be accomplished - Add required dependancies for running tests - Create test directory with general test setup module - Update test running script - Test the index route How to test the test setup - Clone this repo and run git checkout -b ch-api-test-setup-167313391 - Run git pull ch-api-test-setup-167313391 - Run npm test Usage To add tests, - Open/Create a file for the given tests in the test directory, es test users - Import {chai, app} from ./test-setuo - Ensure that required modules/functions not in the test-setup package are imported from their respective sources - Write the test suite(s)/cases Pivotal tracker story [finishes #167313391](https://www.pivotaltracker.com/story/show/167313391) * rename imported server * fix index route response property name error and stream line server name * Update package.json * Update package.json * modify test script to report coverage * What does this PR do? Setup unit testing for the backend Tasks to be accomplished - Add required dependancies for running tests - Create test directory with general test setup module - Update test running script - Test the index route How to test the test setup - Clone this repo and run git checkout -b ch-api-test-setup-167313391 - Run git pull ch-api-test-setup-167313391 - Run npm test Usage To add tests, - Open/Create a file for the given tests in the test directory, es test users - Import {chai, app} from ./test-setuo - Ensure that required modules/functions not in the test-setup package are imported from their respective sources - Write the test suite(s)/cases Pivotal tracker story [finishes #167313391](https://www.pivotaltracker.com/story/show/167313391) * rename imported server * fix index route response property name error and stream line server name * Update package.json * modify test script to report coverage * chore(coveralls):added coveralls badge[Finishes #167313393] * add coveralls badge, change to use expect for assetion and fix typo * remove duplicate application title * remove duplicate title and improve index route test
* chore(heroku) add app.json file to enable heroku to review each open pull request so that we can test app on heroku before merging branch to develop [Starts #167313390] * chore(heroku) add procfile [Continue #167313390] * chore(heroku) add app.json file to enable heroku to review each open pull request so that we can test app on heroku before merging branch to develop [Starts #167313390] * chore(heroku) add procfile [Continue #167313390] * chore(heroku) add index.js to test [Continue #167313390] * chore(heroku) add index.js to test [Continue #167313390] * chore(heroku) rebase from develop [Continue #167313390] * chore(heroku) finish heroku configuration [Finishes #167313390]
* updated develop branch * feature(apis):implemented crud operations[finishes:167313396] * feature(users):added username fields[finished:167313396] * feature(code-refactoring):fixed-eslint[Finish:167313396] * feature(tests):added tests[Finishes:167313396] * feature(testing):added tests[Finishes:#167313396] * feature(testing):fixed travis[Finishes:167313396]
…ation errors (#11) * feature(signup-validations):Users should receive descriptive signup/Registration validation errors [Finishes 167313398] * (signup-validation):Refactor validations [Finishes #167313398] * (signup-validation):Refactor signup validations [Finishes #167313398]
* feature(signout): add user signout logic * feature(logout): add user can logout functionality
…ered user gets access to different routes [Finishes #167313397] (#13)
* bg(heroku) rename Procfile file [Starts #167804454] * bg(heroku) rebasing [Finishes #167804454]
…hes #167313400] (#18)
* feature(social login): user has to login with social platforms [Finishes #167313401] * Purpose of this PR Add social login Tasks to be acomplished - Login from social account if user exists - Create user and login if social user does not exist How to test manually - In a browser enter the url http://<base url>/login/<social account> - Get the base URL in the documentation - social account is facebook or google for the respective logins - Follow the prompts and observe the response in the browser Related PT story [WIP #167313401](https://www.pivotaltracker.com/story/show/167313401) * feature(api-social-login):remove twitter [#167313401 * feature(social login): user has to login with social platforms [Finishes #167313401] * feature(social login): user has to login with social platforms [Finishes #167313401] * Purpose of this PR Add social login Tasks to be acomplished - Login from social account if user exists - Create user and login if social user does not exist How to test manually - In a browser enter the url http://<base url>/login/<social account> - Get the base URL in the documentation - social account is facebook or google for the respective logins - Follow the prompts and observe the response in the browser Related PT story [WIP #167313401](https://www.pivotaltracker.com/story/show/167313401) * Purpose of this PR Add social login Tasks to be acomplished - Login from social account if user exists - Create user and login if social user does not exist How to test manually - In a browser enter the url http://<base url>/login/<social account> - Get the base URL in the documentation - social account is facebook or google for the respective logins - Follow the prompts and observe the response in the browser Related PT story [WIP #167313401](https://www.pivotaltracker.com/story/show/167313401) * feature(api-social-login):remove twitter [#167313401 * feature(api-social-login):remove twitter [#167313401 * Purpose Add social login feature Tasks to be accomplished - Enable social login via twitter, google and facebook - Add creation of new users from social accounts on login - Document routes How can this feature be tested manualy - In the browser address bar, enter the url https://codepirates-ah-backend.herokuapp.com/login/<social>, where social can be facebook, google or twitter - In the resulting window, enter your credentials for the given social platform - If your account exists with this app, you should be logged in and your details and a token displayed in the browser - If your account does not exist, you will get a message in the broswer asking to creat an account - Enter https://codepirates-ah-backend.herokuapp.com/signup/social in the browser address bar and hit enter - You will get a message that your account has been created and a verification email sent along with your details and an access token Pivotal tracker story [finishes #167313401] * disable failing tests for further inspection * resolve merge conflict * Purpose of this commit: Resolve build failure Story ID [finished #167313401](https://www.pivotaltracker.com/story/show/167313401) * fix history packag-lock error * work around twitter account security concern * work around twitter account security concern * pp * twitter security * twitter security * twitter security * Update test-socialLogin.js * feature(social login): user has to login with social platforms [Finishes #167313401] * feature(social login): user has to login with social platforms [Finishes #167313401] * feature(social login): user has to login with social platforms [Finishes #167313401] * Purpose of this PR Add social login Tasks to be acomplished - Login from social account if user exists - Create user and login if social user does not exist How to test manually - In a browser enter the url http://<base url>/login/<social account> - Get the base URL in the documentation - social account is facebook or google for the respective logins - Follow the prompts and observe the response in the browser Related PT story [WIP #167313401](https://www.pivotaltracker.com/story/show/167313401) * Purpose of this PR Add social login Tasks to be acomplished - Login from social account if user exists - Create user and login if social user does not exist How to test manually - In a browser enter the url http://<base url>/login/<social account> - Get the base URL in the documentation - social account is facebook or google for the respective logins - Follow the prompts and observe the response in the browser Related PT story [WIP #167313401](https://www.pivotaltracker.com/story/show/167313401) * Purpose of this PR Add social login Tasks to be acomplished - Login from social account if user exists - Create user and login if social user does not exist How to test manually - In a browser enter the url http://<base url>/login/<social account> - Get the base URL in the documentation - social account is facebook or google for the respective logins - Follow the prompts and observe the response in the browser Related PT story [WIP #167313401](https://www.pivotaltracker.com/story/show/167313401) * feature(api-social-login):remove twitter [#167313401 * feature(api-social-login):remove twitter [#167313401 * feature(api-social-login):remove twitter [#167313401 * Purpose Add social login feature Tasks to be accomplished - Enable social login via twitter, google and facebook - Add creation of new users from social accounts on login - Document routes How can this feature be tested manualy - In the browser address bar, enter the url https://codepirates-ah-backend.herokuapp.com/login/<social>, where social can be facebook, google or twitter - In the resulting window, enter your credentials for the given social platform - If your account exists with this app, you should be logged in and your details and a token displayed in the browser - If your account does not exist, you will get a message in the broswer asking to creat an account - Enter https://codepirates-ah-backend.herokuapp.com/signup/social in the browser address bar and hit enter - You will get a message that your account has been created and a verification email sent along with your details and an access token Pivotal tracker story [finishes #167313401] * disable failing tests for further inspection * resolve merge conflict * Purpose of this commit: Resolve build failure Story ID [finished #167313401](https://www.pivotaltracker.com/story/show/167313401) * fix history packag-lock error * work around twitter account security concern * work around twitter account security concern * pp * twitter security * twitter security * twitter security * Update test-socialLogin.js * respond to feedback * fix merge error * feature(social auth): add social authentication functionality
* rebase * feature(follow-users):Users should be able to follow each other [Finishes #167313409] * feature(follow-users):Improve follow user tests[Finishes #167313409]
…n article [Finishes #167313403] (#19)
* controller business logic * adding testing and validation [Continue #167313402] * remove unwanted dependency
… article [Finishes 167313404] (#21)
…thors [Finishes #167313413] (#24)
…ctive (#28) [Finishes #167942825]
* add migration models * routes * docummentation
…read an article functinality (#30) [Finishes #167313415]
…mocked instead of the whole creating article route [Finishes #168000401] (#31)
* updated develop * User should get notifications * feature(notifications): User should be able to get notifications [Finishes #167313410] * feature(notifications):Remove unnecessary files [Finishes #167313410] * feature(notifications):Remove all unnecessary files [Finishes #167313410] * feature(notifications):Remove nodemailer files [Finishes #167313410]
fix missing images ptoperty bug in article update
… as the one who didn't like it yet when retrieving likes[Finishes #169672715] (#79)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.