Merge branch 'dev'

* dev:
  v1.5.1-beta.2
  v1.5.1-beta.1

app/Console/Commands/Deploy.php

@@ -44,7 +44,7 @@ class Deploy extends Command
 
         // Exec commands
         exec('git pull origin ' . config('app.deploy_branch'));
-        exec('composer update --no-interaction --prefer-dist');
+        //exec('composer update --no-interaction --prefer-dist');
         $this->migrateDatabase();
 
         // Stop deployment

app/Notifications/ResetPassword.php

@@ -43,10 +43,12 @@ class ResetPassword extends Notification
         $reset_url = url('/create-new-password?token=' . $this->token);
 
         return (new MailMessage)
-            ->subject('Reset password for your account on ' . config('vuefilemanager.app_name'))
-            ->line('You are receiving this email because we received a password reset request for your account.')
-            ->action('Reset Password', $reset_url)
-            ->line('If you did not request a password reset, no further action is required.');
+            ->subject(__('vuefilemanager.reset_password_subject') . config('vuefilemanager.app_name'))
+            ->greeting(__('vuefilemanager.reset_password_greeting'))
+            ->line(__('vuefilemanager.reset_password_line_1'))
+            ->action(__('vuefilemanager.reset_password_action'), $reset_url)
+            ->line(__('vuefilemanager.reset_password_line_2'))
+            ->salutation(__('vuefilemanager.salutation') . ', ' . config('vuefilemanager.app_name'));
     }
 
     /**

config/vuefilemanager.php

@@ -2,7 +2,7 @@
 
 return [
 
-    'version' => '1.5',
+    'version' => '1.5.1',
 
     // Your app name
     'app_name' => 'VueFileManager',

resources/js/components/FilesView/EmptyMessage.vue

@@ -49,10 +49,18 @@
     }
 
     @media (prefers-color-scheme: dark) {
-        .empty-message .message .icon {
+        .empty-message {
 
-            path, line, polyline, rect, circle {
-                stroke: $dark_mode_text_secondary;
+            .message {
+                .icon {
+                    path, line, polyline, rect, circle {
+                        stroke: $dark_mode_text_secondary;
+                    }
+                }
+
+                p {
+                    color: $dark_mode_text_secondary;
+                }
             }
         }
     }

resources/js/components/FilesView/FileBrowser.vue

@@ -227,6 +227,7 @@
     .file-content {
         display: flex;
         flex-wrap: nowrap;
+        height: 100%;
 
         &.is-dragging {
             @include transform(scale(0.99));
@@ -234,6 +235,7 @@
     }
 
     .files-container {
+        overflow-x: hidden;
         overflow-y: auto;
         flex: 0 0 100%;
         @include transition(150ms);

resources/js/components/Others/Forms/SelectInput.vue

@@ -205,6 +205,13 @@
                 }
             }
         }
+
+        .option-value {
+
+            &.placehoder {
+                color: $dark_mode_text_secondary;
+            }
+        }
     }
 
 </style>

resources/js/components/Others/MobileNavigation.vue

@@ -90,6 +90,10 @@
                     this.$store.dispatch('getFolder', [{folder: this.homeDirectory, back: false, init: true}])
                 }
 
+                if (name === 'power') {
+                    this.$store.dispatch('logOut')
+                }
+
                 this.closeAndResetContextMenu()
             },
             closeAndResetContextMenu() {

resources/js/views/Auth/CreateNewPassword.vue

@@ -162,10 +162,10 @@
                     })
             },
         },
-        mounted() {
+        created() {
 
             // Get token
-            this.recoverPassword.token = this.$route.params.token
+            this.recoverPassword.token = this.$route.query.token
         }
     }
 </script>

resources/js/views/Auth/SignIn.vue

@@ -86,8 +86,8 @@
             return {
                 isLoading: false,
                 checkedAccount: undefined,
-                loginPassword: '',
-                loginEmail: '',
+                loginPassword: 'vuefilemanager',
+                loginEmail: 'howdy@hi5ve.digital',
             }
         },
         methods: {

resources/lang/cn/vuefilemanager.php

@@ -6,4 +6,13 @@ return [
     'incorrect_password' => '不好意思，您的密码好像不正确。',
     'time'               => '%d. %B. %Y 于 %H:%M',
     'home'               => '首页',
+
+    // Reset password email
+    'reset_password_greeting' => 'Hello!',
+    'reset_password_subject' => 'Reset password for your account on ',
+    'reset_password_line_1'  => 'You are receiving this email because we received a password reset request for your account.',
+    'reset_password_line_2'   => 'If you did not request a password reset, no further action is required.',
+    'reset_password_action'   => 'Reset Password',
+
+    'salutation' => 'Regards'
 ];

resources/lang/en/vuefilemanager.php

@@ -1,9 +1,18 @@
 <?php
 
 return [
-    'app_description'    => 'Make your own Private Cloud with VueFileManager client powered by Laravel and Vue',
-    'user_not_fount'     => 'We can\'t find a user with that e-mail address.',
-    'incorrect_password' => 'Sorry, your password is incorrect.',
-    'time'               => '%d. %B. %Y at %H:%M',
-    'home'               => 'Home',
+    'app_description'         => 'Make your own Private Cloud with VueFileManager client powered by Laravel and Vue',
+    'user_not_fount'          => 'We can\'t find a user with that e-mail address.',
+    'incorrect_password'      => 'Sorry, your password is incorrect.',
+    'time'                    => '%d. %B. %Y at %H:%M',
+    'home'                    => 'Home',
+
+    // Reset password email
+    'reset_password_greeting' => 'Hello!',
+    'reset_password_subject'  => 'Reset password for your account on ',
+    'reset_password_line_1'   => 'You are receiving this email because we received a password reset request for your account.',
+    'reset_password_line_2'   => 'If you did not request a password reset, no further action is required.',
+    'reset_password_action'   => 'Reset Password',
+
+    'salutation' => 'Regards'
 ];

resources/lang/sk/vuefilemanager.php

@@ -6,4 +6,13 @@ return [
     'incorrect_password' => 'Prepáč, zadané heslo je nesprávne',
     'time'               => '%d. %B. %Y o %H:%M',
     'home'               => 'Domov',
+
+    // Reset password email
+    'reset_password_greeting' => 'Ahoj!',
+    'reset_password_subject' => 'Resetujte svoje heslo v aplikácií ',
+    'reset_password_line_1'  => 'Tento email ste dostali pretože ste nás požiadali o zmenu hesla pre Váš účet.',
+    'reset_password_line_2'  => 'Pokiaľ ste si nechceli zmeniť heslo, žiadna akcia nie je vyžadovaná.',
+    'reset_password_action'  => 'Resetovať heslo',
+
+    'salutation' => 'S pozdravom '
 ];

resources/views/vendor/notifications/email.blade.php

@@ -0,0 +1,49 @@
+@component('mail::message')
+{{-- Greeting --}}
+@if (! empty($greeting))
+# {{ $greeting }}
+@else
+@if ($level === 'error')
+# @lang('Whoops!')
+@else
+# @lang('Hello!')
+@endif
+@endif
+
+{{-- Intro Lines --}}
+@foreach ($introLines as $line)
+{{ $line }}
+
+@endforeach
+
+{{-- Action Button --}}
+@isset($actionText)
+<?php
+    switch ($level) {
+        case 'success':
+        case 'error':
+            $color = $level;
+            break;
+        default:
+            $color = 'primary';
+    }
+?>
+@component('mail::button', ['url' => $actionUrl, 'color' => $color])
+{{ $actionText }}
+@endcomponent
+@endisset
+
+{{-- Outro Lines --}}
+@foreach ($outroLines as $line)
+{{ $line }}
+
+@endforeach
+
+{{-- Salutation --}}
+@if (! empty($salutation))
+{{ $salutation }}
+@else
+@lang('Regards'),<br>
+{{ config('app.name') }}
+@endif
+@endcomponent