clean up

MindongLab · Jan 12, 2018 · 264093b · 264093b
1 parent fbb0279
commit 264093b
Show file tree

Hide file tree

Showing 8 changed files with 5,014 additions and 71 deletions.
diff --git a/www/app/app.ts b/www/app/app.ts
@@ -8,8 +8,7 @@ angular.module('app', ['ui.router'])
         .state({
             name: 'home',
             url: '/',
-            templateUrl: 'app/views/welcome.tpl.html',
-            controller: 'homeController'
+            component: 'landingPage'
         })
         .state({
             name: 'showidiom',
@@ -20,24 +19,21 @@ angular.module('app', ['ui.router'])
         .state({
             name: 'showhelp',
             url: '/help',
-            templateUrl: 'app/views/help.tpl.html'
-            // controller: 'mainCtrl'
+            component: 'helpPage'
         })
         .state({
             name: 'showcategories',
             url: '/tags', 
-            templateUrl: 'app/views/tags.tpl.html' ,
-            controller: 'tagsController'
+            component: 'categoryPage'
         })
         .state({
             name: 'showapps',
             url: '/apps', 
-            templateUrl: 'app/views/apps.tpl.html'
+            component: 'appsPage'
         });
 
         $urlRouterProvider.otherwise('/');
 }]);
 
 require('./components');
-require('./controllers');
 require('./services');
diff --git a/www/app/components/index.ts b/www/app/components/index.ts
@@ -9,4 +9,8 @@ angular.module('app')
     .component('fiMainview', require('./fi-mainview.component'))
     .component('fiSidebar', require('./fi-sidebar.component'))
     .component('viewIdiomPage', require('./view-idiom-page.component'))
+    .component('appsPage', require('./apps-page.component'))
+    .component('helpPage', require('./help-page.component'))
+    .component('landingPage', require('./landing-page.component'))
+    .component('categoryPage', require('./category-page.component'))
     .component('sharePanel', require('./share-panel.component'));
diff --git a/www/app/controllers/index.ts b/www/app/controllers/index.ts
diff --git a/www/app/views/apps.tpl.html b/www/app/views/apps.tpl.html
diff --git a/www/app/views/help.tpl.html b/www/app/views/help.tpl.html
diff --git a/www/package.json b/www/package.json
@@ -29,6 +29,7 @@
   },
   "dependencies": {
     "@types/angular": "^1.5.0",
-    "@types/node": "^8.0.26"
+    "@types/node": "^8.0.26",
+    "rxjs": "^5.5.6"
   }
 }
diff --git a/www/webpack.config.js b/www/webpack.config.js
@@ -25,7 +25,7 @@ module.exports = {
     module: {
         rules: [
             { test: /\.(t|j)s$/, use: { loader: 'awesome-typescript-loader?{tsconfig: "tsconfig.json"}' } },
-            { test: /\.(html)$/, use: { loader: 'html-loader'} },
+            { test: /\.(html)$/, use: { loader: 'html-loader', options: { attrs: false }}},
             // addition - add source-map support 
             { enforce: "pre", test: /\.js$/, loader: "source-map-loader" }
         ]