shedd · schamp · Feb 26, 2016 · Feb 26, 2016 · Feb 26, 2016 · Jul 14, 2016
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,11 @@
+# Specifies intentionally untracked files to ignore when using Git
+# http://git-scm.com/docs/gitignore
+
 node_modules/
+plugins/
+resources/android
+resources/ios
+
 *.log
 .DS_Store
 
@@ -7,4 +14,10 @@ www/js/*
 www/css/*
 www/img/*
 www/templates/*
-www/index.html
+www/index.html
+www/fonts/*
+www/dist/*
+platforms/android/assets
+platforms/android/res
+platforms/ios/**/Resources
+coverage
diff --git a/app/index.html b/app/index.html
@@ -13,20 +13,12 @@
     <!-- @endif -->
 
     <!-- ionic/angularjs js -->
-    <script src="lib/ionic/js/ionic.bundle.js"></script>
+    <!-- <script src="lib/ionic/js/ionic.bundle.js"></script> -->
 
     <!-- cordova script (this will be a 404 during development) -->
     <script src="cordova.js"></script>
 
     <!-- custom configuration -->
-    <script src="js/config/config.js"></script>
-
-    <!-- app's js -->
-    <script src="js/app.js"></script>
-    <script src="js/controllers.js"></script>
-    <script src="js/controllers/ApplicationCtrl.js"></script>
-    <script src="js/services.js"></script>
-    <script src="js/services/Session.js"></script>
   </head>
   <body ng-app="BuildTools" ng-controller="ApplicationCtrl" animation="slide-left-right-ios7">
     <!-- 
@@ -45,5 +37,6 @@ <h1 class="title">{{pageTitle}}</h1>
       have templates inline in this html file if you'd like).
     -->
     <ion-nav-view></ion-nav-view>
+    <script src="dist/bundle.js"></script>
   </body>
 </html>
diff --git a/app/js/app.js b/app/js/app.js
@@ -1,42 +1,58 @@
 // angular.module is a global place for creating, registering and retrieving Angular modules
 // 'buildTools' is the name of this angular module example (also set in a <body> attribute in index.html)
 // the 2nd parameter is an array of 'requires'
