Improve dashboard component

2018-06-17 11:29:29 +01:00
parent 1bc2b220d3
commit 394a024f32
3 changed files with 106 additions and 103 deletions
@@ -1,8 +1,9 @@
 <script>
 module.exports = {
-    props: ['welcome-user'],
+    props: ['user'],
    mounted () {
-        if (this.welcomeUser) {
+        if (!this.user.welcomed) {
+            // @todo Replace this with a non-jquery alternative.
            $('#welcome-modal').modal('show');
        }
    },
@@ -1,7 +1,6 @@
@extends('layout.dashboard')

@section('content')
-<dashboard inline-template :welcome-user="{{ $welcome_user ? 'true' : 'false' }}">
 <div>
    <div class="header">
        <div class="sidebar-toggler visible-xs">
@@ -91,5 +90,4 @@
    </div>
    @includeWhen($welcome_user, 'dashboard.partials.welcome-modal')
 </div>
-</dashboard>
@stop
@@ -42,6 +42,8 @@

 <body class="dashboard">
    <div class="wrapper" id="app">
+        <dashboard inline-template :user="{{ $current_user }}">
+            <div>
                @include('dashboard.partials.sidebar')
                <div class="page-content">
                    @if(!$is_writeable)
@@ -59,6 +61,8 @@
                    @yield('content')
                </div>
            </div>
+        </dashboard>
+    </div>
 </body>
@yield('js')
 <script src="{{ mix('dist/js/all.js') }}"></script>