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

added conflicts workflow #173

Merged
merged 3 commits into from Jun 24, 2021
Merged

added conflicts workflow #173

merged 3 commits into from Jun 24, 2021

Conversation

Justinnn07
Copy link
Collaborator

@Justinnn07 Justinnn07 commented Jun 24, 2021 •
edited

🚨 Please review the guidelines for contributing to this repository.

Please check if the PR fulfills these requirements

  • Make sure you are requesting to NEW-UI. Don't request other protected Branches like staging/master
  • Make sure no conflicts are present in the code, if so please resolve it(Tip: Always fetch upstream)
  • Your Commit messages should make sense.
  • Don't push your package.lock.json as this project uses yarn.lock already.
  • Check your code additions will fail neither code linting checks nor unit test.

Describe your changes

  • What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

  • docs update

  • What is the new behavior (if this is a feature change)?

  • added a new workflow

  • Does this PR introduce a breaking change? (i.e changes that may require users to update/refactor existing istances of the application)

  • NULL

  • Other Information:

❤️ Thank you!

@vercel
Copy link

vercel bot commented Jun 24, 2021 •
edited

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/stephin007/cowin-vaccine-availablity-checker/ChidyAY6gajCa9qLk9rqys9bPQZw
✅ Preview: https://cowin-vaccine-availablity-checker-git-workflow-stephin007.vercel.app

@stephin007
Copy link
Owner

stephin007 commented Jun 24, 2021 •
edited

@Justinnn07 Why are there 2 branches? will this check only work for master and NEW-UI branch?

@stephin007 stephin007 added the CodeChange This tag should be only used if there is change only in the codebase label Jun 24, 2021
@Justinnn07
Copy link
Collaborator Author

@Justinnn07 Why are there 2 branches? will this check only work for staging and NEW-UI branch?

Yes, This will work only while raising a New PR ..

@stephin007
Copy link
Owner

stephin007 commented Jun 24, 2021 •
edited

@Justinnn07
Can we add the staging branch for conflict check as right now,it has only master and NEW-UI !

@Justinnn07
Copy link
Collaborator Author

@Justinnn07
Can we add the staging branch for conflict check as right now,it has only master and NEW-UI !

sure

@stephin007
Copy link
Owner

@Justinnn07 why is the check is the failing?? 😆 , i dont see any conflicts!

@stephin007
Copy link
Owner

it requires a label i guess, let me add that as well @Justinnn07

@stephin007
Copy link
Owner

@Justinnn07 whenever this conflicts-bot runs successfully will this create a comment? or will it show the comment only when the checks are failing?

@Justinnn07
Copy link
Collaborator Author

@Justinnn07 whenever this conflicts-bot runs successfully will this create a comment? or will it show the comment only when the checks are failing?

When checks are failing , it will show the comment

stephin007
stephin007 approved these changes Jun 24, 2021
View reviewed changes
Copy link
Owner

@stephin007 stephin007 left a comment

Choose a reason for hiding this comment

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

LGTM, lets hope this works

@stephin007 stephin007 merged commit 0b8e097 into NEW-UI Jun 24, 2021
@stephin007 stephin007 deleted the workflow branch June 25, 2021 19:14
stephin007 added a commit that referenced this pull request Jun 30, 2021
@stephin007 @Justinnn07
🚨 STAGING DEPLOYMENT🚨 (#177)
7599842 
* Added Scroll to top fucntionality

* added firacode font CDN

* Added 3rd option in the World Covid Info. (#171)

* Added single continent info(WIP)

* Added continent options

* Added 3rd option and added horizontal scroll(WIP)

* removed width css and added text to tell user to swipe to see more data

* removed width css and added text to tell user to swipe to see more data

* added text to p tags

* fixed css for the continent Dropdown

* removed unwanted css

* removed whole continents data/graph

* added check for continent chart

* added conflicts workflow  (#173)

* added conflicts workflow 🔨

* added staging to the workflow 🔥

* changed the token name 🔨

* Added the 3rd option for showing per country covid data (#175)

* Added single continent info(WIP)

* Added continent options

* Added 3rd option and added horizontal scroll(WIP)

* removed width css and added text to tell user to swipe to see more data

* removed width css and added text to tell user to swipe to see more data

* added text to p tags

* fixed css for the continent Dropdown

* removed unwanted css

* removed whole continents data/graph

* added check for continent chart

* uncommented the third option

* updated chart content for continent view and removed dataset label

* Added country dropdown for each continent

* Added country flag  for dataReception check

* fixed img tag for vercel deployment error fix

* added the correct jmespath for th destrcutured flag

* added check for empty object for flags

* made continent and country single select responsive

* Added country card for information

* Added country card for information

* fixed css

* Added check for the country right card to be only shown when actual data is fetched

* finalised country card

Co-authored-by: Justin Varghese <69856008+Justinnn07@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stephin007 stephin007 stephin007 approved these changes

Assignees

@Justinnn07 Justinnn07

Labels
CodeChange This tag should be only used if there is change only in the codebase
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Justinnn07 @stephin007