From fa7243a87120daf5a546d8e7750b93c521e308ef Mon Sep 17 00:00:00 2001
From: devfake <devfakeplus@googlemail.com>
Date: Mon, 22 Jun 2015 19:16:22 +0200
Subject: [PATCH] rewrite navigation

---
 site/client/app/components/deckBuilder.js |  8 +++++++-
 site/client/app/components/inner.js       |  2 ++
 site/client/app/components/navigation.js  | 11 +++++++++++
 site/client/app/views/navigation.html     |  8 +++++---
 site/server/app/Http/routes.php           | 10 ++++++----
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/site/client/app/components/deckBuilder.js b/site/client/app/components/deckBuilder.js
index 48912bc..113437f 100644
--- a/site/client/app/components/deckBuilder.js
+++ b/site/client/app/components/deckBuilder.js
@@ -1,5 +1,11 @@
 module.exports = {
 
-  template: "<h2>deckbuilder hier</h2>"
+  template: "<h2>deckbuilder hier</h2>",
+
+  data: function() {
+    return {
+
+    }
+  }
 
 };
\ No newline at end of file
diff --git a/site/client/app/components/inner.js b/site/client/app/components/inner.js
index 381f2f7..c7a68d4 100644
--- a/site/client/app/components/inner.js
+++ b/site/client/app/components/inner.js
@@ -2,6 +2,8 @@ module.exports = {
 
   template: require('../views/inner.html'),
 
+  inherit: true,
+
   data: function() {
     return {
       modal: false
diff --git a/site/client/app/components/navigation.js b/site/client/app/components/navigation.js
index 9d9f695..d3c444f 100644
--- a/site/client/app/components/navigation.js
+++ b/site/client/app/components/navigation.js
@@ -6,6 +6,17 @@ module.exports = {
 
   inherit: true,
 
+  data: function() {
+    return {
+      // todo: work with slug filter
+      navigation: [
+        { name: 'Lobby', route: '/lobby' },
+        { name: 'Deck Builder', route: '/deck-builder' },
+        { name: 'Highscore', route: '/highscore' }
+      ]
+    }
+  },
+
   methods: {
     searchMatch: function() {
       this.modal = true;
diff --git a/site/client/app/views/navigation.html b/site/client/app/views/navigation.html
index 209ff88..a56d928 100644
--- a/site/client/app/views/navigation.html
+++ b/site/client/app/views/navigation.html
@@ -1,8 +1,10 @@
 <nav>
   <ul>
-    <li><a class="active" v-link="/lobby">Lobby</a></li>
-    <li><a v-link="/deck-builder">Deck Builder</a></li>
-    <li><a v-on="click: changeView('highscore')">Highscore</a></li>
+    <li v-repeat="nav: navigation">
+      <a v-link="{{ nav.route }}" class="{{ route.path == nav.route ? 'active' : '' }}">
+        {{ nav.name }}
+      </a>
+    </li>
 
     <li class="sub-nav" v-on="click: searchMatch"><a>Quick Match</a></li>
   </ul>
diff --git a/site/server/app/Http/routes.php b/site/server/app/Http/routes.php
index 0e8afa0..7cd0513 100755
--- a/site/server/app/Http/routes.php
+++ b/site/server/app/Http/routes.php
@@ -1,8 +1,11 @@
 <?php
 
   get('/lobby', function() {
-    return view('app')
-      ->withSection('inner');
+    return view('app')->withSection('inner');
+  });
+
+  get('/deck-builder', function() {
+    return view('app')->withSection('inner');
   });
 
   get('/', function() {
@@ -10,6 +13,5 @@
       return redirect('/lobby');
     }
 
-    return view('app')
-      ->withSection('landing');
+    return view('app')->withSection('landing');
   });
\ No newline at end of file