chore(project-structure): introducing hierarchical folders structure …

…(scripts, templates) reflecting feature/route
vucalur · Jan 8, 2014 · 0c683b6 · 0c683b6
1 parent 6f637af
commit 0c683b6
Show file tree

Hide file tree

Showing 24 changed files with 70 additions and 61 deletions.
diff --git a/django_wibses/django_wibses/wibses/yo/Gruntfile.js b/django_wibses/django_wibses/wibses/yo/Gruntfile.js
@@ -39,11 +39,11 @@ module.exports = function (grunt) {
       // Watches files for changes and runs tasks based on the changed files
       watch: {
          coffee: {
-            files: ['<%= yeoman.app %>/scripts/{,*/}*.{coffee,litcoffee,coffee.md}'],
+            files: ['<%= yeoman.app %>/scripts/**/*.{coffee,litcoffee,coffee.md}'],
             tasks: ['newer:coffee:dist']
          },
          coffeeTest: {
-            files: ['test/spec/{,*/}*.{coffee,litcoffee,coffee.md}'],
+            files: ['test/spec/**/*.{coffee,litcoffee,coffee.md}'],
             tasks: ['newer:coffee:test', 'karma']
          },
          compass: {
@@ -62,7 +62,7 @@ module.exports = function (grunt) {
                livereload: '<%= connect.options.livereload %>'
             },
             files: [
-               '<%= yeoman.app %>/{,*/}*.html',
+               '<%= yeoman.app %>/**/*.html',
                '.tmp/styles/{,*/}*.css',
                '<%= yeoman.app %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}'
             ]
@@ -178,7 +178,7 @@ module.exports = function (grunt) {
                {
                   expand: true,
                   cwd: '<%= yeoman.app %>/scripts',
-                  src: '{,*/}*.coffee',
+                  src: '**/*.coffee',
                   dest: '.tmp/scripts',
                   ext: '.js'
                }
@@ -189,7 +189,7 @@ module.exports = function (grunt) {
                {
                   expand: true,
                   cwd: 'test/spec',
-                  src: '{,*/}*.coffee',
+                  src: '**/*.coffee',
                   dest: '.tmp/spec',
                   ext: '.js'
                }
@@ -206,11 +206,11 @@ module.exports = function (grunt) {
             generatedImagesDir: '.tmp/images/generated',
             imagesDir: '<%= yeoman.app %>/images',
             javascriptsDir: '<%= yeoman.app %>/scripts',
-            fontsDir: '<%= yeoman.app %>/styles/fonts',  /*Do not set to '<%= yeoman.app %>/fonts' since it'll rename files, but leave out references in generated css*/
+            fontsDir: '<%= yeoman.app %>/styles/fonts', /*Do not set to '<%= yeoman.app %>/fonts' since it'll rename files, but leave out references in generated css*/
             importPath: '<%= yeoman.app %>/bower_components',
             httpImagesPath: '/images',
             httpGeneratedImagesPath: '/images/generated',
-            httpFontsPath: '/styles/fonts',  /*Do not set to '/fonts' since it'll rename files, but leave out references in generated css*/
+            httpFontsPath: '/styles/fonts', /*Do not set to '/fonts' since it'll rename files, but leave out references in generated css*/
             relativeAssets: false,
             assetCacheBuster: false
          },
@@ -239,7 +239,7 @@ module.exports = function (grunt) {
          dist: {
             files: {
                src: [
-                  '<%= yeoman.dist %>/scripts/{,*/}*.js',
+                  '<%= yeoman.dist %>/scripts/**/*.js',
                   '<%= yeoman.dist %>/styles/{,*/}*.css',
                   '<%= yeoman.dist %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}',
                   '<%= yeoman.dist %>/styles/fonts/*'
@@ -260,7 +260,7 @@ module.exports = function (grunt) {
 
       // Performs rewrites based on rev and the useminPrepare configuration
       usemin: {
-         html: ['<%= yeoman.dist %>/{,*/}*.html'],
+         html: ['<%= yeoman.dist %>/**/*.html'],
          css: ['<%= yeoman.dist %>/styles/{,*/}*.css'],
          options: {
             assetsDirs: ['<%= yeoman.dist %>']

diff --git a/django_wibses/django_wibses/wibses/yo/app/index.html b/django_wibses/django_wibses/wibses/yo/app/index.html
@@ -94,16 +94,17 @@
 
     		<!-- endbower -->
         <script src="scripts/app.js"></script>
-        <script src="scripts/services/scriptService.js"></script>
-        <script src="scripts/services/defaultScriptService.js"></script>
-        <script src="scripts/services/forkService.js"></script>
-        <script src="scripts/services/tokenProviderService.js"></script>
-        <script src="scripts/services/modalService.js"></script>
-        <script src="scripts/controllers/script.js"></script>
-        <script src="scripts/controllers/slot.js"></script>
-        <script src="scripts/controllers/modal.js"></script>
-        <script src="scripts/directives/parameters.js"></script>
-        <script src="scripts/filters/filters.js"></script>
+        <script src="scripts/COMMON/filters.js"></script>
+        <script src="scripts/COMMON/services/scriptService.js"></script>
+        <script src="scripts/COMMON/services/defaultScriptService.js"></script>
+        <script src="scripts/COMMON/services/forkService.js"></script>
+        <script src="scripts/edit/MODULES.js"></script>
+        <script src="scripts/edit/directives/parameters.js"></script>
+        <script src="scripts/edit/controllers/script.js"></script>
+        <script src="scripts/edit/controllers/slot.js"></script>
+        <script src="scripts/edit/controllers/modal.js"></script>
+        <script src="scripts/edit/services/tokenProviderService.js"></script>
+        <script src="scripts/edit/services/modalService.js"></script>
         <!-- endbuild -->
         <!--TODO vucalur: use Bower resources for ui.grid-->
         <script type="text/javascript" src="http://angular-ui.github.com/ng-grid/lib/ng-grid.debug.js"></script>

diff --git a/...ses/yo/app/scripts/filters/filters.coffee → ...bses/yo/app/scripts/COMMON/filters.coffee b/...ses/yo/app/scripts/filters/filters.coffee → ...bses/yo/app/scripts/COMMON/filters.coffee
diff --git a/...ipts/services/defaultScriptService.coffee → ...MMON/services/defaultScriptService.coffee b/...ipts/services/defaultScriptService.coffee → ...MMON/services/defaultScriptService.coffee
diff --git a/...o/app/scripts/services/forkService.coffee → ...cripts/COMMON/services/forkService.coffee b/...o/app/scripts/services/forkService.coffee → ...cripts/COMMON/services/forkService.coffee
diff --git a/...app/scripts/services/scriptService.coffee → ...ipts/COMMON/services/scriptService.coffee b/...app/scripts/services/scriptService.coffee → ...ipts/COMMON/services/scriptService.coffee
diff --git a/django_wibses/django_wibses/wibses/yo/app/scripts/app.coffee b/django_wibses/django_wibses/wibses/yo/app/scripts/app.coffee
@@ -2,42 +2,21 @@
 
 angular.module('wibsesApp', [
    'ngRoute'
-   'wibsesApp.controller'
-   'wibsesApp.directive'
-])
-
-angular.module('wibsesApp.controller', [
-   'wibsesApp.service'
-   'wibsesApp.filter'
-   'ui.bootstrap.typeahead'
-   'wibsesApp.modal.service'
+   'wibsesApp.edit'
 ])
 
 angular.module('wibsesApp.service', [
    'ngResource'
 ])
 
-angular.module('wibsesApp.modal.service', [
-   'ngResource'
-   'ngGrid'
-   'wibsesApp.modal.controller'
-])
-
-angular.module('wibsesApp.modal.controller', [
-   'wibsesApp.service'
-   'ui.bootstrap.modal'
-])
-
-angular.module('wibsesApp.directive', [])
-
 angular.module('wibsesApp.filter', [])
 
 ###################################################################################
 
 angular.module('wibsesApp').config ['$routeProvider', ($routeProvider) ->
    $routeProvider
    .when '/editor',
-         templateUrl: 'template/OUR/edit.html'
+         templateUrl: 'template/OUR/edit/edit.html'
          controller: 'ScriptCtrl'
          controllerAs: 'ctrl'
          resolve:

diff --git a/django_wibses/django_wibses/wibses/yo/app/scripts/edit/MODULES.coffee b/django_wibses/django_wibses/wibses/yo/app/scripts/edit/MODULES.coffee
@@ -0,0 +1,29 @@
+'use strict'
+
+angular.module('wibsesApp.edit', [
+   'wibsesApp.edit.controller'
+   'wibsesApp.edit.directive'
+])
+
+angular.module('wibsesApp.edit.controller', [
+   'wibsesApp.service'
+   'wibsesApp.edit.service'
+   'wibsesApp.edit.modal.service'
+   'wibsesApp.filter'
+   'ui.bootstrap.typeahead'
+])
+
+angular.module('wibsesApp.edit.service', [])
+
+angular.module('wibsesApp.edit.modal.service', [
+   'ngResource'
+   'ngGrid'
+   'wibsesApp.edit.modal.controller'
+])
+
+angular.module('wibsesApp.edit.modal.controller', [
+   'wibsesApp.edit.service'
+   'ui.bootstrap.modal'
+])
+
+angular.module('wibsesApp.edit.directive', [])
diff --git a/...s/yo/app/scripts/controllers/modal.coffee → ...app/scripts/edit/controllers/modal.coffee b/...s/yo/app/scripts/controllers/modal.coffee → ...app/scripts/edit/controllers/modal.coffee
@@ -1,6 +1,6 @@
 'use strict'
 
-angular.module('wibsesApp.modal.controller')
+angular.module('wibsesApp.edit.modal.controller')
 .controller 'ScriptsListCtrl',
       class Ctrl
          @$inject: ['$scope', 'modalService', 'scriptsList']

diff --git a/.../yo/app/scripts/controllers/script.coffee → ...pp/scripts/edit/controllers/script.coffee b/.../yo/app/scripts/controllers/script.coffee → ...pp/scripts/edit/controllers/script.coffee
@@ -1,6 +1,6 @@
 'use strict'
 
-angular.module('wibsesApp.controller').controller 'ScriptCtrl',
+angular.module('wibsesApp.edit.controller').controller 'ScriptCtrl',
    class ScriptCtrl
       @$inject: ['$scope', '$log', '$timeout', 'modalService', 'scriptService', 'defaultScriptService', 'forkService', 'script']
       constructor: (@$scope, @$log, @$timeout, @modalService, @scriptService, @defaultScriptService, @forkService, script) ->

diff --git a/...es/yo/app/scripts/controllers/slot.coffee → .../app/scripts/edit/controllers/slot.coffee b/...es/yo/app/scripts/controllers/slot.coffee → .../app/scripts/edit/controllers/slot.coffee
@@ -1,6 +1,6 @@
 'use strict'
 
-angular.module('wibsesApp.controller').controller 'SlotCtrl',
+angular.module('wibsesApp.edit.controller').controller 'SlotCtrl',
    class SlotCtrl
       @$inject: ['$scope', 'tokenProviderService']
       constructor: (@$scope, @tokenProviderService) ->

diff --git a/.../app/scripts/directives/parameters.coffee → ...scripts/edit/directives/parameters.coffee b/.../app/scripts/directives/parameters.coffee → ...scripts/edit/directives/parameters.coffee
@@ -1,8 +1,8 @@
 'use strict'
 
-angular.module('wibsesApp.directive')
+angular.module('wibsesApp.edit.directive')
 .directive 'parameters', () ->
-      templateUrl: 'template/OUR/parameters/parameters.html'
+      templateUrl: 'template/OUR/edit/parameters/parameters.html'
       restrict: 'E'
       scope:
          params: '='

diff --git a/.../app/scripts/services/modalService.coffee → ...scripts/edit/services/modalService.coffee b/.../app/scripts/services/modalService.coffee → ...scripts/edit/services/modalService.coffee
@@ -1,6 +1,6 @@
 'use strict'
 
-angular.module('wibsesApp.modal.service')
+angular.module('wibsesApp.edit.modal.service')
 .factory('modalService', ['scriptService', '$modal',
       (@scriptService, @$modal) ->
          @onLoadAction
@@ -12,7 +12,7 @@ angular.module('wibsesApp.modal.service')
                @listModal = undefined
                if not @listModal?
                   @listModal = @$modal.open(
-                     templateUrl: 'template/OUR/uiModals/scripts-list.html'
+                     templateUrl: 'template/OUR/edit/uiModals/scripts-list.html'
                      controller: 'ScriptsListCtrl'
                      resolve:
                         scriptsList: =>
@@ -25,7 +25,7 @@ angular.module('wibsesApp.modal.service')
                @listModal = undefined
                if not @listModal?
                   @listModal = @$modal.open(
-                     templateUrl: 'template/OUR/uiModals/script-revisions.html'
+                     templateUrl: 'template/OUR/edit/uiModals/script-revisions.html'
                      controller: 'ScriptRevisionsCtrl'
                      resolve:
                         revisionsList: =>
@@ -47,7 +47,7 @@ angular.module('wibsesApp.modal.service')
                @forkNameModal = undefined
                if not @forkNameModal?
                   @forkNameModal = @$modal.open(
-                     templateUrl: 'template/OUR/uiModals/fork-name.html'
+                     templateUrl: 'template/OUR/edit/uiModals/fork-name.html'
                      controller: 'ForkNameCtrl'
                   )
 

diff --git a/...ipts/services/tokenProviderService.coffee → ...edit/services/tokenProviderService.coffee b/...ipts/services/tokenProviderService.coffee → ...edit/services/tokenProviderService.coffee
@@ -1,6 +1,6 @@
 'use strict'
 
-angular.module('wibsesApp.service').service 'tokenProviderService',
+angular.module('wibsesApp.edit.service').service 'tokenProviderService',
    class TokenProviderService
       @$inject: ['$http']
       constructor: (@$http) ->

diff --git a/...bses/wibses/yo/app/template/OUR/edit.html → ...wibses/yo/app/template/OUR/edit/edit.html b/...bses/wibses/yo/app/template/OUR/edit.html → ...wibses/yo/app/template/OUR/edit/edit.html
@@ -42,7 +42,7 @@ <h4>Tokens:</h4>
                                typeahead="suggestion as suggestion.base for suggestion in slotCtrl.getTokens($viewValue)"
                                typeahead-min-length="3"
                                typeahead-wait-ms="500"
-                               typeahead-template-url="template/OUR/tokenAutocomplete/typeahead-match.html">
+                               typeahead-template-url="template/OUR/edit/tokenAutocomplete/typeahead-match.html">
                       </div>
                       <button type="submit" class="btn btn-primary">Add</button>
                     </form>

diff --git a/...plate/OUR/parameters/inputs/checkbox.html → .../OUR/edit/parameters/inputs/checkbox.html b/...plate/OUR/parameters/inputs/checkbox.html → .../OUR/edit/parameters/inputs/checkbox.html
@@ -1,7 +1,7 @@
 <div class="param input-group">
   <div class="checkbox">
     <label>
-      <input type="checkbox" ng-model="params[key]">{{key}}
+      <input type="checkbox" ng-model="params[key]">{{ key }}
     </label>
   </div>
 </div>
diff --git a/...emplate/OUR/parameters/inputs/number.html → ...te/OUR/edit/parameters/inputs/number.html b/...emplate/OUR/parameters/inputs/number.html → ...te/OUR/edit/parameters/inputs/number.html
diff --git a/.../template/OUR/parameters/inputs/text.html → ...late/OUR/edit/parameters/inputs/text.html b/.../template/OUR/parameters/inputs/text.html → ...late/OUR/edit/parameters/inputs/text.html
diff --git a/...p/template/OUR/parameters/parameters.html → ...plate/OUR/edit/parameters/parameters.html b/...p/template/OUR/parameters/parameters.html → ...plate/OUR/edit/parameters/parameters.html
@@ -2,7 +2,7 @@
   <div class="row">
     <li ng-repeat="(key, value) in params">
       <div class="param-wrapper col-lg-3">
-        <ng-include src="'template/OUR/parameters/inputs/' + getInputType(key) +'.html'"></ng-include>
+        <ng-include src="'template/OUR/edit/parameters/inputs/' + getInputType(key) +'.html'"></ng-include>
       </div>
     </li>
   </div>

diff --git a/...UR/tokenAutocomplete/typeahead-match.html → ...it/tokenAutocomplete/typeahead-match.html b/...UR/tokenAutocomplete/typeahead-match.html → ...it/tokenAutocomplete/typeahead-match.html
@@ -15,7 +15,7 @@
 
   <div class="forms">
     <ul class="list-inline">
-      <li ng-repeat="form in match.model.forms"><span class="badge badge-warning">{{form}}</span></li>
+      <li ng-repeat="form in match.model.forms"><span class="badge badge-warning">{{ form }}</span></li>
     </ul>
   </div>
 

diff --git a/.../app/template/OUR/uiModals/fork-name.html → ...template/OUR/edit/uiModals/fork-name.html b/.../app/template/OUR/uiModals/fork-name.html → ...template/OUR/edit/uiModals/fork-name.html
diff --git a/...mplate/OUR/uiModals/script-revisions.html → ...e/OUR/edit/uiModals/script-revisions.html b/...mplate/OUR/uiModals/script-revisions.html → ...e/OUR/edit/uiModals/script-revisions.html
diff --git a/...p/template/OUR/uiModals/scripts-list.html → ...plate/OUR/edit/uiModals/scripts-list.html b/...p/template/OUR/uiModals/scripts-list.html → ...plate/OUR/edit/uiModals/scripts-list.html
diff --git a/django_wibses/django_wibses/wibses/yo/test/spec/directives/parameters.coffee b/django_wibses/django_wibses/wibses/yo/test/spec/directives/parameters.coffee
@@ -4,11 +4,11 @@
 
 describe 'Directive: parameters', () ->
 
-   beforeEach module 'wibsesApp.directive'
-   beforeEach module 'template/OUR/parameters/parameters.html', 'template/OUR/parameters/parameters.html'
-   beforeEach module 'template/OUR/parameters/inputs/checkbox.html', 'template/OUR/parameters/inputs/checkbox.html'
-   beforeEach module 'template/OUR/parameters/inputs/number.html', 'template/OUR/parameters/inputs/number.html'
-   beforeEach module 'template/OUR/parameters/inputs/text.html', 'template/OUR/parameters/inputs/text.html'
+   beforeEach module 'wibsesApp.edit.directive'
+   beforeEach module 'template/OUR/edit/parameters/parameters.html', 'template/OUR/edit/parameters/parameters.html'
+   beforeEach module 'template/OUR/edit/parameters/inputs/checkbox.html', 'template/OUR/edit/parameters/inputs/checkbox.html'
+   beforeEach module 'template/OUR/edit/parameters/inputs/number.html', 'template/OUR/edit/parameters/inputs/number.html'
+   beforeEach module 'template/OUR/edit/parameters/inputs/text.html', 'template/OUR/edit/parameters/inputs/text.html'
 
    element = {}
    $compile = {}