From 84b209da56f9d0fec62b1e81d8b600853e73e836 Mon Sep 17 00:00:00 2001 From: devfake Date: Sun, 21 Jun 2015 21:20:17 +0200 Subject: [PATCH] rewrite structure and bit chat styling --- site/client/app/app.js | 5 +-- site/client/app/components/chat.js | 5 +++ site/client/app/components/navigation.js | 5 ++- site/client/app/routes.js | 44 +++++++++++++----------- site/client/app/views/chat.html | 13 +++++++ site/client/app/views/lobby.html | 10 +++--- site/client/app/views/navigation.html | 4 +-- site/client/assets/sass/_chat.scss | 22 ++++++++++++ site/client/assets/sass/_inner.scss | 6 ++++ site/client/assets/sass/_nav.scss | 1 + site/client/assets/sass/app.scss | 3 +- site/client/views/inner.blade.php | 16 ++++++--- 12 files changed, 96 insertions(+), 38 deletions(-) create mode 100644 site/client/app/components/chat.js create mode 100644 site/client/app/views/chat.html create mode 100644 site/client/assets/sass/_chat.scss diff --git a/site/client/app/app.js b/site/client/app/app.js index ee3091e..c69395b 100644 --- a/site/client/app/app.js +++ b/site/client/app/app.js @@ -16,9 +16,10 @@ var app = new Vue({ components: { lobby: require('./components/lobby'), - navigation: require('./components/navigation') + navigation: require('./components/navigation'), + chat: require('./components/chat') } }); -router.init(app); \ No newline at end of file +//router.init(app); \ No newline at end of file diff --git a/site/client/app/components/chat.js b/site/client/app/components/chat.js new file mode 100644 index 0000000..a091206 --- /dev/null +++ b/site/client/app/components/chat.js @@ -0,0 +1,5 @@ +module.exports = { + + template: require('../views/chat.html') + +}; \ No newline at end of file diff --git a/site/client/app/components/navigation.js b/site/client/app/components/navigation.js index 6e0a04a..70da0d3 100644 --- a/site/client/app/components/navigation.js +++ b/site/client/app/components/navigation.js @@ -1,5 +1,4 @@ -var Router = require('director').Router; -var router = new Router(); +var router = require('./../routes'); module.exports = { @@ -7,7 +6,7 @@ module.exports = { methods: { changeView: function(view) { - router.setRoute('test'); + router.changeRoute(view); } } diff --git a/site/client/app/routes.js b/site/client/app/routes.js index e6a065e..aaf7e98 100644 --- a/site/client/app/routes.js +++ b/site/client/app/routes.js @@ -1,24 +1,28 @@ -var Router = require('director').Router; -var router = new Router(); - -module.exports = { - - init: function(app) { - router.on('/lobby', function() { - app.view = 'lobby'; - app.section = 'inner'; - }); - - router.on('/test', function() { - }) - - this.configure(); - router.init(); +var routes = { + '/lobby': function() { + alert('lobby'); }, - configure: function() { - router.configure({ - html5history: true - }) + '/deck-builder': function() { + alert('deck-builder'); + }, + + '/highscore': function() { + alert('highscore'); + } +}; + +var options = { + html5history: true, + run_handler_in_init: false, + convert_hash_in_init: false +} + +var Router = require('director').Router; +var router = new Router(routes).configure(options).init(); + +module.exports = { + changeRoute: function(route) { + router.setRoute(route); } } \ No newline at end of file diff --git a/site/client/app/views/chat.html b/site/client/app/views/chat.html new file mode 100644 index 0000000..9c16323 --- /dev/null +++ b/site/client/app/views/chat.html @@ -0,0 +1,13 @@ +
+ + +
+ +
+ +
\ No newline at end of file diff --git a/site/client/app/views/lobby.html b/site/client/app/views/lobby.html index f2d69b4..40dc786 100644 --- a/site/client/app/views/lobby.html +++ b/site/client/app/views/lobby.html @@ -1,11 +1,11 @@ -
+Gwent - Gwent +
-
+
blaa -
+
- + \ No newline at end of file diff --git a/site/client/app/views/navigation.html b/site/client/app/views/navigation.html index 2e85955..5d60f33 100644 --- a/site/client/app/views/navigation.html +++ b/site/client/app/views/navigation.html @@ -1,7 +1,7 @@ diff --git a/site/client/assets/sass/_chat.scss b/site/client/assets/sass/_chat.scss new file mode 100644 index 0000000..ac34279 --- /dev/null +++ b/site/client/assets/sass/_chat.scss @@ -0,0 +1,22 @@ +.container-chat { + float: right; + width: 29%; + + a { + font-size: 14px; + padding: 15px 15px; + } +} + +.chat { + float: left; + width: 100%; + padding: 20px; + height: calc(100vh - 300px); + min-height: 400px; + clear: both; + + color: #fff; + + @include contentGradient(); +} \ No newline at end of file diff --git a/site/client/assets/sass/_inner.scss b/site/client/assets/sass/_inner.scss index 6bdef57..566a2d4 100644 --- a/site/client/assets/sass/_inner.scss +++ b/site/client/assets/sass/_inner.scss @@ -14,7 +14,13 @@ body.inner { main { float: left; + clear: both; width: 70%; +} + +.container-content { + float: left; + width: 100%; padding: 20px; height: calc(100vh - 300px); min-height: 400px; diff --git a/site/client/assets/sass/_nav.scss b/site/client/assets/sass/_nav.scss index 5eeb284..9b8bae2 100644 --- a/site/client/assets/sass/_nav.scss +++ b/site/client/assets/sass/_nav.scss @@ -21,6 +21,7 @@ nav { padding: 12px 25px; float: left; cursor: pointer; + height: 55px; @include transition(color); diff --git a/site/client/assets/sass/app.scss b/site/client/assets/sass/app.scss index eefc324..b27e07e 100644 --- a/site/client/assets/sass/app.scss +++ b/site/client/assets/sass/app.scss @@ -10,4 +10,5 @@ 'form', 'landing', 'inner', -'nav'; \ No newline at end of file +'nav', +'chat'; \ No newline at end of file diff --git a/site/client/views/inner.blade.php b/site/client/views/inner.blade.php index 2db5a65..5e37bf9 100644 --- a/site/client/views/inner.blade.php +++ b/site/client/views/inner.blade.php @@ -2,10 +2,16 @@ @section('content') - @if($type == 'server') - - @else - - @endif +
+ + @if($type == 'server') + + @else + + @endif + + + +
@stop \ No newline at end of file