Upcomingevent

[Fenil-1]

Resolves #3

Added UpcomingEventCard component using props ..
Register button does not do anything rn as mentioned ..

[netlify]

✅ Deploy Preview for au-pclub ready!

Name	Link
🔨 Latest commit	cf6e13e
🔍 Latest deploy log	https://app.netlify.com/sites/au-pclub/deploys/676eb87c5854400008e53dd2
😎 Deploy Preview	https://deploy-preview-43--au-pclub.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

To edit notification comments on pull requests, go to your Netlify site configuration.

[Saumya40-codes]

LGTM 🚀
looks perfect

Just few suggestions (please review the below comments)

[Saumya40-codes]

The codebase you were/are currently working on might be few commits behind the current codebase which is causing the merge conflict

when you do/did git checkout upcomingevent it takes the state of code during that time and creates a kind of new copy but it doesnt remain in sync with whatever is updating in the main codebase.

A merge conflict happens when changes in your branch and the main branch affect the same parts of the file(s). Git doesn't know which changes to keep.

Now, for this you can do one of the following option:

1. As you saw in image (or above merge conflict message), you can completely replace src/App.jsx and src/components/Navbar.css with the current repo's latest change and commit/push again here . (imo this will be easy way as in your current changes, we wont strictly need the updates that are being made in those two files)

check here

---

2. You can go to cloned repository and make sure your branch is main and click on Sync Fork and then update branch now your main branch is up-to-date with that of our codebase.

in your local setup, run following commands.

git checkout main

git pull

git checkout upcomingevent

git merge main

now you'll see that merge conflict has occurred message. Now if your using vs code, go to file where merge conflict has occured, and click open in merge editor kind option there. Select Accept Incoming Changes this will prioritize the main (latest branch) change in both the file. Once you do this for both file and all conflicts.

Run normal, git add ., git commit and git push commands again.

[Saumya40-codes]

Imo it will be simple and right for now that you overwrite src/App.jsx and src/components/Navbar.css with the current code(the one in this repo) as its ok if what changes you've made in those gets removed as it was going to be changed anyways.

[Saumya40-codes]

Imo it will be simple and right for now that you overwrite src/App.jsx and src/components/Navbar.css with the current code(the one in this repo) as its ok if what changes you've made in those gets removed as it was going to be changed anyways.

If you didn't understand anything, do comment as I can make those changes from my side as well, but I thought it will be better if you make updates there !

[Fenil-1]

Imo it will be simple and right for now that you overwrite src/App.jsx and src/components/Navbar.css with the current code(the one in this repo) as its ok if what changes you've made in those gets removed as it was going to be changed anyways.

If you didn't understand anything, do comment as I can make those changes from my side as well, but I thought it will be better if you make updates there !

I merged with main .. can you please check it once ?

[Saumya40-codes]

Perfect now 🚀

[Saumya40-codes]

Thanks @Fenil-1 for this PR