I have OCD. *go wash his hands, again*

fasterthanlime · Nov 8, 2011 · e20766f · e20766f
1 parent 78a4013
commit e20766f
Show file tree

Hide file tree

Showing 78 changed files with 16 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 *.swp
 .DS_Store
-javascripts/*.js
+frontend/js/*.js
 backend/*.js
 data/
diff --git a/backend/populate.coffee b/backend/populate.coffee
@@ -33,7 +33,7 @@ User.remove {}, ->
     email: "bigsylvain@gmail.com"
     joindate: Date.now()
     posts: 0
-    avatar: "/stylesheets/avatar1.png"
+    avatar: "/css/avatar1.png"
     slogan: "Pardieu, c'est un inculte!"
     sha1: sha1("sylvain")
   }).save()
@@ -44,7 +44,7 @@ User.remove {}, ->
     email: "amos@official.fm"
     joindate: Date.now()
     posts: 0
-    avatar: "/stylesheets/avatar2.png"
+    avatar: "/css/avatar2.png"
     slogan: "Montjoie! Saint-Denis!"
     sha1: sha1("bluesky")
   }).save()

diff --git a/backend/server.coffee b/backend/server.coffee
@@ -48,7 +48,7 @@ app.register('.html', {
   compile: (str, options) -> (locals) -> return str
 });
 
-app.use(express.static(__dirname + '/../'))
+app.use(express.static(__dirname + '/../frontend/'))
 app.use(express.bodyParser());
 
 app.get '/', (req, res) ->

diff --git a/stylesheets/agora.css → frontend/css/agora.css b/stylesheets/agora.css → frontend/css/agora.css
diff --git a/stylesheets/avatar1.png → frontend/css/avatar1.png b/stylesheets/avatar1.png → frontend/css/avatar1.png
diff --git a/stylesheets/avatar2.png → frontend/css/avatar2.png b/stylesheets/avatar2.png → frontend/css/avatar2.png
diff --git a/stylesheets/buttons.css → frontend/css/buttons.css b/stylesheets/buttons.css → frontend/css/buttons.css
diff --git a/stylesheets/logo-nmag.png → frontend/css/logo-nmag.png b/stylesheets/logo-nmag.png → frontend/css/logo-nmag.png
diff --git a/javascripts/Cakefile → frontend/js/Cakefile b/javascripts/Cakefile → frontend/js/Cakefile
diff --git a/javascripts/agora.coffee → frontend/js/agora.coffee b/javascripts/agora.coffee → frontend/js/agora.coffee
diff --git a/javascripts/libs/jquery-1.7.min.js → frontend/js/libs/jquery-1.7.min.js b/javascripts/libs/jquery-1.7.min.js → frontend/js/libs/jquery-1.7.min.js
diff --git a/javascripts/libs/keymaster.min.js → frontend/js/libs/keymaster.min.js b/javascripts/libs/keymaster.min.js → frontend/js/libs/keymaster.min.js
diff --git a/...ammy/min/plugins/sammy.cache-0.6.2.min.js → ...ammy/min/plugins/sammy.cache-0.6.2.min.js b/...ammy/min/plugins/sammy.cache-0.6.2.min.js → ...ammy/min/plugins/sammy.cache-0.6.2.min.js
diff --git a/...mmy/min/plugins/sammy.cache-latest.min.js → ...mmy/min/plugins/sammy.cache-latest.min.js b/...mmy/min/plugins/sammy.cache-latest.min.js → ...mmy/min/plugins/sammy.cache-latest.min.js
diff --git a/...ns/sammy.data_location_proxy-0.6.2.min.js → ...ns/sammy.data_location_proxy-0.6.2.min.js b/...ns/sammy.data_location_proxy-0.6.2.min.js → ...ns/sammy.data_location_proxy-0.6.2.min.js
diff --git a/...s/sammy.data_location_proxy-latest.min.js → ...s/sammy.data_location_proxy-latest.min.js b/...s/sammy.data_location_proxy-latest.min.js → ...s/sammy.data_location_proxy-latest.min.js
diff --git a/.../sammy/min/plugins/sammy.ejs-0.6.2.min.js → .../sammy/min/plugins/sammy.ejs-0.6.2.min.js b/.../sammy/min/plugins/sammy.ejs-0.6.2.min.js → .../sammy/min/plugins/sammy.ejs-0.6.2.min.js
diff --git a/...sammy/min/plugins/sammy.ejs-latest.min.js → ...sammy/min/plugins/sammy.ejs-latest.min.js b/...sammy/min/plugins/sammy.ejs-latest.min.js → ...sammy/min/plugins/sammy.ejs-latest.min.js
diff --git a/...sammy/min/plugins/sammy.form-0.6.2.min.js → ...sammy/min/plugins/sammy.form-0.6.2.min.js b/...sammy/min/plugins/sammy.form-0.6.2.min.js → ...sammy/min/plugins/sammy.form-0.6.2.min.js
diff --git a/...ammy/min/plugins/sammy.form-latest.min.js → ...ammy/min/plugins/sammy.form-latest.min.js b/...ammy/min/plugins/sammy.form-latest.min.js → ...ammy/min/plugins/sammy.form-latest.min.js
diff --git a/...lugins/sammy.googleanalytics-0.6.2.min.js → ...lugins/sammy.googleanalytics-0.6.2.min.js b/...lugins/sammy.googleanalytics-0.6.2.min.js → ...lugins/sammy.googleanalytics-0.6.2.min.js
diff --git a/...ugins/sammy.googleanalytics-latest.min.js → ...ugins/sammy.googleanalytics-latest.min.js b/...ugins/sammy.googleanalytics-latest.min.js → ...ugins/sammy.googleanalytics-latest.min.js
diff --git a/...sammy/min/plugins/sammy.haml-0.6.2.min.js → ...sammy/min/plugins/sammy.haml-0.6.2.min.js b/...sammy/min/plugins/sammy.haml-0.6.2.min.js → ...sammy/min/plugins/sammy.haml-0.6.2.min.js
diff --git a/...ammy/min/plugins/sammy.haml-latest.min.js → ...ammy/min/plugins/sammy.haml-latest.min.js b/...ammy/min/plugins/sammy.haml-latest.min.js → ...ammy/min/plugins/sammy.haml-latest.min.js
diff --git a/...min/plugins/sammy.handlebars-0.6.2.min.js → ...min/plugins/sammy.handlebars-0.6.2.min.js b/...min/plugins/sammy.handlebars-0.6.2.min.js → ...min/plugins/sammy.handlebars-0.6.2.min.js
diff --git a/...in/plugins/sammy.handlebars-latest.min.js → ...in/plugins/sammy.handlebars-latest.min.js b/...in/plugins/sammy.handlebars-latest.min.js → ...in/plugins/sammy.handlebars-latest.min.js
diff --git a/...sammy/min/plugins/sammy.json-0.6.2.min.js → ...sammy/min/plugins/sammy.json-0.6.2.min.js b/...sammy/min/plugins/sammy.json-0.6.2.min.js → ...sammy/min/plugins/sammy.json-0.6.2.min.js
diff --git a/...ammy/min/plugins/sammy.json-latest.min.js → ...ammy/min/plugins/sammy.json-latest.min.js b/...ammy/min/plugins/sammy.json-latest.min.js → ...ammy/min/plugins/sammy.json-latest.min.js
diff --git a/...sammy/min/plugins/sammy.meld-0.6.2.min.js → ...sammy/min/plugins/sammy.meld-0.6.2.min.js b/...sammy/min/plugins/sammy.meld-0.6.2.min.js → ...sammy/min/plugins/sammy.meld-0.6.2.min.js
diff --git a/...ammy/min/plugins/sammy.meld-latest.min.js → ...ammy/min/plugins/sammy.meld-latest.min.js b/...ammy/min/plugins/sammy.meld-latest.min.js → ...ammy/min/plugins/sammy.meld-latest.min.js
diff --git a/...y/min/plugins/sammy.mustache-0.6.2.min.js → ...y/min/plugins/sammy.mustache-0.6.2.min.js b/...y/min/plugins/sammy.mustache-0.6.2.min.js → ...y/min/plugins/sammy.mustache-0.6.2.min.js
diff --git a/.../min/plugins/sammy.mustache-latest.min.js → .../min/plugins/sammy.mustache-latest.min.js b/.../min/plugins/sammy.mustache-latest.min.js → .../min/plugins/sammy.mustache-latest.min.js
diff --git a/.../plugins/sammy.nested_params-0.6.2.min.js → .../plugins/sammy.nested_params-0.6.2.min.js b/.../plugins/sammy.nested_params-0.6.2.min.js → .../plugins/sammy.nested_params-0.6.2.min.js
diff --git a/...plugins/sammy.nested_params-latest.min.js → ...plugins/sammy.nested_params-latest.min.js b/...plugins/sammy.nested_params-latest.min.js → ...plugins/sammy.nested_params-latest.min.js
diff --git a/...ns/sammy.path_location_proxy-0.6.2.min.js → ...ns/sammy.path_location_proxy-0.6.2.min.js b/...ns/sammy.path_location_proxy-0.6.2.min.js → ...ns/sammy.path_location_proxy-0.6.2.min.js
diff --git a/...s/sammy.path_location_proxy-latest.min.js → ...s/sammy.path_location_proxy-latest.min.js b/...s/sammy.path_location_proxy-latest.min.js → ...s/sammy.path_location_proxy-latest.min.js
diff --git a/...sammy/min/plugins/sammy.pure-0.6.2.min.js → ...sammy/min/plugins/sammy.pure-0.6.2.min.js b/...sammy/min/plugins/sammy.pure-0.6.2.min.js → ...sammy/min/plugins/sammy.pure-0.6.2.min.js
diff --git a/...ammy/min/plugins/sammy.pure-latest.min.js → ...ammy/min/plugins/sammy.pure-latest.min.js b/...ammy/min/plugins/sammy.pure-latest.min.js → ...ammy/min/plugins/sammy.pure-latest.min.js
diff --git a/...my/min/plugins/sammy.storage-0.6.2.min.js → ...my/min/plugins/sammy.storage-0.6.2.min.js b/...my/min/plugins/sammy.storage-0.6.2.min.js → ...my/min/plugins/sammy.storage-0.6.2.min.js
diff --git a/...y/min/plugins/sammy.storage-latest.min.js → ...y/min/plugins/sammy.storage-latest.min.js b/...y/min/plugins/sammy.storage-latest.min.js → ...y/min/plugins/sammy.storage-latest.min.js
diff --git a/...y/min/plugins/sammy.template-0.6.2.min.js → ...y/min/plugins/sammy.template-0.6.2.min.js b/...y/min/plugins/sammy.template-0.6.2.min.js → ...y/min/plugins/sammy.template-0.6.2.min.js
diff --git a/.../min/plugins/sammy.template-latest.min.js → .../min/plugins/sammy.template-latest.min.js b/.../min/plugins/sammy.template-latest.min.js → .../min/plugins/sammy.template-latest.min.js
diff --git a/...ammy/min/plugins/sammy.title-0.6.2.min.js → ...ammy/min/plugins/sammy.title-0.6.2.min.js b/...ammy/min/plugins/sammy.title-0.6.2.min.js → ...ammy/min/plugins/sammy.title-0.6.2.min.js
diff --git a/...mmy/min/plugins/sammy.title-latest.min.js → ...mmy/min/plugins/sammy.title-latest.min.js b/...mmy/min/plugins/sammy.title-latest.min.js → ...mmy/min/plugins/sammy.title-latest.min.js
diff --git a/...sammy/min/plugins/sammy.tmpl-0.6.2.min.js → ...sammy/min/plugins/sammy.tmpl-0.6.2.min.js b/...sammy/min/plugins/sammy.tmpl-0.6.2.min.js → ...sammy/min/plugins/sammy.tmpl-0.6.2.min.js
diff --git a/...ammy/min/plugins/sammy.tmpl-latest.min.js → ...ammy/min/plugins/sammy.tmpl-latest.min.js b/...ammy/min/plugins/sammy.tmpl-latest.min.js → ...ammy/min/plugins/sammy.tmpl-latest.min.js
diff --git a/...scripts/libs/sammy/min/sammy-0.6.2.min.js → ...tend/js/libs/sammy/min/sammy-0.6.2.min.js b/...scripts/libs/sammy/min/sammy-0.6.2.min.js → ...tend/js/libs/sammy/min/sammy-0.6.2.min.js
diff --git a/...cripts/libs/sammy/min/sammy-latest.min.js → ...end/js/libs/sammy/min/sammy-latest.min.js b/...cripts/libs/sammy/min/sammy-latest.min.js → ...end/js/libs/sammy/min/sammy-latest.min.js
diff --git a/...scripts/libs/sammy/plugins/sammy.cache.js → ...tend/js/libs/sammy/plugins/sammy.cache.js b/...scripts/libs/sammy/plugins/sammy.cache.js → ...tend/js/libs/sammy/plugins/sammy.cache.js
diff --git a/...ammy/plugins/sammy.data_location_proxy.js → ...ammy/plugins/sammy.data_location_proxy.js b/...ammy/plugins/sammy.data_location_proxy.js → ...ammy/plugins/sammy.data_location_proxy.js
diff --git a/javascripts/libs/sammy/plugins/sammy.ejs.js → frontend/js/libs/sammy/plugins/sammy.ejs.js b/javascripts/libs/sammy/plugins/sammy.ejs.js → frontend/js/libs/sammy/plugins/sammy.ejs.js
diff --git a/javascripts/libs/sammy/plugins/sammy.form.js → frontend/js/libs/sammy/plugins/sammy.form.js b/javascripts/libs/sammy/plugins/sammy.form.js → frontend/js/libs/sammy/plugins/sammy.form.js
diff --git a/...bs/sammy/plugins/sammy.googleanalytics.js → ...bs/sammy/plugins/sammy.googleanalytics.js b/...bs/sammy/plugins/sammy.googleanalytics.js → ...bs/sammy/plugins/sammy.googleanalytics.js
diff --git a/javascripts/libs/sammy/plugins/sammy.haml.js → frontend/js/libs/sammy/plugins/sammy.haml.js b/javascripts/libs/sammy/plugins/sammy.haml.js → frontend/js/libs/sammy/plugins/sammy.haml.js
diff --git a/...ts/libs/sammy/plugins/sammy.handlebars.js → ...js/libs/sammy/plugins/sammy.handlebars.js b/...ts/libs/sammy/plugins/sammy.handlebars.js → ...js/libs/sammy/plugins/sammy.handlebars.js
diff --git a/javascripts/libs/sammy/plugins/sammy.json.js → frontend/js/libs/sammy/plugins/sammy.json.js b/javascripts/libs/sammy/plugins/sammy.json.js → frontend/js/libs/sammy/plugins/sammy.json.js
diff --git a/javascripts/libs/sammy/plugins/sammy.meld.js → frontend/js/libs/sammy/plugins/sammy.meld.js b/javascripts/libs/sammy/plugins/sammy.meld.js → frontend/js/libs/sammy/plugins/sammy.meld.js
diff --git a/...ipts/libs/sammy/plugins/sammy.mustache.js → ...d/js/libs/sammy/plugins/sammy.mustache.js b/...ipts/libs/sammy/plugins/sammy.mustache.js → ...d/js/libs/sammy/plugins/sammy.mustache.js
diff --git a/...libs/sammy/plugins/sammy.nested_params.js → ...libs/sammy/plugins/sammy.nested_params.js b/...libs/sammy/plugins/sammy.nested_params.js → ...libs/sammy/plugins/sammy.nested_params.js
diff --git a/...ammy/plugins/sammy.path_location_proxy.js → ...ammy/plugins/sammy.path_location_proxy.js b/...ammy/plugins/sammy.path_location_proxy.js → ...ammy/plugins/sammy.path_location_proxy.js
diff --git a/javascripts/libs/sammy/plugins/sammy.pure.js → frontend/js/libs/sammy/plugins/sammy.pure.js b/javascripts/libs/sammy/plugins/sammy.pure.js → frontend/js/libs/sammy/plugins/sammy.pure.js
diff --git a/...ripts/libs/sammy/plugins/sammy.storage.js → ...nd/js/libs/sammy/plugins/sammy.storage.js b/...ripts/libs/sammy/plugins/sammy.storage.js → ...nd/js/libs/sammy/plugins/sammy.storage.js
diff --git a/...ipts/libs/sammy/plugins/sammy.template.js → ...d/js/libs/sammy/plugins/sammy.template.js b/...ipts/libs/sammy/plugins/sammy.template.js → ...d/js/libs/sammy/plugins/sammy.template.js
diff --git a/...scripts/libs/sammy/plugins/sammy.title.js → ...tend/js/libs/sammy/plugins/sammy.title.js b/...scripts/libs/sammy/plugins/sammy.title.js → ...tend/js/libs/sammy/plugins/sammy.title.js
diff --git a/javascripts/libs/sammy/plugins/sammy.tmpl.js → frontend/js/libs/sammy/plugins/sammy.tmpl.js b/javascripts/libs/sammy/plugins/sammy.tmpl.js → frontend/js/libs/sammy/plugins/sammy.tmpl.js
diff --git a/javascripts/libs/sammy/sammy.js → frontend/js/libs/sammy/sammy.js b/javascripts/libs/sammy/sammy.js → frontend/js/libs/sammy/sammy.js
diff --git a/javascripts/libs/showdown.js → frontend/js/libs/showdown.js b/javascripts/libs/showdown.js → frontend/js/libs/showdown.js
diff --git a/templates/category-summary.template → frontend/templates/category-summary.template b/templates/category-summary.template → frontend/templates/category-summary.template
diff --git a/templates/category.template → frontend/templates/category.template b/templates/category.template → frontend/templates/category.template
diff --git a/templates/home.template → frontend/templates/home.template b/templates/home.template → frontend/templates/home.template
diff --git a/templates/login.template → frontend/templates/login.template b/templates/login.template → frontend/templates/login.template
diff --git a/templates/new-thread.template → frontend/templates/new-thread.template b/templates/new-thread.template → frontend/templates/new-thread.template
diff --git a/templates/post-reply.template → frontend/templates/post-reply.template b/templates/post-reply.template → frontend/templates/post-reply.template
diff --git a/templates/post.template → frontend/templates/post.template b/templates/post.template → frontend/templates/post.template
diff --git a/templates/profile.template → frontend/templates/profile.template b/templates/profile.template → frontend/templates/profile.template
diff --git a/templates/thread-summary.template → frontend/templates/thread-summary.template b/templates/thread-summary.template → frontend/templates/thread-summary.template
diff --git a/templates/thread.template → frontend/templates/thread.template b/templates/thread.template → frontend/templates/thread.template
diff --git a/views/index.html b/views/index.html
@@ -3,14 +3,14 @@
   <head>
     <meta charset="utf-8"/>
     <title>Agora</title>
-    <link rel="stylesheet" href="stylesheets/agora.css"/>
-    <link rel="stylesheet" href="stylesheets/buttons.css"/>
+    <link rel="stylesheet" href="css/agora.css"/>
+    <link rel="stylesheet" href="css/buttons.css"/>
   </head>
   <body>
     <div id="container">
       <div id="sidebar">
         <h1>
-          <a href="#/"><img alt="Agora" src="stylesheets/logo-nmag.png" /></a>
+          <a href="#/"><img alt="Agora" src="css/logo-nmag.png" /></a>
         </h1>
         <div class="user-info">
           <a href="#/u">
@@ -22,14 +22,14 @@ <h1>
       </div>
       <div id="main"></div>
     </div>
-    <script src="javascripts/libs/jquery-1.7.min.js"></script>
-    <script src="javascripts/libs/showdown.js"></script>
-    <script src="javascripts/libs/keymaster.min.js"></script>
-    <script src="javascripts/libs/sammy/sammy.js"></script>
-    <script src="javascripts/libs/sammy/plugins/sammy.template.js"></script>
-    <script src="javascripts/libs/sammy/plugins/sammy.mustache.js"></script>
-    <script src="javascripts/libs/sammy/plugins/sammy.json.js"></script>
-    <script src="javascripts/libs/sammy/plugins/sammy.storage.js"></script>
-    <script src="javascripts/agora.js"></script>
+    <script src="js/libs/jquery-1.7.min.js"></script>
+    <script src="js/libs/showdown.js"></script>
+    <script src="js/libs/keymaster.min.js"></script>
+    <script src="js/libs/sammy/sammy.js"></script>
+    <script src="js/libs/sammy/plugins/sammy.template.js"></script>
+    <script src="js/libs/sammy/plugins/sammy.mustache.js"></script>
+    <script src="js/libs/sammy/plugins/sammy.json.js"></script>
+    <script src="js/libs/sammy/plugins/sammy.storage.js"></script>
+    <script src="js/agora.js"></script>
   </body>
 </html>