From 01b0007819953f481fbd8a70d4e7700d7e9f8293 Mon Sep 17 00:00:00 2001
From: = <dadmassu1920@gmail.com>
Date: Mon, 6 Mar 2017 19:27:07 +0100
Subject: [PATCH 1/5] D-1: Create the repository

---
 src/app/app.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/app.html b/src/app/app.html
index 29501db8c..7e308ad32 100644
--- a/src/app/app.html
+++ b/src/app/app.html
@@ -1,9 +1,9 @@
 <main>
-  <h1 class="title">Hello from Angular !</h1>
-
-  <!-- Images (and assets) are parsed and loaded from within the public directory -->
-  <img src="http://github.com/img/logo.png">
+    <h1 class="title">Hello from Angular !</h1>
+    <h2>THis dawit from the second header speaking</h2>
+    <!-- Images (and assets) are parsed and loaded from within the public directory -->
+    <img src="http://github.com/img/logo.png">
 </main>
 <footer>
-  <a ng-href="http://github.com/%7B%7Bapp.url%7D%7D">Webpack Angular Starter</a>
+    <a ng-href="http://github.com/%7B%7Bapp.url%7D%7D">Webpack Angular Starter</a>
 </footer>
\ No newline at end of file

From d10b0071e856108c4d88b66aefa4285cf0252f09 Mon Sep 17 00:00:00 2001
From: = <dadmassu1920@gmail.com>
Date: Sat, 11 Mar 2017 20:12:11 +0100
Subject: [PATCH 2/5] Add new feautres to the angular webpack service

---
 package.json                           |  5 +++-
 src/app/app.html                       |  3 +++
 src/app/app.js                         | 28 ++++++++++++++--------
 src/app/beginner/beginner.component.js | 11 +++++++++
 src/app/starter/starte.component.js    |  7 ++++++
 src/app/starter/starter.controller.js  | 32 ++++++++++++++++++++++++++
 src/app/starter/starter.template.html  | 13 +++++++++++
 src/style/app.css                      | 22 ++++++------------
 8 files changed, 95 insertions(+), 26 deletions(-)
 create mode 100644 src/app/beginner/beginner.component.js
 create mode 100644 src/app/starter/starte.component.js
 create mode 100644 src/app/starter/starter.controller.js
 create mode 100644 src/app/starter/starter.template.html

