From f97d0b7e1ff572aa6711fe29b54e6b8fdf9efddf Mon Sep 17 00:00:00 2001 From: livash Date: Wed, 29 Jun 2016 15:25:16 -0600 Subject: [PATCH 01/16] typo fixes (#187) --- lessons/02-rendering-a-route/README.md | 1 + lessons/05-active-links/README.md | 4 +++- lessons/08-index-routes/README.md | 2 +- lessons/10-clean-urls/README.md | 2 +- lessons/12-navigating/README.md | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lessons/02-rendering-a-route/README.md b/lessons/02-rendering-a-route/README.md index 801cf0a3..72f776d9 100644 --- a/lessons/02-rendering-a-route/README.md +++ b/lessons/02-rendering-a-route/README.md @@ -66,6 +66,7 @@ export default React.createClass({ Now we can couple them to the app at their respective paths. ```js +// insert into index.js import About from './modules/About' import Repos from './modules/Repos' diff --git a/lessons/05-active-links/README.md b/lessons/05-active-links/README.md index b32098f1..7e3afcd4 100644 --- a/lessons/05-active-links/README.md +++ b/lessons/05-active-links/README.md @@ -21,6 +21,7 @@ Now as you navigate, the active link is red. You can also use an active class name instead of inline-styles. ```js +// modules/App.js
  • About
  • Repos
    • ``` @@ -29,6 +30,7 @@ We don't have a stylesheet on the page yet though. Lets add one-extra point if you can add a `link` tag from memory. ```html +// index.html ``` @@ -71,7 +73,7 @@ export default React.createClass({ Now you can go change your links to `NavLink`s. ```js -// App.js +// modules/App.js import NavLink from './NavLink' // ... diff --git a/lessons/08-index-routes/README.md b/lessons/08-index-routes/README.md index d92d6f9a..8732d223 100644 --- a/lessons/08-index-routes/README.md +++ b/lessons/08-index-routes/README.md @@ -19,7 +19,7 @@ One option is to see if we have any children in `App`, and if not, render `Home`: ```js -// App.js +// modules/App.js import Home from './Home' // ... diff --git a/lessons/10-clean-urls/README.md b/lessons/10-clean-urls/README.md index d0de7c6a..ade0fb9b 100644 --- a/lessons/10-clean-urls/README.md +++ b/lessons/10-clean-urls/README.md @@ -53,7 +53,7 @@ starts at a deep path, won't be able to find the files. ```html - + diff --git a/lessons/12-navigating/README.md b/lessons/12-navigating/README.md index 79e6aefc..46439ea7 100644 --- a/lessons/12-navigating/README.md +++ b/lessons/12-navigating/README.md @@ -52,7 +52,7 @@ First we can use the `browserHistory` singleton that we passed into `Router` in `index.js` and push a new url into the history. ```js -// Repos.js +// modules/Repos.js import { browserHistory } from 'react-router' // ... From fa2e161d8c37af18786876a88b2f26dd4c85bb95 Mon Sep 17 00:00:00 2001 From: Kyle Pollock Date: Wed, 29 Jun 2016 16:25:41 -0500 Subject: [PATCH 02/16] Fix typo (#188) --- lessons/05-active-links/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lessons/05-active-links/README.md b/lessons/05-active-links/README.md index 7e3afcd4..49aec02d 100644 --- a/lessons/05-active-links/README.md +++ b/lessons/05-active-links/README.md @@ -6,7 +6,7 @@ it links to is active so you can style it differently. ## Active Styles Let's see how it looks with inline styles, add `activeStyle` to your -`Links`s. +`Link`s. ```js // modules/App.js @@ -52,7 +52,7 @@ primary navigation links need to know. It's useful to wrap those so you don't have to remember what your `activeClassName` or `activeStyle` is everywhere. -We will use a spread operator here, the three dots. It clones our props +We will use a spread operator here, the three dots. It clones our props and in this use case it clones `activeClassName` to our desired component for us to benefit from. From f4516e341a743cfb43dcde6a686e08180704d2ba Mon Sep 17 00:00:00 2001 From: Jean Lange Date: Wed, 29 Jun 2016 17:26:12 -0400 Subject: [PATCH 03/16] small grammar change (#190) --- lessons/10-clean-urls/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lessons/10-clean-urls/README.md b/lessons/10-clean-urls/README.md index ade0fb9b..3eb8d916 100644 --- a/lessons/10-clean-urls/README.md +++ b/lessons/10-clean-urls/README.md @@ -1,6 +1,6 @@ # Clean URLs with Browser History -The URLs in our app right now are built on a hack: the hash. Its the +The URLs in our app right now are built on a hack: the hash. It's the default because it will always work, but there's a better way. Modern browsers let JavaScript manipulate the URL without making an http From 06eef1039f787074dc795574616f660a7d040b20 Mon Sep 17 00:00:00 2001 From: Matt Lane Date: Sun, 24 Jul 2016 19:34:45 -0700 Subject: [PATCH 04/16] fix typo, make App.js h1 name consistent (#191) --- lessons/04-nested-routes/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lessons/04-nested-routes/README.md b/lessons/04-nested-routes/README.md index c2c98330..bac8f2cd 100644 --- a/lessons/04-nested-routes/README.md +++ b/lessons/04-nested-routes/README.md @@ -46,7 +46,7 @@ automatically becomes nested UI. ## Sharing Our Navigation -Lets nest our `About` and `Repos` components inside of `App` so that we +Let's nest our `About` and `Repos` components inside of `App` so that we can share the navigation with all screens in the app. We do it in two steps: @@ -75,7 +75,7 @@ Next, render children inside of `App`. render() { return (
    -

    Ghettohub Issues

    +

    React Router Tutorial