New Docs

.gitignore

@@ -15,7 +15,7 @@ docs/code
 docs/_site
 docs/.sass-cache
 docs/js/*
-docs/downloads
+docs/downloads/*.zip
 docs/vendor/bundle
 examples/shared/*.js
 examples/**/bundle.js

.travis.yml

@@ -23,7 +23,11 @@ before_install:
 script:
 - |
     if [ "$TEST_TYPE" = build_website ]; then
-      if [ "$TRAVIS_BRANCH" = "$REACT_WEBSITE_BRANCH" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
+      if [ "$TRAVIS_PULL_REQUEST" = false ]; then
+        if [ "$TRAVIS_BRANCH" != new-docs ]; then
+          echo "This code should only run on the new-docs branch. Please revert it."
+          exit 1
+        fi
         set -e
 
         GH_PAGES_DIR="$TRAVIS_BUILD_DIR"/../react-gh-pages
@@ -42,7 +46,7 @@ script:
         if ! git diff-index --quiet HEAD --; then
           git add -A .
           git commit -m "Rebuild website"
-          git push origin gh-pages
+          git push -f https://[email protected]/reactjs-bot/react.git gh-pages
         fi
         popd
       fi

docs/README.md

@@ -38,7 +38,7 @@ $ cd react/docs
 $ bundle exec rake
 $ bundle exec rake fetch_remotes
 $ bundle exec jekyll serve -w
-$ open http://localhost:4000/react/
+$ open http://localhost:4000/react/index.html
 ```
 
 We use [SASS](http://sass-lang.com/) (with [Bourbon](http://bourbon.io/)) for our CSS, and we use JSX to transform some of our JS.

docs/_config.yml

@@ -20,22 +20,29 @@ defaults:
     type: pages
   values:
     sectionid: blog
+- scope:
+    path: tutorial
+    type: pages
+  values:
+    layout: tutorial
+    sectionid: tutorial
 - scope:
     path: docs
     type: pages
   values:
     layout: docs
     sectionid: docs
 - scope:
-    path: tips
+    path: contributing
     type: pages
   values:
     sectionid: docs
 - scope:
-    path: contributing
+    path: community
     type: pages
   values:
-    sectionid: docs
+    layout: community
+    sectionid: community
 exclude:
 - Gemfile
 - Gemfile.lock

docs/_data/nav_community.yml

@@ -0,0 +1,14 @@
+- title: Community Resources
+  items:
+    - id: support
+      title: Where To Get Support
+    - id: conferences
+      title: Conferences
+    - id: videos
+      title: Videos
+    - id: complementary-tools
+      title: Complementary Tools
+      href: https://github.com/facebook/react/wiki/Complementary-Tools
+    - id: examples
+      title: Examples
+      href: https://github.com/facebook/react/wiki/Examples

docs/_data/nav_docs.yml

@@ -1,104 +1,83 @@
 - title: Quick Start
   items:
-  - id: getting-started
-    title: Getting Started
-  - id: tutorial
-    title: Tutorial
-  - id: thinking-in-react
-    title: Thinking in React
-- title: Community Resources
+    - id: installation
+      title: Installation
+    - id: hello-world
+      title: Hello World
+    - id: introducing-jsx
+      title: Introducing JSX
+    - id: rendering-elements
+      title: Rendering Elements
+    - id: components-and-props
+      title: Components and Props
+    - id: state-and-lifecycle
+      title: State and Lifecycle
+    - id: handling-events
+      title: Handling Events
+    - id: conditional-rendering
+      title: Conditional Rendering
+    - id: lists-and-keys
+      title: Lists and Keys
+    - id: forms
+      title: Forms
+    - id: lifting-state-up
+      title: Lifting State Up
+    - id: composition-vs-inheritance
+      title: Composition vs Inheritance
+    - id: thinking-in-react
+      title: Thinking In React
+- title: Advanced Guides
   items:
-  - id: conferences
-    title: Conferences
-  - id: videos
-    title: Videos
-  - id: complementary-tools
-    title: Complementary Tools
-    href: https://github.com/facebook/react/wiki/Complementary-Tools
-  - id: examples
-    title: Examples
-    href: https://github.com/facebook/react/wiki/Examples
-- title: Guides
-  items:
-  - id: why-react
-    title: Why React?
-  - id: displaying-data
-    title: Displaying Data
-    subitems:
     - id: jsx-in-depth
-      title: JSX in Depth
-    - id: jsx-spread
-      title: JSX Spread Attributes
-    - id: jsx-gotchas
-      title: JSX Gotchas
-  - id: interactivity-and-dynamic-uis
-    title: Interactivity and Dynamic UIs
-  - id: multiple-components
-    title: Multiple Components
-  - id: reusable-components
-    title: Reusable Components
-  - id: transferring-props
-    title: Transferring Props
-  - id: forms
-    title: Forms
-  - id: working-with-the-browser
-    title: Working With the Browser
-    subitems:
-    - id: more-about-refs
-      title: Refs to Components
-  - id: tooling-integration
-    title: Tooling Integration
-    subitems:
-    - id: language-tooling
-      title: Language Tooling
-    - id: package-management
-      title: Package Management
-    - id: environments
-      title: Server-side Environments
-  - id: addons
-    title: Add-Ons
-    subitems:
-    - id: animation
-      title: Animation
-    - id: two-way-binding-helpers
-      title: Two-Way Binding Helpers
-    - id: test-utils
-      title: Test Utilities
-    - id: clone-with-props
-      title: Cloning Elements
-    - id: create-fragment
-      title: Keyed Fragments
-    - id: update
-      title: Immutability Helpers
-    - id: pure-render-mixin
-      title: PureRenderMixin
-    - id: perf
-      title: Performance Tools
-    - id: shallow-compare
-      title: Shallow Compare
-  - id: advanced-performance
-    title: Advanced Performance
-  - id: context
-    title: Context
+      title: JSX In Depth
+    - id: typechecking-with-proptypes
+      title: Typechecking With PropTypes
+    - id: refs-and-the-dom
+      title: Refs and the DOM
+    - id: optimizing-performance
+      title: Optimizing Performance
+    - id: react-without-es6
+      title: React Without ES6
+    - id: react-without-jsx
+      title: React Without JSX
+    - id: reconciliation
+      title: Reconciliation
+    - id: context
+      title: Context
+    - id: web-components
+      title: Web Components
 - title: Reference
   items:
-  - id: top-level-api
-    title: Top-Level API
-  - id: component-api
-    title: Component API
-  - id: component-specs
-    title: Component Specs and Lifecycle
-  - id: tags-and-attributes
-    title: Supported Tags and Attributes
-  - id: events
-    title: Event System
-  - id: dom-differences
-    title: DOM Differences
-  - id: special-non-dom-attributes
-    title: Special Non-DOM Attributes
-  - id: reconciliation
-    title: Reconciliation
-  - id: webcomponents
-    title: Web Components
-  - id: glossary
-    title: React (Virtual) DOM Terminology
+    - id: react-api
+      title: React
+      subitems:
+        - id: react-component
+          title: React.Component
+    - id: react-dom
+      title: ReactDOM
+    - id: react-dom-server
+      title: ReactDOMServer
+    - id: dom-elements
+      title: DOM Elements
+    - id: events
+      title: SyntheticEvent
+    - id: addons
+      title: Add-Ons
+      subitems:
+        - id: perf
+          title: Performance Tools
+        - id: test-utils
+          title: Test Utilities
+        - id: animation
+          title: Animation
+        - id: create-fragment
+          title: Keyed Fragments
+        - id: update
+          title: Immutability Helpers
+        - id: pure-render-mixin
+          title: PureRenderMixin
+        - id: shallow-compare
+          title: Shallow Compare
+        - id: two-way-binding-helpers
+          title: Two-way Binding Helpers
+

docs/_data/nav_tutorial.yml

@@ -0,0 +1,71 @@
+- title: Tutorial
+  items:
+    - id: tutorial
+      title: Overview
+      subitems:
+        - id: what-were-building 
+          title: What We're Building
+          href: /react/tutorial/tutorial.html#what-were-building
+          forceInternal: true
+        - id: what-is-react
+          title: What is React?
+          href: /react/tutorial/tutorial.html#what-is-react
+          forceInternal: true
+        - id: getting-started
+          title: Getting Started
+          href: /react/tutorial/tutorial.html#getting-started
+          forceInternal: true
+        - id: passing-data-through-props
+          title: Passing Data Through Props
+          href: /react/tutorial/tutorial.html#passing-data-through-props
+          forceInternal: true
+        - id: an-interactive-component
+          title: An Interactive Component
+          href: /react/tutorial/tutorial.html#an-interactive-component
+          forceInternal: true
+        - id: developer-tools 
+          title: Developer Tools
+          href: /react/tutorial/tutorial.html#developer-tools
+          forceInternal: true
+    - id: lifting-state-up
+      title: Lifting State Up
+      href: /react/tutorial/tutorial.html#lifting-state-up
+      forceInternal: true
+      subitems:
+        - id: why-immutability-is-important 
+          title: Why Immutability Is Important
+          href: /react/tutorial/tutorial.html#why-immutability-is-important
+          forceInternal: true
+        - id: functional-components 
+          title: Functional Components
+          href: /react/tutorial/tutorial.html#functional-components
+          forceInternal: true
+        - id: taking-turns
+          title: Taking Turns
+          href: /react/tutorial/tutorial.html#taking-turns
+          forceInternal: true
+        - id: declaring-a-winner
+          title: Declaring a Winner
+          href: /react/tutorial/tutorial.html#declaring-a-winner
+          forceInternal: true
+    - id: storing-a-history
+      title: Storing A History
+      href: /react/tutorial/tutorial.html#storing-a-history
+      forceInternal: true
+      subitems:
+        - id: showing-the-moves
+          title: Showing the Moves
+          href: /react/tutorial/tutorial.html#showing-the-moves
+          forceInternal: true
+        - id: keys
+          title: Keys
+          href: /react/tutorial/tutorial.html#keys
+          forceInternal: true
+        - id: implementing-time-travel 
+          title: Implementing Time Travel
+          href: /react/tutorial/tutorial.html#implementing-time-travel
+          forceInternal: true
+        - id: wrapping-up
+          title: Wrapping Up
+          href: /react/tutorial/tutorial.html#wrapping-up
+          forceInternal: true