Merge branch 'petehunt-react' into gh-pages

passy · Jun 17, 2013 · 9bb0646 · 9bb0646
2 parents f22dbf8 + 37589b3
commit 9bb0646
Show file tree

Hide file tree

Showing 16 changed files with 20,127 additions and 0 deletions.
diff --git a/index.html b/index.html
@@ -144,6 +144,9 @@ <h2>JavaScript Apps</h2>
 					<li class="routing labs">
 						<a href="architecture-examples/angularjs-perf/" data-source="http://angularjs.org" data-content="What HTML would have been had it been designed for web apps. A version with several performance optimizations.">AngularJS <br>(optimized)</a>
 					</li>
+					<li class="routing labs">
+						<a href="labs/architecture-examples/react/" data-source="http://facebook.github.io/react/" data-content="React is a JavaScript library for building user interfaces.">React</a>
+					</li>
 				</ul>
 				<hr>
 				<h2>Compile To JavaScript</h2>

diff --git a/labs/architecture-examples/react/bower.json b/labs/architecture-examples/react/bower.json
@@ -0,0 +1,8 @@
+{
+  "name": "todomvc-react",
+  "version": "0.0.0",
+  "dependencies": {
+    "todomvc-common": "~0.1.7",
+    "react": "~0.3.2"
+  }
+}