From a1692ca07554b27e1089015b2de323bc9f1e3bb4 Mon Sep 17 00:00:00 2001 From: Immanuel Onyeka Date: Fri, 28 May 2021 16:49:51 -0400 Subject: [PATCH] Make UI more scalable --- resources/js/panel/panel.vue | 2 +- resources/js/panel/service-pane.vue | 15 ++++++++------- resources/js/panel/services.vue | 19 +++++++++++------- resources/scss/main.scss | 30 ++++++++++++++--------------- resources/views/master.blade.php | 2 ++ resources/views/panel.blade.php | 2 ++ 6 files changed, 40 insertions(+), 30 deletions(-) diff --git a/resources/js/panel/panel.vue b/resources/js/panel/panel.vue index 828c034..4f23209 100644 --- a/resources/js/panel/panel.vue +++ b/resources/js/panel/panel.vue @@ -70,7 +70,7 @@ export default { token: '', orders: '', loading: true} }, methods: {}, - beforeCreate() { + created() { fetch("/panel/services", { method: 'GET', headers: {'Content-Type': 'application/json', diff --git a/resources/js/panel/service-pane.vue b/resources/js/panel/service-pane.vue index 1c48f0c..f0f88ab 100644 --- a/resources/js/panel/service-pane.vue +++ b/resources/js/panel/service-pane.vue @@ -1,9 +1,9 @@ diff --git a/resources/js/panel/services.vue b/resources/js/panel/services.vue index d508b5f..643fd0f 100644 --- a/resources/js/panel/services.vue +++ b/resources/js/panel/services.vue @@ -8,15 +8,16 @@
Name
Credits per 1000
Min Qt.
Max Qt.
- - - - -
- + + + + +
+

Location Targeted Views

+

Cost: 50

Quantity

/ 10000

Location

@@ -38,10 +39,13 @@ diff --git a/resources/scss/main.scss b/resources/scss/main.scss index 0698139..c8d0658 100644 --- a/resources/scss/main.scss +++ b/resources/scss/main.scss @@ -687,26 +687,27 @@ div.register-area.active { } main.panel { - min-height: 750px; - height: 90vh; + // min-height: 750px; + height: 100vh; // max-height: 100vh; background-image: linear-gradient(315deg, #ff4e00 0%, #ec9f05 74%); } #panel { top: 50px; - padding: 10px; + padding: 0 5%; margin: auto; position: relative; - max-width: 450px; - height: 600px; + max-width: 800px; + height: 90%; display: flex; gap: 10px; } #sidebar { position: relative; - width: 35px; + width: 6%; + max-width: 55px; height: 50%; color: white; background: transparent; @@ -719,23 +720,22 @@ main.panel { } svg { - width: 35px; + width: 100%; height: 35px; color: white; } + a.selected svg { color: vars.getColor("brand-orange"); } } #panel #main { - height: 100%; background: white; width: 100%; flex-shrink: 1; margin-left: auto; position: relative; - // opacity: 1; @include vars.hovering3; transition: opacity 0.5s ease; vertical-align: middle; @@ -980,7 +980,7 @@ main.panel { margin-top: 20px; border-top: 1px solid darkgrey; border-bottom: 1px solid darkgrey; - height: 2em; + min-height: 2em; background-color: rgb(239, 239, 239); color: rgb(118, 118, 118); padding-right: 30px; @@ -1071,12 +1071,11 @@ main.panel { top: 0; .overlay-item { - transform: translateY(-50px); width: 20em; - height: 20em; + min-height: 20em; background: white; margin: auto; - margin-top: 25%; + margin-top: 20%; opacity: 1; border-radius: 4px; padding: 5px; @@ -1111,9 +1110,10 @@ main.panel { } .cancel { + position: absolute; width: 30px; - margin-right: 10px; - margin-top: 10px; + right: 10px; + top: 10px; } button { diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php index 2fff216..e6edb89 100644 --- a/resources/views/master.blade.php +++ b/resources/views/master.blade.php @@ -44,6 +44,7 @@ spellcheck='false'>
@yield('content') +@section('footer') +@show @yield('scripts') diff --git a/resources/views/panel.blade.php b/resources/views/panel.blade.php index ffb13d7..e107fdb 100644 --- a/resources/views/panel.blade.php +++ b/resources/views/panel.blade.php @@ -15,6 +15,8 @@
@endsection +@section('footer') +@endsection @section('scripts') @parent