-
Notifications
You must be signed in to change notification settings - Fork 2
merge master to current branch #25
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
Open
driedsoba
wants to merge
13
commits into
zhiyu
Choose a base branch
from
master
base: zhiyu
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 hidden or 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
- Add new API domain for login only (LOGIN_DOMAIN) - Change Login POST request to use separate API (LOGIN_DOMAIN) - Fix /logout method to redirect to home page - Abstract DropdownMenu from LoginMenu - Add comments to Header
- Add AssignedProjects.js file in routes/assignedProjects directory - Add AssignedProjects route in App.js - Add temp AssignedProjects link in Header.js
- Add AssignedProjectDetail.js into assignedProjects dir - Add AssignedProjectDetail.module.css into assignedProjects dir - Update AssignedProjects.js to link to AssignedProjectDetail.js - Update App.js to include AssignedProjectDetail.js Route
- Change API_DOMAIN to new version with assignedProjectInfo type - Add assignedProjectInfo information to APIDocumentation.md - Rewrote AssignedProjects.js to use custom overview layout instead
- Fix heroImage heading and backbutton to be in same line/div while subheading will be the next line just below it - Change assignedProjectDetail to use new API_DOMAIN and correct type
Add last changes to login and authentication feature
- Add 3 sections to AssignedProjectDetail: - Project Description - Project Recruitment Info - Project Registration Link - Sections in AssignedProjectDetail based on data.isRecruiting
- Change registration link to button form - Add 3 sections to recruitment in detail page - Change application status to 'OPEN' or 'CLOSED' in front of cover image
Add Assigned Projects Pages
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.
merge master to current branch