11 files changed, 56 insertions, 33 deletions
diff --git a/site/content/_index.md b/site/content/_index.md
new file mode 100644
index 0000000..02e819d
--- /dev/null
+++ b/site/content/_index.md
@@ -0,0 +1,20 @@
+---
+title: "Great coffee with a conscience"
+subtitle: Support sustainable farming while enjoying a cup
+image: /img/home-jumbotron.jpg
+blurb:
+    heading: Why Kaldi?
+    text: "Kaldi is the coffee store for everyone who believes that great coffee shouldn't just taste good, it should do good too. We source all of our beans directly from small scale sustainable farmers and make sure part of the profits are reinvested in their communities."
+intro:
+    heading: "What we offer"
+    text: "Kaldi is the ultimate spot for coffee lovers who want to learn about their java’s origin and support the farmers that grew it. We take coffee production, roasting and brewing seriously and we’re glad to pass that knowledge to anyone."
+products:
+    - image: img/illustrations-coffee.svg
+      text: "We sell green and roasted coffee beans that are sourced directly from independent farmers and farm cooperatives. We’re proud to offer a variety of coffee beans grown with great care for the environment and local communities. Check our post or contact us directly for current availability."
+    - image: /img/illustrations-coffee-gear.svg
+      text: "We offer a small, but carefully curated selection of brewing gear and tools for every taste and experience level. No matter if you roast your own beans or just bought your first french press, you’ll find a gadget to fall in love with in our shop."
+values:
+    heading: Our values
+    text: Coffee is an amazing part of human culture but it has a dark side too – one of colonialism and mindless abuse of natural resources and human lives. We want to turn this around and return the coffee trade to the drink’s exhilarating, empowering and unifying nature.
+---
+
diff --git a/site/content/contact.md b/site/content/contact/_index.md
index 2e3c24e..1b34ee8 100644
--- a/site/content/contact.md
+++ b/site/content/contact/_index.md
@@ -1,7 +1,5 @@
 ---
 title: "Contact"
-type: "contact"
-page: "/contact.html"
 logo: "/img/logo.svg"
 contact_entries:
   - heading: Location
diff --git a/site/content/products.md b/site/content/products/_index.md
index 67fd186..b8d4b63 100644
--- a/site/content/products.md
+++ b/site/content/products/_index.md
@@ -1,7 +1,6 @@
 ---
 title: Our Coffee
 type: products
-page: /products.html
 image: /img/products-jumbotron.jpg
 heading: What we offer
 description: >-
diff --git a/site/content/values.md b/site/content/values/_index.md
index 98bf92c..b92073d 100644
--- a/site/content/values.md
+++ b/site/content/values/_index.md
@@ -1,7 +1,5 @@
 ---
 title: "Values"
-type: "values"
-page: "/values.html"
 image: /img/about-jumbotron.jpg
 values:
   - heading: "Shade-grown coffee"
diff --git a/site/layouts/index.html b/site/layouts/index.html
index 9ce8a17..a21df24 100644
--- a/site/layouts/index.html
+++ b/site/layouts/index.html
@@ -2,13 +2,13 @@
 
 {{ partial "nav" . }}
 
-{{ partial "jumbotron" (dict "imageUrl" "/img/home-jumbotron.jpg" "title" "Great coffee with a conscience" "subtitle" "Support sustainable farming while enjoying a cup") }}
+{{ partial "jumbotron" (dict "imageUrl" .Params.image "title" .Title "subtitle" .Params.subtitle) }}
 
-{{ partial "short-text" (dict "heading" "Why Kaldi?" "text" "Kaldi is the coffee store for everyone who believes that great coffee shouldn't just taste good, it should do good too. We source all of our beans directly from small scale sustainable farmers and make sure part of the profits are reinvested in their communities.")}}
+{{ partial "short-text" .Params.blurb}}
 
