diff options
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | site/content/post/brewing-chemex.md | 11 | ||||
| -rw-r--r-- | site/content/products.md | 130 | ||||
| -rw-r--r-- | src/cms/config.yml | 4 | ||||
| -rw-r--r-- | src/js/cms-preview-templates/post.js | 4 | ||||
| -rw-r--r-- | src/js/cms.js | 16 | ||||
| -rw-r--r-- | yarn.lock | 6 |
7 files changed, 119 insertions, 54 deletions
diff --git a/package.json b/package.json index 2fc9518..69331b7 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "gulp-replace": "^0.5.4", "gulp-util": "^3.0.7", "imports-loader": "^0.6.5", - "netlify-cms": "^0.3.12", + "netlify-cms": "^0.3.15", "postcss-cssnext": "^2.7.0", "postcss-import": "^8.1.2", "postcss-loader": "^0.9.1", diff --git a/site/content/post/brewing-chemex.md b/site/content/post/brewing-chemex.md index c8c817e..11ddd0c 100644 --- a/site/content/post/brewing-chemex.md +++ b/site/content/post/brewing-chemex.md @@ -1,11 +1,14 @@ --- -title: "A beginners’ guide to brewing with Chemex" +title: A beginners’ guide to brewing with Chemex date: 2017-01-04T15:04:10.000Z -description: Brewing with a Chemex probably seems like a complicated, time-consuming ordeal, but once you get used to the process, it becomes a soothing ritual that’s worth the effort every time. +description: >- + Brewing with a Chemex probably seems like a complicated, time-consuming + ordeal, but once you get used to the process, it becomes a soothing ritual + that's worth the effort every time. image: /img/blog/chemex.jpg --- -This [week](/wdwdw) we’ll **take** a look at all the steps required to make astonishing coffee with a Chemex at home. The Chemex Coffeemaker is a manual, pour-over style glass-container coffeemaker that Peter Schlumbohm invented in 1941, and which continues to be manufactured by the Chemex Corporation in Chicopee, Massachusetts*. +This [week](/wdwdw) we’ll **take** a look at all the steps required to make astonishing coffee with a Chemex at home. The Chemex Coffeemaker is a manual, pour-over style glass-container coffeemaker that Peter Schlumbohm invented in 1941, and which continues to be manufactured by the Chemex Corporation in Chicopee, Massachusetts\*. In 1958, designers at the [Illinois Institute of Technology](https://www.spacefarm.digital) said that the Chemex Coffeemaker is *"one of the best-designed products of modern times"*, and so is included in the collection of the Museum of Modern Art in New York City. @@ -20,4 +23,4 @@ The Chemex Coffeemaker consists of an hourglass-shaped glass flask with a conica The most visually distinctive feature of the Chemex is the heatproof wooden collar around the neck, allowing it to be handled and poured when full of hot water. This is turned, then split in two to allow it to fit around the glass neck. The two pieces are held loosely in place by a tied leather thong. The pieces are not tied tightly and can still move slightly, retained by the shape of the conical glass. -For a design piece that became popular post-war at a time of Modernism and precision manufacture, this juxtaposition of natural wood and the organic nature of a hand-tied knot with the laboratory nature of glassware was a distinctive feature of its appearance. +For a design piece that became popular post-war at a time of Modernism and precision manufacture, this juxtaposition of natural wood and the organic nature of a hand-tied knot with the laboratory nature of glassware was a distinctive feature of its appearance.
\ No newline at end of file diff --git a/site/content/products.md b/site/content/products.md index efcfe04..e851631 100644 --- a/site/content/products.md +++ b/site/content/products.md @@ -1,60 +1,102 @@ --- -title: "Products" -type: "products" -image: "/img/products/jumbotron.jpg" -page: "/products.html" -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." +title: Our Coffee +type: products +page: /products.html +image: /img/products/jumbotron.jpg +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. intro: - 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. blurbs: - - 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. - - image: "/img/illustrations/tutorials.svg" - text: | - Love a great cup of coffee, but never knew how to make one? Bought a fancy new Chemex but have no clue how to use it? Don't worry, we’re here to help. You can schedule a custom 1-on-1 consultation with our baristas to learn anything you want to know about coffee roasting and brewing. Email us or call the store for details. - - image: "/img/illustrations/meeting-space.svg" - text: | - We believe that good coffee has the power to bring people together. That’s why we decided to turn a corner of our shop into a cozy meeting space where you can hang out with fellow coffee lovers and learn about coffee making techniques. All of the artwork on display there is for sale. The full price you pay goes to the artist. + - 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. + - image: /img/illustrations/tutorials.svg + text: > + Love a great cup of coffee, but never knew how to make one? Bought a + fancy new Chemex but have no clue how to use it? Don't worry, we’re here + to help. You can schedule a custom 1-on-1 consultation with our baristas + to learn anything you want to know about coffee roasting and brewing. + Email us or call the store for details. + - image: /img/illustrations/meeting-space.svg + text: > + We believe that good coffee has the power to bring people together. + That’s why we decided to turn a corner of our shop into a cozy meeting + space where you can hang out with fellow coffee lovers and learn about + coffee making techniques. All of the artwork on display there is for + sale. The full price you pay goes to the artist. + 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. main: heading: Great coffee with no compromises - description: | - We hold our coffee to the highest standards from the shrub to the cup. That’s why we’re meticulous and transparent about each step of the coffee’s journey. We personally visit each farm to make sure the conditions are optimal for the plants, farmers and the local environment. + description: > + We hold our coffee to the highest standards from the shrub to the cup. + That’s why we’re meticulous and transparent about each step of the coffee’s + journey. We personally visit each farm to make sure the conditions are + optimal for the plants, farmers and the local environment. image1: - image: /img/products/products-grid3.jpg alt: A close-up of a paper filter filled with ground coffee + image: /img/products/products-grid3.jpg image2: - image: /img/products/products-grid2.jpg alt: A green cup of a coffee on a wooden table + image: /img/products/products-grid2.jpg image3: - image: /img/products/products-grid1.jpg alt: Coffee beans + image: /img/products/products-grid1.jpg testimonials: - - quote: "The first time I tried Kaldi’s coffee, I couldn’t even believe that was the same thing I’ve been drinking every morning." - author: "Elisabeth Kaurismäki" - - quote: "Kaldi is the place to go if you want the best quality coffee. I love their stance on empowering farmers and transparency." - author: "Philipp Trommler" + - author: Elisabeth Kaurismäki + quote: >- + The first time I tried Kaldi’s coffee, I couldn’t even believe that was + the same thing I’ve been drinking every morning. + - author: Philipp Trommler + quote: >- + Kaldi is the place to go if you want the best quality coffee. I love their + stance on empowering farmers and transparency. full_image: /img/products/products-full-width.jpg pricing: - heading: "Monthly subscriptions" - description: "We make it easy to make great coffee a part of your life. Choose one of our monthly subscription plans to receive great coffee at your doorstep each month. Contact us about more details and payment info." + heading: Monthly subscriptions + description: >- + We make it easy to make great coffee a part of your life. Choose one of our + monthly subscription plans to receive great coffee at your doorstep each + month. Contact us about more details and payment info. plans: - - plan: "Small" - price: "50" - description: "Perfect for the drinker who likes to enjoy 1-2 cups per day." - items: ["3 lbs of coffee per month", Green or roasted beans", One or two varieties of beans"] - - plan: Big - price: "80" - description: Great for avid drinkers, java-nsoving couples and bigger crowds - items: ["6 lbs of coffee per month", "Green or roasted beans", "Up to 4 different varieties of beans"] - - plan: Custom - price: "?" - description: "Want a few tiny batches from different varieties? Try our custom plan" - items: ["Whatever you need", "Green or roasted beans", "Unlimited varieties"] + - description: Perfect for the drinker who likes to enjoy 1-2 cups per day. + items: + - 3 lbs of coffee per month + - Green or roasted beans" + - One or two varieties of beans" + plan: Small + price: '50' + - description: 'Great for avid drinkers, java-nsoving couples and bigger crowds' + items: + - 6 lbs of coffee per month + - Green or roasted beans + - Up to 4 different varieties of beans + plan: Big + price: '80' + - description: Want a few tiny batches from different varieties? Try our custom plan + items: + - Whatever you need + - Green or roasted beans + - Unlimited varieties + plan: Custom + price: '?' --- + diff --git a/src/cms/config.yml b/src/cms/config.yml index 3b209aa..89af1d6 100644 --- a/src/cms/config.yml +++ b/src/cms/config.yml @@ -3,8 +3,8 @@ backend: repo: <% GITHUB_REPOSITORY %> # Gulp will replace this with your GitHub repository branch: master # Branch to update (master by default) -media_folder: "dist/img" # Folder where user uploaded files should go -public_folder: "dist" # CMS now knows 'source' is the public folder and will strip this from the path +media_folder: "site/static/img" # Folder where user uploaded files should go +public_folder: "img" collections: # A list of collections the CMS should be able to edit - name: "post" # Used in routes, ie.: /admin/collections/:slug/edit diff --git a/src/js/cms-preview-templates/post.js b/src/js/cms-preview-templates/post.js index 0c819fd..eca7374 100644 --- a/src/js/cms-preview-templates/post.js +++ b/src/js/cms-preview-templates/post.js @@ -8,6 +8,10 @@ export default class PostPreview extends React.Component { return <div className="mw6 center ph3 pv4"> <h1 className="f2 lh-title b mb3">{ entry.getIn(["data", "title"])}</h1> <div className="flex justify-between grey-3"> + <div style={{ + width: "80px", + height: "80px" + }}></div> <p>{ format(entry.getIn(["data", "date"]), "ddd, MMM D, YYYY") }</p> <p>Read in x minutes</p> </div> diff --git a/src/js/cms.js b/src/js/cms.js index 289b26a..8502ed0 100644 --- a/src/js/cms.js +++ b/src/js/cms.js @@ -1,7 +1,23 @@ +import React from "react"; import CMS from "netlify-cms"; + import PostPreview from "./cms-preview-templates/post"; import ProductsPreview from "./cms-preview-templates/products"; + +// Example of creating a custom color widget +class ColorControl extends React.Component { + render() { + return <input + style={{height: "80px"}} + type="color" + value={this.props.value} + onInput={(e) => this.props.onChange(e.target.value)} + />; + } +} + CMS.registerPreviewStyle("/css/main.css"); CMS.registerPreviewTemplate("post", PostPreview); CMS.registerPreviewTemplate("products", ProductsPreview); +CMS.registerWidget("color", ColorControl); @@ -5059,9 +5059,9 @@ netlify-auth-js@^0.5.5: dependencies: micro-api-client "^2.0.0" -netlify-cms@^0.3.9: - version "0.3.9" - resolved "https://registry.yarnpkg.com/netlify-cms/-/netlify-cms-0.3.9.tgz#972b22527b5f33303cdd2ee9d9cea2cfd274d1aa" +netlify-cms@^0.3.15: + version "0.3.15" + resolved "https://registry.yarnpkg.com/netlify-cms/-/netlify-cms-0.3.15.tgz#a17a1a709aa62e4aac96174fdbc04ebb2b5607e1" dependencies: "@kadira/storybook" "^1.36.0" autoprefixer "^6.3.3" |