Change directory structure

mitsuruog · Mar 10, 2013 · 8100309 · 8100309
1 parent 251b605
commit 8100309
Show file tree

Hide file tree

Showing 69 changed files with 142 additions and 142 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -3,19 +3,19 @@ module.exports = function(grunt) {
   grunt.initConfig({
 
     jshint: {
-      all: ['Gruntfile.js', 'app/js/**/*.js']
+      all: ['Gruntfile.js', 'js/**/*.js']
     },
     watch: {
       scripts: {
-        files: ['app/js/**/*.js'],
+        files: ['js/**/*.js'],
         tasks: ['jshint']
       },
       stylus: {
-        files: ['app/css/styl/*.styl'],
+        files: ['css/styl/*.styl'],
         tasks: ['stylus']
       },
       handlebars: {
-        files: ['app/hbs/**/*.hbs'],
+        files: ['hbs/**/*.hbs'],
         tasks: ['handlebars']
       }
     },
@@ -31,8 +31,8 @@ module.exports = function(grunt) {
         version: '0.1.0',
         url: 'https://github.com/mitsuruog/SPA-with-Backbone',
         options: {
-          paths: 'app/js',
-          outdir: 'app/docs'
+          paths: 'js',
+          outdir: 'docs'
         }
       }
     },
@@ -42,7 +42,7 @@ module.exports = function(grunt) {
       },
       compile: {
         files: {
-          'app/css/main.css': ['app/css/styl/*.styl']
+          'css/main.css': ['css/styl/*.styl']
         }
       }
     },
@@ -56,7 +56,7 @@ module.exports = function(grunt) {
           }
         },
         files: {
-          "app/js/template.js": "app/hbs/*.hbs"
+          "js/template.js": "hbs/*.hbs"
         }
       }
     }

