From 74af9ea652031a15fb9a1c0d363b07b80d8630eb Mon Sep 17 00:00:00 2001
From: Adam Wiggins <adam@heroku.com>
Date: Fri, 3 Jun 2011 01:39:41 -0700
Subject: [PATCH] first factor page

---
 content/repo.md  | 11 +++++++++++
 content/toc.md   |  2 +-
 public/style.css | 12 +++++++++++-
 views/factor.erb |  5 +++++
 views/home.erb   | 36 +++++++++++++++---------------------
 views/layout.erb |  6 +++++-
 web.rb           |  5 +++++
 7 files changed, 53 insertions(+), 24 deletions(-)
 create mode 100644 content/repo.md
 create mode 100644 views/factor.erb

diff --git a/content/repo.md b/content/repo.md
new file mode 100644
index 0000000..f46ada6
--- /dev/null
+++ b/content/repo.md
@@ -0,0 +1,11 @@
+Repo | One code repo, many deploys
+==================================
+
+A twelve-factor app is always tracked in a version control system, with the tracked code history known as a *code reposistory*, often shortened to *code repo* or just *repo*.
+
+There is always a one-to-one correlation between the repo and the app.  If there are multiple code repos, it's not an app - it's a distributed system.  Multiple apps sharing the same code is a violation of twelve-factor and generally poor practice.  In the latter case, the better approach is to factor shared code libraries which can be included through the [dependency manager](#).
+
+There is only one repo per app, but there will be many deploys of the app.  A *deploy* is a running instance of the app.  This is typically one production site, and one or more staging sites.  Every developer working on the app has their own local version which also qualifies as a deploy, though one visible only to that developer and only useful for editing the app's code.
+
+The repo is the same across all deploys, although different versions may be active in each deploy.  For example, a developer has some commits not yet deployed to staging; staging has some commits not yet deployed to production.  But they all share the same revision history tree.
+
diff --git a/content/toc.md b/content/toc.md
index 953c4f8..4320006 100644
--- a/content/toc.md
+++ b/content/toc.md
@@ -1,7 +1,7 @@
 The Twelve Factors
 ==================
 
-## I. Repo
+## [I. Repo](/repo)
 ### One code repo, many deploys
 
 ## II. Dependencies
diff --git a/public/style.css b/public/style.css
index d865956..c7b7229 100644
--- a/public/style.css
+++ b/public/style.css
@@ -21,6 +21,10 @@ header {
   box-shadow: 0px 2px 12px #888;
   margin-bottom: 12pt;
 }
+header a {
+  text-decoration: none;
+  color: #fff;
+}
 
 section {
   padding-left: 64pt;
@@ -49,6 +53,13 @@ section#toc h1 {
 section#toc h2 {
   margin-top: 12pt;
 }
+section#toc h2 a {
+  text-decoration: none;
+  color: #000;
+}
+section#toc h2 a:hover {
+  color: #337;
+}
 section#toc h3 {
   font-weight: normal;
 }
@@ -57,7 +68,6 @@ footer {
   color: #444;
   font-size: 12pt;
   background: #000;
-  box-shadow: 0px -2px 12px #888;
   height: 48pt;
   padding-top: 64pt;
   padding-left: 64pt;
diff --git a/views/factor.erb b/views/factor.erb
new file mode 100644
index 0000000..51f4e0a
--- /dev/null
+++ b/views/factor.erb
@@ -0,0 +1,5 @@
+<section>
+  <article>
+    <%= render_markdown(@factor) %>
+  </article>
+</section>
diff --git a/views/home.erb b/views/home.erb
index 08ced05..476402e 100644
--- a/views/home.erb
+++ b/views/home.erb
@@ -1,26 +1,20 @@
-<header>
-  <h1>The Twelve-Factor App</h1>
-</header>
+<section id="abstract">
+  <article>
+    <%= render_markdown('abstract') %>
+  </article>
+</section>
 
-<div id="main" role="main">
-  <section id="abstract">
-    <article>
-      <%= render_markdown('abstract') %>
-    </article>
-  </section>
+<section id="who">
+  <article>
+    <%= render_markdown('who') %>
+  </article>
+</section>
 
-  <section id="who">
-    <article>
-      <%= render_markdown('who') %>
-    </article>
-  </section>
-
-  <section id="toc">
-    <article>
-      <%= render_markdown('toc') %>
-    <article>
-  </section>
-</div>
+<section id="toc">
+  <article>
+    <%= render_markdown('toc') %>
+  <article>
+</section>
 
 <footer>
   <div>Copyright &copy; <%= Time.now.year %> Adam Wiggins</div>
diff --git a/views/layout.erb b/views/layout.erb
index fc7bc96..71835b0 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -15,6 +15,10 @@
   <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 </head>
 <body>
-<%= yield %>
+  <header>
+    <h1><a href="/">The Twelve-Factor App</a></h1>
+  </header>
+
+  <%= yield %>
 </body>
 </html>
diff --git a/web.rb b/web.rb
index 669ab29..7c97a2e 100644
--- a/web.rb
+++ b/web.rb
@@ -5,6 +5,11 @@ get '/' do
   erb :home
 end
 
+get '/:factor' do |factor|
+  @factor = factor
+  erb :factor
+end
+
 helpers do
   def render_markdown(file)
     markdown = File.read("content/#{file}.md")