Merge pull request #4 from OperationCode/jjh/ngModule-fix

Register demo components on angular app module
OperationCode · Apr 1, 2017 · 01ae14f · 01ae14f
2 parents 938ff7f + 7e40e9b
commit 01ae14f
Show file tree

Hide file tree

Showing 46 changed files with 142 additions and 98,163 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,3 +42,6 @@ config
 .env.sh
 .env.js
 env
+
+# Webpack output
+public/*.js
diff --git a/app/angular-app.js b/app/angular-app.js
@@ -0,0 +1,7 @@
+import routes from './modules/routes'
+import demo from './modules/demo'
+
+const ngModule = angular.module('app', ['app.routes', 'app.demo'])
+	.run (() => {
+		console.log('App is running!')
+	})
diff --git a/app/components/angular-app.js b/app/components/angular-app.js
diff --git a/app/components/common/auto-save/index.js b/app/components/common/auto-save/index.js
diff --git a/app/components/demo/index.js b/app/components/demo/index.js
diff --git a/app/components/index.js b/app/components/index.js
diff --git a/app/components/ng-deps.js b/app/components/ng-deps.js
diff --git a/app/components/routes.js b/app/components/routes.js
diff --git a/app/index.html b/app/index.html
@@ -9,19 +9,12 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="description" content="A dashboard built with the MEAN stack">
     <link rel="icon" href="img/logo.svg">
-    <link href="/css/angular-material.css" rel="stylesheet">
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
     <base href="/">
   </head>
   <body ng-app="app">
-
-      <center><h1>Loading...</h1></center>
-      <favorite-teams></favorite-teams>
-    <script src="/js/angular.js"></script>
-    <script src="/js/angular-animate.js"></script>
-    <script src="/js/angular-aria.js"></script>
-    <script src="/js/angular-material.js"></script>
-
-    <script src="bundle.js"></script>
+      <div ng-view></div>
+    <script src="vendor.bundle.js"></script>
+    <script src="app.bundle.js"></script>
   </body>
 </html>
diff --git a/app/components/account/.gitkeep → app/modules/account/components/.gitkeep b/app/components/account/.gitkeep → app/modules/account/components/.gitkeep
diff --git a/app/components/dash/.gitkeep → app/modules/account/services/.gitkeep b/app/components/dash/.gitkeep → app/modules/account/services/.gitkeep
diff --git a/...ave/directive/auto-save-form.directive.js → ...ve/directives/auto-save-form.directive.js b/...ave/directive/auto-save-form.directive.js → ...ve/directives/auto-save-form.directive.js
diff --git a/...ave/directive/auto-save-item.directive.js → ...ve/directives/auto-save-item.directive.js b/...ave/directive/auto-save-item.directive.js → ...ve/directives/auto-save-item.directive.js
diff --git a/app/modules/common/auto-save/index.js b/app/modules/common/auto-save/index.js
@@ -0,0 +1,6 @@
+import AutoSaveFormDirective from './directives/auto-save-form.directive';
+import AutoSaveItemDirective from './directives/auto-save-item.directive';
+
+angular.module('app.autoSave', [])
+	.directive('AutoSaveForm', AutoSaveFormDirective)
+	.directive('AutoSaveItem', AutoSaveItemDirective);
diff --git a/app/components/common/index.js → app/modules/common/index.js b/app/components/common/index.js → app/modules/common/index.js
@@ -1,8 +1,11 @@
 import UserService from './services/user.service'
 import UserModel from './models/user.model'
+import autoSave from './auto-save'
 
-let CommonModule = angular.module('appCommon', [])
+let CommonModule = angular.module('app.common', [])
   .component('UserService', UserService)
   .component('UserModel', UserModel)
+  .directive('AutoSaveItem', AutoSaveItem)
+  .directive('AutoSaveForm', AutoSaveForm)
 
 export default CommonModule
diff --git a/app/components/common/models/user.model.js → app/modules/common/models/user.model.js b/app/components/common/models/user.model.js → app/modules/common/models/user.model.js
diff --git a/...omponents/common/services/user.service.js → app/modules/common/services/user.service.js b/...omponents/common/services/user.service.js → app/modules/common/services/user.service.js
diff --git a/app/components/home/.gitkeep → app/modules/dash/.gitkeep b/app/components/home/.gitkeep → app/modules/dash/.gitkeep
diff --git a/app/components/demo/baseball-team.js → app/modules/demo/components/baseball-team.js b/app/components/demo/baseball-team.js → app/modules/demo/components/baseball-team.js
@@ -6,17 +6,12 @@ class BaseballTeamController {
     $onInit() {
       this.$logService.info('This component displays the baseball team entered');
     }
-
 }
 
-const BaseballTeam = {
+export default {
     bindings: {
         team: '='
     },
-    template: '<div>{{$ctrl.team}}</div>',
+    template: '<div>Baseball Team: {{$ctrl.team}}</div>',
     controller: BaseballTeamController
 }
-
-export default ngModule => {
-  ngModule.component('baseballTeam',  BaseballTeam);
-}
diff --git a/app/components/demo/basketball-team.js → ...odules/demo/components/basketball-team.js b/app/components/demo/basketball-team.js → ...odules/demo/components/basketball-team.js
@@ -6,17 +6,12 @@ class BasketballTeamController {
     $onInit() {
       this.$logService.info('This component displays the basketball team entered');
     }
-
 }
 
-const BasketballTeam = {
+export default {
     bindings: {
         team: '='
     },
-    template: '<div>{{$ctrl.team}}</div>',
+    template: '<div>Basketball Team: {{$ctrl.team}}</div>',
     controller: BasketballTeamController
 }
-
-export default ngModule => {
-  ngModule.component('basketballTeam',  BasketballTeam);
-}
diff --git a/app/components/demo/favorite-teams.html → ...dules/demo/components/favorite-teams.html b/app/components/demo/favorite-teams.html → ...dules/demo/components/favorite-teams.html
@@ -1,4 +1,6 @@
-<form class="favorite-teams">
+<div class="favorite-teams">
+  <h2>Component Demo for Two-Way Binding btw/ Inputs & Controller</h2>
+
   {{$ctrl.greeting}}
 
   <div class="favoriteTeams-input">Football Team <input ng-model="$ctrl.footballTeam"></div>

diff --git a/app/components/demo/favorite-teams.js → ...modules/demo/components/favorite-teams.js b/app/components/demo/favorite-teams.js → ...modules/demo/components/favorite-teams.js
@@ -13,12 +13,8 @@ class FavoriteTeamsController {
     }
 }
 
-const FavoriteTeams = {
+export default {
     bindings: {},
-    template: require('./favorite-teams.html'),  // could also inline it, just trying this out
+    template: require('./favorite-teams.html'),
     controller: FavoriteTeamsController
-}
-
-export default ngModule => {
-  ngModule.component('favoriteTeams',  FavoriteTeams);
-}
+}
diff --git a/app/components/demo/football-team.js → app/modules/demo/components/football-team.js b/app/components/demo/football-team.js → app/modules/demo/components/football-team.js
@@ -6,17 +6,12 @@ class FootballTeamController {
     $onInit() {
       this.$logService.info('This component displays the football team entered');
     }
-
 }
 
-const FootballTeam = {
+export default {
     bindings: {
         team: '='
     },
-    template: '<div>{{$ctrl.team}}</div>',
+    template: '<div> Football Team: {{$ctrl.team}}</div>',
     controller: FootballTeamController
-}
-
-export default ngModule => {
-  ngModule.component('footballTeam',  FootballTeam);
-}
+}
diff --git a/app/modules/demo/index.js b/app/modules/demo/index.js
@@ -0,0 +1,10 @@
+import favoriteTeams from './components/favorite-teams';
+import footballTeam from './components/football-team';
+import basketballTeam from './components/basketball-team';
+import baseballTeam from './components/baseball-team';
+
+export default angular.module('app.demo', [])
+  .component('favoriteTeams', favoriteTeams)
+  .component('footballTeam', footballTeam)
+  .component('basketballTeam', basketballTeam)
+  .component('baseballTeam', baseballTeam);
diff --git a/app/components/nav/.gitkeep → app/modules/demo/services/.gitkeep b/app/components/nav/.gitkeep → app/modules/demo/services/.gitkeep
diff --git a/app/components/user/.gitkeep → app/modules/home/components/.gitkeep b/app/components/user/.gitkeep → app/modules/home/components/.gitkeep
diff --git a/app/modules/home/services/.gitkeep b/app/modules/home/services/.gitkeep
diff --git a/app/modules/nav/components/.gitkeep b/app/modules/nav/components/.gitkeep
diff --git a/app/modules/nav/services/.gitkeep b/app/modules/nav/services/.gitkeep
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,3 +42,6 @@ config @@
     .env.sh
     .env.js
     env
+    # Webpack output
+    public/*.js