Reorganizes the entire app to follow Google's best practice recommendations for Angular App Structure.

see: https://docs.google.com/document/d/1XXMvReO8-Awi1EZXAXS4PzDzdNvV6pGcuaF4Q9821Es/pub

The files are now grouped by view / component.
Tests are located beside tested js files. The Grunt build will be responsible for only distributing actual files without the tests.
Each partial is at the same level as the js files related to it.
Ideally css files should be at the same level, maybe I'll refactor this later.

Moves all non-bower plugins to app/vendor.
Moves all images to app/images and styles to app/styles.
Merges the test and non-test jshintrc files.

Adds all the Jamstash contributors to the package.json file while I was refactoring.

Conflicts:
	app/app.js
	app/images/vgrabber.gif
	app/images/vgrabber2-active.gif
	app/images/vgrabber2-normal.gif
	app/index.html

.jshintrc

@@ -17,9 +17,20 @@
   "trailing": true,
   "smarttabs": true,
   "globals": {
+    "_": false,
+    "after": false,
+    "afterEach": false,
     "angular": false,
-    "_": false
+    "before": false,
-  },
+    "beforeEach": false,
+    "browser": false,
+    "describe": false,
+    "expect": false,
+    "inject": false,
+    "it": false,
+    "jasmine": false,
+    "spyOn": false
+  }
   "browser": true,
   "node": true,
   "jquery": true

Gruntfile.js

@@ -34,14 +34,14 @@ module.exports = function (grunt) {
         tasks: ['wiredep']
       },
       js: {
-        files: ['<%= yeoman.app %>/js/{,*/}*.js'],
+        files: ['<%= yeoman.app %>/**/*.js', '!<%= yeoman.app %>/**/*_test.js'],
         tasks: ['karma:continuous:run'], //'newer:jshint:all'],
         options: {
           livereload: '<%= connect.options.livereload %>'
         }
       },
       jsTest: {
-        files: ['test/**/*_test.js'],
+        files: ['<%= yeoman.app %>/**/*_test.js'],
         tasks: ['karma:continuous:run'], //'newer:jshint:test']
       },
       styles: {
@@ -53,7 +53,7 @@ module.exports = function (grunt) {
       },
       livereload: {
         files: [
-          '<%= yeoman.app %>/{,*/}*.html',
+          '<%= yeoman.app %>/**/*.html',
           '.tmp/styles/{,*/}*.css',
           '<%= yeoman.app %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}'
         ]
@@ -92,7 +92,7 @@ module.exports = function (grunt) {
         middleware: function (connect) {
           return [
             connect.static('.tmp'),
-            connect.static('test'),
+            //connect.static('test'),
             connect().use(
               '/bower_components',
               connect.static('./bower_components')
@@ -119,14 +119,8 @@ module.exports = function (grunt) {
       all: {
         src: [
           'Gruntfile.js',
-          '<%= yeoman.app %>/js/{,*/}*.js'
+          '<%= yeoman.app %>/**/*.js'
         ]
-      },
-      test: {
-        options: {
-          jshintrc: 'test/.jshintrc'
-        },
-        src: ['test/{,*/}*.js']
       }
     },
 
@@ -258,7 +252,7 @@ module.exports = function (grunt) {
     // Test settings
     karma: {
       options: {
-        configFile: 'test/karma.conf.js',
+        configFile: './karma.conf.js',
       },
       unit: {
         singleRun: true

app/app.js

@@ -7,16 +7,15 @@ var jamstash = angular.module('JamStash', ['ngCookies', 'ngRoute', 'ngSanitize',
 jamstash.config(function ($routeProvider) {
     $routeProvider
         .when('/index', { redirectTo: '/library' })
-        .when('/settings', { templateUrl: 'js/partials/settings.html', controller: 'SettingsCtrl' })
+        .when('/settings', { templateUrl: 'settings/settings.html', controller: 'SettingsCtrl' })
-        .when('/queue', { templateUrl: 'js/partials/queue.html', controller: 'QueueCtrl' })
+        .when('/queue', { templateUrl: 'queue/queue.html', controller: 'QueueCtrl' })
-        .when('/library', { templateUrl: 'js/partials/library.html', controller: 'SubsonicCtrl' })
+        .when('/library', { templateUrl: 'subsonic/subsonic.html', controller: 'SubsonicCtrl' })
-        .when('/library/:artistId', { templateUrl: 'js/partials/library.html', controller: 'SubsonicCtrl', reloadOnSearch: false })
+        .when('/library/:artistId', { templateUrl: 'subsonic/subsonic.html', controller: 'SubsonicCtrl', reloadOnSearch: false })
-        .when('/library/:artistId/:albumId', { templateUrl: 'js/partials/library.html', controller: 'SubsonicCtrl', reloadOnSearch: false })
+        .when('/library/:artistId/:albumId', { templateUrl: 'subsonic/subsonic.html', controller: 'SubsonicCtrl', reloadOnSearch: false })
-        .when('/playlists', { templateUrl: 'js/partials/playlists.html', controller: 'PlaylistCtrl' })
+        .when('/podcasts', { templateUrl: 'podcasts/podcasts.html', controller: 'PodcastCtrl' })
-        .when('/podcasts', { templateUrl: 'js/partials/podcasts.html', controller: 'PodcastCtrl' })
+        .when('/archive', { templateUrl: 'archive/archive.html', controller: 'ArchiveCtrl' })
-        .when('/archive', { templateUrl: 'js/partials/archive.html', controller: 'ArchiveCtrl' })
+        .when('/archive/:artist', { templateUrl: 'archive/archive.html', controller: 'ArchiveCtrl' })
-        .when('/archive/:artist', { templateUrl: 'js/partials/archive.html', controller: 'ArchiveCtrl' })
+        .when('/archive/:artist/:album', { templateUrl: 'archive/archive.html', controller: 'ArchiveCtrl' })
-        .when('/archive/:artist/:album', { templateUrl: 'js/partials/archive.html', controller: 'ArchiveCtrl' })
         .otherwise({ redirectTo: '/index' });
 });
 

app/archive/archive.html

@@ -82,7 +82,7 @@
                         <div class="clear"></div>
                     </li>
                     <ul class="simplelist songlist noselect" ng-if="song.length > 0">
-                        <div class="songs" ng-include src="'js/partials/songs.html'"></div>
+                        <div class="songs" ng-include src="'common/songs.html'"></div>
                     </ul>
                 </ul>
             </div>

app/common/directives.js

@@ -45,7 +45,7 @@ jamstash.directive('fancybox', function ($compile) {
 jamstash.directive('songpreview', function ($compile, subsonic) {
     return {
         restrict: 'E',
-        templateUrl: 'js/partials/songs.html',
+        templateUrl: 'common/songs.html',
         replace: false,
         // pass these two names from attrs into the template scope
         scope: {

app/common/utils-service.js

@@ -3,7 +3,7 @@
 *
 * Provides generally useful functions, like sorts, date-related functions, localStorage access, etc.
 */
-angular.module('jamstash.utils', ['jamstash.globals'])
+angular.module('jamstash.utils', ['jamstash.settings'])
 
 .service('utils', function ($rootScope, globals) {
     'use strict';