build(webpack): finish base webpack of project

Nodreame · Apr 29, 2018 · d1a809d · d1a809d
1 parent f5b3dc4
commit d1a809d
Show file tree

Hide file tree

Showing 9 changed files with 352 additions and 340 deletions.
diff --git a/index.html b/index.html
@@ -28,6 +28,5 @@ <h2>快速导航：</h2>
       <a href="/#!/games">游戏</a>
     </div>
     <div ng-view></div>
-    <p>{{test}}</p>
   </body>
 </html>
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "angular": "1.6.9",
-    "angular-route": "1.6.9",
+    "angular-route": "^1.6.10",
     "webpack": "^4.6.0",
     "webpack-cli": "^2.0.15"
   }

diff --git a/src/app.js b/src/app.js
@@ -1,25 +1,35 @@
 import angular from 'angular';
+import route from 'angular-route';
+import pokemon from './pokemon/pokemon';
+import skill from './skill/skill';
+import hagberry from './hagberry/hagberry';
+import prop from './prop/prop';
+import game from './game/game';
 
 (function () {
   'use strict';
   angular.module('pokemon-app', [
+    route,
+    pokemon,
+    skill,
+    hagberry,
+    prop,
+    game
     // 'ngRoute',
     // 'pokemon-app.pokemon',           // 添加依赖
     // 'pokemon-app.skill',
     // 'pokemon-app.hagberry',
     // 'pokemon-app.prop',
     // 'pokemon-app.game'
   ])
-  // .config (['$routeProvider', function ($routeProvider) {
-  //   $routeProvider
-  //     .otherwise({  
-  //       redirectTo: '/pokemons'     // 初始化直接跳转到pokemon模块
-  //     });
-  // }])
+  .config (['$routeProvider', function ($routeProvider) {
+    $routeProvider
+      .otherwise({  
+        redirectTo: '/pokemons'     // 初始化直接跳转到pokemon模块
+      });
+  }])
   .controller('AppController', AppController);
 
   AppController.$inject = ['$scope'];
-  function AppController ($scope) {
-    $scope.test = "webpack success!";
-  }
+  function AppController ($scope) {}
 })();
