From 99c19cadc47db92bf4a2f87337f399ed73901490 Mon Sep 17 00:00:00 2001
From: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date: Fri, 18 Dec 2015 13:38:13 +0100
Subject: [PATCH] Less nesting in example dirs

---
 .../css/uppy.css => src/scss/uppy.scss         |  0
 website/src/examples/cdn/{js => }/app.es6      |  0
 website/src/examples/cdn/{html => }/app.html   |  0
 website/src/examples/cdn/index.ejs             | 18 +++++++-----------
 .../src/examples/dragdrop/{css => }/app.css    |  0
 website/src/examples/dragdrop/{js => }/app.es6 |  0
 .../src/examples/dragdrop/{html => }/app.html  |  2 +-
 website/src/examples/dragdrop/index.ejs        | 18 +++++++-----------
 website/src/examples/dropbox/{css => }/app.css |  0
 website/src/examples/dropbox/{js => }/app.es6  |  0
 .../src/examples/dropbox/{html => }/app.html   |  0
 website/src/examples/dropbox/index.ejs         | 18 +++++++-----------
 12 files changed, 22 insertions(+), 34 deletions(-)
 rename website/src/examples/dragdrop/css/uppy.css => src/scss/uppy.scss (100%)
 rename website/src/examples/cdn/{js => }/app.es6 (100%)
 rename website/src/examples/cdn/{html => }/app.html (100%)
 rename website/src/examples/dragdrop/{css => }/app.css (100%)
 rename website/src/examples/dragdrop/{js => }/app.es6 (100%)
 rename website/src/examples/dragdrop/{html => }/app.html (96%)
 rename website/src/examples/dropbox/{css => }/app.css (100%)
 rename website/src/examples/dropbox/{js => }/app.es6 (100%)
 rename website/src/examples/dropbox/{html => }/app.html (100%)

diff --git a/website/src/examples/dragdrop/css/uppy.css b/src/scss/uppy.scss
similarity index 100%
rename from website/src/examples/dragdrop/css/uppy.css
rename to src/scss/uppy.scss
diff --git a/website/src/examples/cdn/js/app.es6 b/website/src/examples/cdn/app.es6
similarity index 100%
rename from website/src/examples/cdn/js/app.es6
rename to website/src/examples/cdn/app.es6
diff --git a/website/src/examples/cdn/html/app.html b/website/src/examples/cdn/app.html
similarity index 100%
rename from website/src/examples/cdn/html/app.html
rename to website/src/examples/cdn/app.html
diff --git a/website/src/examples/cdn/index.ejs b/website/src/examples/cdn/index.ejs
index e733470c0..418eb76a1 100644
--- a/website/src/examples/cdn/index.ejs
+++ b/website/src/examples/cdn/index.ejs
@@ -6,16 +6,12 @@ order: 0
 ---
 
 {% blockquote %}
-CDN
+This example showcases sourcing an UMD dist build straight from a CDN.
 {% endblockquote %}
 
-<p>
-  This example showcases sourcing an UMD dist build straight from a CDN.
-</p>
-
-<!-- <link rel="stylesheet" href="css/app.css"> -->
-<% include html/app.html %>
-<script src="js/app.js"></script>
+<!-- <link rel="stylesheet" href="app.css"> -->
+<% include app.html %>
+<script src="app.js"></script>
 
 <hr />
 
@@ -26,14 +22,14 @@ CDN
 <p>
   On this page we're using the following HTML snippet:
 </p>
-{% include_code lang:html cdn/html/app.html %}
+{% include_code lang:html cdn/app.html %}
 
 <p>
   Along with this JavaScript:
 </p>
-{% include_code lang:js cdn/js/app.es6 %}
+{% include_code lang:js cdn/app.es6 %}
 
 <!-- <p>
   And the following CSS:
 </p>
-{% include_code lang:css cdn/css/app.css %} -->
+{% include_code lang:css cdn/app.css %} -->
diff --git a/website/src/examples/dragdrop/css/app.css b/website/src/examples/dragdrop/app.css
similarity index 100%
rename from website/src/examples/dragdrop/css/app.css
rename to website/src/examples/dragdrop/app.css
diff --git a/website/src/examples/dragdrop/js/app.es6 b/website/src/examples/dragdrop/app.es6
similarity index 100%
rename from website/src/examples/dragdrop/js/app.es6
rename to website/src/examples/dragdrop/app.es6
diff --git a/website/src/examples/dragdrop/html/app.html b/website/src/examples/dragdrop/app.html
similarity index 96%
rename from website/src/examples/dragdrop/html/app.html
rename to website/src/examples/dragdrop/app.html
index a69474676..72ff78322 100644
--- a/website/src/examples/dragdrop/html/app.html
+++ b/website/src/examples/dragdrop/app.html
@@ -1,5 +1,5 @@
 <!-- Basic Uppy styles -->
