Skip to content

Commit

Permalink
Fix some grammar
Browse files Browse the repository at this point in the history
  • Loading branch information
nlakritz committed Aug 21, 2020
1 parent 63250eb commit 9321095
Show file tree
Hide file tree
Showing 109 changed files with 264 additions and 264 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ___
Created by [Erik Trautman](http://www.github.com/eriktrautman)


# The Odin Project - Javascript Curriculum
# The Odin Project - JavaScript Curriculum

## Mission statement

Expand Down
8 changes: 4 additions & 4 deletions archive/extra_stuff/lessons_in_progress/git/git_basics.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@ To get a good high-level overview of Git plus a series of how-to commands and ex
* Why is Git useful for a developer?
* Why is Git useful for a team of developers?
* How do you create a new Git repository for a project locally?
* How do you create it on Github?
* How do you create it on GitHub?
* How do you commit changes?
* What is the difference between staging and committing changes?
* What is the difference between committing your changes and pushing them to Github?
* What is the difference between committing your changes and pushing them to GitHub?
* How do you check the status of your current repo in git?
* How do you see the history of your previous commits (from the command line)?
* How can you look through your historical commits on the Github website?
* How can you look through your historical commits on the GitHub website?
* What is a "Merge"?
* What is a "Pull Request"?
* What is "Forking" a repo?
* What is "Cloning" a repo?

## Assignment:

1. If you haven't already, watch the following videos (which were linked in the post above as well) from [Github's Youtube Channel](http://www.youtube.com/GitHubGuides):
1. If you haven't already, watch the following videos (which were linked in the post above as well) from [GitHub's YouTube Channel](http://www.youtube.com/GitHubGuides):

1. [Git Basics #1: What is VCS?](http://www.youtube.com/watch?v=8oRjP8yj2Wo) will introduce you to version control for developers.
2. [Git Basics #2: What is Git?](http://www.youtube.com/watch?v=uhtzxPU7Bz0) will start getting a bit more into a Git workflow.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
2. Go into this new folder `cd testing_git`
3. Now we will initialize it with git by entering `git init`
4. Go to github and create a new repository, name it `testing_git` **Note: It's important to your repository the same name as the name of the folder you created on your local machine.**
5. Check the initialize with read me option and create the new repository. This will redirect you to your new repo on Github.
5. Check the initialize with read me option and create the new repository. This will redirect you to your new repo on GitHub.
6. Back on your command line enter `git remote -v` notice that its empty. This project isn't connected to any remote github repositories. Lets fix that.
7. Go to the testing_git repository on github and copy and paste the url. Back in your command line enter: `git remote add origin` followed by the url you copied. The full command will look something like this: `git remote add origin https://github.com/yourname/testing_git`
**Note: `origin` will be the name of your remote connection, you could call it anything you want but origin is convention.**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Sometimes a program just won't work properly so you need to go to Plan B. In ou

[This tutorial](http://www.techrepublic.com/blog/google-in-the-enterprise/quick-tip-set-up-a-google-hangout-for-web-conferencing/2064) describes setting up a hangout session, though they don't get into the actual remote pairing side of things. **Basically, just click [this link](https://plus.google.com/hangouts/_/) to open a new hangout once you've got the plugin installed.**

The easy way is to just screenshare the code, which means one person will be the driver by default and the other will be the navigator (since it's a one-way screen share not a remote desktop). When it's time to switch, push your code up to Github and have the other partner pull it down from that repository.
The easy way is to just screenshare the code, which means one person will be the driver by default and the other will be the navigator (since it's a one-way screen share not a remote desktop). When it's time to switch, push your code up to GitHub and have the other partner pull it down from that repository.

A slightly more interactive way is by using the Hangouts feature called Remote Desktop, which lets your partner use your computer like maybe you've experienced before with tech support. You'll usually have to activate that feature once you're inside the hangout by clicking on it on the lefthand sidebar. If it's not there, you may need to click on the three-dots icon on that same sidebar and then click "Add Apps" and find Remote Desktop yourself.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ If all of that seemed a bit confusing, here's a step-by-step workflow for remote
2. Either use Screenhero voice calling or Skype voice calling to talk with your partner
1. Get your [pomodoro timer](http://tomato-timer.com/) fired up so you know when it's time to switch roles from driver to navigator and back.
1. Come up with your battle plan for the project
1. [If using git] Create the public Github repo for the project
1. [If using git] Create the public GitHub repo for the project
1. **Code! Switch! Code! Switch! Repeat n times!**
1. Push your code to the Github repository or email it to the partner whose computer wasn't used
1. Push your code to the GitHub repository or email it to the partner whose computer wasn't used
2. Have a cookie, you've earned it.
1. Schedule another session!

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ If you already have some settings in your "Settings - User" file, then you may n
I'm not sure why this step works. There is a comment in the "Settings - Default" file that says this particular setting only affects Mac users, but I tried toggling it to _false_ on my Windows machines anyway ...and it worked beautifully.

##Step 4 - Feel the Power
You can now type "subl [filename]" in the command line to begin editing files in Sublime Text. Without this power, your workflow consists of navigating files in Windows Explorer, editing files in Sublime Text, and interacting with Git/Github/Heroku in command prompt. Now that you have completed this guide, you can just stick with the command prompt and Sublime Text. Your new workflow now has a bit less alt-tabbing. Hallelujah.
You can now type "subl [filename]" in the command line to begin editing files in Sublime Text. Without this power, your workflow consists of navigating files in Windows Explorer, editing files in Sublime Text, and interacting with Git/GitHub/Heroku in command prompt. Now that you have completed this guide, you can just stick with the command prompt and Sublime Text. Your new workflow now has a bit less alt-tabbing. Hallelujah.

Note: If you skipped step 2, then you must type "sublime_text [filename]" in the command line, you monster.
4 changes: 2 additions & 2 deletions archive/extra_stuff/lessons_in_progress/text_editor_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Pick your text-editor, choose wisely - this will be a close companion of yours f

And install Git:
- For [Windows](http://installfest.railsbridge.org/installfest/windows); Steps 2 and 3.
- For Linux: [installation](http://installfest.railsbridge.org/installfest/linux) - do step 2 (it's only one line); [configuration](http://installfest.railsbridge.org/installfest/configure_git) - the whole page; make an [SSH key](http://installfest.railsbridge.org/installfest/create_an_ssh_key) and make a [Github account](http://installfest.railsbridge.org/installfest/create_a_github_account)
- For Linux: [installation](http://installfest.railsbridge.org/installfest/linux) - do step 2 (it's only one line); [configuration](http://installfest.railsbridge.org/installfest/configure_git) - the whole page; make an [SSH key](http://installfest.railsbridge.org/installfest/create_an_ssh_key) and make a [GitHub account](http://installfest.railsbridge.org/installfest/create_a_github_account)

##Additional Resources
^ Seems like overkill; maybe some git resources if absolutely necessary or some ideas about package manager on the text editors:
Expand All @@ -30,7 +30,7 @@ Really useful for workflow!!
<!--
### Git
Git, the version-control system you've read about, is another tool that requires a brief install. You'll also be asked to create your Github account, which is very important because it'll host your portfolio. When people visit your repo on Github (if it's public), they see all the source code files you've uploaded.
Git, the version-control system you've read about, is another tool that requires a brief install. You'll also be asked to create your GitHub account, which is very important because it'll host your portfolio. When people visit your repo on GitHub (if it's public), they see all the source code files you've uploaded.
### Text Editor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ You know what a developer does now but you'll also want to familiarize yourself
* **[Command Line Interface (CLI)](http://skillcrush.com/2012/05/25/command-line/)** Shell -- For most people, this is just the Terminal (mac) or the MS-Dos Command Prompt (Windows) but sometimes people will use their own version. The shell is your window into your operating system (which we'll talk about a bit more in the next unit) where you type in commands and navigate in a text-based way through directories on your hard drive. Think of it as your mini command center where you'll save your files to a version-control system, deploy onto the web, test out code snippets in Ruby, and interact directly with your database.
* **[Stack Overflow](http://stackoverflow.com/)** -- By extension, most Google queries lead to Stack Overflow, an online question-and-answer community that has high quality responses to thousands of the questions you'll search for.
* **[Git](http://skillcrush.com/2013/02/18/git/)** -- Git is a version-control system. You will love it, then hate it, then praise it. But you must know it. Git is one of those things that non-developers either haven't heard of or don't understand and it's a dividing line between hobby hacking and using industry best-practices to keep your code base safely version-controlled and stored in the cloud.
* **[Github](http://github.com/)** is the place where copies of your code files will be stored. **Your github account is more important than your resume.** It holds the record of all the code you've written, which open-source projects you've contributed to and how. Your github account is your developer portfolio.
* **[GitHub](http://github.com/)** is the place where copies of your code files will be stored. **Your GitHub account is more important than your resume.** It holds the record of all the code you've written, which open-source projects you've contributed to and how. Your github account is your developer portfolio.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Developers are passionate builders and they often enjoy taking part in various c

### Online
* **[Hacker News](http://news.ycombinator.com)** -- HN is the community around the Y Combinator startup accelerator and it's a link-submission board that's got some of the best quality startup- and tech-related discourse on the web.
* **[Github](http://www.github.com)** -- Less an active community than a gathering place, github is the place where you can find and contribute to almost any of the open-source projects out there.
* **[GitHub](http://www.github.com)** -- Less an active community than a gathering place, github is the place where you can find and contribute to almost any of the open-source projects out there.
* **[Stack Overflow](http://www.stackoverflow.com)** -- Stack, mentioned above, is a great community where you're encouraged to ask and answer questions about a wide variety of programming topics.
* **IRC** -- There are channels on this chat protocol for just about everything... it's like AOL Instant Messenger or GChat for programmers. Learn more about it at [IRCHelp.org's Help page](http://www.irchelp.org/irchelp/help.html).
* **[Reddit's /r/programming](http://www.reddit.com/r/programming/)** and **[/r/learnprogramming](http://www.reddit.com/r/learnprogramming)** -- Link submission, questions and commenting.
Expand Down
4 changes: 2 additions & 2 deletions archive/extra_stuff/old_lessons/rails/api_interfacing.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Look through these now and then use them to test yourself after doing the assign
* What are the steps you'll almost always have to go through when setting up your app to use an API?
* What is an API key?
* How is API use typically controlled?
* How do you avoid including an API's secret token in your Github repo (e.g. hard coding it)?
* How do you avoid including an API's secret token in your GitHub repo (e.g. hard coding it)?
* Why is it important to know which API version you're using?
* What is a RESTful API and why does that make your life easier?
* What (basically) is OAuth?
Expand Down Expand Up @@ -96,7 +96,7 @@ See [this brief overview of OAuth 2.0](http://tutorials.jenkov.com/oauth2/overvi

This sounds horribly complicated! Someone must have made a gem for it...

Luckily someone has. Many someones, actually. There is a generic OAuth gem called `omniauth` (docs available [on Github](https://github.com/intridea/omniauth)) and then a separate gem which provides a specific authentication strategy for every major API (see the list [HERE](https://github.com/intridea/omniauth/wiki/List-of-Strategies)). Once you've gone through things with one of them, you'll become comfortable with all of them.
Luckily someone has. Many someones, actually. There is a generic OAuth gem called `omniauth` (docs available [on GitHub](https://github.com/intridea/omniauth)) and then a separate gem which provides a specific authentication strategy for every major API (see the list [HERE](https://github.com/intridea/omniauth/wiki/List-of-Strategies)). Once you've gone through things with one of them, you'll become comfortable with all of them.

I'll leave it to the projects to walk through using Omniauth since it's much easier to learn by doing than reading a bunch of bullet points.

Expand Down
2 changes: 1 addition & 1 deletion archive/extra_stuff/old_lessons/rails/conclusion.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ If you start working on more public-facing applications, security will become mo

#### Rake Tasks

Rake tasks are a special way of running scripts that can use your application. You're already familiar with some like `$ rake db:migrate`, but you can also create your own. This website uses a Rake task to populate the curriculum from its Github repo. Check out the [Rails Guide on Command Line and Rake Tasks](http://guides.rubyonrails.org/command_line.html) for more information.
Rake tasks are a special way of running scripts that can use your application. You're already familiar with some like `$ rake db:migrate`, but you can also create your own. This website uses a Rake task to populate the curriculum from its GitHub repo. Check out the [Rails Guide on Command Line and Rake Tasks](http://guides.rubyonrails.org/command_line.html) for more information.

#### Caching

Expand Down
2 changes: 1 addition & 1 deletion archive/extra_stuff/old_lessons/rails/databases.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ The next step, once you've had a chance to practice this all in the project, is
This section contains helpful links to other content. It isn't required, so consider it supplemental for if you need to dive deeper into something.


* Odinite Hunter D made his excellent notes into a [Github Book on SQL](http://hgducharme.gitbooks.io/sql-basics/content/) which you should totally check out if you want a decent resource.
* Odinite Hunter D made his excellent notes into a [GitHub Book on SQL](http://hgducharme.gitbooks.io/sql-basics/content/) which you should totally check out if you want a decent resource.
* Read [Zed Shaw's Learning SQL The Hard Way](http://sql.learncodethehardway.org/book/). It is imperfect and also incomplete but should help solidify things for you. It'll have you doing a fair bit of work from the command line, so you'll get a chance to catch up on your Bash scripting as well. Double whammy!
* [SQL "tutorial" from tutorialspoint](http://www.tutorialspoint.com/sql/index.htm)... doesn't really give much guidance, but can be a useful reference for the language.
* [A beginners guide to SQL](http://www.sohamkamani.com/blog/2016/07/07/a-beginners-guide-to-sql/) by Soham Kamani.
2 changes: 1 addition & 1 deletion archive/extra_stuff/old_lessons/rails/forms_advanced.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ The best part? This is more or less the most complicated conceptual stuff with
### Additional Resources
This section contains helpful links to other content. It isn't required, so consider it supplemental for if you need to dive deeper into something.

* [Simple Form Documentation on Github](https://github.com/plataformatec/simple_form)
* [Simple Form Documentation on GitHub](https://github.com/plataformatec/simple_form)
* [`accepts_nested_attributes_for` documentation](http://api.rubyonrails.org/classes/ActiveRecord/NestedAttributes/ClassMethods.html)
* [Another example of a nested form on SO](http://stackoverflow.com/questions/15648396/rails-how-to-manage-nested-attributes-without-using-accepts-nested-attributes?rq=1)
* [Using `inverse_of` to make `accepts_nested_attributes_for` work for `has_many :through` relationships](http://robots.thoughtbot.com/accepts-nested-attributes-for-with-has-many-through)
Expand Down
Loading

0 comments on commit 9321095

Please sign in to comment.