Skip to content
This repository was archived by the owner on Mar 7, 2024. It is now read-only.

Conversation

@sarthakkundra
Copy link
Contributor

Created a new folder src/views/HomeView/Testimonials having the card layout and an index.js file to map through the data in src/views/HomeViewData.js to show the testimonials. #28

Side note :- I did a last minute change to make the alternate name dynamic in case there's no picture for the avatar which caused a merge conflict. Maybe this will help in resolving it. File :- src/views/HomeView/Testimonials/TestimonialCard.js Line :- 45

@Abhishek-kumar09
Copy link
Contributor

Abhishek-kumar09 commented Jul 20, 2020

Hey @sarthakkundra ,

CI is failing because you have many unused variables...Delete unused variables and deploy will work fine:)
image

I think npm run format could help you in formatting and removing unused variables.

@Abhishek-kumar09
Copy link
Contributor

Also, rebase your branch to current development branch to resolve merge conflicts:
Its easy... just do

git remote add upstream https://github.com/codeforcauseorg/codeforcause.org.git
git fetch upstream
git rebase upstream/development

Then you will have to resolve merge conflicts on your own... There will be two code blocks one is written by you and other is written in current development branch... You can just delete any of the two codeblocks, that works for your PR.

once done:
run

npm run start

to confirm everything is working fine.

Now do:

git push -f

and we can see your changes 🥇

@sarthakkundra
Copy link
Contributor Author

@Abhishek-kumar09 Thanks for the help will do the changes :)

@Abhishek-kumar09
Copy link
Contributor

@sarthakkundra , Is it running in your local machine, the build is failing here.
Also, you have to rebase your PR anyways to get it merged with the latest code. .Please tell me when you stuck somewhere, we are there to help you.

@sarthakkundra
Copy link
Contributor Author

@Abhishek-kumar09 I have made the changes and I was just pushing them after rebasing but I'm getting committing is not possible because I have unmerged files after resolving the conflict issues. I'm trying to fix that

@Abhishek-kumar09
Copy link
Contributor

have you done rebasing?
you have to force push the branch after rebasing...because git history changes with rebasing.

@sarthakkundra
Copy link
Contributor Author

@Abhishek-kumar09 Done! Thanks a lot for the help! 💯

@Abhishek-kumar09
Copy link
Contributor

Booyah! you have made it...:)

@Abhishek-kumar09
Copy link
Contributor

@GangaChatrvedi @KeenWarrior , please review.

Copy link
Contributor

@Abhishek-kumar09 Abhishek-kumar09 left a comment

Choose a reason for hiding this comment

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

Changes

},
cardMedia: {
paddingTop: '55.75%', // set 61.25% for 16:9 or highresolution images--- currently set to 55.75% to fit hqquality images.
paddingTop: '61.25%' // 16:9
Copy link
Contributor

Choose a reason for hiding this comment

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

Please undo this change.

@KeenWarrior
Copy link
Contributor

Kudos to your work @sarthakkundra

There are some changes.

  1. Pull request created extra borders on top and bottom here.

Screenshot 2020-07-22 at 1 04 07 AM

  1. HTML provided was for reference. You will need to use the design specified in the issue.

Screenshot 2020-07-22 at 1 05 40 AM

Please message here in case of any doubt in this PR. And on discord for any general concern.

@Abhishek-kumar09
Copy link
Contributor

There are some changes.
Pull request created extra borders on top and bottom here.

This will be fixed by this change https://github.com/codeforcauseorg/codeforcause.org/pull/46#pullrequestreview-452765869

@sarthakkundra
Copy link
Contributor Author

@KeenWarrior I think this PR should close this issue :)
Also @Abhishek-kumar09 once again thanks for all the help while making the PR!

@KeenWarrior
Copy link
Contributor

Some more changes 😄

  • Please fix top and bottom padding according to this
  • Hover on the picture should also create a shadow on the box.

@GangaChatrvedi GangaChatrvedi merged commit 6c2dabc into codeforcauseorg:development Jul 29, 2020
@Abhishek-kumar09
Copy link
Contributor

congrats @sarthakkundra , your first commit merged into codeforcause.org. Good Work!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants