search

HarshKapadia2 / git_basics

A PWA and TWA for Git and GitHub concepts and commands.
https://harshkapadia2.github.io/git_basics
Creative Commons Attribution Share Alike 4.0 International
105 stars 20 forks source link

My branch #83

Closed shefali12-ab closed 3 years ago

shefali12-ab commented 3 years ago

Added the required content in page opensource_programs.adoc gitbasic1 gitbasic3 gitbasic5 gitbsc2 gitbsc4 I have added these changes in new branch named my_branch. this much content i will change font style and format text afterwards. please review it . closes #83

shefali12-ab commented 3 years ago

@KartikSoneji and @HarshKapadia2 please have a look .

KartikSoneji commented 3 years ago

This is a proper draft pull request, good job! Please add Closes #<issue number> to the pull request description, that way the issue will automatically be closed when this PR is merged.

Also, it seems like the build step has some errors, note that you will need to fix them before the PR can be merged. Looks like the workflow itself is broken, let me fix that.

shefali12-ab commented 3 years ago

okay @KartikSoneji where to see these errors. i am geeting mail regarding github page workflow failed. eror

shefali12-ab commented 3 years ago

@KartikSoneji is build setup error has been resolved ?? also is this much content is ok? some of the things I have written by my own so please check. also one ques as this repo is part of Hacktoberfest can this issue get a label of hacktoberfest?

HarshKapadia2 commented 3 years ago

The workflow has been updated to handle PRs. Please update your branch with the latest commits.

Also, you have used syntax arbitrarily. For bullet points, please use * and ==== for headings. (The number of = can change.) Please do not leave lines and whitespaces arbitrarily. Please refer to other files in the project, the CONTRIBUTING.md file and the Asciidoctor syntax reference for the code style and acceptable syntax.

Once the PR has been merged, the hacktoberfest-accepted label will be added to the PR.

shefali12-ab commented 3 years ago

okay, sure I will do it.

shefali12-ab commented 3 years ago

@HarshKapadia2 I have made some commits, changed the syntax. Please check is it working or not.

shefali12-ab commented 3 years ago

okay sure, will add these changes also.

shefali12-ab commented 3 years ago

@KartikSoneji @HarshKapadia2 I have added the required changes, in place of unofficial sites I have added some blog posts. also added logo images, Eligibility Section. please check that list element section for combining two list elements I have just added + at the end of each para, is this correct? as I have read in the documentation that + is added in the new line, but that was not working here so, I have added it at the end of para.

shefali12-ab commented 3 years ago

@KartikSoneji @HarshKapadia2 Please Review it.

HarshKapadia2 commented 3 years ago

Hey @shefali12-ab I would recommend that you try to build the web site. You have not linked the files properly, so it is not appearing in the final build. Please read the 'Parsing' section in the CONTRIBUTING.md file to understand how to link files.

Please test the final site before pushing.

You have a typo in the file name as well.

So please go through the CONTRIBUTING.md file properly and always test the final site before committing and pushing. This will ensure that the PR will get merged quicker.

HarshKapadia2 commented 3 years ago

Also, the CI/CD workflow has been modified again, so I would recommend updating your branch with the latest commits.

HarshKapadia2 commented 3 years ago

There are a LOT of spelling errors as well. Please use a spell checker plugin. (For VS Code)

shefali12-ab commented 3 years ago

@HarshKapadia2 I have made the required, i need help please tell me how to perform testing of website. as I have read contributing.md and there it was written to generate website in build directory and run sh build.sh command . i didn't understand like where to run these commands( i am doing it like opening new terminal in open_source_programs file and typed sh build.sh command )but it didn't worked .please guide me.

shefali12-ab commented 3 years ago

@HarshKapadia2 Please review it .

HarshKapadia2 commented 3 years ago

i didn't understand like where to run these commands

As mentioned in the CONTRIBUTING.md file, the sh build.sh command has to be run in the root directory of the project. Eg: If the entire project resides in a directory named git_basics, then the command has to be run in that git_basics directory. Do not run the command in any sub-directory inside the git_basics directory.