diff --git a/src/game/game.js b/src/game/game.js
@@ -1,6 +1,7 @@
-(function () {
-  'use strict';
-  angular.module('pokemon-app.game', ['ngRoute'])
+import angular from 'angular';
+import ngRoute from 'angular-route';
+
+export default angular.module('pokemon-app.game', [ngRoute])
   .config(['$routeProvider', function ($routeProvider) {
     $routeProvider
       .when('/games', {
@@ -12,83 +13,83 @@
       });
   }])
   .controller('GameListController', GameListController)
-  .controller('GameDetailController', GameDetailController);
+  .controller('GameDetailController', GameDetailController)
+  .name;
 
-  var games = [
-    {
-      id: 1,
-      name: {
-        cn: '精灵宝可梦红绿版（日本）',
-        jp: '',
-        en: ''
-      },
-      platform: 'GB',
-      pubDate: {
-        jp: '1996–02–27',
-        na: '',
-        eu: ''
-      }
+var games = [
+  {
+    id: 1,
+    name: {
+      cn: '精灵宝可梦红绿版（日本）',
+      jp: '',
+      en: ''
     },
-    {
-      id: 2,
-      name: {
-        cn: '精灵宝可梦蓝版（日本）',
-        jp: '',
-        en: ''
-      },
-      platform: 'GB',
-      pubDate: {
-        jp: '1999–10–10',
-        na: '',
-        eu: ''
-      }
+    platform: 'GB',
+    pubDate: {
+      jp: '1996–02–27',
+      na: '',
+      eu: ''
+    }
+  },
+  {
+    id: 2,
+    name: {
+      cn: '精灵宝可梦蓝版（日本）',
+      jp: '',
+      en: ''
     },
-    {
-      id: 3,
-      name: {
-        cn: '精灵宝可梦红蓝版（欧美）',
-        jp: '',
-        en: ''
-      },
-      platform: 'GB',
-      pubDate: {
-        jp: '',
-        na: '1998–09–01',
-        eu: '1999–10–05'
-      }
+    platform: 'GB',
+    pubDate: {
+      jp: '1999–10–10',
+      na: '',
+      eu: ''
+    }
+  },
+  {
+    id: 3,
+    name: {
+      cn: '精灵宝可梦红蓝版（欧美）',
+      jp: '',
+      en: ''
     },
-    {
-      id: 4,
-      name: {
-        cn: '宝可梦竞技场',
-        jp: '',
-        en: ''
-      },
-      platform: 'N64',
-      pubDate: {
-        jp: '1998–08–01',
-        na: '',
-        eu: ''
-      }
+    platform: 'GB',
+    pubDate: {
+      jp: '',
+      na: '1998–09–01',
+      eu: '1999–10–05'
     }
-  ];
+  },
+  {
+    id: 4,
+    name: {
+      cn: '宝可梦竞技场',
+      jp: '',
+      en: ''
+    },
+    platform: 'N64',
+    pubDate: {
+      jp: '1998–08–01',
+      na: '',
+      eu: ''
+    }
+  }
+];
 
-  GameListController.$inject = ['$scope'];
-  function GameListController ($scope) {
-    $scope.games = games;
-    $scope.remove = function (index) {
-      $scope.games.splice(index, 1);
-    };
+GameListController.$inject = ['$scope'];
+function GameListController ($scope) {
+  $scope.games = games;
+  $scope.remove = function (index) {
+    $scope.games.splice(index, 1);
   };
+};
 
-  GameDetailController.$inject = ['$scope', '$routeParams'];
-  function GameDetailController ($scope, $routeParams) {
-    var id = parseInt($routeParams.id);
-    angular.forEach(games, function (element) {
-      if (element.id === id) {
-        $scope.game = element;
-        console.log(element);
-      }
-    });
-  };
-})();
+GameDetailController.$inject = ['$scope', '$routeParams'];
+function GameDetailController ($scope, $routeParams) {
+  var id = parseInt($routeParams.id);
+  angular.forEach(games, function (element) {
+    if (element.id === id) {
+      $scope.game = element;
+      console.log(element);
+    }
+  });
+};
diff --git a/src/hagberry/hagberry.js b/src/hagberry/hagberry.js
@@ -1,79 +1,80 @@
-(function () {
-  'use strict';
-  angular.module('pokemon-app.hagberry', ['ngRoute'])
-  .config(['$routeProvider', function ($routeProvider) {
-    $routeProvider
-      .when('/hagberrys', {
-        templateUrl: 'src/hagberry/hagberry-list.html',
-        controller:  'HagberryListController'
-      }).when('/hagberry/:id', {
-        templateUrl:  'src/hagberry/hagberry-detail.html',
-        controller:   'HagberryDetailController'
-      });
-  }])
-  .controller('HagberryListController', HagberryListController)
-  .controller('HagberryDetailController', HagberryDetailController);
+import angular from 'angular';
+import ngRoute from 'angular-route';
 
-  var hagberrys = [
-    {
-      id: 1,
-      name: {
-        cn: '树果',
-        jp: 'きのみ',
-        en: 'Berry'
-      },
-      version: '第二世代',
-      desc: '携带后，可以回复自己１０点体力'
-    }, 
-    {
-      id: 2,
-      name: {
-        cn: '黄金的果实',
-        jp: 'おうごんのみ',
-        en: 'Gold Berry'
-      },
-      version: '第二世代',
-      desc: '携带后，可以回复自己３０点体力'
-    }, 
-    {
-      id: 3,
-      name: {
-        cn: '樱子果',
-        jp: 'クラボのみ',
-        en: 'Cheri Berry'
-      },
-      version: '第三世代',
-      desc: '让宝可梦携带后，可以治愈麻痹'
-    }, 
-    {
-      id: 4,
-      name: {
-        cn: '零余果',
-        jp: 'カゴのみ',
-        en: 'Chesto Berry'
-      },
-      version: '第三世代',
-      desc: '让宝可梦携带后，可以治愈睡眠'
-    }
-  ];
+export default angular.module('pokemon-app.hagberry', [ngRoute])
+.config(['$routeProvider', function ($routeProvider) {
+  $routeProvider
+    .when('/hagberrys', {
+      templateUrl: 'src/hagberry/hagberry-list.html',
+      controller:  'HagberryListController'
+    }).when('/hagberry/:id', {
+      templateUrl:  'src/hagberry/hagberry-detail.html',
+      controller:   'HagberryDetailController'
+    });
+}])
+.controller('HagberryListController', HagberryListController)
+.controller('HagberryDetailController', HagberryDetailController)
+.name;
 
-  HagberryListController.$inject = ['$scope'];
-  function HagberryListController ($scope) {
-    $scope.hagberrys = hagberrys;
-    $scope.remove = function (index) {
-      $scope.hagberrys.splice(index, 1);
-    };
-  };
+var hagberrys = [
+  {
+    id: 1,
+    name: {
+      cn: '树果',
+      jp: 'きのみ',
+      en: 'Berry'
+    },
+    version: '第二世代',
+    desc: '携带后，可以回复自己１０点体力'
+  }, 
+  {
+    id: 2,
+    name: {
+      cn: '黄金的果实',
+      jp: 'おうごんのみ',
+      en: 'Gold Berry'
+    },
+    version: '第二世代',
+    desc: '携带后，可以回复自己３０点体力'
+  }, 
+  {
+    id: 3,
+    name: {
+      cn: '樱子果',
+      jp: 'クラボのみ',
+      en: 'Cheri Berry'
+    },
+    version: '第三世代',
+    desc: '让宝可梦携带后，可以治愈麻痹'
+  }, 
+  {
+    id: 4,
+    name: {
+      cn: '零余果',
+      jp: 'カゴのみ',
+      en: 'Chesto Berry'
+    },
+    version: '第三世代',
+    desc: '让宝可梦携带后，可以治愈睡眠'
+  }
+];
 
-  HagberryDetailController.$inject = ['$scope', '$routeParams'];
-  function HagberryDetailController ($scope, $routeParams) {
-    console.log('$routeParams.id: ', $routeParams.id);
-    var id = parseInt($routeParams.id);
-    angular.forEach(hagberrys, function (element) {
-      if (element.id === id) {
-        $scope.hagberry = element;
-        console.log(element);
-      }
-    });
+HagberryListController.$inject = ['$scope'];
+function HagberryListController ($scope) {
+  $scope.hagberrys = hagberrys;
+  $scope.remove = function (index) {
+    $scope.hagberrys.splice(index, 1);
   };
-})();
+};
+
+HagberryDetailController.$inject = ['$scope', '$routeParams'];
+function HagberryDetailController ($scope, $routeParams) {
+  console.log('$routeParams.id: ', $routeParams.id);
+  var id = parseInt($routeParams.id);
+  angular.forEach(hagberrys, function (element) {
+    if (element.id === id) {
+      $scope.hagberry = element;
+      console.log(element);
+    }
+  });
+};