From 45e189f1b733d9a56404c506fbb21bca3d5cfdc3 Mon Sep 17 00:00:00 2001 From: Benaiah Mischenko Date: Tue, 5 Dec 2017 13:56:58 -0800 Subject: Add new page definitions and move all images to media library --- gulpfile.babel.js | 4 ++-- site/content/post/brewing-chemex.md | 4 ++-- site/content/post/making-sense.md | 2 +- site/content/products.md | 18 +++++++-------- site/layouts/index.html | 4 ++-- site/layouts/partials/footer.html | 8 +++---- site/layouts/partials/head.html | 10 ++++---- site/layouts/partials/svg.html | 2 +- site/layouts/partials/text-and-image.html | 2 +- site/static/admin/config.yml | 16 +++++++++++++ site/static/android-chrome-192x192.png | Bin 2529 -> 0 bytes site/static/android-chrome-512x512.png | Bin 5302 -> 0 bytes site/static/apple-touch-icon.png | Bin 1641 -> 0 bytes site/static/blog-chemex.jpg | Bin 0 -> 146657 bytes site/static/blog-flavor_wheel.jpg | Bin 0 -> 60110 bytes site/static/browserconfig.xml | 2 +- site/static/favicon-16x16.png | Bin 690 -> 0 bytes site/static/favicon-32x32.png | Bin 925 -> 0 bytes site/static/favicon.ico | Bin 15086 -> 0 bytes site/static/img/about-direct-sourcing.jpg | Bin 0 -> 194683 bytes site/static/img/about-jumbotron.jpg | Bin 0 -> 167854 bytes site/static/img/about-reinvest-profits.jpg | Bin 0 -> 161713 bytes site/static/img/about-shade-grown.jpg | Bin 0 -> 108493 bytes site/static/img/about-single-origin.jpg | Bin 0 -> 116457 bytes site/static/img/about-sustainable-farming.jpg | Bin 0 -> 196653 bytes site/static/img/about/direct-sourcing.jpg | Bin 194683 -> 0 bytes site/static/img/about/jumbotron.jpg | Bin 167854 -> 0 bytes site/static/img/about/reinvest-profits.jpg | Bin 161713 -> 0 bytes site/static/img/about/shade-grown.jpg | Bin 108493 -> 0 bytes site/static/img/about/single-origin.jpg | Bin 116457 -> 0 bytes site/static/img/about/sustainable-farming.jpg | Bin 196653 -> 0 bytes site/static/img/android-chrome-192x192.png | Bin 0 -> 2529 bytes site/static/img/android-chrome-512x512.png | Bin 0 -> 5302 bytes site/static/img/apple-touch-icon.png | Bin 0 -> 1641 bytes site/static/img/blog/chemex.jpg | Bin 146657 -> 0 bytes site/static/img/blog/flavor_wheel.jpg | Bin 60110 -> 0 bytes site/static/img/favicon-16x16.png | Bin 0 -> 690 bytes site/static/img/favicon-32x32.png | Bin 0 -> 925 bytes site/static/img/favicon.ico | Bin 0 -> 15086 bytes site/static/img/home-about-section.jpg | Bin 0 -> 196603 bytes site/static/img/home-jumbotron.jpg | Bin 0 -> 141447 bytes site/static/img/home/about-section.jpg | Bin 196603 -> 0 bytes site/static/img/home/jumbotron.jpg | Bin 141447 -> 0 bytes site/static/img/icons-facebook.svg | 9 ++++++++ site/static/img/icons-instagram.svg | 10 ++++++++ site/static/img/icons-twitter.svg | 11 +++++++++ site/static/img/icons-vimeo.svg | 10 ++++++++ site/static/img/icons/facebook.svg | 9 -------- site/static/img/icons/instagram.svg | 10 -------- site/static/img/icons/twitter.svg | 11 --------- site/static/img/icons/vimeo.svg | 10 -------- site/static/img/illustrations-coffee-gear.svg | 1 + site/static/img/illustrations-coffee.svg | 1 + site/static/img/illustrations-meeting-space.svg | 1 + site/static/img/illustrations-tutorials.svg | 1 + site/static/img/illustrations/coffee-gear.svg | 1 - site/static/img/illustrations/coffee.svg | 1 - site/static/img/illustrations/meeting-space.svg | 1 - site/static/img/illustrations/tutorials.svg | 1 - site/static/img/mstile-144x144.png | Bin 0 -> 2004 bytes site/static/img/mstile-150x150.png | Bin 0 -> 2097 bytes site/static/img/mstile-310x150.png | Bin 0 -> 2331 bytes site/static/img/mstile-310x310.png | Bin 0 -> 4413 bytes site/static/img/mstile-70x70.png | Bin 0 -> 1478 bytes site/static/img/og-image.jpg | Bin 0 -> 91417 bytes site/static/img/products-full-width.jpg | Bin 0 -> 217443 bytes site/static/img/products-grid1.jpg | Bin 0 -> 329208 bytes site/static/img/products-grid2.jpg | Bin 0 -> 166193 bytes site/static/img/products-grid3.jpg | Bin 0 -> 149603 bytes site/static/img/products-jumbotron.jpg | Bin 0 -> 136554 bytes site/static/img/products/jumbotron.jpg | Bin 136554 -> 0 bytes site/static/img/products/products-full-width.jpg | Bin 217443 -> 0 bytes site/static/img/products/products-grid1.jpg | Bin 329208 -> 0 bytes site/static/img/products/products-grid2.jpg | Bin 166193 -> 0 bytes site/static/img/products/products-grid3.jpg | Bin 149603 -> 0 bytes site/static/img/safari-pinned-tab.svg | 28 +++++++++++++++++++++++ site/static/manifest.json | 4 ++-- site/static/mstile-144x144.png | Bin 2004 -> 0 bytes site/static/mstile-150x150.png | Bin 2097 -> 0 bytes site/static/mstile-310x150.png | Bin 2331 -> 0 bytes site/static/mstile-310x310.png | Bin 4413 -> 0 bytes site/static/mstile-70x70.png | Bin 1478 -> 0 bytes site/static/og-image.jpg | Bin 91417 -> 0 bytes site/static/safari-pinned-tab.svg | 28 ----------------------- 84 files changed, 118 insertions(+), 102 deletions(-) delete mode 100644 site/static/android-chrome-192x192.png delete mode 100644 site/static/android-chrome-512x512.png delete mode 100644 site/static/apple-touch-icon.png create mode 100755 site/static/blog-chemex.jpg create mode 100755 site/static/blog-flavor_wheel.jpg delete mode 100644 site/static/favicon-16x16.png delete mode 100644 site/static/favicon-32x32.png delete mode 100644 site/static/favicon.ico create mode 100755 site/static/img/about-direct-sourcing.jpg create mode 100644 site/static/img/about-jumbotron.jpg create mode 100755 site/static/img/about-reinvest-profits.jpg create mode 100755 site/static/img/about-shade-grown.jpg create mode 100755 site/static/img/about-single-origin.jpg create mode 100755 site/static/img/about-sustainable-farming.jpg delete mode 100755 site/static/img/about/direct-sourcing.jpg delete mode 100644 site/static/img/about/jumbotron.jpg delete mode 100755 site/static/img/about/reinvest-profits.jpg delete mode 100755 site/static/img/about/shade-grown.jpg delete mode 100755 site/static/img/about/single-origin.jpg delete mode 100755 site/static/img/about/sustainable-farming.jpg create mode 100644 site/static/img/android-chrome-192x192.png create mode 100644 site/static/img/android-chrome-512x512.png create mode 100644 site/static/img/apple-touch-icon.png delete mode 100755 site/static/img/blog/chemex.jpg delete mode 100755 site/static/img/blog/flavor_wheel.jpg create mode 100644 site/static/img/favicon-16x16.png create mode 100644 site/static/img/favicon-32x32.png create mode 100644 site/static/img/favicon.ico create mode 100755 site/static/img/home-about-section.jpg create mode 100644 site/static/img/home-jumbotron.jpg delete mode 100755 site/static/img/home/about-section.jpg delete mode 100644 site/static/img/home/jumbotron.jpg create mode 100644 site/static/img/icons-facebook.svg create mode 100644 site/static/img/icons-instagram.svg create mode 100644 site/static/img/icons-twitter.svg create mode 100644 site/static/img/icons-vimeo.svg delete mode 100644 site/static/img/icons/facebook.svg delete mode 100644 site/static/img/icons/instagram.svg delete mode 100644 site/static/img/icons/twitter.svg delete mode 100644 site/static/img/icons/vimeo.svg create mode 100644 site/static/img/illustrations-coffee-gear.svg create mode 100644 site/static/img/illustrations-coffee.svg create mode 100644 site/static/img/illustrations-meeting-space.svg create mode 100644 site/static/img/illustrations-tutorials.svg delete mode 100644 site/static/img/illustrations/coffee-gear.svg delete mode 100644 site/static/img/illustrations/coffee.svg delete mode 100644 site/static/img/illustrations/meeting-space.svg delete mode 100644 site/static/img/illustrations/tutorials.svg create mode 100644 site/static/img/mstile-144x144.png create mode 100644 site/static/img/mstile-150x150.png create mode 100644 site/static/img/mstile-310x150.png create mode 100644 site/static/img/mstile-310x310.png create mode 100644 site/static/img/mstile-70x70.png create mode 100644 site/static/img/og-image.jpg create mode 100644 site/static/img/products-full-width.jpg create mode 100755 site/static/img/products-grid1.jpg create mode 100755 site/static/img/products-grid2.jpg create mode 100755 site/static/img/products-grid3.jpg create mode 100755 site/static/img/products-jumbotron.jpg delete mode 100755 site/static/img/products/jumbotron.jpg delete mode 100644 site/static/img/products/products-full-width.jpg delete mode 100755 site/static/img/products/products-grid1.jpg delete mode 100755 site/static/img/products/products-grid2.jpg delete mode 100755 site/static/img/products/products-grid3.jpg create mode 100644 site/static/img/safari-pinned-tab.svg delete mode 100644 site/static/mstile-144x144.png delete mode 100644 site/static/mstile-150x150.png delete mode 100644 site/static/mstile-310x150.png delete mode 100644 site/static/mstile-310x310.png delete mode 100644 site/static/mstile-70x70.png delete mode 100644 site/static/og-image.jpg delete mode 100644 site/static/safari-pinned-tab.svg diff --git a/gulpfile.babel.js b/gulpfile.babel.js index d1420f2..4bc694a 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js @@ -54,7 +54,7 @@ gulp.task("js", (cb) => { gulp.task("svg", () => { const svgs = gulp - .src("site/static/img/icons/*.svg") + .src("site/static/img/icons-*.svg") .pipe(svgmin()) .pipe(svgstore({inlineSvg: true})); @@ -76,7 +76,7 @@ gulp.task("server", ["hugo", "css", "cms-assets", "js", "svg"], () => { }); gulp.watch("./src/js/**/*.js", ["js"]); gulp.watch("./src/css/**/*.css", ["css"]); - gulp.watch("./site/static/img/icons/*.svg", ["svg"]); + gulp.watch("./site/static/img/icons-*.svg", ["svg"]); gulp.watch("./site/**/*", ["hugo"]); }); diff --git a/site/content/post/brewing-chemex.md b/site/content/post/brewing-chemex.md index 11ddd0c..a64363a 100644 --- a/site/content/post/brewing-chemex.md +++ b/site/content/post/brewing-chemex.md @@ -5,7 +5,7 @@ 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 +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\*. @@ -23,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. \ No newline at end of file +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. diff --git a/site/content/post/making-sense.md b/site/content/post/making-sense.md index 3d6c8b5..3573c31 100644 --- a/site/content/post/making-sense.md +++ b/site/content/post/making-sense.md @@ -2,7 +2,7 @@ title: "Making sense of the SCAA’s new Flavor Wheel" date: 2016-12-17T15:04:10.000Z description: The Coffee Taster’s Flavor Wheel, the official resource used by coffee tasters, has been revised for the first time this year. -image: /img/blog/flavor_wheel.jpg +image: /img/blog-flavor_wheel.jpg --- The SCAA updated the wheel to reflect the finer nuances needed to describe flavors more precisely. The new descriptions are more detailed and hence allow cuppers to distinguish between more flavors. diff --git a/site/content/products.md b/site/content/products.md index 62fd0f0..67fd186 100644 --- a/site/content/products.md +++ b/site/content/products.md @@ -2,7 +2,7 @@ title: Our Coffee type: products page: /products.html -image: /img/products/jumbotron.jpg +image: /img/products-jumbotron.jpg heading: What we offer description: >- Kaldi is the ultimate spot for coffee lovers who want to learn about their @@ -11,27 +11,27 @@ description: >- anyone. intro: blurbs: - - image: /img/illustrations/coffee.svg + - 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 + - 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 + - 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 + - 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 @@ -53,13 +53,13 @@ main: optimal for the plants, farmers and the local environment. image1: alt: A close-up of a paper filter filled with ground coffee - image: /img/products/products-grid3.jpg + image: /img/products-grid3.jpg image2: alt: A green cup of a coffee on a wooden table - image: /img/products/products-grid2.jpg + image: /img/products-grid2.jpg image3: alt: Coffee beans - image: /img/products/products-grid1.jpg + image: /img/products-grid1.jpg testimonials: - author: Elisabeth Kaurismäki quote: >- @@ -69,7 +69,7 @@ testimonials: 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 +full_image: /img/products-full-width.jpg pricing: heading: Monthly subscriptions description: >- diff --git a/site/layouts/index.html b/site/layouts/index.html index e57ce45..9ce8a17 100644 --- a/site/layouts/index.html +++ b/site/layouts/index.html @@ -2,11 +2,11 @@ {{ 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" "/img/home-jumbotron.jpg" "title" "Great coffee with a conscience" "subtitle" "Support sustainable farming while enjoying a cup") }} {{ 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 "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" (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 "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") }} diff --git a/site/layouts/partials/footer.html b/site/layouts/partials/footer.html index b69672e..5547c82 100644 --- a/site/layouts/partials/footer.html +++ b/site/layouts/partials/footer.html @@ -36,10 +36,10 @@

Social media

diff --git a/site/layouts/partials/head.html b/site/layouts/partials/head.html index b58be17..9e75f44 100644 --- a/site/layouts/partials/head.html +++ b/site/layouts/partials/head.html @@ -12,18 +12,18 @@ - - - + + + - + - + diff --git a/site/layouts/partials/svg.html b/site/layouts/partials/svg.html index 5a7068f..25e80a9 100644 --- a/site/layouts/partials/svg.html +++ b/site/layouts/partials/svg.html @@ -1,5 +1,5 @@
- +
diff --git a/site/layouts/partials/text-and-image.html b/site/layouts/partials/text-and-image.html index ff3bd7c..06baa68 100644 --- a/site/layouts/partials/text-and-image.html +++ b/site/layouts/partials/text-and-image.html @@ -9,7 +9,7 @@
- +
diff --git a/site/static/admin/config.yml b/site/static/admin/config.yml index b0df0a3..2edc318 100644 --- a/site/static/admin/config.yml +++ b/site/static/admin/config.yml @@ -18,6 +18,14 @@ collections: # A list of collections the CMS should be able to edit - name: "pages" label: "Pages" files: + - file: "site/content/contact.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: Body, name: body, widget: markdown} - file: "site/content/products.md" label: "Products Page" name: "products" @@ -33,3 +41,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" + 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: Body, name: body, widget: markdown} diff --git a/site/static/android-chrome-192x192.png b/site/static/android-chrome-192x192.png deleted file mode 100644 index 79b84dc..0000000 Binary files a/site/static/android-chrome-192x192.png and /dev/null differ diff --git a/site/static/android-chrome-512x512.png b/site/static/android-chrome-512x512.png deleted file mode 100644 index 3c58dda..0000000 Binary files a/site/static/android-chrome-512x512.png and /dev/null differ diff --git a/site/static/apple-touch-icon.png b/site/static/apple-touch-icon.png deleted file mode 100644 index 46afa7c..0000000 Binary files a/site/static/apple-touch-icon.png and /dev/null differ diff --git a/site/static/blog-chemex.jpg b/site/static/blog-chemex.jpg new file mode 100755 index 0000000..903f68a Binary files /dev/null and b/site/static/blog-chemex.jpg differ diff --git a/site/static/blog-flavor_wheel.jpg b/site/static/blog-flavor_wheel.jpg new file mode 100755 index 0000000..dc2a87d Binary files /dev/null and b/site/static/blog-flavor_wheel.jpg differ diff --git a/site/static/browserconfig.xml b/site/static/browserconfig.xml index b3926a3..e8c37ed 100644 --- a/site/static/browserconfig.xml +++ b/site/static/browserconfig.xml @@ -2,7 +2,7 @@ - + #ff4400 diff --git a/site/static/favicon-16x16.png b/site/static/favicon-16x16.png deleted file mode 100644 index 18985a3..0000000 Binary files a/site/static/favicon-16x16.png and /dev/null differ diff --git a/site/static/favicon-32x32.png b/site/static/favicon-32x32.png deleted file mode 100644 index 2d52eff..0000000 Binary files a/site/static/favicon-32x32.png and /dev/null differ diff --git a/site/static/favicon.ico b/site/static/favicon.ico deleted file mode 100644 index d055e90..0000000 Binary files a/site/static/favicon.ico and /dev/null differ diff --git a/site/static/img/about-direct-sourcing.jpg b/site/static/img/about-direct-sourcing.jpg new file mode 100755 index 0000000..0a52cc5 Binary files /dev/null and b/site/static/img/about-direct-sourcing.jpg differ diff --git a/site/static/img/about-jumbotron.jpg b/site/static/img/about-jumbotron.jpg new file mode 100644 index 0000000..6ecc2b2 Binary files /dev/null and b/site/static/img/about-jumbotron.jpg differ diff --git a/site/static/img/about-reinvest-profits.jpg b/site/static/img/about-reinvest-profits.jpg new file mode 100755 index 0000000..73bd5d0 Binary files /dev/null and b/site/static/img/about-reinvest-profits.jpg differ diff --git a/site/static/img/about-shade-grown.jpg b/site/static/img/about-shade-grown.jpg new file mode 100755 index 0000000..2f4b502 Binary files /dev/null and b/site/static/img/about-shade-grown.jpg differ diff --git a/site/static/img/about-single-origin.jpg b/site/static/img/about-single-origin.jpg new file mode 100755 index 0000000..78becb3 Binary files /dev/null and b/site/static/img/about-single-origin.jpg differ diff --git a/site/static/img/about-sustainable-farming.jpg b/site/static/img/about-sustainable-farming.jpg new file mode 100755 index 0000000..54eac24 Binary files /dev/null and b/site/static/img/about-sustainable-farming.jpg differ diff --git a/site/static/img/about/direct-sourcing.jpg b/site/static/img/about/direct-sourcing.jpg deleted file mode 100755 index 0a52cc5..0000000 Binary files a/site/static/img/about/direct-sourcing.jpg and /dev/null differ diff --git a/site/static/img/about/jumbotron.jpg b/site/static/img/about/jumbotron.jpg deleted file mode 100644 index 6ecc2b2..0000000 Binary files a/site/static/img/about/jumbotron.jpg and /dev/null differ diff --git a/site/static/img/about/reinvest-profits.jpg b/site/static/img/about/reinvest-profits.jpg deleted file mode 100755 index 73bd5d0..0000000 Binary files a/site/static/img/about/reinvest-profits.jpg and /dev/null differ diff --git a/site/static/img/about/shade-grown.jpg b/site/static/img/about/shade-grown.jpg deleted file mode 100755 index 2f4b502..0000000 Binary files a/site/static/img/about/shade-grown.jpg and /dev/null differ diff --git a/site/static/img/about/single-origin.jpg b/site/static/img/about/single-origin.jpg deleted file mode 100755 index 78becb3..0000000 Binary files a/site/static/img/about/single-origin.jpg and /dev/null differ diff --git a/site/static/img/about/sustainable-farming.jpg b/site/static/img/about/sustainable-farming.jpg deleted file mode 100755 index 54eac24..0000000 Binary files a/site/static/img/about/sustainable-farming.jpg and /dev/null differ diff --git a/site/static/img/android-chrome-192x192.png b/site/static/img/android-chrome-192x192.png new file mode 100644 index 0000000..79b84dc Binary files /dev/null and b/site/static/img/android-chrome-192x192.png differ diff --git a/site/static/img/android-chrome-512x512.png b/site/static/img/android-chrome-512x512.png new file mode 100644 index 0000000..3c58dda Binary files /dev/null and b/site/static/img/android-chrome-512x512.png differ diff --git a/site/static/img/apple-touch-icon.png b/site/static/img/apple-touch-icon.png new file mode 100644 index 0000000..46afa7c Binary files /dev/null and b/site/static/img/apple-touch-icon.png differ diff --git a/site/static/img/blog/chemex.jpg b/site/static/img/blog/chemex.jpg deleted file mode 100755 index 903f68a..0000000 Binary files a/site/static/img/blog/chemex.jpg and /dev/null differ diff --git a/site/static/img/blog/flavor_wheel.jpg b/site/static/img/blog/flavor_wheel.jpg deleted file mode 100755 index dc2a87d..0000000 Binary files a/site/static/img/blog/flavor_wheel.jpg and /dev/null differ diff --git a/site/static/img/favicon-16x16.png b/site/static/img/favicon-16x16.png new file mode 100644 index 0000000..18985a3 Binary files /dev/null and b/site/static/img/favicon-16x16.png differ diff --git a/site/static/img/favicon-32x32.png b/site/static/img/favicon-32x32.png new file mode 100644 index 0000000..2d52eff Binary files /dev/null and b/site/static/img/favicon-32x32.png differ diff --git a/site/static/img/favicon.ico b/site/static/img/favicon.ico new file mode 100644 index 0000000..d055e90 Binary files /dev/null and b/site/static/img/favicon.ico differ diff --git a/site/static/img/home-about-section.jpg b/site/static/img/home-about-section.jpg new file mode 100755 index 0000000..2571ab6 Binary files /dev/null and b/site/static/img/home-about-section.jpg differ diff --git a/site/static/img/home-jumbotron.jpg b/site/static/img/home-jumbotron.jpg new file mode 100644 index 0000000..f02e6d8 Binary files /dev/null and b/site/static/img/home-jumbotron.jpg differ diff --git a/site/static/img/home/about-section.jpg b/site/static/img/home/about-section.jpg deleted file mode 100755 index 2571ab6..0000000 Binary files a/site/static/img/home/about-section.jpg and /dev/null differ diff --git a/site/static/img/home/jumbotron.jpg b/site/static/img/home/jumbotron.jpg deleted file mode 100644 index f02e6d8..0000000 Binary files a/site/static/img/home/jumbotron.jpg and /dev/null differ diff --git a/site/static/img/icons-facebook.svg b/site/static/img/icons-facebook.svg new file mode 100644 index 0000000..2c6edb0 --- /dev/null +++ b/site/static/img/icons-facebook.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/site/static/img/icons-instagram.svg b/site/static/img/icons-instagram.svg new file mode 100644 index 0000000..8b4f212 --- /dev/null +++ b/site/static/img/icons-instagram.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/site/static/img/icons-twitter.svg b/site/static/img/icons-twitter.svg new file mode 100644 index 0000000..8b04036 --- /dev/null +++ b/site/static/img/icons-twitter.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/site/static/img/icons-vimeo.svg b/site/static/img/icons-vimeo.svg new file mode 100644 index 0000000..6ccc7a5 --- /dev/null +++ b/site/static/img/icons-vimeo.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/site/static/img/icons/facebook.svg b/site/static/img/icons/facebook.svg deleted file mode 100644 index 2c6edb0..0000000 --- a/site/static/img/icons/facebook.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/site/static/img/icons/instagram.svg b/site/static/img/icons/instagram.svg deleted file mode 100644 index 8b4f212..0000000 --- a/site/static/img/icons/instagram.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/site/static/img/icons/twitter.svg b/site/static/img/icons/twitter.svg deleted file mode 100644 index 8b04036..0000000 --- a/site/static/img/icons/twitter.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/site/static/img/icons/vimeo.svg b/site/static/img/icons/vimeo.svg deleted file mode 100644 index 6ccc7a5..0000000 --- a/site/static/img/icons/vimeo.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/site/static/img/illustrations-coffee-gear.svg b/site/static/img/illustrations-coffee-gear.svg new file mode 100644 index 0000000..93b797e --- /dev/null +++ b/site/static/img/illustrations-coffee-gear.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/site/static/img/illustrations-coffee.svg b/site/static/img/illustrations-coffee.svg new file mode 100644 index 0000000..baa46a7 --- /dev/null +++ b/site/static/img/illustrations-coffee.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/site/static/img/illustrations-meeting-space.svg b/site/static/img/illustrations-meeting-space.svg new file mode 100644 index 0000000..043eafb --- /dev/null +++ b/site/static/img/illustrations-meeting-space.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/site/static/img/illustrations-tutorials.svg b/site/static/img/illustrations-tutorials.svg new file mode 100644 index 0000000..64f42a1 --- /dev/null +++ b/site/static/img/illustrations-tutorials.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/site/static/img/illustrations/coffee-gear.svg b/site/static/img/illustrations/coffee-gear.svg deleted file mode 100644 index 93b797e..0000000 --- a/site/static/img/illustrations/coffee-gear.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/static/img/illustrations/coffee.svg b/site/static/img/illustrations/coffee.svg deleted file mode 100644 index baa46a7..0000000 --- a/site/static/img/illustrations/coffee.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/static/img/illustrations/meeting-space.svg b/site/static/img/illustrations/meeting-space.svg deleted file mode 100644 index 043eafb..0000000 --- a/site/static/img/illustrations/meeting-space.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/static/img/illustrations/tutorials.svg b/site/static/img/illustrations/tutorials.svg deleted file mode 100644 index 64f42a1..0000000 --- a/site/static/img/illustrations/tutorials.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/static/img/mstile-144x144.png b/site/static/img/mstile-144x144.png new file mode 100644 index 0000000..2787c56 Binary files /dev/null and b/site/static/img/mstile-144x144.png differ diff --git a/site/static/img/mstile-150x150.png b/site/static/img/mstile-150x150.png new file mode 100644 index 0000000..edfb37f Binary files /dev/null and b/site/static/img/mstile-150x150.png differ diff --git a/site/static/img/mstile-310x150.png b/site/static/img/mstile-310x150.png new file mode 100644 index 0000000..abd262e Binary files /dev/null and b/site/static/img/mstile-310x150.png differ diff --git a/site/static/img/mstile-310x310.png b/site/static/img/mstile-310x310.png new file mode 100644 index 0000000..1873248 Binary files /dev/null and b/site/static/img/mstile-310x310.png differ diff --git a/site/static/img/mstile-70x70.png b/site/static/img/mstile-70x70.png new file mode 100644 index 0000000..ac78c21 Binary files /dev/null and b/site/static/img/mstile-70x70.png differ diff --git a/site/static/img/og-image.jpg b/site/static/img/og-image.jpg new file mode 100644 index 0000000..9d829cf Binary files /dev/null and b/site/static/img/og-image.jpg differ diff --git a/site/static/img/products-full-width.jpg b/site/static/img/products-full-width.jpg new file mode 100644 index 0000000..b1a0194 Binary files /dev/null and b/site/static/img/products-full-width.jpg differ diff --git a/site/static/img/products-grid1.jpg b/site/static/img/products-grid1.jpg new file mode 100755 index 0000000..600be3c Binary files /dev/null and b/site/static/img/products-grid1.jpg differ diff --git a/site/static/img/products-grid2.jpg b/site/static/img/products-grid2.jpg new file mode 100755 index 0000000..b066a88 Binary files /dev/null and b/site/static/img/products-grid2.jpg differ diff --git a/site/static/img/products-grid3.jpg b/site/static/img/products-grid3.jpg new file mode 100755 index 0000000..df47e06 Binary files /dev/null and b/site/static/img/products-grid3.jpg differ diff --git a/site/static/img/products-jumbotron.jpg b/site/static/img/products-jumbotron.jpg new file mode 100755 index 0000000..dfb2dbe Binary files /dev/null and b/site/static/img/products-jumbotron.jpg differ diff --git a/site/static/img/products/jumbotron.jpg b/site/static/img/products/jumbotron.jpg deleted file mode 100755 index dfb2dbe..0000000 Binary files a/site/static/img/products/jumbotron.jpg and /dev/null differ diff --git a/site/static/img/products/products-full-width.jpg b/site/static/img/products/products-full-width.jpg deleted file mode 100644 index b1a0194..0000000 Binary files a/site/static/img/products/products-full-width.jpg and /dev/null differ diff --git a/site/static/img/products/products-grid1.jpg b/site/static/img/products/products-grid1.jpg deleted file mode 100755 index 600be3c..0000000 Binary files a/site/static/img/products/products-grid1.jpg and /dev/null differ diff --git a/site/static/img/products/products-grid2.jpg b/site/static/img/products/products-grid2.jpg deleted file mode 100755 index b066a88..0000000 Binary files a/site/static/img/products/products-grid2.jpg and /dev/null differ diff --git a/site/static/img/products/products-grid3.jpg b/site/static/img/products/products-grid3.jpg deleted file mode 100755 index df47e06..0000000 Binary files a/site/static/img/products/products-grid3.jpg and /dev/null differ diff --git a/site/static/img/safari-pinned-tab.svg b/site/static/img/safari-pinned-tab.svg new file mode 100644 index 0000000..ac6b23d --- /dev/null +++ b/site/static/img/safari-pinned-tab.svg @@ -0,0 +1,28 @@ + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + + + diff --git a/site/static/manifest.json b/site/static/manifest.json index 80c5526..c488cb2 100644 --- a/site/static/manifest.json +++ b/site/static/manifest.json @@ -2,12 +2,12 @@ "name": "", "icons": [ { - "src": "\/android-chrome-192x192.png", + "src": "\/img\/android-chrome-192x192.png", "sizes": "192x192", "type": "image\/png" }, { - "src": "\/android-chrome-512x512.png", + "src": "\/img\/android-chrome-512x512.png", "sizes": "512x512", "type": "image\/png" } diff --git a/site/static/mstile-144x144.png b/site/static/mstile-144x144.png deleted file mode 100644 index 2787c56..0000000 Binary files a/site/static/mstile-144x144.png and /dev/null differ diff --git a/site/static/mstile-150x150.png b/site/static/mstile-150x150.png deleted file mode 100644 index edfb37f..0000000 Binary files a/site/static/mstile-150x150.png and /dev/null differ diff --git a/site/static/mstile-310x150.png b/site/static/mstile-310x150.png deleted file mode 100644 index abd262e..0000000 Binary files a/site/static/mstile-310x150.png and /dev/null differ diff --git a/site/static/mstile-310x310.png b/site/static/mstile-310x310.png deleted file mode 100644 index 1873248..0000000 Binary files a/site/static/mstile-310x310.png and /dev/null differ diff --git a/site/static/mstile-70x70.png b/site/static/mstile-70x70.png deleted file mode 100644 index ac78c21..0000000 Binary files a/site/static/mstile-70x70.png and /dev/null differ diff --git a/site/static/og-image.jpg b/site/static/og-image.jpg deleted file mode 100644 index 9d829cf..0000000 Binary files a/site/static/og-image.jpg and /dev/null differ diff --git a/site/static/safari-pinned-tab.svg b/site/static/safari-pinned-tab.svg deleted file mode 100644 index ac6b23d..0000000 --- a/site/static/safari-pinned-tab.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - -Created by potrace 1.11, written by Peter Selinger 2001-2013 - - - - - -- cgit v1.3 From efac17392eb9ef90710184bdbf1c59506f113611 Mon Sep 17 00:00:00 2001 From: Benaiah Mischenko Date: Wed, 6 Dec 2017 16:49:41 -0800 Subject: Upgrade netlify-cms --- package.json | 2 +- yarn.lock | 1399 ++++++++++++++++------------------------------------------ 2 files changed, 371 insertions(+), 1030 deletions(-) diff --git a/package.json b/package.json index 0223d2e..931c0f2 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "gulp-replace": "^0.5.4", "gulp-util": "^3.0.7", "imports-loader": "^0.6.5", - "netlify-cms": "^0.5.0", + "netlify-cms": "^0.7.6", "postcss-cssnext": "^2.7.0", "postcss-import": "^8.1.2", "postcss-loader": "^0.9.1", diff --git a/yarn.lock b/yarn.lock index 93b67ee..81b14dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,55 +2,13 @@ # yarn lockfile v1 -"@kadira/react-split-pane@^1.4.0": - version "1.4.7" - resolved "https://registry.yarnpkg.com/@kadira/react-split-pane/-/react-split-pane-1.4.7.tgz#6d753d4a9fe62fe82056e323a6bcef7f026972b5" +"@types/inline-style-prefixer@^3.0.0": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/inline-style-prefixer/-/inline-style-prefixer-3.0.1.tgz#8541e636b029124b747952e9a28848286d2b5bf6" -"@kadira/storybook-ui@^2.6.0": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@kadira/storybook-ui/-/storybook-ui-2.6.1.tgz#db0686d3e89e13efe3b7fa2fdac621712439a714" - dependencies: - "@kadira/react-split-pane" "^1.4.0" - babel-runtime "^6.5.0" - deep-equal "^1.0.1" - fuzzysearch "^1.0.3" - json-stringify-safe "^5.0.1" - keycode "^2.1.1" - lodash.pick "^4.2.1" - mantra-core "^1.6.1" - qs "^6.2.0" - react-fuzzy "^0.2.3" - react-inspector "^1.1.0" - react-modal "^1.2.1" - redux "^3.5.2" - -"@kadira/storybook@^1.36.0": - version "1.41.0" - resolved "https://registry.yarnpkg.com/@kadira/storybook/-/storybook-1.41.0.tgz#3fe26b21a192a68799ef03df3c841bdf02765f4d" - dependencies: - "@kadira/storybook-ui" "^2.6.0" - airbnb-js-shims "^1.0.0" - babel-core "^6.11.4" - babel-loader "^6.2.4" - babel-polyfill "^6.9.1" - babel-preset-es2015 "^6.9.0" - babel-preset-react "^6.11.1" - babel-preset-stage-0 "^6.5.0" - babel-runtime "^6.9.2" - cjson "^0.4.0" - commander "^2.9.0" - es6-shim "^0.35.1" - express "^4.13.3" - json-stringify-safe "^5.0.1" - page-bus "^3.0.1" - qs "^6.1.0" - redbox-react "^1.2.2" - shelljs "^0.6.0" - stack-source-map "^1.0.5" - uuid "^2.0.1" - webpack "^1.12.11" - webpack-dev-middleware "^1.6.0" - webpack-hot-middleware "^2.10.0" +"@types/react@^16.0.18": + version "16.0.27" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.27.tgz#341899469ea2e98b48b11c18afb4d8361d03b013" abbrev@1: version "1.1.1" @@ -63,7 +21,7 @@ accepts@1.3.3: mime-types "~2.1.11" negotiator "0.6.1" -accepts@~1.3.3, accepts@~1.3.4: +accepts@~1.3.3: version "1.3.4" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f" dependencies: @@ -92,21 +50,6 @@ after@0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/after/-/after-0.8.1.tgz#ab5d4fb883f596816d3515f8f791c0af486dd627" -airbnb-js-shims@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/airbnb-js-shims/-/airbnb-js-shims-1.3.0.tgz#aac46d80057fb0b414f70e06d07e362fd99ee2fa" - dependencies: - array-includes "^3.0.3" - es5-shim "^4.5.9" - es6-shim "^0.35.3" - function.prototype.name "^1.0.3" - object.entries "^1.0.4" - object.getownpropertydescriptors "^2.0.3" - object.values "^1.0.4" - promise.prototype.finally "^3.0.0" - string.prototype.padend "^3.0.0" - string.prototype.padstart "^3.0.0" - ajv-keywords@^1.0.0: version "1.5.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c" @@ -147,10 +90,6 @@ ansi-escapes@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" -ansi-html@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" - ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -227,17 +166,6 @@ array-each@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - -array-includes@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.7.0" - array-iterate@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/array-iterate/-/array-iterate-1.1.1.tgz#865bf7f8af39d6b0982c60902914ac76bc0108f6" @@ -355,7 +283,7 @@ babel-code-frame@^6.16.0, babel-code-frame@^6.26.0: esutils "^2.0.2" js-tokens "^3.0.2" -babel-core@^6.0.2, babel-core@^6.11.4, babel-core@^6.24.1, babel-core@^6.26.0: +babel-core@^6.0.2, babel-core@^6.24.1, babel-core@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8" dependencies: @@ -402,22 +330,6 @@ babel-generator@^6.26.0: source-map "^0.5.6" trim-right "^1.0.1" -babel-helper-bindify-decorators@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz#14c19e5f142d7b47f19a52431e52b1ccbc40a330" - dependencies: - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" - dependencies: - babel-helper-explode-assignable-expression "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - babel-helper-builder-react-jsx@^6.24.1: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0" @@ -444,23 +356,6 @@ babel-helper-define-map@^6.24.1: babel-types "^6.26.0" lodash "^4.17.4" -babel-helper-explode-assignable-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa" - dependencies: - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-explode-class@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz#7dc2a3910dee007056e1e31d640ced3d54eaa9eb" - dependencies: - babel-helper-bindify-decorators "^6.24.1" - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - babel-helper-function-name@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" @@ -500,16 +395,6 @@ babel-helper-regex@^6.24.1: babel-types "^6.26.0" lodash "^4.17.4" -babel-helper-remap-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - babel-helper-replace-supers@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" @@ -549,50 +434,18 @@ babel-plugin-check-es2015-constants@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-syntax-async-functions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - -babel-plugin-syntax-async-generators@^6.5.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a" - -babel-plugin-syntax-class-constructor-call@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz#9cb9d39fe43c8600bec8146456ddcbd4e1a76416" - babel-plugin-syntax-class-properties@^6.8.0: version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de" -babel-plugin-syntax-decorators@^6.13.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b" - -babel-plugin-syntax-do-expressions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz#5747756139aa26d390d09410b03744ba07e4796d" - babel-plugin-syntax-dynamic-import@^6.18.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da" -babel-plugin-syntax-exponentiation-operator@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" - -babel-plugin-syntax-export-extensions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz#70a1484f0f9089a4e84ad44bac353c95b9b12721" - babel-plugin-syntax-flow@^6.18.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d" -babel-plugin-syntax-function-bind@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz#48c495f177bdf31a981e732f55adc0bdd2601f46" - babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" @@ -601,47 +454,19 @@ babel-plugin-syntax-object-rest-spread@^6.13.0, babel-plugin-syntax-object-rest- version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" -babel-plugin-syntax-trailing-function-commas@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" - babel-plugin-transform-amd-system-wrapper@^0.3.7: version "0.3.7" resolved "https://registry.yarnpkg.com/babel-plugin-transform-amd-system-wrapper/-/babel-plugin-transform-amd-system-wrapper-0.3.7.tgz#521c782d35644491c979ea683e8a5e1caff0ba42" dependencies: babel-template "^6.9.0" -babel-plugin-transform-async-generator-functions@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-generators "^6.5.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-functions "^6.8.0" - babel-runtime "^6.22.0" - babel-plugin-transform-cjs-system-wrapper@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/babel-plugin-transform-cjs-system-wrapper/-/babel-plugin-transform-cjs-system-wrapper-0.6.2.tgz#bd7494775289424ff493b6ed455de495bd71ba1d" dependencies: babel-template "^6.9.0" -babel-plugin-transform-class-constructor-call@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz#80dc285505ac067dcb8d6c65e2f6f11ab7765ef9" - dependencies: - babel-plugin-syntax-class-constructor-call "^6.18.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-class-properties@^6.10.2, babel-plugin-transform-class-properties@^6.24.1: +babel-plugin-transform-class-properties@^6.10.2: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac" dependencies: @@ -650,23 +475,6 @@ babel-plugin-transform-class-properties@^6.10.2, babel-plugin-transform-class-pr babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-plugin-transform-decorators@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d" - dependencies: - babel-helper-explode-class "^6.24.1" - babel-plugin-syntax-decorators "^6.13.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-do-expressions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz#28ccaf92812d949c2cd1281f690c8fdc468ae9bb" - dependencies: - babel-plugin-syntax-do-expressions "^6.8.0" - babel-runtime "^6.22.0" - babel-plugin-transform-es2015-arrow-functions@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" @@ -835,21 +643,6 @@ babel-plugin-transform-es2015-unicode-regex@^6.24.1: babel-runtime "^6.22.0" regexpu-core "^2.0.0" -babel-plugin-transform-exponentiation-operator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" - dependencies: - babel-helper-builder-binary-assignment-operator-visitor "^6.24.1" - babel-plugin-syntax-exponentiation-operator "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-export-extensions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz#53738b47e75e8218589eea946cbbd39109bbe653" - dependencies: - babel-plugin-syntax-export-extensions "^6.8.0" - babel-runtime "^6.22.0" - babel-plugin-transform-flow-strip-types@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf" @@ -857,13 +650,6 @@ babel-plugin-transform-flow-strip-types@^6.22.0: babel-plugin-syntax-flow "^6.18.0" babel-runtime "^6.22.0" -babel-plugin-transform-function-bind@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz#c6fb8e96ac296a310b8cf8ea401462407ddf6a97" - dependencies: - babel-plugin-syntax-function-bind "^6.8.0" - babel-runtime "^6.22.0" - babel-plugin-transform-global-system-wrapper@^0.3.4: version "0.3.4" resolved "https://registry.yarnpkg.com/babel-plugin-transform-global-system-wrapper/-/babel-plugin-transform-global-system-wrapper-0.3.4.tgz#948dd7d29fc21447e39bd3447f2debc7f2f73aac" @@ -876,7 +662,7 @@ babel-plugin-transform-object-assign@^6.8.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-object-rest-spread@^6.22.0, babel-plugin-transform-object-rest-spread@^6.8.0: +babel-plugin-transform-object-rest-spread@^6.8.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06" dependencies: @@ -928,14 +714,6 @@ babel-plugin-transform-system-register@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-system-register/-/babel-plugin-transform-system-register-0.0.1.tgz#9dff40390c2763ac518f0b2ad7c5ea4f65a5be25" -babel-polyfill@^6.9.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" - dependencies: - babel-runtime "^6.26.0" - core-js "^2.5.0" - regenerator-runtime "^0.10.5" - babel-preset-es2015@^6.9.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939" @@ -982,41 +760,6 @@ babel-preset-react@^6.11.1: babel-plugin-transform-react-jsx-source "^6.22.0" babel-preset-flow "^6.23.0" -babel-preset-stage-0@^6.5.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-preset-stage-0/-/babel-preset-stage-0-6.24.1.tgz#5642d15042f91384d7e5af8bc88b1db95b039e6a" - dependencies: - babel-plugin-transform-do-expressions "^6.22.0" - babel-plugin-transform-function-bind "^6.22.0" - babel-preset-stage-1 "^6.24.1" - -babel-preset-stage-1@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz#7692cd7dcd6849907e6ae4a0a85589cfb9e2bfb0" - dependencies: - babel-plugin-transform-class-constructor-call "^6.24.1" - babel-plugin-transform-export-extensions "^6.22.0" - babel-preset-stage-2 "^6.24.1" - -babel-preset-stage-2@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz#d9e2960fb3d71187f0e64eec62bc07767219bdc1" - dependencies: - babel-plugin-syntax-dynamic-import "^6.18.0" - babel-plugin-transform-class-properties "^6.24.1" - babel-plugin-transform-decorators "^6.24.1" - babel-preset-stage-3 "^6.24.1" - -babel-preset-stage-3@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz#836ada0a9e7a7fa37cb138fb9326f87934a48395" - dependencies: - babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-generator-functions "^6.24.1" - babel-plugin-transform-async-to-generator "^6.24.1" - babel-plugin-transform-exponentiation-operator "^6.24.1" - babel-plugin-transform-object-rest-spread "^6.22.0" - babel-register@^6.11.6, babel-register@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" @@ -1029,14 +772,14 @@ babel-register@^6.11.6, babel-register@^6.26.0: mkdirp "^0.5.1" source-map-support "^0.4.15" -babel-runtime@6.x.x, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runtime@^6.5.0, babel-runtime@^6.9.2: +babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" dependencies: core-js "^2.4.0" regenerator-runtime "^0.11.0" -babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.7.0, babel-template@^6.9.0: +babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.9.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" dependencies: @@ -1138,8 +881,8 @@ big.js@^3.1.3: resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" binary-extensions@^1.0.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0" + version "1.11.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" binaryextensions@~1.0.0: version "1.0.1" @@ -1175,21 +918,6 @@ bluebird@~3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.1.5.tgz#69278a1e1d365a1817ba88f3214c2f942779d0ae" -body-parser@1.18.2: - version "1.18.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454" - dependencies: - bytes "3.0.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.1" - http-errors "~1.6.2" - iconv-lite "0.4.19" - on-finished "~2.3.0" - qs "6.5.1" - raw-body "2.3.2" - type-is "~1.6.15" - boolbase@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" @@ -1213,8 +941,8 @@ boom@5.x.x: hoek "4.x.x" bowser@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.7.3.tgz#504bdb43118ca8db9cbbadf28fd60f265af96e4f" + version "1.8.1" + resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.8.1.tgz#49785777e7302febadb1a5b71d9a646520ed310d" brace-expansion@^1.0.0, brace-expansion@^1.1.7: version "1.1.8" @@ -1329,10 +1057,6 @@ builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - caller-path@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f" @@ -1479,19 +1203,13 @@ circular-json@^0.3.1: version "0.3.3" resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66" -cjson@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/cjson/-/cjson-0.4.0.tgz#627ea5a6887fb425baa44732a85ba800031c4ab0" - dependencies: - json-parse-helpfulerror "^1.0.3" - clap@^1.0.9: version "1.2.3" resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51" dependencies: chalk "^1.1.3" -classnames@^2.2.3, classnames@^2.2.5: +classnames@^2.2.5: version "2.2.5" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d" @@ -1529,10 +1247,14 @@ clone@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f" -clone@^1.0.0, clone@^1.0.2: +clone@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149" +clone@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f" + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -1616,10 +1338,14 @@ commander@2.9.x, commander@~2.9.0: dependencies: graceful-readlink ">= 1.0.0" -commander@^2.2.0, commander@^2.9.0: +commander@^2.2.0: version "2.11.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" +commander@^2.9.0: + version "2.12.2" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555" + commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -1695,21 +1421,9 @@ contains-path@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" -content-disposition@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" - -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - convert-source-map@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5" - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + version "1.5.1" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" cookie@0.3.1: version "0.3.1" @@ -1944,7 +1658,7 @@ debug@2.6.8: dependencies: ms "2.0.0" -debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.2, debug@^2.6.8: +debug@^2.1.1, debug@^2.2.0, debug@^2.3.2, debug@^2.6.8: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" dependencies: @@ -1960,10 +1674,6 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" -deep-equal@^1.0.0, deep-equal@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" - deep-extend@~0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" @@ -1978,13 +1688,6 @@ defaults@^1.0.0: dependencies: clone "^1.0.2" -define-properties@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94" - dependencies: - foreach "^2.0.5" - object-keys "^1.0.8" - defined@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" @@ -2009,7 +1712,7 @@ delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" -depd@1.1.1, depd@~1.1.0, depd@~1.1.1: +depd@1.1.1, depd@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359" @@ -2039,6 +1742,10 @@ detect-indent@^4.0.0: dependencies: repeating "^2.0.0" +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + dev-ip@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0" @@ -2051,9 +1758,9 @@ disposables@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/disposables/-/disposables-1.0.1.tgz#064727a25b54f502bd82b89aa2dfb8df9f1b39e3" -dnd-core@^2.5.3: - version "2.5.3" - resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-2.5.3.tgz#a4163d59a01779860d2edbdadab5183ce321147c" +dnd-core@^2.5.4: + version "2.5.4" + resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-2.5.4.tgz#0c70a8dcbb609c0b222e275fcae9fa83e5897397" dependencies: asap "^2.0.6" invariant "^2.0.0" @@ -2085,10 +1792,6 @@ dom-serializer@0, dom-serializer@~0.1.0: domelementtype "~1.1.1" entities "~1.1.1" -dom-walk@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018" - domain-browser@^1.1.1: version "1.1.7" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" @@ -2169,10 +1872,6 @@ electron-to-chromium@^1.2.7: version "1.3.24" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.24.tgz#9b7b88bb05ceb9fa016a177833cc2dde388f21b6" -element-class@^0.2.0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/element-class/-/element-class-0.2.2.tgz#9d3bbd0767f9013ef8e1c8ebe722c1402a60050e" - emitter-steward@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/emitter-steward/-/emitter-steward-1.0.0.tgz#f3411ade9758a7565df848b2da0cbbd1b46cbd64" @@ -2274,30 +1973,6 @@ error-ex@^1.2.0: dependencies: is-arrayish "^0.2.1" -error-stack-parser@^1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-1.3.6.tgz#e0e73b93e417138d1cd7c0b746b1a4a14854c292" - dependencies: - stackframe "^0.3.1" - -es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.6.1, es-abstract@^1.7.0, es-abstract@^1.8.2: - version "1.9.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.9.0.tgz#690829a07cae36b222e7fd9b75c0d0573eb25227" - dependencies: - es-to-primitive "^1.1.1" - function-bind "^1.1.1" - has "^1.0.1" - is-callable "^1.1.3" - is-regex "^1.0.4" - -es-to-primitive@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d" - dependencies: - is-callable "^1.1.1" - is-date-object "^1.0.1" - is-symbol "^1.0.1" - es3ify@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/es3ify/-/es3ify-0.1.4.tgz#ad9fa5df1ae34f3f31e1211b5818b2d51078dfd1" @@ -2306,18 +1981,29 @@ es3ify@^0.1.3: jstransform "~3.0.0" through "~2.3.4" -es5-ext@^0.10.12, es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14: +es5-ext@^0.10.12: version "0.10.30" resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.30.tgz#7141a16836697dbabfaaaeee41495ce29f52c939" dependencies: es6-iterator "2" es6-symbol "~3.1" -es5-shim@^4.5.9: - version "4.5.9" - resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.9.tgz#2a1e2b9e583ff5fed0c20a3ee2cbf3f75230a5c0" +es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: + version "0.10.37" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3" + dependencies: + es6-iterator "~2.0.1" + es6-symbol "~3.1.1" + +es6-iterator@2, es6-iterator@~2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" + dependencies: + d "1" + es5-ext "^0.10.35" + es6-symbol "^3.1.1" -es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1: +es6-iterator@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512" dependencies: @@ -2325,7 +2011,7 @@ es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1: es5-ext "^0.10.14" es6-symbol "^3.1" -es6-map@^0.1.3, es6-map@^0.1.4: +es6-map@^0.1.3: version "0.1.5" resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0" dependencies: @@ -2350,10 +2036,6 @@ es6-set@^0.1.4, es6-set@~0.1.5: es6-symbol "3.1.1" event-emitter "~0.3.5" -es6-shim@^0.35.1, es6-shim@^0.35.3: - version "0.35.3" - resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.3.tgz#9bfb7363feffff87a6cdb6cd93e405ec3c4b6f26" - es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" @@ -2522,7 +2204,7 @@ esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" -etag@^1.7.0, etag@~1.8.0, etag@~1.8.1: +etag@^1.7.0, etag@~1.8.0: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" @@ -2559,10 +2241,6 @@ exec-sh@^0.2.0: dependencies: merge "^1.1.3" -exenv@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.0.tgz#3835f127abf075bfe082d0aed4484057c78e3c89" - exit-hook@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" @@ -2607,41 +2285,6 @@ express@2.5.x: mkdirp "0.3.0" qs "0.4.x" -express@^4.13.3: - version "4.16.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.16.1.tgz#6b33b560183c9b253b7b62144df33a4654ac9ed0" - dependencies: - accepts "~1.3.4" - array-flatten "1.1.1" - body-parser "1.18.2" - content-disposition "0.5.2" - content-type "~1.0.4" - cookie "0.3.1" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.1" - encodeurl "~1.0.1" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "1.1.0" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.2" - path-to-regexp "0.1.7" - proxy-addr "~2.0.2" - qs "6.5.1" - range-parser "~1.2.0" - safe-buffer "5.1.1" - send "0.16.1" - serve-static "1.13.1" - setprototypeof "1.1.0" - statuses "~1.3.1" - type-is "~1.6.15" - utils-merge "1.0.1" - vary "~1.1.2" - extend-shallow@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" @@ -2667,10 +2310,14 @@ extract-zip@~1.6.5: mkdirp "0.5.0" yauzl "2.4.1" -extsprintf@1.3.0, extsprintf@^1.2.0: +extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + falafel@^1.0.1: version "1.2.0" resolved "https://registry.yarnpkg.com/falafel/-/falafel-1.2.0.tgz#c18d24ef5091174a497f318cd24b026a25cddab4" @@ -2767,18 +2414,6 @@ finalhandler@0.5.0: statuses "~1.3.0" unpipe "~1.0.0" -finalhandler@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5" - dependencies: - debug "2.6.9" - encodeurl "~1.0.1" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.2" - statuses "~1.3.1" - unpipe "~1.0.0" - find-cache-dir@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9" @@ -2838,6 +2473,18 @@ flatten@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" +focus-trap-react@^3.0.3: + version "3.0.5" + resolved "https://registry.yarnpkg.com/focus-trap-react/-/focus-trap-react-3.0.5.tgz#8fb381b92eafe075c2406297d1da618650d37143" + dependencies: + focus-trap "^2.0.1" + +focus-trap@^2.0.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-2.3.1.tgz#f4fb86cfe6da38dc652b373e9f42ba476eab1c14" + dependencies: + tabbable "^1.0.3" + for-in@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -2894,18 +2541,10 @@ formidable@1.0.x: version "1.0.17" resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.0.17.tgz#ef5491490f9433b705faa77249c99029ae348559" -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" - fresh@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e" -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - fresh@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f" @@ -2939,11 +2578,11 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.0.0, fsevents@^1.0.14: - version "1.1.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4" + version "1.1.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" dependencies: nan "^2.3.0" - node-pre-gyp "^0.6.36" + node-pre-gyp "^0.6.39" fstream-ignore@^1.0.5: version "1.0.5" @@ -2962,30 +2601,14 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: mkdirp ">=0.5 0" rimraf "2" -function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1: +function-bind@^1.0.2: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" -function.prototype.name@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.0.3.tgz#0099ae5572e9dd6f03c97d023fd92bcc5e639eac" - dependencies: - define-properties "^1.1.2" - function-bind "^1.1.0" - is-callable "^1.1.3" - -fuse.js@^2.2.0: - version "2.7.4" - resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-2.7.4.tgz#96e420fde7ef011ac49c258a621314fe576536f9" - fuzzy@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8" -fuzzysearch@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fuzzysearch/-/fuzzysearch-1.0.3.tgz#dffc80f6d6b04223f2226aa79dd194231096d008" - gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -3139,13 +2762,6 @@ global-prefix@^0.1.4: is-windows "^0.2.0" which "^1.2.12" -global@^4.3.0: - version "4.3.2" - resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" - dependencies: - min-document "^2.19.0" - process "~0.5.1" - globals@^9.14.0, globals@^9.18.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" @@ -3175,12 +2791,18 @@ glogg@^1.0.0: dependencies: sparkles "^1.0.0" -gotrue-js@^0.9.1, gotrue-js@^0.9.11: +gotrue-js@^0.9.1: version "0.9.13" resolved "https://registry.yarnpkg.com/gotrue-js/-/gotrue-js-0.9.13.tgz#99041d0a5e88a838ae479993412e27a5cd8c3850" dependencies: micro-api-client "^3.2.0" +gotrue-js@^0.9.15: + version "0.9.15" + resolved "https://registry.yarnpkg.com/gotrue-js/-/gotrue-js-0.9.15.tgz#ccddda083ba8fc75572c7e7817556be2b09b3ab4" + dependencies: + micro-api-client "^3.2.0" + graceful-fs@^3.0.0: version "3.0.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818" @@ -3200,8 +2822,8 @@ graceful-fs@~1.2.0: resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" gray-matter@^3.0.6: - version "3.0.8" - resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-3.0.8.tgz#44bdaff586ab4e61e3fe2d30d577da0e502afb93" + version "3.1.1" + resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-3.1.1.tgz#101f80d9e69eeca6765cdce437705b18f40876ac" dependencies: extend-shallow "^2.0.1" js-yaml "^3.10.0" @@ -3421,8 +3043,8 @@ hast-util-from-parse5@^1.0.0: vfile-location "^2.0.0" hast-util-has-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/hast-util-has-property/-/hast-util-has-property-1.0.0.tgz#211f9d7f7640898244a33f5d16f5c5d1880c8e40" + version "1.0.1" + resolved "https://registry.yarnpkg.com/hast-util-has-property/-/hast-util-has-property-1.0.1.tgz#ac08c40bcbf27b80a85aaae91e4f6250a53e802f" hast-util-is-body-ok-link@^1.0.0: version "1.0.1" @@ -3503,14 +3125,15 @@ hawk@~6.0.2: hoek "4.x.x" sntp "2.x.x" -history@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/history/-/history-2.1.2.tgz#4aa2de897a0e4867e4539843be6ecdb2986bfdec" +history@^4.7.2: + version "4.7.2" + resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b" dependencies: - deep-equal "^1.0.0" - invariant "^2.0.0" - query-string "^3.0.0" - warning "^2.0.0" + invariant "^2.2.1" + loose-envify "^1.2.0" + resolve-pathname "^2.2.0" + value-equal "^0.4.0" + warning "^3.0.0" hoek@2.x.x: version "2.16.3" @@ -3520,11 +3143,11 @@ hoek@4.x.x: version "4.2.0" resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d" -hoist-non-react-statics@1.x.x, hoist-non-react-statics@^1.0.3, hoist-non-react-statics@^1.2.0: +hoist-non-react-statics@^1.0.3, hoist-non-react-statics@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb" -hoist-non-react-statics@^2.1.0, hoist-non-react-statics@^2.2.1: +hoist-non-react-statics@^2.1.0, hoist-non-react-statics@^2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0" @@ -3549,10 +3172,6 @@ html-comment-regex@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e" -html-entities@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" - html-tags@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-1.2.0.tgz#c78de65b5663aa597989dd2b7ab49200d7e4db98" @@ -3586,15 +3205,6 @@ htmlparser2@~3.8.1: entities "1.0" readable-stream "1.1" -http-errors@1.6.2, http-errors@~1.6.1, http-errors@~1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736" - dependencies: - depd "1.1.1" - inherits "2.0.3" - setprototypeof "1.0.3" - statuses ">= 1.3.1 < 2" - http-errors@~1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750" @@ -3603,6 +3213,15 @@ http-errors@~1.5.0: setprototypeof "1.0.2" statuses ">= 1.3.1 < 2" +http-errors@~1.6.1: + version "1.6.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736" + dependencies: + depd "1.1.1" + inherits "2.0.3" + setprototypeof "1.0.3" + statuses ">= 1.3.1 < 2" + http-proxy@1.15.2: version "1.15.2" resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.15.2.tgz#642fdcaffe52d3448d2bda3b0079e9409064da31" @@ -3634,7 +3253,7 @@ hyphenate-style-name@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b" -iconv-lite@0.4.19, iconv-lite@~0.4.13: +iconv-lite@~0.4.13: version "0.4.19" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" @@ -3704,10 +3323,14 @@ inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" -ini@^1.3.4, ini@~1.3.0: +ini@^1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" +ini@~1.3.0: + version "1.3.5" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" + inline-process-browser@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/inline-process-browser/-/inline-process-browser-1.0.0.tgz#46a61b153dd3c9b1624b1a00626edb4f7f414f22" @@ -3748,7 +3371,7 @@ interpret@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0" -invariant@2.x.x, invariant@^2.0.0, invariant@^2.1.0, invariant@^2.2.1, invariant@^2.2.2: +invariant@^2.0.0, invariant@^2.1.0, invariant@^2.2.1, invariant@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" dependencies: @@ -3758,10 +3381,6 @@ invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" -ipaddr.js@1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0" - is-absolute-url@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" @@ -3803,8 +3422,8 @@ is-binary-path@^1.0.0: binary-extensions "^1.0.0" is-buffer@^1.1.4, is-buffer@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc" + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" is-builtin-module@^1.0.0: version "1.0.0" @@ -3812,14 +3431,6 @@ is-builtin-module@^1.0.0: dependencies: builtin-modules "^1.0.0" -is-callable@^1.1.1, is-callable@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2" - -is-date-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" - is-decimal@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.1.tgz#f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82" @@ -3828,10 +3439,6 @@ is-directory@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" -is-dom@^1.0.5: - version "1.0.9" - resolved "https://registry.yarnpkg.com/is-dom/-/is-dom-1.0.9.tgz#483832d52972073de12b9fe3f60320870da8370d" - is-dotfile@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" @@ -3880,6 +3487,10 @@ is-hexadecimal@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz#6e084bbc92061fbb0971ec58b6ce6d404e24da69" +is-hotkey@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-hotkey/-/is-hotkey-0.1.1.tgz#b279a2fd108391be9aa93c6cb317f50357da549a" + is-html@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-html/-/is-html-1.0.0.tgz#9cbbbfebd9ee11dc206683f3ecaf4df5b1633a1b" @@ -3955,12 +3566,6 @@ is-property@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" -is-regex@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" - dependencies: - has "^1.0.1" - is-relative@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5" @@ -3983,10 +3588,6 @@ is-svg@^2.0.0: dependencies: html-comment-regex "^1.1.0" -is-symbol@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572" - is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -4043,6 +3644,10 @@ isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" +isomorphic-base64@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/isomorphic-base64/-/isomorphic-base64-1.0.2.tgz#f426aae82569ba8a4ec5ca73ad21a44ab1ee7803" + isomorphic-fetch@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" @@ -4061,13 +3666,9 @@ istextorbinary@1.0.2: binaryextensions "~1.0.0" textextensions "~1.0.0" -jju@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jju/-/jju-1.3.0.tgz#dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa" - js-base64@^2.1.9: - version "2.3.2" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf" + version "2.4.0" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa" js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" @@ -4099,12 +3700,6 @@ jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" -json-parse-helpfulerror@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz#13f14ce02eed4e981297b64eb9e3b932e2dd13dc" - dependencies: - jju "^1.1.0" - json-schema-traverse@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" @@ -4119,7 +3714,7 @@ json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: dependencies: jsonify "~0.0.0" -json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: +json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" @@ -4245,7 +3840,7 @@ kew@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b" -keycode@^2.1.1, keycode@^2.1.2: +keycode@^2.1.2: version "2.1.9" resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.1.9.tgz#964a23c54e4889405b4861a5c9f0480d45141dfa" @@ -4262,8 +3857,8 @@ kind-of@^4.0.0: is-buffer "^1.1.5" kind-of@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.0.2.tgz#f57bec933d9a2209ffa96c5c08343607b7035fda" + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" klaw@^1.0.0: version "1.3.1" @@ -4347,8 +3942,8 @@ loader-utils@^1.0.2: json5 "^0.5.0" localforage@^1.4.2: - version "1.5.0" - resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.5.0.tgz#6b994e19b56611fa85df3992df397ac4ab66e815" + version "1.5.5" + resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.5.5.tgz#55fc1c3a88a47f67f5fac6f1231b25ff13556423" dependencies: lie "3.0.2" @@ -4361,7 +3956,7 @@ localtunnel@1.8.3: request "2.81.0" yargs "3.29.0" -lodash-es@^4.2.0, lodash-es@^4.2.1: +lodash-es@^4.2.1: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7" @@ -4408,7 +4003,7 @@ lodash._root@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" -lodash.assign@^4.0.0, lodash.assign@^4.2.0: +lodash.assign@^4.0.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" @@ -4490,7 +4085,7 @@ lodash.isstring@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" -lodash.keys@^3.0.0, lodash.keys@^3.1.2: +lodash.keys@^3.0.0: version "3.1.2" resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" dependencies: @@ -4586,7 +4181,7 @@ lodash@^3.10.1, lodash@^3.2.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1: +lodash@^4.0.0, lodash@^4.12.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -4599,8 +4194,8 @@ lodash@~4.0.1: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.0.1.tgz#cd8c902c9e03f2e69ce3e0e456d505ab89eb98f4" longest-streak@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.1.tgz#42d291b5411e40365c00e63193497e2247316e35" + version "2.0.2" + resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e" longest@^1.0.1: version "1.0.1" @@ -4626,14 +4221,6 @@ makeerror@1.0.x: dependencies: tmpl "1.0.x" -mantra-core@^1.6.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/mantra-core/-/mantra-core-1.7.0.tgz#a8c83e8cee83ef6a7383131519fe8031ad546386" - dependencies: - babel-runtime "6.x.x" - react-komposer "^1.9.0" - react-simple-di "^1.2.0" - map-cache@^0.2.0: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -4672,8 +4259,8 @@ mdast-util-definitions@^1.2.0, mdast-util-definitions@^1.2.2: unist-util-visit "^1.0.0" mdast-util-to-hast@^2.2.0: - version "2.4.3" - resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-2.4.3.tgz#cd7874c9832627f134fd3756163873f93f2b1de3" + version "2.5.0" + resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-2.5.0.tgz#f087844d255c7540f36906da30ba106c0ee5ee2f" dependencies: collapse-white-space "^1.0.0" detab "^2.0.0" @@ -4695,10 +4282,6 @@ mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - memory-fs@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290" @@ -4710,25 +4293,10 @@ memory-fs@~0.3.0: errno "^0.1.3" readable-stream "^2.0.1" -memory-fs@~0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - merge@^1.1.3: version "1.2.0" resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - micro-api-client@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/micro-api-client/-/micro-api-client-3.2.0.tgz#5ea1fd708bd9b31c21004d29af2ece39466a3ebb" @@ -4755,7 +4323,7 @@ mime-db@~1.30.0: version "1.30.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01" -mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7: +mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7: version "2.1.17" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a" dependencies: @@ -4773,20 +4341,10 @@ mime@1.3.x: version "1.3.6" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0" -mime@1.4.1, mime@^1.3.4: - version "1.4.1" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" - "mime@>= 0.0.1": version "2.0.3" resolved "https://registry.yarnpkg.com/mime/-/mime-2.0.3.tgz#4353337854747c48ea498330dc034f9f4bbbcc0b" -min-document@^2.19.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" - dependencies: - dom-walk "^0.1.0" - "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -4834,13 +4392,9 @@ mkdirp@0.5.0: dependencies: minimist "0.0.8" -mobx@^2.3.4: - version "2.7.0" - resolved "https://registry.yarnpkg.com/mobx/-/mobx-2.7.0.tgz#cf3d82d18c0ca7f458d8f2a240817b3dc7e54a01" - moment@^2.11.2: - version "2.18.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f" + version "2.19.3" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.3.tgz#bdb99d270d6d7fda78cc0fbace855e27fe7da69f" ms@0.7.1: version "0.7.1" @@ -4873,8 +4427,8 @@ mute-stream@0.0.5: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" nan@^2.3.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" + version "2.8.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" natives@^1.1.0: version "1.1.0" @@ -4892,17 +4446,17 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" -netlify-cms@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/netlify-cms/-/netlify-cms-0.5.1.tgz#b0c0f46820a29dc27ee221fdb27c4f7671a53555" +netlify-cms@^0.7.6: + version "0.7.6" + resolved "https://registry.yarnpkg.com/netlify-cms/-/netlify-cms-0.7.6.tgz#7862caf7ea5e431985a803d7a8ada4fccd5ec91a" dependencies: - "@kadira/storybook" "^1.36.0" classnames "^2.2.5" create-react-class "^15.6.0" + focus-trap-react "^3.0.3" fuzzy "^0.1.1" - gotrue-js "^0.9.11" + gotrue-js "^0.9.15" gray-matter "^3.0.6" - history "^2.1.2" + history "^4.7.2" immutable "^3.7.6" js-base64 "^2.1.9" js-yaml "^3.10.0" @@ -4915,22 +4469,22 @@ netlify-cms@^0.5.0: moment "^2.11.2" normalize.css "^4.2.0" prop-types "^15.5.10" - react "^15.1.0" - react-autosuggest "^7.0.1" + react "^16.0.0" + react-autosuggest "^9.3.2" react-datetime "^2.6.0" - react-dom "^15.1.0" - react-frame-component "^1.0.3" - react-hot-loader "^3.0.0-beta.7" + react-dnd "^2.5.4" + react-dnd-html5-backend "^2.5.4" + react-dom "^16.0.0" + react-frame-component "^2.0.0" react-immutable-proptypes "^2.1.0" react-redux "^4.4.0" - react-router "^2.5.1" - react-router-redux "^4.0.5" + react-router-dom "^4.2.2" + react-router-redux "^5.0.0-alpha.8" react-sidebar "^2.2.1" - react-simple-dnd "^0.1.2" - react-sortable "^1.2.0" + react-sortable-hoc "^0.6.8" react-split-pane "^0.1.66" react-toolbox "^2.0.0-beta.12" - react-topbar-progress-indicator "^1.0.0" + react-topbar-progress-indicator "^2.0.0" react-transition-group "^2.2.1" react-waypoint "^7.1.0" redux "^3.3.1" @@ -4945,19 +4499,20 @@ netlify-cms@^0.5.0: remark-stringify "^3.0.1" sanitize-filename "^1.6.1" semaphore "^1.0.5" - slate "^0.25.0" - slate-edit-list "^0.8.0" - slate-edit-table "^0.11.0" - slate-plain-serializer "^0.1.10" - slate-react "^0.1.10" - slate-soft-break "^0.4.0" + slate "^0.30.0" + slate-edit-list "^0.10.1" + slate-edit-table "^0.12.0" + slate-plain-serializer "^0.4.0" + slate-react "0.10.11" + slate-soft-break "^0.6.0" slug "^0.9.1" toml-j0.4 "^1.1.1" + tomlify-j0.4 "^3.0.0-alpha.0" unified "^6.1.4" unist-builder "^1.0.2" unist-util-visit-parents "^1.1.1" - uuid "^2.0.3" - whatwg-fetch "^1.0.0" + url "^0.11.0" + uuid "^3.1.0" optionalDependencies: fsevents "^1.0.14" @@ -5004,10 +4559,11 @@ node-libs-browser@^0.7.0: util "^0.10.3" vm-browserify "0.0.4" -node-pre-gyp@^0.6.36: - version "0.6.38" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz#e92a20f83416415bb4086f6d1fb78b3da73d113d" +node-pre-gyp@^0.6.39: + version "0.6.39" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" dependencies: + detect-libc "^1.0.2" hawk "3.1.3" mkdirp "^0.5.1" nopt "^4.0.1" @@ -5111,7 +4667,7 @@ object-component@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" -object-keys@^1.0.6, object-keys@^1.0.8: +object-keys@^1.0.6: version "1.0.11" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d" @@ -5128,22 +4684,6 @@ object.defaults@^1.1.0: for-own "^1.0.0" isobject "^3.0.0" -object.entries@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.6.1" - function-bind "^1.1.0" - has "^1.0.1" - -object.getownpropertydescriptors@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.5.1" - object.omit@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" @@ -5157,15 +4697,6 @@ object.pick@^1.2.0: dependencies: isobject "^3.0.1" -object.values@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.6.1" - function-bind "^1.1.0" - has "^1.0.1" - on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -5262,12 +4793,6 @@ osenv@^0.1.4: os-homedir "^1.0.0" os-tmpdir "^1.0.0" -page-bus@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/page-bus/-/page-bus-3.0.1.tgz#701d3906bcebab8524e2390bf271a220e4f12e09" - dependencies: - inherits "^2.0.1" - pako@~0.2.0: version "0.2.9" resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" @@ -5332,7 +4857,7 @@ parseuri@0.0.5: dependencies: better-assert "~1.0.0" -parseurl@~1.3.1, parseurl@~1.3.2: +parseurl@~1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" @@ -5368,9 +4893,11 @@ path-root@^0.1.1: dependencies: path-root-regex "^0.1.0" -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" +path-to-regexp@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d" + dependencies: + isarray "0.0.1" path-type@^1.0.0: version "1.1.0" @@ -6022,10 +5549,14 @@ pretty-hrtime@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" -private@^0.1.6, private@^0.1.7, private@~0.1.5: +private@^0.1.6: version "0.1.7" resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1" +private@^0.1.7, private@~0.1.5: + version "0.1.8" + resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" + process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" @@ -6034,10 +5565,6 @@ process@^0.11.0: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" -process@~0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf" - progress@^1.1.8, progress@~1.1.8: version "1.1.8" resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" @@ -6048,21 +5575,13 @@ promise-each@^2.2.0: dependencies: any-promise "^0.1.0" -promise.prototype.finally@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.0.1.tgz#51ba2fa0a4cba5cbca54da818a8da8f24fc68f39" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.8.2" - function-bind "^1.1.1" - promise@^7.1.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" dependencies: asap "~2.0.3" -prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8: +prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0: version "15.6.0" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" dependencies: @@ -6083,13 +5602,6 @@ property-information@^3.0.0, property-information@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/property-information/-/property-information-3.2.0.tgz#fd1483c8fbac61808f5fe359e7693a1f48a58331" -proxy-addr@~2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec" - dependencies: - forwarded "~0.1.2" - ipaddr.js "1.5.2" - prr@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" @@ -6121,7 +5633,7 @@ qs@6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.1.tgz#ce03c5ff0935bc1d9d69a9f14cbd18e568d67625" -qs@6.5.1, "qs@>= 0.4.0", qs@^6.1.0, qs@^6.2.0, qs@~6.5.1: +"qs@>= 0.4.0", qs@~6.5.1: version "6.5.1" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" @@ -6133,12 +5645,6 @@ qs@~6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" -query-string@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-3.0.3.tgz#ae2e14b4d05071d4e9b9eb4873c35b0dcd42e638" - dependencies: - strict-uri-encode "^1.0.0" - query-string@^4.1.0: version "4.3.4" resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" @@ -6150,7 +5656,7 @@ querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" -querystring@0.2.0, querystring@^0.2.0: +querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" @@ -6165,41 +5671,32 @@ randomatic@^1.1.3: is-number "^3.0.0" kind-of "^4.0.0" -range-parser@^1.0.3, range-parser@~1.2.0: +range-parser@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" -raw-body@2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89" - dependencies: - bytes "3.0.0" - http-errors "1.6.2" - iconv-lite "0.4.19" - unpipe "1.0.0" - rc@^1.1.7: - version "1.2.1" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95" + version "1.2.2" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077" dependencies: deep-extend "~0.4.0" ini "~1.3.0" minimist "^1.2.0" strip-json-comments "~2.0.1" -react-autosuggest@^7.0.1: - version "7.1.0" - resolved "https://registry.yarnpkg.com/react-autosuggest/-/react-autosuggest-7.1.0.tgz#60df5b4d38ee8063a9df33cc513d5e83102e9f98" +react-autosuggest@^9.3.2: + version "9.3.2" + resolved "https://registry.yarnpkg.com/react-autosuggest/-/react-autosuggest-9.3.2.tgz#dd8c0fbe9c25aa94afe296180353647f6ecc10a7" dependencies: - react-autowhatever "^7.0.0" - react-redux "^5.0.1" - redux "^3.6.0" + prop-types "^15.5.10" + react-autowhatever "^10.1.0" shallow-equal "^1.0.0" -react-autowhatever@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/react-autowhatever/-/react-autowhatever-7.0.0.tgz#7ea19f8024183acf1568fc8e4b76c0d0cc250d00" +react-autowhatever@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/react-autowhatever/-/react-autowhatever-10.1.0.tgz#41f6d69382437d3447a0a3c8913bb8ca2feaabc1" dependencies: + prop-types "^15.5.8" react-themeable "^1.1.0" section-iterator "^2.0.0" @@ -6211,119 +5708,58 @@ react-css-themr@^2.1.2: invariant "^2.2.1" react-datetime@^2.6.0: - version "2.10.3" - resolved "https://registry.yarnpkg.com/react-datetime/-/react-datetime-2.10.3.tgz#9807a7d9be1dd4ee01b3466b0416614e3543378e" + version "2.11.1" + resolved "https://registry.yarnpkg.com/react-datetime/-/react-datetime-2.11.1.tgz#11d15081dd7d6729284e21c1b8ea7b975e3bdc7e" dependencies: create-react-class "^15.5.2" object-assign "^3.0.0" prop-types "^15.5.7" react-onclickoutside "^6.5.0" -react-deep-force-update@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-2.1.1.tgz#8ea4263cd6455a050b37445b3f08fd839d86e909" - -react-dnd-html5-backend@^2.1.2: - version "2.5.3" - resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-2.5.3.tgz#1158112e8129dfe672d4c72222f266dd05321f03" +react-dnd-html5-backend@^2.5.4: + version "2.5.4" + resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-2.5.4.tgz#974ad083f67b12d56977a5b171f5ffeb29d78352" dependencies: lodash "^4.2.0" -react-dnd@^2.1.4: - version "2.5.3" - resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-2.5.3.tgz#ee5357da19d4ebd0e0da0a070a862bbc133e3241" +react-dnd@^2.5.4: + version "2.5.4" + resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-2.5.4.tgz#0b6dc5e9d0dfc2909f4f4fe736e5534f3afd1bd9" dependencies: disposables "^1.0.1" - dnd-core "^2.5.3" + dnd-core "^2.5.4" hoist-non-react-statics "^2.1.0" invariant "^2.1.0" lodash "^4.2.0" prop-types "^15.5.10" -react-dom-factories@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/react-dom-factories/-/react-dom-factories-1.0.2.tgz#eb7705c4db36fb501b3aa38ff759616aa0ff96e0" - -react-dom@^15.1.0: - version "15.6.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730" +react-dom@^16.0.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044" dependencies: - fbjs "^0.8.9" + fbjs "^0.8.16" loose-envify "^1.1.0" - object-assign "^4.1.0" - prop-types "^15.5.10" - -react-frame-component@^1.0.3: - version "1.1.1" - resolved "https://registry.yarnpkg.com/react-frame-component/-/react-frame-component-1.1.1.tgz#05b7f5689a2d373f25baf0c9adb0e59d78103388" - -react-fuzzy@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/react-fuzzy/-/react-fuzzy-0.2.3.tgz#4fa08729524cd491e2b589509e8d2de7e3adfb9e" - dependencies: - babel-runtime "^6.5.0" - classnames "^2.2.3" - fuse.js "^2.2.0" + object-assign "^4.1.1" + prop-types "^15.6.0" -react-hot-loader@^3.0.0-beta.7: - version "3.0.0-beta.7" - resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-3.0.0-beta.7.tgz#d5847b8165d731c4d5b30d86d5d4716227a0fa83" - dependencies: - babel-template "^6.7.0" - global "^4.3.0" - react-deep-force-update "^2.0.1" - react-proxy "^3.0.0-alpha.0" - redbox-react "^1.3.6" - source-map "^0.4.4" +react-frame-component@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/react-frame-component/-/react-frame-component-2.0.0.tgz#a39e1fec9b0da6e1295beccf1b659b0f15e6bb98" react-immutable-proptypes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz#023d6f39bb15c97c071e9e60d00d136eac5fa0b4" -react-inspector@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-1.1.2.tgz#192bc54f2be44f9fa0f29f183386f7f6e380f5ec" - dependencies: - babel-runtime "^6.9.2" - is-dom "^1.0.5" - -react-komposer@^1.9.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/react-komposer/-/react-komposer-1.13.1.tgz#4b8ac4bcc71323bd7413dcab95c831197f50eed0" - dependencies: - babel-runtime "6.x.x" - hoist-non-react-statics "1.x.x" - invariant "2.x.x" - mobx "^2.3.4" - shallowequal "0.2.x" - -react-modal@^1.2.1: - version "1.9.7" - resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-1.9.7.tgz#07ef56790b953e3b98ef1e2989e347983c72871d" - dependencies: - create-react-class "^15.5.2" - element-class "^0.2.0" - exenv "1.2.0" - lodash.assign "^4.2.0" - prop-types "^15.5.7" - react-dom-factories "^1.0.0" - react-onclickoutside@^6.5.0: - version "6.6.0" - resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.6.0.tgz#8526d0675fad26558e9f0a400c983b813c99ef3c" + version "6.7.0" + resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.7.0.tgz#997a4d533114c9a0a104913638aa26afc084f75c" react-portal@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-3.1.0.tgz#865c44fb72a1da106c649206936559ce891ee899" + version "3.2.0" + resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-3.2.0.tgz#4224e19b2b05d5cbe730a7ba0e34ec7585de0043" dependencies: prop-types "^15.5.8" -react-proxy@^3.0.0-alpha.0: - version "3.0.0-alpha.1" - resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz#4400426bcfa80caa6724c7755695315209fa4b07" - dependencies: - lodash "^4.6.1" - react-redux@^4.0.0, react-redux@^4.4.0: version "4.4.8" resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-4.4.8.tgz#e7bc1dd100e8b64e96ac8212db113239b9e2e08f" @@ -6335,64 +5771,63 @@ react-redux@^4.0.0, react-redux@^4.4.0: loose-envify "^1.1.0" prop-types "^15.5.4" -react-redux@^5.0.1: - version "5.0.6" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.6.tgz#23ed3a4f986359d68b5212eaaa681e60d6574946" +react-router-dom@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.2.2.tgz#c8a81df3adc58bba8a76782e946cbd4eae649b8d" dependencies: - hoist-non-react-statics "^2.2.1" - invariant "^2.0.0" - lodash "^4.2.0" - lodash-es "^4.2.0" - loose-envify "^1.1.0" - prop-types "^15.5.10" + history "^4.7.2" + invariant "^2.2.2" + loose-envify "^1.3.1" + prop-types "^15.5.4" + react-router "^4.2.0" + warning "^3.0.0" -react-router-redux@^4.0.5: - version "4.0.8" - resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-4.0.8.tgz#227403596b5151e182377dab835b5d45f0f8054e" +react-router-redux@^5.0.0-alpha.8: + version "5.0.0-alpha.8" + resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-5.0.0-alpha.8.tgz#5242c705730b2ac862aff7a8e90f870d0cf45e12" + dependencies: + history "^4.7.2" + prop-types "^15.6.0" + react-router "^4.2.0" -react-router@^2.5.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-2.8.1.tgz#73e9491f6ceb316d0f779829081863e378ee4ed7" +react-router@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.2.0.tgz#61f7b3e3770daeb24062dae3eedef1b054155986" dependencies: - history "^2.1.2" - hoist-non-react-statics "^1.2.0" - invariant "^2.2.1" - loose-envify "^1.2.0" + history "^4.7.2" + hoist-non-react-statics "^2.3.0" + invariant "^2.2.2" + loose-envify "^1.3.1" + path-to-regexp "^1.7.0" + prop-types "^15.5.4" warning "^3.0.0" react-sidebar@^2.2.1: version "2.3.2" resolved "https://registry.yarnpkg.com/react-sidebar/-/react-sidebar-2.3.2.tgz#ec140bea8a6f5fa3d8ea7a56479665b44cf4f9cf" -react-simple-di@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/react-simple-di/-/react-simple-di-1.2.0.tgz#dde0e5bf689f391ef2ab02c9043b213fe239c6d0" - dependencies: - babel-runtime "6.x.x" - hoist-non-react-statics "1.x.x" - -react-simple-dnd@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/react-simple-dnd/-/react-simple-dnd-0.1.2.tgz#a224231338f13b1f6328ce5c6b8c99d872e59ee0" +react-sortable-hoc@^0.6.8: + version "0.6.8" + resolved "https://registry.yarnpkg.com/react-sortable-hoc/-/react-sortable-hoc-0.6.8.tgz#b08562f570d7c41f6e393fca52879d2ebb9118e9" dependencies: - react-dnd "^2.1.4" - react-dnd-html5-backend "^2.1.2" - -react-sortable@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/react-sortable/-/react-sortable-1.2.0.tgz#5acd7e1910df665408957035acb5f2354519d849" + babel-runtime "^6.11.6" + invariant "^2.2.1" + lodash "^4.12.0" + prop-types "^15.5.7" react-split-pane@^0.1.66: - version "0.1.66" - resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.66.tgz#369085dd07ec1237bda123e73813dcc7dc6502c1" + version "0.1.71" + resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.71.tgz#19b1b30638655e655f9f5fe57b1ae7cc6c151829" dependencies: + "@types/inline-style-prefixer" "^3.0.0" + "@types/react" "^16.0.18" inline-style-prefixer "^3.0.6" prop-types "^15.5.10" react-style-proptype "^3.0.0" react-style-proptype@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/react-style-proptype/-/react-style-proptype-3.0.0.tgz#89e0b646f266c656abb0f0dd8202dbd5036c31e6" + version "3.1.0" + resolved "https://registry.yarnpkg.com/react-style-proptype/-/react-style-proptype-3.1.0.tgz#c8912fc13460f5b0c1ec1114c729d535b52b8073" dependencies: prop-types "^15.5.4" @@ -6413,9 +5848,9 @@ react-toolbox@^2.0.0-beta.12: react-style-proptype "^3.0.0" react-transition-group "^1.1.3" -react-topbar-progress-indicator@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/react-topbar-progress-indicator/-/react-topbar-progress-indicator-1.0.0.tgz#3379ab2cb840c1bc1bc22fb5fc871688b9104dd4" +react-topbar-progress-indicator@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/react-topbar-progress-indicator/-/react-topbar-progress-indicator-2.0.0.tgz#cfb4b4bd85a32f90dae74338dd008d3a082355d3" dependencies: topbar "^0.1.3" @@ -6441,13 +5876,13 @@ react-transition-group@^2.2.1: warning "^3.0.0" react-waypoint@^7.1.0: - version "7.3.1" - resolved "https://registry.yarnpkg.com/react-waypoint/-/react-waypoint-7.3.1.tgz#abb165d9b6c9590f8d82ceafbe61c2c887262a37" + version "7.3.2" + resolved "https://registry.yarnpkg.com/react-waypoint/-/react-waypoint-7.3.2.tgz#11ec5cfa0b5acb1cc95f7f8fb82e194170d95ecf" dependencies: consolidated-events "^1.1.0" prop-types "^15.0.0" -react@15.6.1, react@^15.1.0: +react@15.6.1: version "15.6.1" resolved "https://registry.yarnpkg.com/react/-/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df" dependencies: @@ -6457,6 +5892,15 @@ react@15.6.1, react@^15.1.0: object-assign "^4.1.0" prop-types "^15.5.10" +react@^16.0.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba" + dependencies: + fbjs "^0.8.16" + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.0" + read-cache@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" @@ -6560,15 +6004,6 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" -redbox-react@^1.2.2, redbox-react@^1.3.6: - version "1.5.0" - resolved "https://registry.yarnpkg.com/redbox-react/-/redbox-react-1.5.0.tgz#04dab11557d26651bf3562a67c22ace56c5d3967" - dependencies: - error-stack-parser "^1.3.6" - object-assign "^4.0.1" - prop-types "^15.5.4" - sourcemapped-stacktrace "^1.1.6" - reduce-css-calc@^1.2.6, reduce-css-calc@^1.2.7: version "1.3.0" resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716" @@ -6600,7 +6035,7 @@ redux-thunk@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-1.0.3.tgz#778aa0099eea0595031ab6b39165f6670d8d26bd" -redux@^3.3.1, redux@^3.5.2, redux@^3.6.0, redux@^3.7.1: +redux@^3.3.1, redux@^3.7.1: version "3.7.2" resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" dependencies: @@ -6613,10 +6048,6 @@ regenerate@^1.2.1: version "1.3.3" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f" -regenerator-runtime@^0.10.5: - version "0.10.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" - regenerator-runtime@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1" @@ -6895,6 +6326,10 @@ resolve-from@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" +resolve-pathname@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879" + resolve@^1.1.6, resolve@^1.1.7: version "1.4.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86" @@ -6971,7 +6406,7 @@ rx@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" -safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" @@ -7035,24 +6470,6 @@ send@0.15.2: range-parser "~1.2.0" statuses "~1.3.1" -send@0.16.1: - version "0.16.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3" - dependencies: - debug "2.6.9" - depd "~1.1.1" - destroy "~1.0.4" - encodeurl "~1.0.1" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "~1.6.2" - mime "1.4.1" - ms "2.0.0" - on-finished "~2.3.0" - range-parser "~1.2.0" - statuses "~1.3.1" - sequencify@~0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c" @@ -7078,15 +6495,6 @@ serve-static@1.12.2: parseurl "~1.3.1" send "0.15.2" -serve-static@1.13.1: - version "1.13.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719" - dependencies: - encodeurl "~1.0.1" - escape-html "~1.0.3" - parseurl "~1.3.2" - send "0.16.1" - server-destroy@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd" @@ -7120,10 +6528,6 @@ setprototypeof@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04" -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - sha.js@2.2.6: version "2.2.6" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.2.6.tgz#17ddeddc5f722fb66501658895461977867315ba" @@ -7132,16 +6536,6 @@ shallow-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.0.0.tgz#508d1838b3de590ab8757b011b25e430900945f7" -shallowequal@0.2.x: - version "0.2.2" - resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-0.2.2.tgz#1e32fd5bcab6ad688a4812cb0cc04efc75c7014e" - dependencies: - lodash.keys "^3.1.2" - -shelljs@^0.6.0: - version "0.6.1" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.1.tgz#ec6211bed1920442088fe0f70b2837232ed2c8a8" - shelljs@^0.7.5: version "0.7.8" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3" @@ -7162,67 +6556,70 @@ slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" -slate-base64-serializer@^0.1.9: - version "0.1.10" - resolved "https://registry.yarnpkg.com/slate-base64-serializer/-/slate-base64-serializer-0.1.10.tgz#5fb7fe6de52ef56d2619dc34f8960fe81a866bfb" +slate-base64-serializer@^0.2.8: + version "0.2.15" + resolved "https://registry.yarnpkg.com/slate-base64-serializer/-/slate-base64-serializer-0.2.15.tgz#5764ed47807e415f2435dd89762371d5ca9ed066" + dependencies: + isomorphic-base64 "^1.0.2" -slate-dev-logger@^0.1.10, slate-dev-logger@^0.1.11: - version "0.1.11" - resolved "https://registry.yarnpkg.com/slate-dev-logger/-/slate-dev-logger-0.1.11.tgz#740fd2e23b1dda1f4629419fc914eea91272b6f0" +slate-dev-logger@^0.1.32, slate-dev-logger@^0.1.33, slate-dev-logger@^0.1.36: + version "0.1.36" + resolved "https://registry.yarnpkg.com/slate-dev-logger/-/slate-dev-logger-0.1.36.tgz#ecdb37dbf944dfc742bab23b6a20d5a0472db95e" -slate-edit-list@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/slate-edit-list/-/slate-edit-list-0.8.0.tgz#3f8904fc9cb308d3c614efa5586953a6de6a4608" +slate-edit-list@^0.10.1: + version "0.10.1" + resolved "https://registry.yarnpkg.com/slate-edit-list/-/slate-edit-list-0.10.1.tgz#9c6a142a314b0ff22a327f1b50c8f5c85468cb17" -slate-edit-table@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/slate-edit-table/-/slate-edit-table-0.11.0.tgz#4ab175a02146ec1c45a4a2826eaa66b5db0d2266" +slate-edit-table@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/slate-edit-table/-/slate-edit-table-0.12.0.tgz#9163e67b8025c3c09d6037eb76cb5e652b65dd47" -slate-plain-serializer@^0.1.10: - version "0.1.11" - resolved "https://registry.yarnpkg.com/slate-plain-serializer/-/slate-plain-serializer-0.1.11.tgz#0b70cd870a935b294d6418785084be33ae23b96e" +slate-plain-serializer@^0.4.0, slate-plain-serializer@^0.4.6: + version "0.4.13" + resolved "https://registry.yarnpkg.com/slate-plain-serializer/-/slate-plain-serializer-0.4.13.tgz#1979e4bb57008312e8d45c92c511db5169c316a5" dependencies: - slate-dev-logger "^0.1.11" + slate-dev-logger "^0.1.36" -slate-prop-types@^0.1.9: - version "0.1.10" - resolved "https://registry.yarnpkg.com/slate-prop-types/-/slate-prop-types-0.1.10.tgz#a0c21d880ae72cb7f38a0d0fb025b7db2fa5d5b1" +slate-prop-types@^0.4.6: + version "0.4.13" + resolved "https://registry.yarnpkg.com/slate-prop-types/-/slate-prop-types-0.4.13.tgz#d2efe6599af0943542aec309d8a1bfcab190de0d" dependencies: - slate-dev-logger "^0.1.11" + slate-dev-logger "^0.1.36" -slate-react@^0.1.10: - version "0.1.10" - resolved "https://registry.yarnpkg.com/slate-react/-/slate-react-0.1.10.tgz#1d5886fb89bc9f03cb5cf15b74c3e8b9600d52e7" +slate-react@0.10.11: + version "0.10.11" + resolved "https://registry.yarnpkg.com/slate-react/-/slate-react-0.10.11.tgz#5fbfbf0da2dd726df468d788d2bd81dd578a15a3" dependencies: debug "^2.3.2" get-window "^1.1.1" + is-hotkey "^0.1.1" is-in-browser "^1.1.3" is-window "^1.0.2" keycode "^2.1.2" prop-types "^15.5.8" + react-immutable-proptypes "^2.1.0" react-portal "^3.1.0" selection-is-backward "^1.0.0" - slate-base64-serializer "^0.1.9" - slate-dev-logger "^0.1.10" - slate-plain-serializer "^0.1.10" - slate-prop-types "^0.1.9" + slate-base64-serializer "^0.2.8" + slate-dev-logger "^0.1.32" + slate-plain-serializer "^0.4.6" + slate-prop-types "^0.4.6" -slate-soft-break@^0.4.0: - version "0.4.3" - resolved "https://registry.yarnpkg.com/slate-soft-break/-/slate-soft-break-0.4.3.tgz#e3a9279a9b92ca173915467f5fbd359f739a7e96" +slate-soft-break@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/slate-soft-break/-/slate-soft-break-0.6.0.tgz#1e44815b7ff4ddada055bba14cd0d2d4ef0fd463" -slate@^0.25.0: - version "0.25.3" - resolved "https://registry.yarnpkg.com/slate/-/slate-0.25.3.tgz#d232ee168135269f10fbd3534307560e8ebf38b6" +slate@^0.30.0: + version "0.30.7" + resolved "https://registry.yarnpkg.com/slate/-/slate-0.30.7.tgz#98b5e4d8529775eaf2e7e3a2306db8cc49034772" dependencies: debug "^2.3.2" direction "^0.1.5" - es6-map "^0.1.4" esrever "^0.2.0" is-empty "^1.0.0" is-plain-object "^2.0.4" lodash "^4.17.4" - slate-dev-logger "^0.1.11" + slate-dev-logger "^0.1.33" type-of "^2.0.1" slice-ansi@0.0.4: @@ -7335,29 +6732,19 @@ source-map@0.1.x: dependencies: amdefine ">=0.0.4" -source-map@0.5.6: - version "0.5.6" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" - source-map@0.5.x, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.5, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" -source-map@^0.4.4, source-map@~0.4.1: - version "0.4.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" - dependencies: - amdefine ">=0.0.4" - source-map@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" -sourcemapped-stacktrace@^1.1.6: - version "1.1.7" - resolved "https://registry.yarnpkg.com/sourcemapped-stacktrace/-/sourcemapped-stacktrace-1.1.7.tgz#17e05374ff78b71a9d89ad3975a49f22725ba935" +source-map@~0.4.1: + version "0.4.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" dependencies: - source-map "0.5.6" + amdefine ">=0.0.4" space-separated-tokens@^1.0.0: version "1.1.1" @@ -7413,22 +6800,15 @@ sshpk@^1.7.0: jsbn "~0.1.0" tweetnacl "~0.14.0" -stack-source-map@^1.0.5: - version "1.0.7" - resolved "https://registry.yarnpkg.com/stack-source-map/-/stack-source-map-1.0.7.tgz#ca2d72aafbcc340c5474de3b6a158d0f3495f4bc" - dependencies: - path-browserify "0.0.0" - source-map "^0.5.6" - -stackframe@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-0.3.1.tgz#33aa84f1177a5548c8935533cbfeb3420975f5a4" - state-toggle@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.0.tgz#d20f9a616bb4f0c3b98b91922d25b640aa2bc425" -"statuses@>= 1.3.1 < 2", statuses@~1.3.0, statuses@~1.3.1: +"statuses@>= 1.3.1 < 2": + version "1.4.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" + +statuses@~1.3.0, statuses@~1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" @@ -7491,22 +6871,6 @@ string-width@^2.0.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string.prototype.padend@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.4.3" - function-bind "^1.0.2" - -string.prototype.padstart@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/string.prototype.padstart/-/string.prototype.padstart-3.0.0.tgz#5bcfad39f4649bb2d031292e19bcf0b510d4b242" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.4.3" - function-bind "^1.0.2" - string_decoder@^0.10.25, string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" @@ -7606,8 +6970,8 @@ svgo@^0.7.0: whet.extend "~0.9.9" symbol-observable@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d" + version "1.1.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.1.0.tgz#5c68fd8d54115d9dfb72a84720549222e8db9b32" systemjs-builder@0.16.11: version "0.16.11" @@ -7641,6 +7005,10 @@ systemjs@^0.19.46: dependencies: when "^3.7.5" +tabbable@^1.0.3: + version "1.1.1" + resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-1.1.1.tgz#88618caa0dc76e877572a678f0ad97519bba6761" + table@^3.7.8: version "3.8.3" resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f" @@ -7666,8 +7034,8 @@ tar-fs@^1.13.0: tar-stream "^1.1.2" tar-pack@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984" + version "3.4.1" + resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" dependencies: debug "^2.2.0" fstream "^1.0.10" @@ -7749,10 +7117,6 @@ time-stamp@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" -time-stamp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357" - timers-browserify@^2.0.2: version "2.0.4" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6" @@ -7785,6 +7149,10 @@ toml-j0.4@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/toml-j0.4/-/toml-j0.4-1.1.1.tgz#eb0c70348609a0263bb1d6e4a3dd191dcca60866" +tomlify-j0.4@^3.0.0-alpha.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/tomlify-j0.4/-/tomlify-j0.4-3.0.0.tgz#99414d45268c3a3b8bf38be82145b7bba34b7473" + topbar@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/topbar/-/topbar-0.1.3.tgz#c9ef8776dc4469f7840e6416f4136ddeccf4b7c6" @@ -7863,13 +7231,6 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-is@~1.6.15: - version "1.6.15" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410" - dependencies: - media-typer "0.3.0" - mime-types "~2.1.15" - type-of@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/type-of/-/type-of-2.0.1.tgz#e72a1741896568e9f628378d816d6912f7f23972" @@ -7883,8 +7244,8 @@ ua-parser-js@0.7.12: resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb" ua-parser-js@^0.7.9: - version "0.7.14" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.14.tgz#110d53fa4c3f326c121292bbeac904d2e03387ca" + version "0.7.17" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac" uglify-js@^2.6.1: version "2.8.29" @@ -7952,8 +7313,8 @@ unherit@^1.0.4: resolved "https://registry.yarnpkg.com/unicode/-/unicode-10.0.0.tgz#e5d51c1db93b6c71a0b879e0b0c4af7e6fdf688e" unified@^6.1.4: - version "6.1.5" - resolved "https://registry.yarnpkg.com/unified/-/unified-6.1.5.tgz#716937872621a63135e62ced2f3ac6a063c6fb87" + version "6.1.6" + resolved "https://registry.yarnpkg.com/unified/-/unified-6.1.6.tgz#5ea7f807a0898f1f8acdeefe5f25faa010cc42b1" dependencies: bail "^1.0.0" extend "^3.0.0" @@ -8000,7 +7361,7 @@ unist-util-generated@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.1.tgz#99f16c78959ac854dee7c615c291924c8bf4de7f" -unist-util-is@^2.0.0, unist-util-is@^2.1.0: +unist-util-is@^2.0.0, unist-util-is@^2.1.0, unist-util-is@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.1.tgz#0c312629e3f960c66e931e812d3d80e77010947b" @@ -8020,7 +7381,7 @@ unist-util-remove-position@^1.0.0: dependencies: unist-util-visit "^1.1.0" -unist-util-stringify-position@^1.0.0: +unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.1.tgz#3ccbdc53679eed6ecf3777dd7f5e3229c1b6aa3c" @@ -8029,8 +7390,10 @@ unist-util-visit-parents@^1.1.1: resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-1.1.1.tgz#7d3f56b5b039a3c6e2d16e51cc093f10e4755342" unist-util-visit@^1.0.0, unist-util-visit@^1.1.0, unist-util-visit@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.1.3.tgz#ec268e731b9d277a79a5b5aa0643990e405d600b" + version "1.2.0" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.2.0.tgz#9dc78d1f95cd242e865f7f93f327d3296bb9a718" + dependencies: + unist-util-is "^2.1.1" units-css@^0.4.0: version "0.4.0" @@ -8043,7 +7406,7 @@ universalify@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7" -unpipe@1.0.0, unpipe@~1.0.0: +unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -8097,14 +7460,6 @@ utils-merge@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8" -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - -uuid@^2.0.1, uuid@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" - uuid@^3.0.0, uuid@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" @@ -8122,9 +7477,9 @@ validate-npm-package-license@^3.0.1: spdx-correct "~1.0.0" spdx-expression-parse "~1.0.0" -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" +value-equal@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7" vendors@^1.0.0: version "1.0.1" @@ -8142,13 +7497,20 @@ vfile-location@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.2.tgz#d3675c59c877498e492b4756ff65e4af1a752255" +vfile-message@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.0.0.tgz#a6adb0474ea400fa25d929f1d673abea6a17e359" + dependencies: + unist-util-stringify-position "^1.1.1" + vfile@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.2.0.tgz#ce47a4fb335922b233e535db0f7d8121d8fced4e" + version "2.3.0" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz#e62d8e72b20e83c324bc6c67278ee272488bf84a" dependencies: is-buffer "^1.1.4" replace-ext "1.0.0" unist-util-stringify-position "^1.0.0" + vfile-message "^1.0.0" viewport-dimensions@^0.2.0: version "0.2.0" @@ -8200,12 +7562,6 @@ walker@~1.0.5: dependencies: makeerror "1.0.x" -warning@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/warning/-/warning-2.1.0.tgz#21220d9c63afc77a8c92111e011af705ce0c6901" - dependencies: - loose-envify "^1.0.0" - warning@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" @@ -8231,26 +7587,7 @@ webpack-core@~0.6.9: source-list-map "~0.1.7" source-map "~0.4.1" -webpack-dev-middleware@^1.6.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz#d34efefb2edda7e1d3b5dbe07289513219651709" - dependencies: - memory-fs "~0.4.1" - mime "^1.3.4" - path-is-absolute "^1.0.0" - range-parser "^1.0.3" - time-stamp "^2.0.0" - -webpack-hot-middleware@^2.10.0: - version "2.19.1" - resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.19.1.tgz#5db32c31c955c1ead114d37c7519ea554da0d405" - dependencies: - ansi-html "0.0.7" - html-entities "^1.2.0" - querystring "^0.2.0" - strip-ansi "^3.0.0" - -webpack@^1.12.11, webpack@^1.13.1: +webpack@^1.13.1: version "1.15.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-1.15.0.tgz#4ff31f53db03339e55164a9d468ee0324968fe98" dependencies: @@ -8278,7 +7615,11 @@ weinre@^2.0.0-pre-I0Z7U9OV: nopt "3.0.x" underscore "1.7.x" -whatwg-fetch@>=0.10.0, whatwg-fetch@^1.0.0: +whatwg-fetch@>=0.10.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84" + +whatwg-fetch@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz#ac3c9d39f320c6dce5339969d054ef43dd333319" -- cgit v1.3 From 665598c6d4d16a0cb3ac8a9eecc3a24cc40ca225 Mon Sep 17 00:00:00 2001 From: Benaiah Mischenko Date: Wed, 6 Dec 2017 16:54:28 -0800 Subject: Move Values page into the CMS --- site/content/values.md | 52 +++++++++++++++++++--- site/layouts/values/single.html | 17 ++++--- site/static/admin/config.yml | 9 +++- .../cms-preview-templates/components/jumbotron.js | 24 ++++++++++ src/js/cms-preview-templates/products.js | 22 +++------ src/js/cms-preview-templates/values.js | 46 +++++++++++++++++++ src/js/cms.js | 2 + 7 files changed, 140 insertions(+), 32 deletions(-) create mode 100644 src/js/cms-preview-templates/components/jumbotron.js create mode 100644 src/js/cms-preview-templates/values.js diff --git a/site/content/values.md b/site/content/values.md index 3dcd089..98bf92c 100644 --- a/site/content/values.md +++ b/site/content/values.md @@ -1,5 +1,47 @@ -+++ -title = "Values" -type = "values" -page="/values.html" -+++ +--- +title: "Values" +type: "values" +page: "/values.html" +image: /img/about-jumbotron.jpg +values: + - heading: "Shade-grown coffee" + text: > + Coffee is a small tree or shrub that grows in the forest + understory in its wild form, and traditionally was grown + commercially under other trees that provided shade. The + forest-like structure of shade coffee farms provides habitat for + a great number of migratory and resident species. + imageUrl: "/img/about-shade-grown.jpg" + - heading: "Single origin" + text: > + Single-origin coffee is coffee grown within a single known + geographic origin. Sometimes, this is a single farm or a + specific collection of beans from a single country. The name of + the coffee is then usually the place it was grown to whatever + degree available. + imageUrl: "/img/about-single-origin.jpg" + - heading: "Sustainable farming" + text: > + Sustainable agriculture is farming in sustainable ways based on + an understanding of ecosystem services, the study of + relationships between organisms and their environment. What + grows where and how it is grown are a matter of choice and + careful consideration for nature and communities. + imageUrl: "/img/about-sustainable-farming.jpg" + - heading: "Direct sourcing" + text: > + We want to truly empower the communities that bring amazing + coffee to you. That’s why we reinvest 20% of our profits into + farms, local businesses and schools everywhere our coffee is + grown. You can see the communities grow and learn more about + coffee farming on our blog. + imageUrl: "/img/about-direct-sourcing.jpg" + - heading: "Reinvest profits" + text: > + We want to truly empower the communities that bring amazing + coffee to you. That’s why we reinvest 20% of our profits into + farms, local businesses and schools everywhere our coffee is + grown. You can see the communities grow and learn more about + coffee farming on our blog. + imageUrl: "/img/about-reinvest-profits.jpg" +--- diff --git a/site/layouts/values/single.html b/site/layouts/values/single.html index 552922a..9b6fa13 100644 --- a/site/layouts/values/single.html +++ b/site/layouts/values/single.html @@ -1,18 +1,17 @@ {{ partial "head" . }} {{ partial "nav" . }} -{{ partial "jumbotron" (dict "imageUrl" "/img/about/jumbotron.jpg" "title" "Values") }} +{{ partial "jumbotron" (dict "imageUrl" .Params.image "title" .Title) }}
- {{ partial "media-block" (dict "heading" "Shade-grown coffee" "text" "Coffee is a small tree or shrub that grows in the forest understory in its wild form, and traditionally was grown commercially under other trees that provided shade. The forest-like structure of shade coffee farms provides habitat for a great number of migratory and resident species." "imageUrl" "/img/about/shade-grown.jpg") }} + {{ range $index, $element := .Params.values }} + {{ if modBool $index 2 }} + {{ partial "media-block" $element }} + {{ else }} + {{ partial "media-block-reverse" $element }} + {{ end }} + {{ end }} - {{ partial "media-block-reverse" (dict "heading" "Single origin" "text" "Single-origin coffee is coffee grown within a single known geographic origin. Sometimes, this is a single farm or a specific collection of beans from a single country. The name of the coffee is then usually the place it was grown to whatever degree available." "imageUrl" "/img/about/single-origin.jpg") }} - - {{ partial "media-block" (dict "heading" "Sustainable farming" "text" "Sustainable agriculture is farming in sustainable ways based on an understanding of ecosystem services, the study of relationships between organisms and their environment. What grows where and how it is grown are a matter of choice and careful consideration for nature and communities." "imageUrl" "/img/about/sustainable-farming.jpg") }} - - {{ partial "media-block-reverse" (dict "heading" "Direct sourcing" "text" "Direct trade is a form of sourcing practiced by some coffee roasters. Advocates of direct trade practices promote direct communication and price negotiation between buyer and farmer, along with systems that encourage and incentivize quality." "imageUrl" "/img/about/direct-sourcing.jpg") }} - - {{ partial "media-block" (dict "heading" "Reinvest profits" "text" "We want to truly empower the communities that bring amazing coffee to you. That’s why we reinvest 20% of our profits into farms, local businesses and schools everywhere our coffee is grown. You can see the communities grow and learn more about coffee farming on our blog." "imageUrl" "/img/about/reinvest-profits.jpg") }}
{{ partial "footer" . }} diff --git a/site/static/admin/config.yml b/site/static/admin/config.yml index 2edc318..3c8fed4 100644 --- a/site/static/admin/config.yml +++ b/site/static/admin/config.yml @@ -48,4 +48,11 @@ collections: # A list of collections the CMS should be able to edit - {label: Title, name: title, widget: string} - {label: Type, name: type, widget: hidden, default: values} - {label: Page, name: page, widget: hidden, default: "/values.html"} - - {label: Body, name: body, widget: markdown} + - {label: Image, name: image, widget: image} + - label: Values + name: values + widget: list + fields: + - {label: Heading, name: heading, widget: string} + - {label: Text, name: text, widget: text} + - {label: Image, name: imageUrl, widget: image} diff --git a/src/js/cms-preview-templates/components/jumbotron.js b/src/js/cms-preview-templates/components/jumbotron.js new file mode 100644 index 0000000..cb14df9 --- /dev/null +++ b/src/js/cms-preview-templates/components/jumbotron.js @@ -0,0 +1,24 @@ +import React from "react"; + +export default class Jumbotron extends React.Component { + render() { + const {image, title} = this.props; + return
+
+
+
+
+

+ { title } +

+
+
+
+
+
+
+
; + } +} diff --git a/src/js/cms-preview-templates/products.js b/src/js/cms-preview-templates/products.js index 547ff33..4316c7d 100644 --- a/src/js/cms-preview-templates/products.js +++ b/src/js/cms-preview-templates/products.js @@ -1,9 +1,11 @@ import React from "react"; import format from "date-fns/format"; +import Jumbotron from "./components/jumbotron"; + export default class PostPreview extends React.Component { render() { - const {entry, getAsset, widgetFor} = this.props; + const {entry, getAsset} = this.props; let image = getAsset(entry.getIn(["data", "image"])); // Bit of a nasty hack to make relative paths work as expected as a background image here @@ -12,21 +14,7 @@ export default class PostPreview extends React.Component { } return
-
-
-
-
-

- { entry.getIn(["data", "title"]) } -

-
-
-
-
-
-
+
@@ -34,7 +22,7 @@ export default class PostPreview extends React.Component {

{entry.getIn(["data", "intro", "description"])}

- {(entry.getIn(["data","intro", "blurbs"]) || []).map((blurb, index) =>
+ {(entry.getIn(["data", "intro", "blurbs"]) || []).map((blurb, index) =>

{blurb.get("text")}

)} diff --git a/src/js/cms-preview-templates/values.js b/src/js/cms-preview-templates/values.js new file mode 100644 index 0000000..173d0c9 --- /dev/null +++ b/src/js/cms-preview-templates/values.js @@ -0,0 +1,46 @@ +import React from "react"; +import { List } from 'immutable'; + +import Jumbotron from "./components/jumbotron"; + +const MediaBlock = ({heading, text, imageUrl, reverse}) => { + const imageContainerClassName = reverse + ? "ph3-m w-50-m" + : "ph3-m w-50-m order-last-m"; + return
+
+ +
+
+

{heading}

+

{text}

+
+
; +}; + +export default class ValuesPreview extends React.Component { + render() { + const {entry, getAsset} = this.props; + + let image = getAsset(entry.getIn(["data", "image"])); + + // Bit of a nasty hack to make relative paths work as expected as a background image here + if (image && !image.fileObj) { + image = window.parent.location.protocol + "//" + window.parent.location.host + image; + } + + const entryValues = entry.getIn(["data", "values"]); + const values = entryValues ? entryValues.toJS() : []; + + return
+ +
+
+ {values.map(({text, heading, imageUrl}, i) => + + )} +
+
+
; + } +} diff --git a/src/js/cms.js b/src/js/cms.js index 8502ed0..5bc6e65 100644 --- a/src/js/cms.js +++ b/src/js/cms.js @@ -3,6 +3,7 @@ import CMS from "netlify-cms"; import PostPreview from "./cms-preview-templates/post"; import ProductsPreview from "./cms-preview-templates/products"; +import ValuesPreview from "./cms-preview-templates/values"; // Example of creating a custom color widget @@ -20,4 +21,5 @@ class ColorControl extends React.Component { CMS.registerPreviewStyle("/css/main.css"); CMS.registerPreviewTemplate("post", PostPreview); CMS.registerPreviewTemplate("products", ProductsPreview); +CMS.registerPreviewTemplate("values", ValuesPreview); CMS.registerWidget("color", ColorControl); -- cgit v1.3 From 3dc23ec6642f8238a9bb3e618544108cddcf2791 Mon Sep 17 00:00:00 2001 From: Benaiah Mischenko Date: Wed, 6 Dec 2017 16:58:42 -0800 Subject: Move Contact page into the CMS --- site/content/contact.md | 26 +++++++++++++++++++++----- site/layouts/contact/single.html | 24 ++++++++---------------- site/static/admin/config.yml | 11 +++++++++++ src/js/cms-preview-templates/contact.js | 28 ++++++++++++++++++++++++++++ src/js/cms.js | 2 ++ 5 files changed, 70 insertions(+), 21 deletions(-) create mode 100644 src/js/cms-preview-templates/contact.js diff --git a/site/content/contact.md b/site/content/contact.md index fd0b607..2e3c24e 100644 --- a/site/content/contact.md +++ b/site/content/contact.md @@ -1,5 +1,21 @@ -+++ -title = "Contact" -type = "contact" -page="/contact.html" -+++ +--- +title: "Contact" +type: "contact" +page: "/contact.html" +logo: "/img/logo.svg" +contact_entries: + - heading: Location + text: "3153 Lynn Avenue, South San Francisco, California 94080" + - heading: Working hours + text: "Monday – Saturday: 9AM – 7PM We’re closed on Sundays" +--- + +We’d love to get in touch with you and hear your ideas and +questions. We strive to grow and improve constantly and your feedback +is valuable for us. + +

How can I get…?

+ +You can also use the form below for any inquiries about coffee +availability, monthly subscriptions and scheduling a 1-on-1 session +with our baristas. Don’t be shy, drop us a line! diff --git a/site/layouts/contact/single.html b/site/layouts/contact/single.html index 07e5ce4..205d92e 100644 --- a/site/layouts/contact/single.html +++ b/site/layouts/contact/single.html @@ -5,25 +5,17 @@
- + -

We’d love to get in touch with you and hear your ideas and questions. We strive to grow and improve constantly and your feedback is valuable for us.

- -

How can I get…?

-

You can also use the form below for any inquiries about coffee availability, monthly subscriptions and scheduling a 1-on-1 session with our baristas. Don’t be shy, drop us a line!

+ {{ .Content }}
- -
-

Location

-

3153 Lynn Avenue, South San Francisco, California 94080

-
- -
-

Working hours

-

Monday – Saturday: 9AM – 7PM We’re closed on Sundays

-
- + {{ range .Params.contact_entries }} +
+

{{ .heading }}

+

{{ .text }}

+
+ {{ end }}
{{ partial "contact-form" . }} diff --git a/site/static/admin/config.yml b/site/static/admin/config.yml index 3c8fed4..cdb089e 100644 --- a/site/static/admin/config.yml +++ b/site/static/admin/config.yml @@ -25,7 +25,18 @@ collections: # A list of collections the CMS should be able to edit - {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 + name: contact_entries + widget: list + fields: + - label: Heading + name: heading + widget: string + - label: Text + name: text + widget: text - file: "site/content/products.md" label: "Products Page" name: "products" diff --git a/src/js/cms-preview-templates/contact.js b/src/js/cms-preview-templates/contact.js new file mode 100644 index 0000000..dea318c --- /dev/null +++ b/src/js/cms-preview-templates/contact.js @@ -0,0 +1,28 @@ +import React from "react"; + +const ContactEntry = ({heading, text}) => +
+

{ heading }

+

{ text }

+
; + +const ContactEntries = ({data}) => data && data.length > 0 + ?
+ {data.map(({heading, text}) => )} +
+ : ""; + +export default class ContactPreview extends React.Component { + render() { + const {entry, getAsset, widgetFor} = this.props; + const entryContactEntries = entry.getIn(["data", "contact_entries"]); + const contactEntries = entryContactEntries ? entryContactEntries.toJS() : []; + return
+ +
+ { widgetFor("body") } + +
+
; + } +} diff --git a/src/js/cms.js b/src/js/cms.js index 5bc6e65..3f018b9 100644 --- a/src/js/cms.js +++ b/src/js/cms.js @@ -4,6 +4,7 @@ import CMS from "netlify-cms"; import PostPreview from "./cms-preview-templates/post"; import ProductsPreview from "./cms-preview-templates/products"; import ValuesPreview from "./cms-preview-templates/values"; +import ContactPreview from "./cms-preview-templates/contact"; // Example of creating a custom color widget @@ -22,4 +23,5 @@ CMS.registerPreviewStyle("/css/main.css"); CMS.registerPreviewTemplate("post", PostPreview); CMS.registerPreviewTemplate("products", ProductsPreview); CMS.registerPreviewTemplate("values", ValuesPreview); +CMS.registerPreviewTemplate("contact", ContactPreview); CMS.registerWidget("color", ColorControl); -- cgit v1.3 From d91206659bd17c190e2940a2c564f371cafc7ebc Mon Sep 17 00:00:00 2001 From: Mathias Biilmann Christensen Date: Thu, 7 Dec 2017 00:21:51 -0800 Subject: Update hugo and content structure; add home page to CMS This updates to hugo v0.31 It also adapts the content model to follow the convention for sections with _index.md files and makes the home page a fully editable section --- bin/hugo.darwin | Bin 17009148 -> 37453092 bytes bin/hugo.exe | Bin 17067008 -> 28099072 bytes bin/hugo.linux | Bin 17064750 -> 27993152 bytes gulpfile.babel.js | 4 + site/content/_index.md | 20 ++++ site/content/contact.md | 21 ----- site/content/contact/_index.md | 19 ++++ site/content/products.md | 103 --------------------- site/content/products/_index.md | 102 ++++++++++++++++++++ site/content/values.md | 47 ---------- site/content/values/_index.md | 45 +++++++++ site/layouts/contact/single.html | 26 ------ site/layouts/index.html | 8 +- site/layouts/partials/2-up.html | 23 ++--- site/layouts/partials/text-and-image.html | 2 +- site/layouts/products/single.html | 32 ------- site/layouts/section/contact.html | 26 ++++++ site/layouts/section/products.html | 32 +++++++ site/layouts/section/values.html | 17 ++++ site/layouts/values/single.html | 17 ---- site/static/admin/config.yml | 31 +++++-- .../cms-preview-templates/components/jumbotron.js | 3 +- src/js/cms-preview-templates/home.js | 69 ++++++++++++++ src/js/cms.js | 2 + 24 files changed, 374 insertions(+), 275 deletions(-) create mode 100644 site/content/_index.md delete mode 100644 site/content/contact.md create mode 100644 site/content/contact/_index.md delete mode 100644 site/content/products.md create mode 100644 site/content/products/_index.md delete mode 100644 site/content/values.md create mode 100644 site/content/values/_index.md delete mode 100644 site/layouts/contact/single.html delete mode 100644 site/layouts/products/single.html create mode 100644 site/layouts/section/contact.html create mode 100644 site/layouts/section/products.html create mode 100644 site/layouts/section/values.html delete mode 100644 site/layouts/values/single.html create mode 100644 src/js/cms-preview-templates/home.js diff --git a/bin/hugo.darwin b/bin/hugo.darwin index a1e4260..99151d6 100755 Binary files a/bin/hugo.darwin and b/bin/hugo.darwin differ diff --git a/bin/hugo.exe b/bin/hugo.exe index e0b713b..144e2ce 100755 Binary files a/bin/hugo.exe and b/bin/hugo.exe differ diff --git a/bin/hugo.linux b/bin/hugo.linux index 5915625..0f34c02 100755 Binary files a/bin/hugo.linux and b/bin/hugo.linux differ diff --git a/gulpfile.babel.js b/gulpfile.babel.js index 4bc694a..a93dc8a 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js @@ -17,6 +17,10 @@ const browserSync = BrowserSync.create(); const hugoBin = `./bin/hugo.${process.platform === "win32" ? "exe" : process.platform}`; const defaultArgs = ["-d", "../dist", "-s", "site"]; +if (process.env.DEBUG) { + defaultArgs.unshift("--debug") +} + gulp.task("hugo", (cb) => buildSite(cb)); gulp.task("hugo-preview", (cb) => buildSite(cb, ["--buildDrafts", "--buildFuture"])); gulp.task("build", ["css", "js", "cms-assets", "hugo"]); 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.md deleted file mode 100644 index 2e3c24e..0000000 --- a/site/content/contact.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -title: "Contact" -type: "contact" -page: "/contact.html" -logo: "/img/logo.svg" -contact_entries: - - heading: Location - text: "3153 Lynn Avenue, South San Francisco, California 94080" - - heading: Working hours - text: "Monday – Saturday: 9AM – 7PM We’re closed on Sundays" ---- - -We’d love to get in touch with you and hear your ideas and -questions. We strive to grow and improve constantly and your feedback -is valuable for us. - -

How can I get…?

- -You can also use the form below for any inquiries about coffee -availability, monthly subscriptions and scheduling a 1-on-1 session -with our baristas. Don’t be shy, drop us a line! diff --git a/site/content/contact/_index.md b/site/content/contact/_index.md new file mode 100644 index 0000000..1b34ee8 --- /dev/null +++ b/site/content/contact/_index.md @@ -0,0 +1,19 @@ +--- +title: "Contact" +logo: "/img/logo.svg" +contact_entries: + - heading: Location + text: "3153 Lynn Avenue, South San Francisco, California 94080" + - heading: Working hours + text: "Monday – Saturday: 9AM – 7PM We’re closed on Sundays" +--- + +We’d love to get in touch with you and hear your ideas and +questions. We strive to grow and improve constantly and your feedback +is valuable for us. + +

How can I get…?

+ +You can also use the form below for any inquiries about coffee +availability, monthly subscriptions and scheduling a 1-on-1 session +with our baristas. Don’t be shy, drop us a line! diff --git a/site/content/products.md b/site/content/products.md deleted file mode 100644 index 67fd186..0000000 --- a/site/content/products.md +++ /dev/null @@ -1,103 +0,0 @@ ---- -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: - 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. - 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. This is an edit via identity... -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. - image1: - alt: A close-up of a paper filter filled with ground coffee - image: /img/products-grid3.jpg - image2: - alt: A green cup of a coffee on a wooden table - image: /img/products-grid2.jpg - image3: - alt: Coffee beans - image: /img/products-grid1.jpg -testimonials: - - 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-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. - plans: - - 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/site/content/products/_index.md b/site/content/products/_index.md new file mode 100644 index 0000000..b8d4b63 --- /dev/null +++ b/site/content/products/_index.md @@ -0,0 +1,102 @@ +--- +title: Our Coffee +type: products +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: + 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. + 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. This is an edit via identity... +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. + image1: + alt: A close-up of a paper filter filled with ground coffee + image: /img/products-grid3.jpg + image2: + alt: A green cup of a coffee on a wooden table + image: /img/products-grid2.jpg + image3: + alt: Coffee beans + image: /img/products-grid1.jpg +testimonials: + - 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-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. + plans: + - 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/site/content/values.md b/site/content/values.md deleted file mode 100644 index 98bf92c..0000000 --- a/site/content/values.md +++ /dev/null @@ -1,47 +0,0 @@ ---- -title: "Values" -type: "values" -page: "/values.html" -image: /img/about-jumbotron.jpg -values: - - heading: "Shade-grown coffee" - text: > - Coffee is a small tree or shrub that grows in the forest - understory in its wild form, and traditionally was grown - commercially under other trees that provided shade. The - forest-like structure of shade coffee farms provides habitat for - a great number of migratory and resident species. - imageUrl: "/img/about-shade-grown.jpg" - - heading: "Single origin" - text: > - Single-origin coffee is coffee grown within a single known - geographic origin. Sometimes, this is a single farm or a - specific collection of beans from a single country. The name of - the coffee is then usually the place it was grown to whatever - degree available. - imageUrl: "/img/about-single-origin.jpg" - - heading: "Sustainable farming" - text: > - Sustainable agriculture is farming in sustainable ways based on - an understanding of ecosystem services, the study of - relationships between organisms and their environment. What - grows where and how it is grown are a matter of choice and - careful consideration for nature and communities. - imageUrl: "/img/about-sustainable-farming.jpg" - - heading: "Direct sourcing" - text: > - We want to truly empower the communities that bring amazing - coffee to you. That’s why we reinvest 20% of our profits into - farms, local businesses and schools everywhere our coffee is - grown. You can see the communities grow and learn more about - coffee farming on our blog. - imageUrl: "/img/about-direct-sourcing.jpg" - - heading: "Reinvest profits" - text: > - We want to truly empower the communities that bring amazing - coffee to you. That’s why we reinvest 20% of our profits into - farms, local businesses and schools everywhere our coffee is - grown. You can see the communities grow and learn more about - coffee farming on our blog. - imageUrl: "/img/about-reinvest-profits.jpg" ---- diff --git a/site/content/values/_index.md b/site/content/values/_index.md new file mode 100644 index 0000000..b92073d --- /dev/null +++ b/site/content/values/_index.md @@ -0,0 +1,45 @@ +--- +title: "Values" +image: /img/about-jumbotron.jpg +values: + - heading: "Shade-grown coffee" + text: > + Coffee is a small tree or shrub that grows in the forest + understory in its wild form, and traditionally was grown + commercially under other trees that provided shade. The + forest-like structure of shade coffee farms provides habitat for + a great number of migratory and resident species. + imageUrl: "/img/about-shade-grown.jpg" + - heading: "Single origin" + text: > + Single-origin coffee is coffee grown within a single known + geographic origin. Sometimes, this is a single farm or a + specific collection of beans from a single country. The name of + the coffee is then usually the place it was grown to whatever + degree available. + imageUrl: "/img/about-single-origin.jpg" + - heading: "Sustainable farming" + text: > + Sustainable agriculture is farming in sustainable ways based on + an understanding of ecosystem services, the study of + relationships between organisms and their environment. What + grows where and how it is grown are a matter of choice and + careful consideration for nature and communities. + imageUrl: "/img/about-sustainable-farming.jpg" + - heading: "Direct sourcing" + text: > + We want to truly empower the communities that bring amazing + coffee to you. That’s why we reinvest 20% of our profits into + farms, local businesses and schools everywhere our coffee is + grown. You can see the communities grow and learn more about + coffee farming on our blog. + imageUrl: "/img/about-direct-sourcing.jpg" + - heading: "Reinvest profits" + text: > + We want to truly empower the communities that bring amazing + coffee to you. That’s why we reinvest 20% of our profits into + farms, local businesses and schools everywhere our coffee is + grown. You can see the communities grow and learn more about + coffee farming on our blog. + imageUrl: "/img/about-reinvest-profits.jpg" +--- diff --git a/site/layouts/contact/single.html b/site/layouts/contact/single.html deleted file mode 100644 index 205d92e..0000000 --- a/site/layouts/contact/single.html +++ /dev/null @@ -1,26 +0,0 @@ -{{ partial "head" . }} - -{{ partial "nav" . }} - -
-
- - - - {{ .Content }} - -
- {{ range .Params.contact_entries }} -
-

{{ .heading }}

-

{{ .text }}

-
- {{ end }} -
- - {{ partial "contact-form" . }} - -
-
- -{{ partial "footer" . }} 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 @@
-

{{.heading}}

-

{{.description}}

+

{{.intro.heading}}

+

{{.intro.text}}

+ {{ range .products }}
- -

{{.text1}}

-
- -
- -

{{.text2}}

+ +

{{.text}}

+ {{ end }}
- {{ if .buttonText }} -
- {{.buttonText}} -
- {{ end }} +
+ See all products +
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 @@
-

{{.heading}}

+

{{.heading}}

{{.text}}

diff --git a/site/layouts/products/single.html b/site/layouts/products/single.html deleted file mode 100644 index bf430ca..0000000 --- a/site/layouts/products/single.html +++ /dev/null @@ -1,32 +0,0 @@ -{{ partial "head" . }} -{{ partial "nav" . }} - -{{ partial "jumbotron" (dict "imageUrl" .Params.image "title" .Title) }} - -{{ partial "4-up" .Params.intro }} - - -{{ with .Params.main }} -
-
-

{{ .heading }}

-

{{ .description }}

-
-
- - -{{ partial "image-grid" . }} -{{ end }} - -
- {{ range .Params.testimonials }} - {{ partial "blockquote" . }} - {{ end }} -
- - - - -{{ partial "table" .Params.pricing }} - -{{ partial "footer" . }} diff --git a/site/layouts/section/contact.html b/site/layouts/section/contact.html new file mode 100644 index 0000000..205d92e --- /dev/null +++ b/site/layouts/section/contact.html @@ -0,0 +1,26 @@ +{{ partial "head" . }} + +{{ partial "nav" . }} + +
+
+ + + + {{ .Content }} + +
+ {{ range .Params.contact_entries }} +
+

{{ .heading }}

+

{{ .text }}

+
+ {{ end }} +
+ + {{ partial "contact-form" . }} + +
+
+ +{{ partial "footer" . }} diff --git a/site/layouts/section/products.html b/site/layouts/section/products.html new file mode 100644 index 0000000..bf430ca --- /dev/null +++ b/site/layouts/section/products.html @@ -0,0 +1,32 @@ +{{ partial "head" . }} +{{ partial "nav" . }} + +{{ partial "jumbotron" (dict "imageUrl" .Params.image "title" .Title) }} + +{{ partial "4-up" .Params.intro }} + + +{{ with .Params.main }} +
+
+

{{ .heading }}

+

{{ .description }}

+
+
+ + +{{ partial "image-grid" . }} +{{ end }} + +
+ {{ range .Params.testimonials }} + {{ partial "blockquote" . }} + {{ end }} +
+ + + + +{{ partial "table" .Params.pricing }} + +{{ partial "footer" . }} diff --git a/site/layouts/section/values.html b/site/layouts/section/values.html new file mode 100644 index 0000000..9b6fa13 --- /dev/null +++ b/site/layouts/section/values.html @@ -0,0 +1,17 @@ +{{ partial "head" . }} +{{ partial "nav" . }} +{{ partial "jumbotron" (dict "imageUrl" .Params.image "title" .Title) }} + +
+ + {{ range $index, $element := .Params.values }} + {{ if modBool $index 2 }} + {{ partial "media-block" $element }} + {{ else }} + {{ partial "media-block-reverse" $element }} + {{ end }} + {{ end }} + +
+ +{{ partial "footer" . }} diff --git a/site/layouts/values/single.html b/site/layouts/values/single.html deleted file mode 100644 index 9b6fa13..0000000 --- a/site/layouts/values/single.html +++ /dev/null @@ -1,17 +0,0 @@ -{{ partial "head" . }} -{{ partial "nav" . }} -{{ partial "jumbotron" (dict "imageUrl" .Params.image "title" .Title) }} - -
- - {{ range $index, $element := .Params.values }} - {{ if modBool $index 2 }} - {{ partial "media-block" $element }} - {{ else }} - {{ partial "media-block-reverse" $element }} - {{ end }} - {{ end }} - -
- -{{ partial "footer" . }} 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 diff --git a/src/js/cms-preview-templates/components/jumbotron.js b/src/js/cms-preview-templates/components/jumbotron.js index cb14df9..128a51e 100644 --- a/src/js/cms-preview-templates/components/jumbotron.js +++ b/src/js/cms-preview-templates/components/jumbotron.js @@ -2,7 +2,7 @@ import React from "react"; export default class Jumbotron extends React.Component { render() { - const {image, title} = this.props; + const {image, title, subtitle} = this.props; return
+ {subtitle &&

{ subtitle }

}
diff --git a/src/js/cms-preview-templates/home.js b/src/js/cms-preview-templates/home.js new file mode 100644 index 0000000..ca8c123 --- /dev/null +++ b/src/js/cms-preview-templates/home.js @@ -0,0 +1,69 @@ +import React from "react"; +import format from "date-fns/format"; + +import Jumbotron from "./components/jumbotron"; + +export default class PostPreview extends React.Component { + render() { + const {entry, getAsset} = this.props; + let image = getAsset(entry.getIn(["data", "image"])); + + // Bit of a nasty hack to make relative paths work as expected as a background image here + if (image && !image.fileObj) { + image = window.parent.location.protocol + "//" + window.parent.location.host + image; + } + + return
+ + +
+
+

{entry.getIn(["data", "blurb", "heading"])}

+

{entry.getIn(["data", "blurb", "text"])}

+
+
+ +
+
+

{entry.getIn(["data", "intro", "heading"])}

+

{entry.getIn(["data", "intro", "text"])}

+ +
+ {(entry.getIn(["data", "products"]) || []).map((product, i) =>
+ +

{product.get("text")}

+
)} +
+ + +
+
+ +
+
+ +
+
+

{entry.getIn(["data", "values", "heading"])}

+ +

{entry.getIn(["data", "values", "text"])}

+
+ +
+ +
+
+ +
+ Read more +
+ +
+
+ + +
+ } +} \ No newline at end of file diff --git a/src/js/cms.js b/src/js/cms.js index 3f018b9..ad298dd 100644 --- a/src/js/cms.js +++ b/src/js/cms.js @@ -1,6 +1,7 @@ import React from "react"; import CMS from "netlify-cms"; +import HomePreview from "./cms-preview-templates/home"; import PostPreview from "./cms-preview-templates/post"; import ProductsPreview from "./cms-preview-templates/products"; import ValuesPreview from "./cms-preview-templates/values"; @@ -20,6 +21,7 @@ class ColorControl extends React.Component { } CMS.registerPreviewStyle("/css/main.css"); +CMS.registerPreviewTemplate("home", HomePreview); CMS.registerPreviewTemplate("post", PostPreview); CMS.registerPreviewTemplate("products", ProductsPreview); CMS.registerPreviewTemplate("values", ValuesPreview); -- cgit v1.3 From a4bfd44601069a1b054c396ad754c8a2b7ec688c Mon Sep 17 00:00:00 2001 From: Mathias Biilmann Christensen Date: Thu, 7 Dec 2017 10:10:59 -0800 Subject: Update Netlify CMS --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 931c0f2..7bc28bf 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "gulp-replace": "^0.5.4", "gulp-util": "^3.0.7", "imports-loader": "^0.6.5", - "netlify-cms": "^0.7.6", + "netlify-cms": "^1.0.1", "postcss-cssnext": "^2.7.0", "postcss-import": "^8.1.2", "postcss-loader": "^0.9.1", -- cgit v1.3