Merge branch 'release-0.0.2'

meisyal · Feb 5, 2016 · 3d16b77 · 3d16b77
2 parents 9bbb61d + b65a758
commit 3d16b77
Show file tree

Hide file tree

Showing 14 changed files with 781 additions and 1,150 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -106,7 +106,7 @@ If you face any problems or find a bug, feel free to submit an [issue][issue] or
 
 ## License
 
-This project is released under GNU General Public License Version 3. Please, check
+This project is released under Apache License Version 2. Please, check
 [LICENSE][license] for more information. All other contents (dependencies and
 etc.) are redistributed under their original license terms.
 

diff --git a/config.xml b/config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.focusedsamurai.mim" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="id.meisyal.mim" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>MIM</name>
   <description>
-        An Ionic mobile inventory manager application.
+        An inventory manager mobile application built with Ionic framework.
     </description>
   <author email="[email protected]" href="http://meisyal.web.id/">
       MIM Project Team

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "MIM",
-  "version": "0.0.1",
-  "description": "An Ionic mobile inventory manager application.",
+  "version": "0.0.2",
+  "description": "An inventory manager mobile application built with Ionic framework.",
   "dependencies": {
     "gulp": "^3.5.6",
     "gulp-sass": "^1.3.3",

diff --git a/www/index.html b/www/index.html
@@ -21,11 +21,14 @@
     <script src="js/ng-cordova.min.js"></script>
     <script src="cordova.js"></script>
 
-    <!-- your app's js -->
+    <!-- chart.js and angular-chart.js -->
     <script src="js/Chart.min.js"></script>
     <script src="js/angular-chart.min.js"></script>
+    <!-- app's js -->
     <script src="js/app.js"></script>
     <script src="js/controllers.js"></script>
+    <script src="js/routers.js"></script>
+    <script src="js/services.js"></script>
   </head>
   <body ng-app="starter">
     <ion-nav-view></ion-nav-view>

diff --git a/www/js/app.js b/www/js/app.js
@@ -1,121 +1,17 @@
-// Ionic Starter App
+var MIM = angular.module('starter', ['ionic',
+                                     'starter.controllers',
+                                     'starter.routers']);
 
-// angular.module is a global place for creating, registering and retrieving Angular modules
-// 'starter' 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 MIM = angular.module('starter', ['ionic', 'starter.controllers']);
-
-MIM.run(function($ionicPlatform) {
-  $ionicPlatform.ready(function() {
+MIM.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.StatusBar) {
       StatusBar.styleDefault();
     }
   });
 });
-
-MIM.config(function($stateProvider, $urlRouterProvider) {
-  $stateProvider
-    .state('app', {
-      url: '/app',
-      abstract: true,
-      templateUrl: 'templates/menu.html',
-      controller: 'AppController'
-    })
-    .state('app.config', {
-      url: '/config',
-      views: {
-        'menuContent': {
-          templateUrl: 'templates/config.html',
-          controller: 'ConfigController'
-        }
-      }
-    })
-    .state('app.sales', {
-      url: '/sales',
-      views: {
-        'menuContent': {
-          templateUrl: 'templates/sales.html',
-          controller: 'SalesController'
-        }
-      }
-    })
-    .state('app.salesorder', {
-      cache: false,
-      url: '/sales-order',
-      views: {
-        'menuContent': {
-          templateUrl: 'templates/sales_order.html',
-          controller: 'SalesOrderController'
-        }
-      }
-    })
-    .state('app.orderdetail', {
-      url: '/order-detail/:orderId',
-      views: {
-        'menuContent': {
-          templateUrl: 'templates/order_detail.html',
-          controller: 'OrderDetailController'
-        }
-      }
-    })
-    .state('app.addinventory', {
-      url: '/add-inventory',
-      views: {
-        'menuContent': {
-          templateUrl: 'templates/add_inventory.html',
-          controller: 'AddInventoryController'
-        }
-      }
-    })
-    .state('app.inventoryitems', {
-      url: '/inventory-items',
-      views: {
-        'menuContent': {
-          templateUrl: 'templates/inventory_items.html',
-          controller: 'InventoryItemsController'
-        }
-      }
-    })
-    .state('app.itemdetail', {
-      url: '/item-detail/:itemId',
-      views: {
-        'menuContent': {
-          templateUrl: 'templates/item_detail.html',
-          controller: 'ItemDetailController'
-        }
-      }
-    })
-    .state('app.customer', {
-      url: '/customer',
-      views: {
-        'menuContent': {
-          templateUrl: 'templates/customers.html',
-          controller: 'CustomerController'
-        }
-      }
-    })
-    .state('app.customerdetail', {
-      url: '/customer-detail/:customerId',
-      views: {
-        'menuContent': {
-          templateUrl: 'templates/customer_detail.html',
-          controller: 'CustomerDetailController'
-        }
-      }
-    })
-    .state('app.statistics', {
-      url: '/statistics',
-      views: {
-        'menuContent': {
-          templateUrl: 'templates/statistics.html',
-          controller: 'StatisticsController'
-        }
-      }
-    });
-    $urlRouterProvider.otherwise('/app/config');
-});