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.

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

Git Basics: replaced screenshots with equivalent text and code snippets #28002

Merged

Conversation

kol3x
Copy link
Contributor

@kol3x kol3x commented May 19, 2024

Because

The lesson assignment used a bunch of screenshots, hurting accessibility.

This PR

  • Deleted screenshot files
  • Added some text fixes and code snippets to compensate for screenshots.

Issue

Closes #27904

Additional Information

I was about to commit this PR and noticed that my PR is deleting main README file for some reason... I returned it but github still acts like I changed something in it 😅

Pull Request Requirements

  • I have thoroughly read and understand The Odin Project curriculum contributing guide
  • The title of this PR follows the location of change: brief description of change format, e.g. Intro to HTML and CSS lesson: Fix link text
  • The Because section summarizes the reason for this PR
  • The This PR section has a bullet point list describing the changes in this PR
  • If this PR addresses an open issue, it is linked in the Issue section
  • If any lesson files are included in this PR, they have been previewed with the Markdown preview tool to ensure it is formatted correctly
  • If any lesson files are included in this PR, they follow the Layout Style Guide

@github-actions github-actions bot added the Content: Git Involves Git content label May 19, 2024
@kol3x
Copy link
Contributor Author

kol3x commented May 19, 2024

markdown playing with me -_-

@MaoShizhong MaoShizhong requested review from wise-king-sullyman and thatblindgeye and removed request for wise-king-sullyman May 19, 2024 11:39
Copy link
Contributor

@thatblindgeye thatblindgeye left a comment

Choose a reason for hiding this comment

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

A lot of change requests, but a lot of them are super quick ones that mainly relate to removing bash blocks that we don't really need. Since instruction items say inline "Enter this command some command.", the bash block isn't really necessary if it's just stating the same command again.

1. Create a new repository by clicking the button shown in the screenshot below.

