codeforcauseorg / edu-client

Product focuses on 100% education as well as upskilling developing countries and rural areas.
https://educlient.codeforcause.org/
MIT License
130 stars 149 forks source link

Making the Application a PWA #213

Open dhwaj1902 opened 3 years ago

dhwaj1902 commented 3 years ago

Currently, the application is running on a browser, but now I want to convert it to an app a PWA so that it can installable on the machine.

dhwaj1902 commented 3 years ago

@Abhishek-kumar09 I am facing an issue while creating a Pull Request, I rebase my currently forked main branch with upstream/main breach, but it is still showing this.

image

and when I create a pull request it shows my previous commits like:

image

I also create new branches but they all are showing this.

Please Help me regarding this issue.

dhwaj1902 commented 3 years ago

And also can you please review my issue also @Abhishek-kumar09, regarding PWA.

dhwaj1902 commented 3 years ago

@kunal-kushwaha @KeenWarrior please help 🙏.

ADRE9 commented 3 years ago

Hey @dhwaj1902 actually this react app is gonna be converted to an apk file using the Capacitor js library. So you don't have to make it as a PWA.

dhwaj1902 commented 3 years ago

Ok, I understand that but what about this issue? I am not able to make any or any commit because this is showing.

rizwan2000rm commented 3 years ago

@dhwaj1902 Please look into advance git functionality. You might have to hard reset to a previous commit and merge with a rebase rather than a commit.

ADRE9 commented 3 years ago

I guess each time you pull from the upstream you commit with a message and push so it takes it as an update and shows that your branch is ahead of the forked project. So after pulling simple push without commiting to bring your GitHub repo equal to the project repo. Hope this will help you in future.

dhwaj1902 commented 3 years ago

@ADRE9 I did the same but it is still showing like this. image

Abhishek-kumar09 commented 3 years ago

Hi, @dhwaj1902

To delete those extra commits and make your branch even with main branch, Do rebasing.

git rebase -i HEAD~5 // 5 being the number of commits to look into an interactive terminal
now delete the commits that you dont want by replacing "pick" with "drop"
Once done, press "ctrl+s and then ctrl+x"
Your branch is rebased and is now even with the main branch of edu-clent