From c07b5b7e3bd45853215cf649c349d051317237fc Mon Sep 17 00:00:00 2001
From: Alexander Teinum <ateinum@gmail.com>
Date: Wed, 3 Apr 2013 18:38:26 +0200
Subject: [PATCH] Restructure frontend by not separating .coffee and compiled
 .js files

---
 .gitignore                                     | 12 ++++++------
 frontend/{coffee => }/collections/tests.coffee |  0
 frontend/{js => }/deps/backbone.js             |  0
 frontend/index.html                            |  2 +-
 frontend/{coffee => }/main.coffee              |  2 +-
 frontend/{coffee => }/models/test-run.coffee   |  0
 frontend/{coffee => }/models/test.coffee       |  0
 frontend/{js => }/require.js                   |  0
 frontend/{coffee => }/router.coffee            |  0
 frontend/{coffee => }/test/test.coffee         |  0
 frontend/{coffee => }/views/home.coffee        |  0
 frontend/{coffee => }/views/iframe.coffee      |  0
 frontend/{coffee => }/views/navbar.coffee      |  0
 frontend/{coffee => }/views/result.coffee      |  0
 frontend/{coffee => }/views/test.coffee        |  0
 frontend/{coffee => }/views/views.coffee       |  0
 16 files changed, 8 insertions(+), 8 deletions(-)
 rename frontend/{coffee => }/collections/tests.coffee (100%)
 rename frontend/{js => }/deps/backbone.js (100%)
 rename frontend/{coffee => }/main.coffee (97%)
 rename frontend/{coffee => }/models/test-run.coffee (100%)
 rename frontend/{coffee => }/models/test.coffee (100%)
 rename frontend/{js => }/require.js (100%)
 rename frontend/{coffee => }/router.coffee (100%)
 rename frontend/{coffee => }/test/test.coffee (100%)
 rename frontend/{coffee => }/views/home.coffee (100%)
 rename frontend/{coffee => }/views/iframe.coffee (100%)
 rename frontend/{coffee => }/views/navbar.coffee (100%)
 rename frontend/{coffee => }/views/result.coffee (100%)
 rename frontend/{coffee => }/views/test.coffee (100%)
 rename frontend/{coffee => }/views/views.coffee (100%)

diff --git a/.gitignore b/.gitignore
index 58e0930..e683969 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
 backend/main.js
 backend/node_modules
-frontend/js/collections/*.js
-frontend/js/main.js
-frontend/js/models/*.js
-frontend/js/router.js
-frontend/js/test/*.js
-frontend/js/views/*.js
+frontend/collections/*.js
+frontend/main.js
+frontend/models/*.js
+frontend/router.js
+frontend/test/*.js
+frontend/views/*.js
 nohup.out
diff --git a/frontend/coffee/collections/tests.coffee b/frontend/collections/tests.coffee
similarity index 100%
rename from frontend/coffee/collections/tests.coffee
rename to frontend/collections/tests.coffee
diff --git a/frontend/js/deps/backbone.js b/frontend/deps/backbone.js
similarity index 100%
rename from frontend/js/deps/backbone.js
rename to frontend/deps/backbone.js
diff --git a/frontend/index.html b/frontend/index.html
index bed7516..b47545b 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -166,6 +166,6 @@ <h1>Results for <%= webPage %></h1>
       </p>
     </script>
 
-    <script data-main="js/main" type="text/javascript" charset="utf-8" src="js/require.js"></script>
+    <script data-main="main" type="text/javascript" charset="utf-8" src="require.js"></script>
   </body>
 </html>
diff --git a/frontend/coffee/main.coffee b/frontend/main.coffee
similarity index 97%
rename from frontend/coffee/main.coffee
rename to frontend/main.coffee
index 5aa03de..ff1c96b 100644
--- a/frontend/coffee/main.coffee
+++ b/frontend/main.coffee
@@ -1,5 +1,5 @@
 requirejs.config {
-  baseUrl: 'js'
+  baseUrl: '.'
   paths: {
     jquery:      'http://code.jquery.com/jquery-1.9.1.min'
     backbone:    'deps/backbone'
diff --git a/frontend/coffee/models/test-run.coffee b/frontend/models/test-run.coffee
similarity index 100%
rename from frontend/coffee/models/test-run.coffee
rename to frontend/models/test-run.coffee
diff --git a/frontend/coffee/models/test.coffee b/frontend/models/test.coffee
similarity index 100%
rename from frontend/coffee/models/test.coffee
rename to frontend/models/test.coffee
diff --git a/frontend/js/require.js b/frontend/require.js
similarity index 100%
rename from frontend/js/require.js
rename to frontend/require.js
diff --git a/frontend/coffee/router.coffee b/frontend/router.coffee
similarity index 100%
rename from frontend/coffee/router.coffee
rename to frontend/router.coffee
diff --git a/frontend/coffee/test/test.coffee b/frontend/test/test.coffee
similarity index 100%
rename from frontend/coffee/test/test.coffee
rename to frontend/test/test.coffee
diff --git a/frontend/coffee/views/home.coffee b/frontend/views/home.coffee
similarity index 100%
rename from frontend/coffee/views/home.coffee
rename to frontend/views/home.coffee
diff --git a/frontend/coffee/views/iframe.coffee b/frontend/views/iframe.coffee
similarity index 100%
rename from frontend/coffee/views/iframe.coffee
rename to frontend/views/iframe.coffee
diff --git a/frontend/coffee/views/navbar.coffee b/frontend/views/navbar.coffee
similarity index 100%
rename from frontend/coffee/views/navbar.coffee
rename to frontend/views/navbar.coffee
diff --git a/frontend/coffee/views/result.coffee b/frontend/views/result.coffee
similarity index 100%
rename from frontend/coffee/views/result.coffee
rename to frontend/views/result.coffee
diff --git a/frontend/coffee/views/test.coffee b/frontend/views/test.coffee
similarity index 100%
rename from frontend/coffee/views/test.coffee
rename to frontend/views/test.coffee
diff --git a/frontend/coffee/views/views.coffee b/frontend/views/views.coffee
similarity index 100%
rename from frontend/coffee/views/views.coffee
rename to frontend/views/views.coffee