![The GitHub Profile Screen](https://cdn.statically.io/gh/TheOdinProject/curriculum/b54d14c5dcee1c6fac61aee02fca7e9ef7ba1510/foundations/git_basics/project_practicing_git_basics/imgs/00.png)
1. Create a new repository by clicking the "+" button in the top-right corner and selecting "New repository".
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
1. Create a new repository by clicking the "+" button in the top-right corner and selecting "New repository".
1. From the GitHub homepage, create a new repository by clicking the "+" button in the top-right corner and selecting "New repository".

Wondering if we should also mention how to do this for when the "create new..." dropdown isn't visible.

In that case a user would have to click their avatar, select "Your repositories", then on the new page click the "New" button.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right, I thought about that.

git/foundations_git/git_basics.md Outdated Show resolved Hide resolved
git/foundations_git/git_basics.md Outdated Show resolved Hide resolved
git/foundations_git/git_basics.md Outdated Show resolved Hide resolved
git/foundations_git/git_basics.md Outdated Show resolved Hide resolved
git/foundations_git/git_basics.md Outdated Show resolved Hide resolved
git/foundations_git/git_basics.md Outdated Show resolved Hide resolved
git/foundations_git/git_basics.md Outdated Show resolved Hide resolved
git/foundations_git/git_basics.md Outdated Show resolved Hide resolved
git/foundations_git/git_basics.md Outdated Show resolved Hide resolved
@kol3x kol3x requested a review from thatblindgeye May 20, 2024 19:33
git/foundations_git/git_basics.md Outdated Show resolved Hide resolved
Co-authored-by: MaoShizhong <122839503+MaoShizhong@users.noreply.github.com>
@kol3x
Copy link
Contributor Author

kol3x commented May 22, 2024

@MaoShizhong Done! It doesn't work in preview tool, but I suppose will work on prod?
image

@MaoShizhong
Copy link
Contributor

@MaoShizhong Done! It doesn't work in preview tool, but I suppose will work on prod? image

Oops, that's my mistake! I listed the wrong suggestion - instead of &grave;, it should be &#96; which does work in the markdown preview tool. For whatever reason, Kramdown accepts HTML codes but not entities, which are parsed as plaintext instead. Apologies!
Would you mind also remove the comment on line 79? I also missed that line in the previous suggestion selection.

Copy link
Contributor

@thatblindgeye thatblindgeye left a comment

Choose a reason for hiding this comment

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

This is looking great 💪🏼 Couple more comments below, and then let me know if you wanted to add some additional verbiage about the location of the "Create repository" instructions on smaller viewports.

1. This will redirect you to your new repository on GitHub. To get ready to copy (clone) this repository onto your local machine, click the green "Code" button. Then select the SSH option, and copy the line below it. **NOTE: You MUST click the SSH option to get the correct URL.**

![Copy SSH link using GitHub](https://cdn.statically.io/gh/TheOdinProject/curriculum/b54d14c5dcee1c6fac61aee02fca7e9ef7ba1510/foundations/git_basics/project_practicing_git_basics/imgs/02.png)
1. This will redirect you to your new repository on GitHub. You should see a layout that includes a tab list of different views (such as "Code", "Pull Requests", and so on) and your repository name along the top of the page, along with a lot of other content elsewhere on the page. To get ready to copy (clone) this repository onto your local machine, click the "Code" button which should be in the section below your repository name. Then select the SSH option in the "Clone" section, and copy the line below it. **NOTE: You MUST click the SSH option to get the correct URL.**
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
1. This will redirect you to your new repository on GitHub. You should see a layout that includes a tab list of different views (such as "Code", "Pull Requests", and so on) and your repository name along the top of the page, along with a lot of other content elsewhere on the page. To get ready to copy (clone) this repository onto your local machine, click the "Code" button which should be in the section below your repository name. Then select the SSH option in the "Clone" section, and copy the line below it. **NOTE: You MUST click the SSH option to get the correct URL.**
1. This will redirect you to your new repository on GitHub. You should see a layout that includes a tab list of different views (such as "Code", "Pull Requests", and so on) and your repository name along the top of the page, along with a lot of other content elsewhere on the page. To get ready to copy (clone) this repository onto your local machine, click the "Code" button which should be in the section **below** your repository name - note that you should not click the "Code" *tab* that appears above your repository name. Then select the SSH option in the "Clone" section, and copy the line below it. **NOTE: You MUST click the SSH option to get the correct URL.**

Lemme know what you think of the above addition. Realized it may be confusing that there's a "Code" tab and button on the same page.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I would delete this part "You should see a layout that includes a tab list of different views (such as "Code", "Pull Requests", and so on) and your repository name along the top of the page, along with a lot of other content elsewhere on the page." to not focus attention on that other Code button.

And instead of "click the "Code" button which should be in the section below your repository name - note that you should not click the "Code" tab that appears above your repository name." I would say "Click the green "Code" button at the bottom right of the repository name."

Copy link
Contributor

Choose a reason for hiding this comment

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

So you're thinking something more along the lines of:

  1. This will redirect you to your new repository on GitHub. To get ready to copy (clone) this repository onto your local machine, click the green "Code" button which should be below and to the right of your repository name. Then select the SSH option in the "Clone" section, and copy the line below it. NOTE: You MUST click the SSH option to get the correct URL.

That would probably be good. An alternative would be instead of mentioning its position based on the repo name, using the branch toggle or the repo files/folders, e.g. "click the green "Code" button, which should be to the right of the button displaying the current branch (typically it will display the main branch)" or "click the green "Code" button, which should be directly above the section that contains the files and folders in your directory"

I'll leave it up to you what makes the most sense from a user perspective, though.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So you're thinking something more along the lines of:

  1. This will redirect you to your new repository on GitHub. To get ready to copy (clone) this repository onto your local machine, click the green "Code" button which should be below and to the right of your repository name. Then select the SSH option in the "Clone" section, and copy the line below it. NOTE: You MUST click the SSH option to get the correct URL.

That would probably be good. An alternative would be instead of mentioning its position based on the repo name, using the branch toggle or the repo files/folders, e.g. "click the green "Code" button, which should be to the right of the button displaying the current branch (typically it will display the main branch)" or "click the green "Code" button, which should be directly above the section that contains the files and folders in your directory"

I'll leave it up to you what makes the most sense from a user perspective, though.

I'm gonna go with relating the "Code" button position to branch name, as that doesn't change on smaller viewports

1. Go back to your terminal or if you're using Visual Studio Code you can open the built-in terminal by pressing <kbd>Ctrl</kbd> + <kbd>`</kbd> (backtick). Then type <code>git status</code>. You'll notice that README.md is now shown as not staged or committed.

![Check repo status again using CLI](https://cdn.statically.io/gh/TheOdinProject/curriculum/b54d14c5dcee1c6fac61aee02fca7e9ef7ba1510/foundations/git_basics/project_practicing_git_basics/imgs/13.png)
<!-- code element needed to not treat the backtick inside the kbd element as code markdown -->
Copy link
Contributor

Choose a reason for hiding this comment

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

This can be removed if we're not keeping the comment to disable the rule.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@kol3x
Copy link
Contributor Author

kol3x commented May 22, 2024

This is looking great 💪🏼 Couple more comments below, and then let me know if you wanted to add some additional verbiage about the location of the "Create repository" instructions on smaller viewports.

i checked and it seems like the "+" button is always in the top-right corner somewhere, unless you are on mobile, which I think learner is not supposed to be on. So the the current instruction should be sufficient

@MaoShizhong MaoShizhong dismissed their stale review May 22, 2024 14:14

Changes addressed - rest of review for Eric, so this pending review won't block

@thatblindgeye
Copy link
Contributor

i checked and it seems like the "+" button is always in the top-right corner somewhere, unless you are on mobile, which I think learner is not supposed to be on. So the the current instruction should be sufficient

It'll not be displayed at certain viewport widths larger than mobile as well, such as if someone is splitting their monitor to have the browser open on one half and VS Code/something else open on the other. Adding instructions for this scenario isn't a blocker, though, especially since we don't currently have those instructions, so we can always revisit this if people do start voicing confusion.

@kol3x
Copy link
Contributor Author

kol3x commented May 27, 2024

i checked and it seems like the "+" button is always in the top-right corner somewhere, unless you are on mobile, which I think learner is not supposed to be on. So the the current instruction should be sufficient

It'll not be displayed at certain viewport widths larger than mobile as well, such as if someone is splitting their monitor to have the browser open on one half and VS Code/something else open on the other. Adding instructions for this scenario isn't a blocker, though, especially since we don't currently have those instructions, so we can always revisit this if people do start voicing confusion.

I improved directions for "New Repo" and "Code" buttons in the latest commits.

Let me know if there is anything else to be improved.

Copy link
Contributor

@thatblindgeye thatblindgeye left a comment

Choose a reason for hiding this comment

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

🔥 This looks good. Before merging I just want to check whether this verbiage regarding cloning your repo is accurate, as I'm not sure if it matches what you had mentioned above about relating the position to the branch name:

click the green "Code" button which should be below and to the right of your repository name

@kol3x
Copy link
Contributor Author

kol3x commented Jun 4, 2024

🔥 This looks good. Before merging I just want to check whether this verbiage regarding cloning your repo is accurate, as I'm not sure if it matches what you had mentioned above about relating the position to the branch name:

click the green "Code" button which should be below and to the right of your repository name

omg, I thought I went insane, but turns out I just didn't push this change, it was left hanging in my VSCode
Should be good now :)

Copy link
Contributor

@thatblindgeye thatblindgeye left a comment

Choose a reason for hiding this comment

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

It happens to the best of us! 😆 Thanks for making these updates 💪🏼

@thatblindgeye thatblindgeye merged commit 02ebb10 into TheOdinProject:main Jun 4, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Content: Git Involves Git content
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Git Basics: <Accessibility of screenshots>
3 participants