-var buildTools = angular.module('BuildTools', [ 'ionic', 
-                                                'BuildTools.config',
-                                                'BuildTools.controllers', 
-                                                'BuildTools.services'
-                                                ]);
-
-buildToolsServices.run(function($ionicPlatform) {
-  $ionicPlatform.ready(function() {
+//
+
+var angular = require('angular')
+
+// dependencies of ionic
+require('angular-animate')
+require('angular-sanitize')
+require('angular-ui-router')
+
+require('ionic')
+require('ionic-angular')
+
+require('./config/config.js')
+require('./controllers.js')
+require('./services.js')
+
+var buildTools = angular.module('BuildTools', [
+  'ionic',
+  'BuildTools.config',
+  'BuildTools.controllers',
+  'BuildTools.services'
+])
+
+buildTools.run(function ($ionicPlatform) {
+  $ionicPlatform.ready(function () {
     // Hide the accessory bar by default (remove this to show the accessory bar above the keyboard
     // for form inputs)
-    if(window.cordova && window.cordova.plugins.Keyboard) {
-      cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true);
+    if (window.cordova && window.cordova.plugins.Keyboard) {
+      cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true)
     }
-    if(window.StatusBar) {
+    if (window.StatusBar) {
       // org.apache.cordova.statusbar required
-      StatusBar.styleDefault();
+      StatusBar.styleDefault()
     }
-  });
+  })
 })
 
-// Configure Ionic
-.config(function($stateProvider, $urlRouterProvider) {
-
-  // Ionic uses AngularUI Router which uses the concept of states
-  // Learn more here: https://github.com/angular-ui/ui-router
-  // Set up the various states which the app can be in.
-  // Each state's controller can be found in controllers.js
-  $stateProvider
+  // Configure Ionic
+  .config(function ($stateProvider, $urlRouterProvider) {
+    // Ionic uses AngularUI Router which uses the concept of states
+    // Learn more here: https://github.com/angular-ui/ui-router
+    // Set up the various states which the app can be in.
+    // Each state's controller can be found in controllers.js
+    $stateProvider
 
-    .state('login', {
-      url: "/login",
-      templateUrl: "templates/login.html",
-      controller: 'LoginCtrl'
-    })
+      .state('login', {
+        url: '/login',
+        templateUrl: 'templates/login.html',
+        controller: 'LoginCtrl'
+      })
 
-  // if none of the above states are matched, use this as the fallback
-  $urlRouterProvider.otherwise("/login");
+    // if none of the above states are matched, use this as the fallback
+    $urlRouterProvider.otherwise('/login')
 
-});
+  })
diff --git a/app/js/controllers.js b/app/js/controllers.js
@@ -2,4 +2,6 @@
  * See controllers/ for the individual Controller definitions
  */
 
-var buildToolsCtrl = angular.module('BuildTools.controllers', ['ionic', 'BuildTools.config']);
+module.exports = angular.module('BuildTools.controllers', ['ionic', 'BuildTools.config'])
+  .controller('ApplicationCtrl', require('./controllers/ApplicationCtrl'))
+  .controller('LoginCtrl', require('./controllers/LoginCtrl'))
diff --git a/app/js/controllers/ApplicationCtrl.js b/app/js/controllers/ApplicationCtrl.js
@@ -1,4 +1,11 @@
-buildToolsCtrl.controller('ApplicationCtrl', function($scope, Config) {
+function ApplicationCtrl ($scope, Config) {
   // your code here
+  var foo = (a) => a + 1
 
-});
+  var bar = foo(3)
+
+  console.log('bar:', bar)
+
+}
+
+module.exports = ['$scope', 'Config', ApplicationCtrl]
diff --git a/app/js/controllers/LoginCtrl.js b/app/js/controllers/LoginCtrl.js
@@ -0,0 +1,11 @@
+function LoginCtrl ($scope, Config) {
+  // your code here
+  var foo = (a) => a + 1
+
+  var bar = foo(3)
+
+  console.log('bar:', bar)
+
+}
+
+module.exports = ['$scope', 'Config', LoginCtrl]
diff --git a/app/js/services.js b/app/js/services.js
@@ -2,4 +2,5 @@
  * See services/ for the individual Service definitions.
  */
 
-var buildToolsServices = angular.module('BuildTools.services', ['BuildTools.config']);
+module.exports = angular.module('BuildTools.services', ['BuildTools.config'])
+  .service('SessionService', require('./services/Session'))
diff --git a/app/js/services/Session.js b/app/js/services/Session.js
@@ -1,3 +1,5 @@
-buildToolsServices.service('Session', function () {
+function SessionService () {
   // your code here
-});
+}
+
+module.exports = [SessionService]
diff --git a/app/res/README.md b/app/res/README.md
diff --git a/app/res/convert.sh b/app/res/convert.sh
diff --git a/app/scss/ionic.app.scss b/app/scss/ionic.app.scss
@@ -18,8 +18,8 @@ $dark:                            #444 !default;
 // The path for our ionicons font files, relative to the built CSS in www/css
 $ionicons-font-path: "../lib/ionic/fonts" !default;
 
-// Include all of Ionic
-@import "www/lib/ionic/scss/ionic";
+/* Include all of Ionic */
+@import "../../node_modules/ionic/scss/ionic";
 
 [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
   display: none !important;

diff --git a/app/templates/login.html b/app/templates/login.html
@@ -0,0 +1,6 @@
+ <ion-view title="Login page">
+    <ion-nav-title>Log in please.</ion-nav-title>
+    <ion-content scroll="true" class="has-header">
+<div>This is the login page.</div>
+    </ion-content>
+</ion-view>
diff --git a/bower.json b/bower.json