diff --git a/app/hbs/history.hbs b/app/hbs/history.hbs
diff --git a/app/assets/css/bootstrap-2.3.0.css → assets/css/bootstrap-2.3.0.css b/app/assets/css/bootstrap-2.3.0.css → assets/css/bootstrap-2.3.0.css
diff --git a/app/assets/css/bootstrap-2.3.0.min.css → assets/css/bootstrap-2.3.0.min.css b/app/assets/css/bootstrap-2.3.0.min.css → assets/css/bootstrap-2.3.0.min.css
diff --git a/app/assets/css/bootstrap-narrow-0.0.1.css → assets/css/bootstrap-narrow-0.0.1.css b/app/assets/css/bootstrap-narrow-0.0.1.css → assets/css/bootstrap-narrow-0.0.1.css
diff --git a/...assets/css/bootstrap-narrow-0.0.1.min.css → assets/css/bootstrap-narrow-0.0.1.min.css b/...assets/css/bootstrap-narrow-0.0.1.min.css → assets/css/bootstrap-narrow-0.0.1.min.css
diff --git a/...assets/css/bootstrap-responsive-2.3.0.css → assets/css/bootstrap-responsive-2.3.0.css b/...assets/css/bootstrap-responsive-2.3.0.css → assets/css/bootstrap-responsive-2.3.0.css
diff --git a/...ts/css/bootstrap-responsive.-2.3.0min.css → ...ts/css/bootstrap-responsive.-2.3.0min.css b/...ts/css/bootstrap-responsive.-2.3.0min.css → ...ts/css/bootstrap-responsive.-2.3.0min.css
diff --git a/...assets/img/glyphicons-halflings-white.png → assets/img/glyphicons-halflings-white.png b/...assets/img/glyphicons-halflings-white.png → assets/img/glyphicons-halflings-white.png
diff --git a/app/assets/img/glyphicons-halflings.png → assets/img/glyphicons-halflings.png b/app/assets/img/glyphicons-halflings.png → assets/img/glyphicons-halflings.png
diff --git a/app/assets/js/backbone-0.9.10.js → assets/js/backbone-0.9.10.js b/app/assets/js/backbone-0.9.10.js → assets/js/backbone-0.9.10.js
diff --git a/app/assets/js/backbone-0.9.10.min.js → assets/js/backbone-0.9.10.min.js b/app/assets/js/backbone-0.9.10.min.js → assets/js/backbone-0.9.10.min.js
diff --git a/app/assets/js/backbone.localStorage-1.1.0.js → assets/js/backbone.localStorage-1.1.0.js b/app/assets/js/backbone.localStorage-1.1.0.js → assets/js/backbone.localStorage-1.1.0.js
diff --git a/...ets/js/backbone.localStorage-1.1.0.min.js → assets/js/backbone.localStorage-1.1.0.min.js b/...ets/js/backbone.localStorage-1.1.0.min.js → assets/js/backbone.localStorage-1.1.0.min.js
diff --git a/app/assets/js/bootstrap-2.3.0.js → assets/js/bootstrap-2.3.0.js b/app/assets/js/bootstrap-2.3.0.js → assets/js/bootstrap-2.3.0.js
diff --git a/app/assets/js/bootstrap-2.3.0.min.js → assets/js/bootstrap-2.3.0.min.js b/app/assets/js/bootstrap-2.3.0.min.js → assets/js/bootstrap-2.3.0.min.js
diff --git a/app/assets/js/handlebars-1.0.0-rc.3.js → assets/js/handlebars-1.0.0-rc.3.js b/app/assets/js/handlebars-1.0.0-rc.3.js → assets/js/handlebars-1.0.0-rc.3.js
diff --git a/app/assets/js/moment-2.0.0.js → assets/js/moment-2.0.0.js b/app/assets/js/moment-2.0.0.js → assets/js/moment-2.0.0.js
diff --git a/app/assets/js/moment.-2.0.0.min.js → assets/js/moment.-2.0.0.min.js b/app/assets/js/moment.-2.0.0.min.js → assets/js/moment.-2.0.0.min.js
diff --git a/app/assets/js/twitter-text.js → assets/js/twitter-text.js b/app/assets/js/twitter-text.js → assets/js/twitter-text.js
diff --git a/app/assets/js/underscore-1.4.4.js → assets/js/underscore-1.4.4.js b/app/assets/js/underscore-1.4.4.js → assets/js/underscore-1.4.4.js
diff --git a/app/assets/js/underscore-1.4.4.min.js → assets/js/underscore-1.4.4.min.js b/app/assets/js/underscore-1.4.4.min.js → assets/js/underscore-1.4.4.min.js
diff --git a/app/css/main.css → css/main.css b/app/css/main.css → css/main.css
diff --git a/app/css/styl/color_thema.styl → css/styl/color_thema.styl b/app/css/styl/color_thema.styl → css/styl/color_thema.styl
@@ -6,7 +6,7 @@ thema_blue_body()
 
 thema_blue_special_container()
  background linear-gradient(top, #292C3E, #13152A)
- 
+
 thema_blue_special_color()
  color #FFF
 

diff --git a/app/css/styl/main.styl → css/styl/main.styl b/app/css/styl/main.styl → css/styl/main.styl
diff --git a/app/docs/api.js → docs/api.js b/app/docs/api.js → docs/api.js
diff --git a/app/docs/assets/css/external-small.png → docs/assets/css/external-small.png b/app/docs/assets/css/external-small.png → docs/assets/css/external-small.png
diff --git a/app/docs/assets/css/logo.png → docs/assets/css/logo.png b/app/docs/assets/css/logo.png → docs/assets/css/logo.png
diff --git a/app/docs/assets/css/main.css → docs/assets/css/main.css b/app/docs/assets/css/main.css → docs/assets/css/main.css
diff --git a/app/docs/assets/favicon.png → docs/assets/favicon.png b/app/docs/assets/favicon.png → docs/assets/favicon.png
diff --git a/app/docs/assets/img/spinner.gif → docs/assets/img/spinner.gif b/app/docs/assets/img/spinner.gif → docs/assets/img/spinner.gif
diff --git a/app/docs/assets/index.html → docs/assets/index.html b/app/docs/assets/index.html → docs/assets/index.html
diff --git a/app/docs/assets/js/api-filter.js → docs/assets/js/api-filter.js b/app/docs/assets/js/api-filter.js → docs/assets/js/api-filter.js
diff --git a/app/docs/assets/js/api-list.js → docs/assets/js/api-list.js b/app/docs/assets/js/api-list.js → docs/assets/js/api-list.js
diff --git a/app/docs/assets/js/api-search.js → docs/assets/js/api-search.js b/app/docs/assets/js/api-search.js → docs/assets/js/api-search.js
diff --git a/app/docs/assets/js/apidocs.js → docs/assets/js/apidocs.js b/app/docs/assets/js/apidocs.js → docs/assets/js/apidocs.js
diff --git a/app/docs/assets/js/yui-prettify.js → docs/assets/js/yui-prettify.js b/app/docs/assets/js/yui-prettify.js → docs/assets/js/yui-prettify.js
diff --git a/app/docs/assets/vendor/prettify/CHANGES.html → docs/assets/vendor/prettify/CHANGES.html b/app/docs/assets/vendor/prettify/CHANGES.html → docs/assets/vendor/prettify/CHANGES.html
diff --git a/app/docs/assets/vendor/prettify/COPYING → docs/assets/vendor/prettify/COPYING b/app/docs/assets/vendor/prettify/COPYING → docs/assets/vendor/prettify/COPYING
diff --git a/app/docs/assets/vendor/prettify/README.html → docs/assets/vendor/prettify/README.html b/app/docs/assets/vendor/prettify/README.html → docs/assets/vendor/prettify/README.html
diff --git a/...s/assets/vendor/prettify/prettify-min.css → docs/assets/vendor/prettify/prettify-min.css b/...s/assets/vendor/prettify/prettify-min.css → docs/assets/vendor/prettify/prettify-min.css
diff --git a/...cs/assets/vendor/prettify/prettify-min.js → docs/assets/vendor/prettify/prettify-min.js b/...cs/assets/vendor/prettify/prettify-min.js → docs/assets/vendor/prettify/prettify-min.js
diff --git a/app/docs/classes/MyApp.Views.History.html → docs/classes/MyApp.Views.History.html b/app/docs/classes/MyApp.Views.History.html → docs/classes/MyApp.Views.History.html
diff --git a/app/docs/classes/index.html → docs/classes/index.html b/app/docs/classes/index.html → docs/classes/index.html
diff --git a/app/docs/data.json → docs/data.json b/app/docs/data.json → docs/data.json
diff --git a/app/docs/files/app_js_views_history.js.html → docs/files/app_js_views_history.js.html b/app/docs/files/app_js_views_history.js.html → docs/files/app_js_views_history.js.html
diff --git a/app/docs/files/index.html → docs/files/index.html b/app/docs/files/index.html → docs/files/index.html
diff --git a/app/docs/index.html → docs/index.html b/app/docs/index.html → docs/index.html
diff --git a/app/docs/modules/index.html → docs/modules/index.html b/app/docs/modules/index.html → docs/modules/index.html
diff --git a/hbs/history.hbs b/hbs/history.hbs
@@ -0,0 +1,11 @@
+{{#each history}}
+<ul class="history" data-id="{{this.id}}">
+  <li class="query">{{this.query}}</li>
+  <li class="service">({{this.service}})</li>
+  <li class="search-buttons">
+    <button class="btn btn-mini btn-danger btn-delete">
+      <i class="icon-remove-sign icon-white"></i>
+    </button>
+  </li>
+</ul>
+{{/each}}
diff --git a/app/hbs/hotpepper.hbs → hbs/hotpepper.hbs b/app/hbs/hotpepper.hbs → hbs/hotpepper.hbs
diff --git a/app/hbs/layout.hbs → hbs/layout.hbs b/app/hbs/layout.hbs → hbs/layout.hbs
diff --git a/app/hbs/search_bar.hbs → hbs/search_bar.hbs b/app/hbs/search_bar.hbs → hbs/search_bar.hbs
diff --git a/app/hbs/tabs.hbs → hbs/tabs.hbs b/app/hbs/tabs.hbs → hbs/tabs.hbs
diff --git a/app/hbs/twitter.hbs → hbs/twitter.hbs b/app/hbs/twitter.hbs → hbs/twitter.hbs
diff --git a/app/index.html → index.html b/app/index.html → index.html
@@ -1,51 +1,51 @@
-<!DOCTYPE html>
-<!--[if lt IE 7 ]> <html lang="ja" class="no-js ie6"> <![endif]-->
-<!--[if IE 7 ]>    <html lang="ja" class="no-js ie7"> <![endif]-->
-<!--[if IE 8 ]>    <html lang="ja" class="no-js ie8"> <![endif]-->
-<!--[if IE 9 ]>    <html lang="ja" class="no-js ie9"> <![endif]-->
-<!--[if (gt IE 9)|!(IE)]><!--> <html lang="ja" class="no-js"> <!--<![endif]-->
-<head>
-  <meta charset="utf-8" />
-  <meta name="description" content="" />
-  <meta name="author" content="" />
-  <title>How to build single page application with Backbone.js</title>
-
-  <link href="assets/css/bootstrap-2.3.0.css" rel="stylesheet" media="screen" />
-<!--  <link href="assets/css/bootstrap-responsive-2.3.0.css" rel="stylesheet" media="screen" />-->
-  <link href="assets/css/bootstrap-narrow-0.0.1.css" rel="stylesheet" media="screen" />
-  <link href="css/main.css" rel="stylesheet" media="screen" />
-
-</head>
-<body>
-
-  <!--app root  -->
-  <div id="app"></div>
-
-  <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-  <!--[if lt IE 9]>
-    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-  <![endif]-->
-  <script type="text/javascript" src="assets/js/bootstrap-2.3.0.js"></script>
-  <script type="text/javascript" src="assets/js/underscore-1.4.4.js"></script>
-  <script type="text/javascript" src="assets/js/backbone-0.9.10.js"></script>
-  <script type="text/javascript" src="assets/js/backbone.localStorage-1.1.0.js"></script>
-  <script type="text/javascript" src="assets/js/moment-2.0.0.js"></script>
-  <script type="text/javascript" src="assets/js/handlebars-1.0.0-rc.3.js"></script>
-  <script type="text/javascript" src="assets/js/twitter-text.js"></script>
-
-  <script type="text/javascript" src="js/namespace.js"></script>
-  <script type="text/javascript" src="js/template.js"></script>
-  <script type="text/javascript" src="js/models/twitter.js"></script>
-  <script type="text/javascript" src="js/models/hotpepper.js"></script>
-  <script type="text/javascript" src="js/collections/search_list.js"></script>
-  <script type="text/javascript" src="js/collections/twitter_list.js"></script>
-  <script type="text/javascript" src="js/collections/hotpepper_list.js"></script>
-  <script type="text/javascript" src="js/views/search_bar.js"></script>
-  <script type="text/javascript" src="js/views/tabs.js"></script>
-  <script type="text/javascript" src="js/views/search_results.js"></script>
-  <script type="text/javascript" src="js/views/history.js"></script>
-  <script type="text/javascript" src="js/views/footer.js"></script>
-  <script type="text/javascript" src="js/app.js"></script> 
-
-</body>
+<!DOCTYPE html>
+<!--[if lt IE 7 ]> <html lang="ja" class="no-js ie6"> <![endif]-->
+<!--[if IE 7 ]>    <html lang="ja" class="no-js ie7"> <![endif]-->
+<!--[if IE 8 ]>    <html lang="ja" class="no-js ie8"> <![endif]-->
+<!--[if IE 9 ]>    <html lang="ja" class="no-js ie9"> <![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--> <html lang="ja" class="no-js"> <!--<![endif]-->
+<head>
+  <meta charset="utf-8" />
+  <meta name="description" content="" />
+  <meta name="author" content="" />
+  <title>How to build single page application with Backbone.js</title>
+
+  <link href="assets/css/bootstrap-2.3.0.css" rel="stylesheet" media="screen" />
+<!--  <link href="assets/css/bootstrap-responsive-2.3.0.css" rel="stylesheet" media="screen" />-->
+  <link href="assets/css/bootstrap-narrow-0.0.1.css" rel="stylesheet" media="screen" />
+  <link href="css/main.css" rel="stylesheet" media="screen" />
+
+</head>
+<body>
+
+  <!--app root  -->
+  <div id="app"></div>
+
+  <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+  <!--[if lt IE 9]>
+    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+  <![endif]-->
+  <script type="text/javascript" src="assets/js/bootstrap-2.3.0.js"></script>
+  <script type="text/javascript" src="assets/js/underscore-1.4.4.js"></script>
+  <script type="text/javascript" src="assets/js/backbone-0.9.10.js"></script>
+  <script type="text/javascript" src="assets/js/backbone.localStorage-1.1.0.js"></script>
+  <script type="text/javascript" src="assets/js/moment-2.0.0.js"></script>
+  <script type="text/javascript" src="assets/js/handlebars-1.0.0-rc.3.js"></script>
+  <script type="text/javascript" src="assets/js/twitter-text.js"></script>
+
+  <script type="text/javascript" src="js/namespace.js"></script>
+  <script type="text/javascript" src="js/template.js"></script>
+  <script type="text/javascript" src="js/models/twitter.js"></script>
+  <script type="text/javascript" src="js/models/hotpepper.js"></script>
+  <script type="text/javascript" src="js/collections/search_list.js"></script>
+  <script type="text/javascript" src="js/collections/twitter_list.js"></script>
+  <script type="text/javascript" src="js/collections/hotpepper_list.js"></script>
+  <script type="text/javascript" src="js/views/search_bar.js"></script>
+  <script type="text/javascript" src="js/views/tabs.js"></script>
+  <script type="text/javascript" src="js/views/search_results.js"></script>
+  <script type="text/javascript" src="js/views/history.js"></script>
+  <script type="text/javascript" src="js/views/footer.js"></script>
+  <script type="text/javascript" src="js/app.js"></script> 
+
+</body>
 </html>
diff --git a/app/js/app.js → js/app.js b/app/js/app.js → js/app.js
diff --git a/app/js/collections/hotpepper_list.js → js/collections/hotpepper_list.js b/app/js/collections/hotpepper_list.js → js/collections/hotpepper_list.js
diff --git a/app/js/collections/search_list.js → js/collections/search_list.js b/app/js/collections/search_list.js → js/collections/search_list.js
diff --git a/app/js/collections/twitter_list.js → js/collections/twitter_list.js b/app/js/collections/twitter_list.js → js/collections/twitter_list.js
@@ -1,26 +1,26 @@
-MyApp.Collections.TwitterList = Backbone.Collection.extend({
-
-	url: 'http://search.twitter.com/search.json',
-
-	model: MyApp.Models.Twitter,
-
-	search: function (param) {
-
-		this.fetch({
-			data: {
-				q: encodeURIComponent(param.query),
-			},
-			dataType: 'jsonp'
-		});
-
-	},
-
-	parse: function (response, options) {
-
-		this.response = response;
-
-		return response.results;
-
-	}
-
+MyApp.Collections.TwitterList = Backbone.Collection.extend({
+
+	url: 'http://search.twitter.com/search.json',
+
+	model: MyApp.Models.Twitter,
+
+	search: function (param) {
+
+		this.fetch({
+			data: {
+				q: encodeURIComponent(param.query),
+			},
+			dataType: 'jsonp'
+		});
+
+	},
+
+	parse: function (response, options) {
+
+		this.response = response;
+
+		return response.results;
+
+	}
+
 });
diff --git a/app/js/models/hotpepper.js → js/models/hotpepper.js b/app/js/models/hotpepper.js → js/models/hotpepper.js
diff --git a/app/js/models/twitter.js → js/models/twitter.js b/app/js/models/twitter.js → js/models/twitter.js
diff --git a/app/js/namespace.js → js/namespace.js b/app/js/namespace.js → js/namespace.js
diff --git a/app/js/template.js → js/template.js b/app/js/template.js → js/template.js
@@ -11,11 +11,11 @@ function program1(depth0,data) {
   var buffer = "", stack1;
   buffer += "\r\n<ul class=\"history\" data-id=\""
     + escapeExpression(((stack1 = depth0.id),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\"> \r\n  <li class=\"query\">"
+    + "\">\r\n  <li class=\"query\">"
     + escapeExpression(((stack1 = depth0.query),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "</li> \r\n  <li class=\"service\">("
+    + "</li>\r\n  <li class=\"service\">("
     + escapeExpression(((stack1 = depth0.service),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + ")</li> \r\n  <li class=\"search-buttons\"> \r\n    <button class=\"btn btn-mini btn-danger btn-delete\"> \r\n      <i class=\"icon-remove-sign icon-white\"></i> \r\n    </button> \r\n  </li> \r\n</ul> \r\n";
+    + ")</li>\r\n  <li class=\"search-buttons\">\r\n    <button class=\"btn btn-mini btn-danger btn-delete\">\r\n      <i class=\"icon-remove-sign icon-white\"></i>\r\n    </button>\r\n  </li>\r\n</ul>\r\n";
   return buffer;
   }
 

diff --git a/app/js/views/footer.js → js/views/footer.js b/app/js/views/footer.js → js/views/footer.js
@@ -1,14 +1,14 @@
-MyApp.Views.Footer = Backbone.View.extend({
-
-  tmpl: _.template(
-    '<div class="navbar navbar-inverse navbar-fixed-bottom">' +
-    '  <div class="navbar-inner">' +
-    '    <div class="container">Copyright (C) 2013 <a href="https://twitter.com/mitsuruog" target="_blank">@mitsuruog</a> All Rights Reserved.</div>' +
-    '  </div>' +
-    '</div>'  ),
-
-  initialize: function() {
-    this.$el.html(this.tmpl());
-  }
-
+MyApp.Views.Footer = Backbone.View.extend({
+
+  tmpl: _.template(
+    '<div class="navbar navbar-inverse navbar-fixed-bottom">' +
+    '  <div class="navbar-inner">' +
+    '    <div class="container">Copyright (C) 2013 <a href="https://twitter.com/mitsuruog" target="_blank">@mitsuruog</a> All Rights Reserved.</div>' +
+    '  </div>' +
+    '</div>'  ),
+
+  initialize: function() {
+    this.$el.html(this.tmpl());
+  }
+
 });
diff --git a/app/js/views/history.js → js/views/history.js b/app/js/views/history.js → js/views/history.js
diff --git a/app/js/views/search_bar.js → js/views/search_bar.js b/app/js/views/search_bar.js → js/views/search_bar.js
diff --git a/app/js/views/search_results.js → js/views/search_results.js b/app/js/views/search_results.js → js/views/search_results.js
@@ -1,32 +1,32 @@
-MyApp.Views.SearchResults = Backbone.View.extend({
-
-	initialize: function (options) {
-
-		_.bindAll(this);
-
-		this.collections = options.collections;
-		this.tmpl = options.tmpl;
-		this.service = options.service;
-
-		MyApp.Mediator.on('search:add:' + this.service + ' search:history:' + this.service, this.search);
-
-		this.collections.on('reset', this.render);
-	},
-
-	search: function (search) {
-
-		this.collections.search(search);
-
-	},
-
-	render: function () {
-
-		this.$el.html(this.tmpl({
-			models: this.collections.toJSON()
-		}));
-
-		MyApp.Mediator.trigger('select:tab', this.$el.data('service'));
-
-	}
-
+MyApp.Views.SearchResults = Backbone.View.extend({
+
+	initialize: function (options) {
+
+		_.bindAll(this);
+
+		this.collections = options.collections;
+		this.tmpl = options.tmpl;
+		this.service = options.service;
+
+		MyApp.Mediator.on('search:add:' + this.service + ' search:history:' + this.service, this.search);
+
+		this.collections.on('reset', this.render);
+	},
+
+	search: function (search) {
+
+		this.collections.search(search);
+
+	},
+
+	render: function () {
+
+		this.$el.html(this.tmpl({
+			models: this.collections.toJSON()
+		}));
+
+		MyApp.Mediator.trigger('select:tab', this.$el.data('service'));
+
+	}
+
 });
diff --git a/app/js/views/tabs.js → js/views/tabs.js b/app/js/views/tabs.js → js/views/tabs.js