HarshKapadia2 commented 3 years ago

Please remove all the logos as well. They are not required.

KartikSoneji commented 3 years ago

Please remove all the logos as well. They are not required.

I think the logos will help differentiate between programs at a glance. Maybe just add them in one row above the relevant column in the table.

shefali12-ab commented 3 years ago

I have run this command sh build.sh using gitbash terminal, before I was doing it on vs code terminal, and opened this index.html in build directory through live server, the content I have added are appearing like this, see attached screenshot,as you have said earlier it was not appearing on the final build. is it correct now? also, I am editing it again according to the changes that you have said today. git_basics

HarshKapadia2 commented 3 years ago

It seems that the Table of Contents (ToC) is missing in your output. Weird.

In the image below, please note how all programs are appearing in the ToC rather than just the heading 'Open Source Programs'. Please look into your heading levels (no. of =). There should only be one level three heading (===) in a file. All the others should be between level 4 to 6.

Please change the title of the 'Official Website' table column to 'Links'.

Some of the empty table cells have a single dash while other have three hyphens. Please make them all long dashes.

The middle column line of the table is thicker than the rest. Why is that? Please make it similar to the others.

The main branch has been updated with some code, so please update your branch.

shefali12-ab commented 3 years ago

made these required changes now the table of content is visible and only opensource programs heading is visible there, but that middle column is thicker I am not getting why it is happening, I am searching for it or if you know then please tell. git_basics (1)

HarshKapadia2 commented 3 years ago

Any updates, @shefali12-ab?

shefali12-ab commented 3 years ago

@HarshKapadia2 Need to fix the table column. will update you by tomorrow.

shefali12-ab commented 3 years ago

@HarshKapadia2 I am not able to figure out why the middle column of the table is thicker. the syntax is same as of other columns.

HarshKapadia2 commented 3 years ago

Okay, no issues. Have you made all the other changes and checked the built version thoroughly for all the suggested changes?

shefali12-ab commented 3 years ago

yes ,please see this screenshot attached, Table of content is not visible here in this screenshot but it was there, just check the content that is visible. Also, I haven't removed the images, it is looking good or if you want I will remove them. git_basics (2)

HarshKapadia2 commented 3 years ago

The aspect ratio of the GSoC and GSoD images is improper. Please correct that and push a commit to this PR.

shefali12-ab commented 3 years ago

I have made changes and pushed it.

HarshKapadia2 commented 3 years ago

@KartikSoneji please check and suggest changes. I have made all the changes as per my liking.

Also, should some of the commits in between be squashed before merging?

HarshKapadia2 commented 3 years ago

@shefali12-ab please check the changes in my commits. I corrected a LOT of grammar and formatting errors. Please take care while contributing to documentation projects in the future.

shefali12-ab commented 3 years ago

Yeah, sure I will check them again. This was my first open-source contribution in documentation, which I will take care of in the future, further thank you for your guidance as I have learned to use assciidoctor and Github :)) by contributing to this repo.

HarshKapadia2 commented 3 years ago

Great! Thank you for contributing and unless @KartikSoneji suggests any changes, this PR looks good to be merged!

HarshKapadia2 commented 3 years ago

Hey @shefali12-ab I rebased the commits to maintain a clean history and force pushed to your branch.

I will be merging the PR now. 🎉

Thank you SO much for your contribution! I am impressed by the way you did not give up despite there being a lot changes. This PR has gone on for almost a month now and you kept improving upon your work. That's awesome! I did help you out a little in the end, but I'm sure you'll get better with more PRs. Do work on your language skills and please read the CONTRIBUTING.md file thoroughly whenever you're contributing to any project. PLEASE keep raising issues and opening PRs. Your attitude of not giving up will really help you out! 👍

All the best! Feel free to reach out for any help.

shefali12-ab commented 3 years ago

@HarshKapadia2 Thank you so much for merging PR, this appreciation means a lot to me, I will surely improve my skills.