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 map #17

Merged
merged 5 commits into from
Aug 23, 2021
Merged

Feature map #17

merged 5 commits into from
Aug 23, 2021

Conversation

Dkay-code
Copy link
Collaborator

@Dkay-code Dkay-code commented Aug 16, 2021

Close issue #8 The map section is finished including a map with the number of universities by province.
A test folder was added to src and a snapshot test has been created under the name 'Map.test.js' for this section.

@netlify
Copy link

netlify bot commented Aug 16, 2021

✔️ Deploy Preview for choose-wisely ready!

🔨 Explore the source changes: 9729bbf

🔍 Inspect the deploy log: https://app.netlify.com/sites/choose-wisely/deploys/611eaafee00b9200087d3672

😎 Browse the preview: https://deploy-preview-17--choose-wisely.netlify.app/

Copy link
Collaborator

@Ammar-64 Ammar-64 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for next time keep the 2 PRs separated I can see changes from the other PR done here too

src/components/Map/style.scss Outdated Show resolved Hide resolved
@Ammar-64
Copy link
Collaborator

LGTM but I can't approve it now because it has changes from the other branch which will cause a conflict later, to solve it we either have to wait until the other one is merged or you can create another branch from dev, include only the map changes in it and open a new pr

@Dkay-code
Copy link
Collaborator Author

Thanks for the review, I'll wait until the other PR is merged and be careful next time to work on one branch per PR.

@Ammar-64
Copy link
Collaborator

@Dkay-code there are some conflicts need to be solved here before merging

@Dkay-code
Copy link
Collaborator Author

PTAL

Copy link
Collaborator

@Ammar-64 Ammar-64 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Ammar-64 Ammar-64 merged commit 315a8be into dev Aug 23, 2021
@Ammar-64 Ammar-64 deleted the feature_map branch August 23, 2021 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants