From be396796905d05fd8e3019597e9bfe91ccf9df43 Mon Sep 17 00:00:00 2001 From: devfake Date: Mon, 22 Jun 2015 12:16:40 +0200 Subject: [PATCH] rewrite app view --- site/client/app/components/modals/searchMatch.js | 14 +++++++------- site/client/app/views/inner.html | 2 +- site/client/views/app.blade.php | 6 +----- site/server/app/Http/routes.php | 4 ++++ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/site/client/app/components/modals/searchMatch.js b/site/client/app/components/modals/searchMatch.js index cb5aef0..1b05253 100644 --- a/site/client/app/components/modals/searchMatch.js +++ b/site/client/app/components/modals/searchMatch.js @@ -2,13 +2,13 @@ module.exports = { template: require('../../views/modals/searchMatch.html'), - inherit: true, + inherit: true, - methods: { - cancelMatch: function() { - this.modal = false; - // trigger match functions - } - } + methods: { + cancelMatch: function() { + this.modal = false; + // trigger match functions + } + } }; \ No newline at end of file diff --git a/site/client/app/views/inner.html b/site/client/app/views/inner.html index e319baa..fcf4779 100644 --- a/site/client/app/views/inner.html +++ b/site/client/app/views/inner.html @@ -12,4 +12,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/site/client/views/app.blade.php b/site/client/views/app.blade.php index 3f3b84c..13e306d 100644 --- a/site/client/views/app.blade.php +++ b/site/client/views/app.blade.php @@ -14,11 +14,7 @@ - @if(Auth::check() || Request::path() != '/') - - @else - - @endif + diff --git a/site/server/app/Http/routes.php b/site/server/app/Http/routes.php index 4d1e212..0e8afa0 100755 --- a/site/server/app/Http/routes.php +++ b/site/server/app/Http/routes.php @@ -6,6 +6,10 @@ }); get('/', function() { + if(Auth::check()) { + return redirect('/lobby'); + } + return view('app') ->withSection('landing'); }); \ No newline at end of file