-{{ partial "2-up" (dict "heading" "What we offer" "description" "Kaldi is the ultimate spot for coffee lovers who want to learn about their java’s origin and support the farmers that grew it. We take coffee production, roasting and brewing seriously and we’re glad to pass that knowledge to anyone." "svg1" "img/illustrations-coffee.svg" "text1" "We sell green and roasted coffee beans that are sourced directly from independent farmers and farm cooperatives. We’re proud to offer a variety of coffee beans grown with great care for the environment and local communities. Check our post or contact us directly for current availability." "svg2" "/img/illustrations-coffee-gear.svg" "text2" "We offer a small, but carefully curated selection of brewing gear and tools for every taste and experience level. No matter if you roast your own beans or just bought your first french press, you’ll find a gadget to fall in love with in our shop." "buttonText" "See all products" "buttonLink" "/products"  ) }}
+{{ partial "2-up" .Params }}
 
-{{ partial "text-and-image" (dict "heading" "Our values" "text" "Coffee is an amazing part of human culture but it has a dark side too – one of colonialism and mindless abuse of natural resources and human lives. We want to turn this around and return the coffee trade to the drink’s exhilarating, empowering and unifying nature." "buttonText" "Read more" "buttonLink" "/values") }}
+{{ partial "text-and-image" (dict "heading" .Params.values.heading "text" .Params.values.text "buttonText" "Read more" "buttonLink" "/values") }}
 
 {{ partial "blog" . }}
 
diff --git a/site/layouts/partials/2-up.html b/site/layouts/partials/2-up.html
index 06849f0..ab827b4 100644
--- a/site/layouts/partials/2-up.html
+++ b/site/layouts/partials/2-up.html
@@ -1,24 +1,19 @@
 <div class="bg-off-white pv4">
   <div class="ph3 mw7 center">
-    <h2 class="f2 b lh-title mb2">{{.heading}}</h2>
-    <p class="mb4 mw6">{{.description}}</p>
+    <h2 class="f2 b lh-title mb2">{{.intro.heading}}</h2>
+    <p class="mb4 mw6">{{.intro.text}}</p>
 
     <div class="flex-ns mhn2-ns mb3">
+      {{ range .products }}
       <div class="ph2-ns w-50-ns">
-        <img src="{{.svg1}}" alt="" class="center db mb3" style="width: 240px">
-        <p>{{.text1}}</p>
-      </div>
-
-      <div class="ph2-ns w-50-ns">
-        <img src="{{.svg2}}" alt="" class="center db mb3" style="width: 240px">
-        <p>{{.text2}}</p>
+        <img src="{{.image}}" alt="" class="center db mb3" style="width: 240px">
+        <p>{{.text}}</p>
       </div>
+      {{ end }}
     </div>
 
-    {{ if .buttonText }}
-      <div class="tc">
-        <a href="{{.buttonLink}}" class="btn raise">{{.buttonText}}</a>
-      </div>
-    {{ end }}
+    <div class="tc">
+      <a href="/products" class="btn raise">See all products</a>
+    </div>
   </div>
 </div>
diff --git a/site/layouts/partials/text-and-image.html b/site/layouts/partials/text-and-image.html
index 06baa68..7a55f15 100644
--- a/site/layouts/partials/text-and-image.html
+++ b/site/layouts/partials/text-and-image.html
@@ -3,7 +3,7 @@
 
 		<div class="flex-l mhn2-l">
 			<div class="w-40-l ph2-l">
-				<h2 class="f2 b lh-title mb2">{{.heading}}</h1>
+				<h2 class="f2 b lh-title mb2">{{.heading}}</h2>
 
 				<p>{{.text}}</p>
 			</div>
