From ae0e1b97f481121d6c3068d3eb9bd7c0de2d75dd Mon Sep 17 00:00:00 2001
From: Tom Fagerland <tom@fagerland.org>
Date: Thu, 21 Apr 2016 14:21:51 +0200
Subject: [PATCH 1/2] Renamed folder /app to /src

---
 template/roc.config.js                              |   4 ++--
 template/{app => src}/components/clicker/index.js   |   0
 template/{app => src}/components/clicker/style.scss |   0
 template/{app => src}/components/footer/gh.png      | Bin
 template/{app => src}/components/footer/index.js    |   0
 template/{app => src}/components/footer/style.scss  |   0
 template/{app => src}/components/footer/vg.png      | Bin
 template/{app => src}/components/navbar/index.js    |   0
 template/{app => src}/components/navbar/style.scss  |   0
 template/{app => src}/redux/clicker.js              |   0
 template/{app => src}/redux/reducers.js             |   0
 template/{app => src}/routes/index.js               |   0
 template/{app => src}/screens/about/index.js        |   0
 template/{app => src}/screens/about/style.scss      |   0
 template/{app => src}/screens/app/index.js          |   0
 template/{app => src}/screens/app/style.scss        |   0
 template/{app => src}/screens/start/index.js        |   4 ++--
 template/{app => src}/screens/start/style.scss      |   0
 18 files changed, 4 insertions(+), 4 deletions(-)
 rename template/{app => src}/components/clicker/index.js (100%)
 rename template/{app => src}/components/clicker/style.scss (100%)
 rename template/{app => src}/components/footer/gh.png (100%)
 rename template/{app => src}/components/footer/index.js (100%)
 rename template/{app => src}/components/footer/style.scss (100%)
 rename template/{app => src}/components/footer/vg.png (100%)
 rename template/{app => src}/components/navbar/index.js (100%)
 rename template/{app => src}/components/navbar/style.scss (100%)
 rename template/{app => src}/redux/clicker.js (100%)
 rename template/{app => src}/redux/reducers.js (100%)
 rename template/{app => src}/routes/index.js (100%)
 rename template/{app => src}/screens/about/index.js (100%)
 rename template/{app => src}/screens/about/style.scss (100%)
 rename template/{app => src}/screens/app/index.js (100%)
 rename template/{app => src}/screens/app/style.scss (100%)
 rename template/{app => src}/screens/start/index.js (96%)
 rename template/{app => src}/screens/start/style.scss (100%)

diff --git a/template/roc.config.js b/template/roc.config.js
index bf72eb6..80e25c7 100755
--- a/template/roc.config.js
+++ b/template/roc.config.js
@@ -7,8 +7,8 @@ module.exports = {
       favicon: 'favicon.png',
     },
     build: {
-      reducers: 'app/redux/reducers.js',
-      routes: 'app/routes/index.js',
+      reducers: 'src/redux/reducers.js',
+      routes: 'src/routes/index.js',
     },
   },
 };
