add winner

IceMaD · Feb 19, 2016 · 4793e08 · 4793e08
1 parent 3bdac75
commit 4793e08
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 15 deletions.
diff --git a/app/sass/ext/_fonts.scss b/app/sass/ext/_fonts.scss
@@ -0,0 +1,36 @@
+@font-face {
+  font-family: 'Material Icons';
+  font-style: normal;
+  font-weight: 400;
+  src: url(/node_modules/material-design-icons/iconfont/MaterialIcons-Regular.eot); /* For IE6-8 */
+  src: local('Material Icons'),
+  local('MaterialIcons-Regular'),
+  url(/node_modules/material-design-icons/iconfont/MaterialIcons-Regular.woff2) format('woff2'),
+  url(/node_modules/material-design-icons/iconfont/MaterialIcons-Regular.woff) format('woff'),
+  url(/node_modules/material-design-icons/iconfont/MaterialIcons-Regular.ttf) format('truetype');
+}
+
+.material-icons {
+  font-family: 'Material Icons';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 1.5em;  /* Preferred icon size */
+  display: inline-block;
+  line-height: 1;
+  text-transform: none;
+  letter-spacing: normal;
+  word-wrap: normal;
+  white-space: nowrap;
+  direction: ltr;
+
+  /* Support for all WebKit browsers. */
+  -webkit-font-smoothing: antialiased;
+  /* Support for Safari and Chrome. */
+  text-rendering: optimizeLegibility;
+
+  /* Support for Firefox. */
+  -moz-osx-font-smoothing: grayscale;
+
+  /* Support for IE. */
+  font-feature-settings: 'liga';
+}
diff --git a/app/sass/style.sass b/app/sass/style.sass
@@ -1,6 +1,7 @@
 @import 'ext/reset'
 @import 'ext/variables'
 @import 'ext/mixins'
+@import 'ext/fonts'
 
 +component(tree)
 
@@ -73,6 +74,10 @@
 
         content: none
 
+    +modifier(winner)
+
+      background-color: gold
+
     +modifier(won)
 
       background-color: lighten($granny-green, 10%)
@@ -89,6 +94,7 @@
 
         background-color: darken($blush-pink, 20%)
 
+
 +component(router-outlet)
 
   display: none
@@ -177,6 +183,17 @@
 
 +component(message)
 
-  +child(warning)
+  display: flex
+  align-items: center
+
+  +child(status)
+
+    margin-right: .5em
+
+    +modifier(error)
+
+      color: $blush-pink
+
+    +modifier(success)
 
-    color: $blush-pink
+      color: $granny-green
diff --git a/app/templates/homepage.html b/app/templates/homepage.html
diff --git a/app/templates/node.html b/app/templates/node.html
@@ -3,7 +3,8 @@
           '--last': node.last,
           '--won': node.status == 'won',
           '--lost': node.status == 'lost',
-          '--highlighted': node.highlighted
+          '--highlighted': node.highlighted,
+          '--winner': node.last && node.team
         }"
         [overlay]="node"
         (click)="node.win()">

diff --git a/app/templates/team-management.html b/app/templates/team-management.html
@@ -8,11 +8,18 @@
 
   <div class="button-bar">
     <span class="message">
+        <i class="message_status material-icons"
+           [class.--success]="isFilled()"
+           [class.--error]="!isFilled()">{{ isFilled() ? 'check' : 'close' }}</i>
       Currently {{ teams.length }} teams
-      <span class="message_warning" *ngIf="!isFilled()">
-        X
-      </span>
     </span>
     <a class="button" [routerLink]="['TreeComponent']">Generate</a>
   </div>
 </div>
+
+
+<ul>
+  <li>Edit Team name</li>
+  <li>Winner in gold</li>
+  <li>Remove all team button</li>
+</ul>
diff --git a/app/ts/Services/TeamHolderService.ts b/app/ts/Services/TeamHolderService.ts
@@ -95,10 +95,14 @@ export class TeamHolderService {
   }
 
   private static hasConfirmed(): boolean {
-    if (this.hasTree() && confirm('Cette action aura pour effet de supprimer l\'arbre existant')) {
-      this._tree = null;
+    if (!this.hasTree()) {
+      return true;
     }
 
-    return true
+    if (!confirm('Cette action aura pour effet de supprimer l\'arbre existant')) {
+      return false;
+    }
+    this._tree = null;
+    return true;
   }
 }
diff --git a/app/ts/Services/TreeManager.ts b/app/ts/Services/TreeManager.ts
@@ -31,10 +31,12 @@ export class TreeManager {
 
     this._nodes = this._nodes.concat(nodes);
 
+    nodes[0].last = true;
+
     return nodes[0];
   }
 
-  static findParentOf(nodeTofind: NodeModel): NodeModel|boolean {
+  static findParentOf(nodeToFind: NodeModel): NodeModel|boolean {
 
     // For each node
     for (let i:number = 0; i < this._nodes.length; i++) {
@@ -45,7 +47,7 @@ export class TreeManager {
         let child:NodeModel = node.children[j];
 
         // If the child match, return the parent
-        if (child.id === nodeTofind.id) {
+        if (child.id === nodeToFind.id) {
           return node;
         }
       }

diff --git a/package.json b/package.json
@@ -16,7 +16,8 @@
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.0",
     "zone.js": "0.5.10",
-    "underscore": "~1.8.3"
+    "underscore": "~1.8.3",
+    "material-design-icons": "~2.2.0"
   },
   "devDependencies": {
     "concurrently": "^1.0.0",