diff --git a/site/layouts/contact/single.html b/site/layouts/section/contact.html
index 205d92e..205d92e 100644
--- a/site/layouts/contact/single.html
+++ b/site/layouts/section/contact.html
diff --git a/site/layouts/products/single.html b/site/layouts/section/products.html
index bf430ca..bf430ca 100644
--- a/site/layouts/products/single.html
+++ b/site/layouts/section/products.html
diff --git a/site/layouts/values/single.html b/site/layouts/section/values.html
index 9b6fa13..9b6fa13 100644
--- a/site/layouts/values/single.html
+++ b/site/layouts/section/values.html
diff --git a/site/static/admin/config.yml b/site/static/admin/config.yml
index cdb089e..bf0f03d 100644
--- a/site/static/admin/config.yml
+++ b/site/static/admin/config.yml
@@ -18,13 +18,30 @@ collections: # A list of collections the CMS should be able to edit
   - name: "pages"
     label: "Pages"
     files:
-      - file: "site/content/contact.md"
+      - file: "site/content/_index.md"
+        label: "Home Page"
+        name: "home"
+        fields:
+          - {label: Title, name: title, widget: string}
+          - {label: Subtitle, name: subtitle, widget: string}
+          - {label: Image, name: image, widget: image}
+          - {label: "Blurb", name: blurb, widget: object, fields: [
+              {label: "Heading", name: "heading", widget: string},
+              {label: "Text", name: "text", widget: "text"}]}
+          - {label: "Intro", name: intro, widget: object, fields: [
+              {label: "Heading", name: "heading", widget: string},
+              {label: "Text", name: "text", widget: "text"}]}
+          - {label: "Products", name: products, widget: list, fields: [
+              {label: "Image", name: "image", widget: "image"},
+              {label: "Text", name: "text", widget: "text"}]}
+          - {label: "Values", name: "values", widget: "object", fields: [
+              {label: "Heading", name: "heading", widget: string},
+              {label: "Text", name: "text", widget: "text"}]}
+      - file: "site/content/contact/_index.md"
         label: "Contact Page"
         name: "contact"
         fields:
           - {label: Title, name: title, widget: string}
-          - {label: Type, name: type, widget: hidden, default: contact}
-          - {label: Page, name: page, widget: hidden, default: "/contact.html"}
           - {label: Logo, name: logo, widget: image}
           - {label: Body, name: body, widget: markdown}
           - label: Contact Entries
@@ -37,13 +54,11 @@ collections: # A list of collections the CMS should be able to edit
               - label: Text
                 name: text
                 widget: text
-      - file: "site/content/products.md"
+      - file: "site/content/products/_index.md"
         label: "Products Page"
         name: "products"
         fields:
           - {label: Title, name: title, widget: string}
-          - {label: Type, name: type, widget: hidden, default: products}
-          - {label: Page, name: page, widget: hidden, default: "/products.html"}
           - {label: Image, name: image, widget: image}
           - {label: Heading, name: heading, widget: string}
           - {label: Description, name: description, widget: string}
@@ -52,13 +67,11 @@ collections: # A list of collections the CMS should be able to edit
           - {label: Testimonials, name: testimonials, widget: list, fields: [{label: Quote, name: quote, widget: string}, {label: Author, name: author, widget: string}]}
           - {label: Full_image, name: full_image, widget: image}
           - {label: Pricing, name: pricing, widget: object, fields: [{label: Heading, name: heading, widget: string}, {label: Description, name: description, widget: string}, {label: Plans, name: plans, widget: list, fields: [{label: Plan, name: plan, widget: string}, {label: Price, name: price, widget: string}, {label: Description, name: description, widget: string}, {label: Items, name: items, widget: list}]}]}
-      - file: "site/content/values.md"
+      - file: "site/content/values/_index.md"
         label: "Values Page"
         name: "values"
         fields:
           - {label: Title, name: title, widget: string}
-          - {label: Type, name: type, widget: hidden, default: values}
-          - {label: Page, name: page, widget: hidden, default: "/values.html"}
           - {label: Image, name: image, widget: image}
           - label: Values
             name: values