diff --git a/package.json b/package.json
index ff1992462..290187db4 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,10 @@
   },
   "homepage": "https://github.com/Foxandxss/angular-webpack-workflow",
   "dependencies": {
-    "angular": "^1.5.0"
+    "angular": "^1.5.0",
+    "angular-animate": "^1.6.2",
+    "angular-aria": "^1.6.2",
+    "angular-material": "^1.1.3"
   },
   "devDependencies": {
     "angular-mocks": "^1.5.0",
diff --git a/src/app/app.html b/src/app/app.html
index 7e308ad32..1f87abb25 100644
--- a/src/app/app.html
+++ b/src/app/app.html
@@ -2,8 +2,11 @@
     <h1 class="title">Hello from Angular !</h1>
     <h2>THis dawit from the second header speaking</h2>
     <!-- Images (and assets) are parsed and loaded from within the public directory -->
+    <input ng-model="$ctrl.name"> {{$ctrl.name}}
     <img src="http://github.com/img/logo.png">
 </main>
+<starter></starter>
+<beginner></beginner>
 <footer>
     <a ng-href="http://github.com/%7B%7Bapp.url%7D%7D">Webpack Angular Starter</a>
 </footer>
\ No newline at end of file
diff --git a/src/app/app.js b/src/app/app.js
index d5e26c84a..5406a5bfc 100644
--- a/src/app/app.js
+++ b/src/app/app.js
@@ -1,25 +1,33 @@
 import angular from 'angular';
+import starter from './starter/starte.component';
+import beginner from './beginner/beginner.component';
+
+import 'angular-animate';
+import 'angular-aria';
+import 'angular-material';
 
 import '../style/app.css';
 
 let app = () => {
-  return {
-    template: require('./app.html'),
-    controller: 'AppCtrl',
-    controllerAs: 'app'
-  }
+    return {
+        template: require('./app.html'),
+        controller: 'AppCtrl',
+        controllerAs: 'app'
+    }
 };
 
 class AppCtrl {
-  constructor() {
-    this.url = 'https://github.com/preboot/angular-webpack';
-  }
+    constructor() {
+        this.url = 'https://github.com/preboot/angular-webpack';
+    }
 }
 
 const MODULE_NAME = 'app';
 
 angular.module(MODULE_NAME, [])
-  .directive('app', app)
-  .controller('AppCtrl', AppCtrl);
+    .directive('app', app)
+    .component('starter', starter)
+    .component('beginner', beginner)
+    .controller('AppCtrl', AppCtrl);
 
 export default MODULE_NAME;
\ No newline at end of file
diff --git a/src/app/beginner/beginner.component.js b/src/app/beginner/beginner.component.js
new file mode 100644
index 000000000..792ff8cb5
--- /dev/null
+++ b/src/app/beginner/beginner.component.js
@@ -0,0 +1,11 @@
+class controller {
+    constructor($scope) {
+        this.$scope = $scope;
+        this.$scope.names = ["first", "second", "third"];
+    }
+}
+
+export default {
+    template: "<div><ul><li ng-repeat='name in names'>{{name}}</li></ul></div>",
+    controller,
+}
\ No newline at end of file
diff --git a/src/app/starter/starte.component.js b/src/app/starter/starte.component.js
new file mode 100644
index 000000000..0cd97909b
--- /dev/null
+++ b/src/app/starter/starte.component.js
@@ -0,0 +1,7 @@
+import controller from './starter.controller'
+import template from './starter.template.html'
+
+export default {
+    template,
+    controller
+}
\ No newline at end of file
diff --git a/src/app/starter/starter.controller.js b/src/app/starter/starter.controller.js
new file mode 100644
index 000000000..87582159d
--- /dev/null
+++ b/src/app/starter/starter.controller.js
@@ -0,0 +1,32 @@
+class controller {
+    constructor($scope, $http) {
+        this.$scope = $scope;
+        this.$scope.name = "dawit";
+        this.$http = $http;
+        this.selamta = "";
+        this.contacts = "example.com";
+        this.counter = 0;
+    }
+
+    $onInit() {
+        this.$http.get('http://127.0.0.1:5000/')
+            .then((datas) => {
+                this.selamta = datas.data;
+                console.log('inside', this.selamta);
+
+            }, (datas) => {
+                console.log(datas);
+            }).then(() => { console.log('outside', this.selamta) })
+    }
+
+    count() {
+        this.counter++;
+    }
+
+    reset() {
+        this.counter = 0;
+    }
+
+}
+
+export default controller;
\ No newline at end of file
diff --git a/src/app/starter/starter.template.html b/src/app/starter/starter.template.html
new file mode 100644
index 000000000..fc6f8705f
--- /dev/null
+++ b/src/app/starter/starter.template.html
@@ -0,0 +1,13 @@
+<div>
+    <md-switch ng-model="$ctrl.contacts" aria-label="Switch 2" ng-true-value="'yup'" ng-false-value="'nope'" class="md-warn">
+        Switch 2 (md-warn): {{ $ctrl.contacts }}
+    </md-switch>
+    <p>what is up</p>
+    <h1>{{name}}from the starter component</h1>
+    <h1> {{$ctrl.selamta.title}} from the http request in the starter component</h1>
+    <md-chips ng-model="$ctrl.contacts">
+        {{$ctrl.contacts}}
+    </md-chips>
+    <button ng-click="$ctrl.count()">{{$ctrl.counter}}</button> {{$ctrl.counter != 5}}
+    <button ng-click="$ctrl.reset()" ng-disabled="$ctrl.counter == 5">reset</button>
+</div>
\ No newline at end of file
diff --git a/src/style/app.css b/src/style/app.css
index c0d850e33..b9a42d52d 100644
--- a/src/style/app.css
+++ b/src/style/app.css
@@ -1,22 +1,14 @@
 /* styles in src/style directory are applied to the whole page */
-body {
-  background: #0147A7;
-  color: #fff;
-}
-
-a {
-  color: #03A9F4;
-}
 
 main {
-  padding: 1em;
-  font-family: Arial, Helvetica, sans-serif;
-  text-align: center;
-  margin-top: 50px;
-  display: block;
+    padding: 1em;
+    font-family: Arial, Helvetica, sans-serif;
+    text-align: center;
+    margin-top: 50px;
+    display: block;
 }
 
 footer {
-  text-align: center;
-  font-size: 0.8em;
+    text-align: center;
+    font-size: 0.8em;
 }
\ No newline at end of file

From 0d0dcc7cb1c19c5dea3bbeee842532ef85e9d42d Mon Sep 17 00:00:00 2001
From: = <dadmassu1920@gmail.com>
Date: Wed, 15 Mar 2017 20:09:35 +0100
Subject: [PATCH 3/5] this is zimblo commit

---
 src/app/starter/simple.component.js | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 src/app/starter/simple.component.js

diff --git a/src/app/starter/simple.component.js b/src/app/starter/simple.component.js
new file mode 100644
index 000000000..62d257051
--- /dev/null
+++ b/src/app/starter/simple.component.js
@@ -0,0 +1,10 @@
+export default {
+    template: `
+    <h1>This is the small component speaking</h1><br/>
+    <input type="text" ng-model="$ctrl.content">
+    {{$ctrl.content}}
+    `,
+    bindings: {
+        content: '=',
+    },
+}
\ No newline at end of file

From 54384c84197fd2926a4aef9fecc9c0d96d2330b5 Mon Sep 17 00:00:00 2001
From: = <dadmassu1920@gmail.com>
Date: Wed, 15 Mar 2017 08:17:18 +0100
Subject: [PATCH 4/5] This is where the commit message goes

---
 package.json                           |  2 +-
 src/app/app.html                       |  2 ++
 src/app/app.js                         |  7 ++++++-
 src/app/beginner/beginner.component.js | 11 +++--------
 src/app/starter/starter.template.html  | 20 ++++++++++++--------
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 290187db4..5098a1601 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "angular": "^1.5.0",
     "angular-animate": "^1.6.2",
     "angular-aria": "^1.6.2",
-    "angular-material": "^1.1.3"
+    "angular-material": "1.1.3"
   },
   "devDependencies": {
     "angular-mocks": "^1.5.0",
diff --git a/src/app/app.html b/src/app/app.html
index 1f87abb25..216c6dbf1 100644
--- a/src/app/app.html
+++ b/src/app/app.html
@@ -5,6 +5,8 @@ <h2>THis dawit from the second header speaking</h2>
     <input ng-model="$ctrl.name"> {{$ctrl.name}}
     <img src="http://github.com/img/logo.png">
 </main>
+<h1>{{$ctrl.what}}</h1>
+<simple-state content="deva"></simple-state>
 <starter></starter>
 <beginner></beginner>
 <footer>
diff --git a/src/app/app.js b/src/app/app.js
index 5406a5bfc..83048f93c 100644
--- a/src/app/app.js
+++ b/src/app/app.js
@@ -1,6 +1,8 @@
 import angular from 'angular';
 import starter from './starter/starte.component';
 import beginner from './beginner/beginner.component';
+import angularMaterial from 'angular-material';
+import simple from './starter/simple.component'
 
 import 'angular-animate';
 import 'angular-aria';
@@ -19,13 +21,16 @@ let app = () => {
 class AppCtrl {
     constructor() {
         this.url = 'https://github.com/preboot/angular-webpack';
+        this.what = "what is speaking at the moment"
+        this.names = ['dawit', 'tuna', 'afom'];
     }
 }
 
 const MODULE_NAME = 'app';
 
-angular.module(MODULE_NAME, [])
+angular.module(MODULE_NAME, [angularMaterial])
     .directive('app', app)
+    .component('simpleState', simple)
     .component('starter', starter)
     .component('beginner', beginner)
     .controller('AppCtrl', AppCtrl);
diff --git a/src/app/beginner/beginner.component.js b/src/app/beginner/beginner.component.js
index 792ff8cb5..6e39682d1 100644
--- a/src/app/beginner/beginner.component.js
+++ b/src/app/beginner/beginner.component.js
@@ -1,11 +1,6 @@
-class controller {
-    constructor($scope) {
-        this.$scope = $scope;
-        this.$scope.names = ["first", "second", "third"];
-    }
-}
-
 export default {
     template: "<div><ul><li ng-repeat='name in names'>{{name}}</li></ul></div>",
-    controller,
+    bindings: {
+        names: '=',
+    },
 }
\ No newline at end of file
diff --git a/src/app/starter/starter.template.html b/src/app/starter/starter.template.html
index fc6f8705f..8ba4c2820 100644
--- a/src/app/starter/starter.template.html
+++ b/src/app/starter/starter.template.html
@@ -2,12 +2,16 @@
     <md-switch ng-model="$ctrl.contacts" aria-label="Switch 2" ng-true-value="'yup'" ng-false-value="'nope'" class="md-warn">
         Switch 2 (md-warn): {{ $ctrl.contacts }}
     </md-switch>
-    <p>what is up</p>
-    <h1>{{name}}from the starter component</h1>
-    <h1> {{$ctrl.selamta.title}} from the http request in the starter component</h1>
-    <md-chips ng-model="$ctrl.contacts">
-        {{$ctrl.contacts}}
-    </md-chips>
-    <button ng-click="$ctrl.count()">{{$ctrl.counter}}</button> {{$ctrl.counter != 5}}
-    <button ng-click="$ctrl.reset()" ng-disabled="$ctrl.counter == 5">reset</button>
+    < <p>what is up</p>
+        <h1>{{name}}from the starter component</h1>
+        <h1> {{$ctrl.selamta.title}} from the http request in the starter component</h1>
+        <md-chips ng-model="$ctrl.contacts">
+            {{$ctrl.contacts}}
+        </md-chips>
+
+        <md-button>Default Button</md-button>
+
+
+        <button ng-click="$ctrl.count()">{{$ctrl.counter}}</button> {{$ctrl.counter != 5}}
+        <button ng-click="$ctrl.reset()" ng-disabled="$ctrl.counter == 5">reset</button>
 </div>
\ No newline at end of file

From a0236276f262bdc70a92692f9f5c445a98f8de18 Mon Sep 17 00:00:00 2001
From: = <dadmassu1920@gmail.com>
Date: Sun, 19 Mar 2017 00:07:21 +0100
Subject: [PATCH 5/5] aadded some shit

---
 src/app/starter/starter.controller.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/starter/starter.controller.js b/src/app/starter/starter.controller.js
index 87582159d..c638688b4 100644
--- a/src/app/starter/starter.controller.js
+++ b/src/app/starter/starter.controller.js
@@ -13,6 +13,7 @@ class controller {
             .then((datas) => {
                 this.selamta = datas.data;
                 console.log('inside', this.selamta);
+                console.log('muole');
 
             }, (datas) => {
                 console.log(datas);