migrating to moleculejs packages

Gruntfile.js

@@ -53,8 +53,8 @@ module.exports = function(grunt) {
             },
             dist: {
               files: {
-                  './static/js/<%= pkg.name %>.js': [ './static/js/dev/app.js', './views/*.hbs' ],
-                  './tests/tests.js': [ './tests/specs/index.js', './views/*.hbs' ]
+                  './static/js/<%= pkg.name %>.js': [ './static/js/dev/app.js', './views/*.hbs' ]
+                  //, './tests/tests.js': [ './tests/specs/index.js', './views/*.hbs' ]
               }
             }
         },

package.json

@@ -33,7 +33,9 @@
     "karma-phantomjs-launcher": "^0.2.3",
     "karma-sinon": "^1.0.4",
     "mocha": "^2.3.4",
-    "moleculejs": "^1.0.0",
+    "molecule-router": "^1.0.1",
+    "molecule-singleton": "^1.0.5",
+    "moleculejs": "^1.0.1",
     "node-sass": "^3.4.2",
     "phantomjs": "^1.9.19",
     "sass": "~0.5.0",

static/js/dev/app.js

@@ -1,4 +1,4 @@
-import Router from './lib/router';
+import { Router } from 'molecule-router';
 
 // Pages
 import BracketDisplay from './views/bracket-display';

static/js/dev/views/admin.js

@@ -1,5 +1,4 @@
-import Route from 'lib/route';
-import Router from 'lib/router';
+import { Route, Router } from 'molecule-router';
 import $ from 'jquery';
 
 import Characters from './admin/characters';

static/js/dev/views/admin/characters.js

@@ -1,6 +1,5 @@
 import $ from 'jquery';
-
-import Route from 'lib/route';
+import { Route } from 'molecule-router';
 
 const LOADING = 'loading';
 

static/js/dev/views/admin/nominee.js

@@ -1,6 +1,5 @@
 import $ from 'jquery';
-
-import Route from 'lib/route';
+import { Route } from 'molecule-router';
 
 import Nominee from 'templates/admin/nominee.hbs';
 

static/js/dev/views/admin/start-bracket.js

@@ -1,6 +1,5 @@
 import $ from 'jquery';
-
-import Route from 'lib/route';
+import { Route } from 'molecule-router';
 
 export default Route('admin-start-bracket', {
   initRoute() {

static/js/dev/views/admin/stats.js

@@ -1,6 +1,5 @@
 import $ from 'jquery';
-
-import Route from 'lib/route';
+import { Route } from 'molecule-router';
 
 export default Route('admin-stats', {
   initRoute() {

static/js/dev/views/bracket-display.js

@@ -1,10 +1,9 @@
 import Handlebars from 'handlebars/runtime';
+import { Route, Router } from 'molecule-router';
 import $ from 'jquery';
 
 import Entrant from '../model/entrant';
 import { default as Tier, ENTRANT_HEIGHT } from '../model/tier';
-import Route from 'lib/route';
-import Router from 'lib/router';
 
 import TPL_GROUP_PICKER from 'templates/groupPicker.hbs';
 import TPL_ENTRANT from 'templates/partials/_entrant.hbs';

static/js/dev/views/characters.js

@@ -1,6 +1,6 @@
 import $ from 'jquery';
 
-import Route from 'lib/route';
+import { Route } from 'molecule-router';
 
 import characterList from 'templates/partials/_characterList.hbs';
 

static/js/dev/views/nav.js

@@ -1,6 +1,6 @@
 import $ from 'jquery';
 
-import Singleton from 'lib/singleton';
+import Singleton from 'molecule-singleton';
 
 const CLICK = 'click';
 const SHOW_NAV = 'show';

static/js/dev/views/nominations.js

@@ -1,6 +1,6 @@
 import $ from 'jquery';
+import { Route } from 'molecule-router';
 
-import Route from 'lib/route';
 import Typeahead from '../controls/typeahead';
 
 const IS_IE = (/MSIE/).test(window.navigator.userAgent);

static/js/dev/views/voting.js

@@ -1,6 +1,5 @@
 import $ from 'jquery';
-
-import Route from 'lib/route';
+import { Route } from 'molecule-router';
 
 const bracketId = window.bracketId;