-<link rel="stylesheet" href="css/uppy.css">
+<link rel="stylesheet" href="/css/uppy.css">
 
 <form id="upload-target" class="UppyDragDrop" method="post" action="/" enctype="multipart/form-data">
   <svg class="UppyDragDrop-puppy" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 125" enable-background="new 0 0 100 100"><path d="M16.582 21.3L-.085 62.713l32.94 13.295zM99.915 62.714L66.975 76.01 83.25 21.3zM50.917 68.117L62.443 56.59H37.386l11.527 11.526v5.905l-3.063 3.32 1.474 1.36 2.59-2.807 2.59 2.807 1.475-1.358-3.063-3.32zM66.976 41.415c-3.972 0-7.193-3.22-7.193-7.193 0-3.973 3.222-7.193 7.193-7.193 3.974 0 7.193 3.22 7.193 7.192 0 3.973-3.22 7.193-7.194 7.193m2.506-11.732c-.738 0-1.337.6-1.337 1.337s.6 1.336 1.337 1.336 1.337-.598 1.337-1.336-.6-1.337-1.338-1.337zM32.854 41.415c-3.973 0-7.193-3.22-7.193-7.193 0-3.973 3.22-7.193 7.194-7.193 3.973 0 7.192 3.22 7.192 7.192 0 3.973-3.22 7.193-7.192 7.193m2.506-11.732c-.738 0-1.337.6-1.337 1.337s.6 1.336 1.337 1.336 1.337-.598 1.337-1.336-.598-1.337-1.337-1.337z"/></svg>
diff --git a/website/src/examples/dragdrop/index.ejs b/website/src/examples/dragdrop/index.ejs
index 320194ee4..0691f03a9 100644
--- a/website/src/examples/dragdrop/index.ejs
+++ b/website/src/examples/dragdrop/index.ejs
@@ -6,16 +6,12 @@ order: 2
 ---
 
 {% blockquote %}
-Drag &amp; Drop
+Here you'll see a demo of how you might set up Drag and Drop with Uppy:
 {% endblockquote %}
 
-<p>
-  Here you'll see a demo of how you might set up Drag and Drop with Uppy:
-</p>
-
-<link rel="stylesheet" href="css/app.css">
-<% include html/app.html %>
-<script src="js/app.js"></script>
+<link rel="stylesheet" href="app.css">
+<% include app.html %>
+<script src="app.js"></script>
 
 <hr />
 
@@ -26,14 +22,14 @@ Drag &amp; Drop
 <p>
   On this page we're using the following HTML snippet:
 </p>
-{% include_code lang:html dragdrop/html/app.html %}
+{% include_code lang:html dragdrop/app.html %}
 
 <p>
   Along with this JavaScript:
 </p>
-{% include_code lang:js dragdrop/js/app.es6 %}
+{% include_code lang:js dragdrop/app.es6 %}
 
 <p>
   And the following CSS:
 </p>
-{% include_code lang:css dragdrop/css/app.css %}
+{% include_code lang:css dragdrop/app.css %}
diff --git a/website/src/examples/dropbox/css/app.css b/website/src/examples/dropbox/app.css
similarity index 100%
rename from website/src/examples/dropbox/css/app.css
rename to website/src/examples/dropbox/app.css
diff --git a/website/src/examples/dropbox/js/app.es6 b/website/src/examples/dropbox/app.es6
similarity index 100%
rename from website/src/examples/dropbox/js/app.es6
rename to website/src/examples/dropbox/app.es6
diff --git a/website/src/examples/dropbox/html/app.html b/website/src/examples/dropbox/app.html
similarity index 100%
rename from website/src/examples/dropbox/html/app.html
rename to website/src/examples/dropbox/app.html
diff --git a/website/src/examples/dropbox/index.ejs b/website/src/examples/dropbox/index.ejs
index 79d3fcb46..9052ebe29 100644
--- a/website/src/examples/dropbox/index.ejs
+++ b/website/src/examples/dropbox/index.ejs
@@ -6,16 +6,12 @@ order: 1
 ---
 
 {% blockquote %}
-Dropbox
+Here you'll see a demo of how you might set up Dropbox with Uppy:
 {% endblockquote %}
 
-<p>
-  Here you'll see a demo of how you might set up Dropbox with Uppy:
-</p>
-
-<link rel="stylesheet" href="css/app.css">
-<% include html/app.html %>
-<script src="js/app.js"></script>
+<link rel="stylesheet" href="app.css">
+<% include app.html %>
+<script src="app.js"></script>
 
 <hr />
 
@@ -26,14 +22,14 @@ Dropbox
 <p>
   On this page we're using the following HTML snippet:
 </p>
-{% include_code lang:html dropbox/html/app.html %}
+{% include_code lang:html dropbox/app.html %}
 
 <p>
   Along with this JavaScript:
 </p>
-{% include_code lang:js dropbox/js/app.es6 %}
+{% include_code lang:js dropbox/app.es6 %}
 
 <p>
   And the following CSS:
 </p>
-{% include_code lang:css dropbox/css/app.css %}
+{% include_code lang:css dropbox/app.css %}