Welcome all users to their status page

resources/lang/en/dashboard.php

@@ -233,7 +233,7 @@ return [
     'login' => [
         'login'      => 'Login',
         'logged_in'  => 'You\'re logged in.',
-        'welcome'    => 'Welcome Back!',
+        'welcome'    => 'Welcome back!',
         'two-factor' => 'Please enter your token.',
     ],
 
@@ -259,16 +259,16 @@ return [
 
     // Welcome modal
     'welcome' => [
-        'welcome' => 'Welcome to your new Status page!',
-        'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Take me straight to my dashboard',
+        'welcome' => 'Welcome to your new status page, :username!',
+        'message' => 'You\'re almost ready but you might want to configure these extra settings first...',
+        'close'   => 'I\'m good thanks!',
         'steps'   => [
-            'component'  => 'Create components',
-            'incident'   => 'Create incidents',
-            'customize'  => 'Customize',
-            'team'       => 'Add users',
-            'api'        => 'Generate API token',
-            'two-factor' => 'Two Factor Authentication',
+            'component'  => 'Add your components',
+            'incident'   => 'Create an incident',
+            'customize'  => 'Customize your page',
+            'team'       => 'Add your team',
+            'api'        => 'Generate an API token',
+            'two-factor' => 'Setup Two Factor Authentication',
         ],
     ],
 

resources/views/dashboard/index.blade.php

@@ -87,12 +87,7 @@
         @endif
     </div>
 </div>
-@if(Session::get('setup.done'))
+@if ($welcome_user)
 @include('dashboard.partials.welcome-modal')
-<script>
-(function() {
-    $('#welcome-modal').modal('show');
-}());
-</script>
 @endif
 @stop

resources/views/dashboard/partials/welcome-modal.blade.php

@@ -1,4 +1,3 @@
-<!-- First time welcome Modal -->
 <div class="modal fade" id="welcome-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
         <div class="modal-content">
@@ -7,7 +6,7 @@
             </div>
             <div class="modal-body">
                 <header>
-                    {{ trans('dashboard.welcome.welcome') }}
+                    {{ trans('dashboard.welcome.welcome', ['username' => $current_user->username]) }}
                 </header>
 
                 <p>
@@ -38,18 +37,18 @@
                     <div class="row">
                         <div class="col-md-4 animated fadeInDown">
                             <a href="{{ route('dashboard.team.add') }}">
-                                <i class="ion  ion-ios-people"></i>
+                                <i class="ion ion-ios-people"></i>
                                 {{ trans('dashboard.welcome.steps.team') }}
                             </a>
                         </div>
                         <div class="col-md-4 animated fadeInDown two">
-                            <a href="{{ route('dashboard.user') }}">
+                            <a href="{{ route('dashboard.user.user') }}">
                                 <i class="ion ion-code-working"></i>
                                 {{ trans('dashboard.welcome.steps.api') }}
                             </a>
                         </div>
                         <div class="col-md-4 animated fadeInDown three">
-                            <a href="{{ route('dashboard.user') }}">
+                            <a href="{{ route('dashboard.user.user') }}">
                                 <i class="ion ion-unlocked"></i>
                                 {{ trans('dashboard.welcome.steps.two-factor') }}
                             </a>
@@ -65,3 +64,9 @@
         </div>
     </div>
 </div>
+
+<script>
+(function() {
+    $('#welcome-modal').modal('show');
+}());
+</script>