diff --git a/template/app/components/clicker/index.js b/template/src/components/clicker/index.js
similarity index 100%
rename from template/app/components/clicker/index.js
rename to template/src/components/clicker/index.js
diff --git a/template/app/components/clicker/style.scss b/template/src/components/clicker/style.scss
similarity index 100%
rename from template/app/components/clicker/style.scss
rename to template/src/components/clicker/style.scss
diff --git a/template/app/components/footer/gh.png b/template/src/components/footer/gh.png
similarity index 100%
rename from template/app/components/footer/gh.png
rename to template/src/components/footer/gh.png
diff --git a/template/app/components/footer/index.js b/template/src/components/footer/index.js
similarity index 100%
rename from template/app/components/footer/index.js
rename to template/src/components/footer/index.js
diff --git a/template/app/components/footer/style.scss b/template/src/components/footer/style.scss
similarity index 100%
rename from template/app/components/footer/style.scss
rename to template/src/components/footer/style.scss
diff --git a/template/app/components/footer/vg.png b/template/src/components/footer/vg.png
similarity index 100%
rename from template/app/components/footer/vg.png
rename to template/src/components/footer/vg.png
diff --git a/template/app/components/navbar/index.js b/template/src/components/navbar/index.js
similarity index 100%
rename from template/app/components/navbar/index.js
rename to template/src/components/navbar/index.js
diff --git a/template/app/components/navbar/style.scss b/template/src/components/navbar/style.scss
similarity index 100%
rename from template/app/components/navbar/style.scss
rename to template/src/components/navbar/style.scss
diff --git a/template/app/redux/clicker.js b/template/src/redux/clicker.js
similarity index 100%
rename from template/app/redux/clicker.js
rename to template/src/redux/clicker.js
diff --git a/template/app/redux/reducers.js b/template/src/redux/reducers.js
similarity index 100%
rename from template/app/redux/reducers.js
rename to template/src/redux/reducers.js
diff --git a/template/app/routes/index.js b/template/src/routes/index.js
similarity index 100%
rename from template/app/routes/index.js
rename to template/src/routes/index.js
diff --git a/template/app/screens/about/index.js b/template/src/screens/about/index.js
similarity index 100%
rename from template/app/screens/about/index.js
rename to template/src/screens/about/index.js
diff --git a/template/app/screens/about/style.scss b/template/src/screens/about/style.scss
similarity index 100%
rename from template/app/screens/about/style.scss
rename to template/src/screens/about/style.scss
diff --git a/template/app/screens/app/index.js b/template/src/screens/app/index.js
similarity index 100%
rename from template/app/screens/app/index.js
rename to template/src/screens/app/index.js
diff --git a/template/app/screens/app/style.scss b/template/src/screens/app/style.scss
similarity index 100%
rename from template/app/screens/app/style.scss
rename to template/src/screens/app/style.scss
diff --git a/template/app/screens/start/index.js b/template/src/screens/start/index.js
similarity index 96%
rename from template/app/screens/start/index.js
rename to template/src/screens/start/index.js
index 6d2134b..cc2ba4a 100644
--- a/template/app/screens/start/index.js
+++ b/template/src/screens/start/index.js
@@ -27,7 +27,7 @@ export default class Start extends Component {
           <h4>Routing</h4>
           <p>
             Your <a href="https://github.com/reactjs/react-router">React Router</a> entry is set up
-            at <strong>app/routes/index.js</strong>
+            at <strong>src/routes/index.js</strong>
           </p>
           <p>
             You can test the universal route changes with the included test routes using the navbar
@@ -37,7 +37,7 @@ export default class Start extends Component {
           <h4>Redux reducers</h4>
           <p>
             Your <a href="https://github.com/reactjs/redux">Redux</a> reducer exports are set up
-            at <strong>app/redux/reducers.js</strong>
+            at <strong>src/redux/reducers.js</strong>
           </p>
           <p>
             Reducers are pure functions that define new state in your app. We have included a
diff --git a/template/app/screens/start/style.scss b/template/src/screens/start/style.scss
similarity index 100%
rename from template/app/screens/start/style.scss
rename to template/src/screens/start/style.scss

From ecdb9a6d59d6f6d85cb7cf9d73520aca40c03d2b Mon Sep 17 00:00:00 2001
From: Tom Fagerland <tom@fagerland.org>
Date: Thu, 21 Apr 2016 14:33:22 +0200
Subject: [PATCH 2/2] fixes lanother reference to app

---
 template/src/screens/start/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/src/screens/start/index.js b/template/src/screens/start/index.js
index cc2ba4a..f8b9ea5 100644
--- a/template/src/screens/start/index.js
+++ b/template/src/screens/start/index.js
@@ -46,7 +46,7 @@ export default class Start extends Component {
 
           <h4>Get your Redux actions on</h4>
           <p>
-            We have added an example click action for you at <strong>app/redux/clicker.js</strong>
+            We have added an example click action for you at <strong>src/redux/clicker.js</strong>
           </p>
           <p>
             Dispatch a click action by hitting the button below!