From 6330f8a2fb7c51a1d109c87b0d8bf98ba6c2a33a Mon Sep 17 00:00:00 2001 From: jvictor Date: Thu, 31 Aug 2017 16:09:27 +0200 Subject: [PATCH] added auto-refresh on master status page --- app/Composers/AppComposer.php | 1 + app/Console/Commands/DemoSeederCommand.php | 3 +++ database/factories/ModelFactory.php | 7 +++++++ resources/lang/en-US/forms.php | 1 + resources/lang/en/forms.php | 1 + .../views/dashboard/settings/app-setup.blade.php | 8 ++++++++ resources/views/layout/master.blade.php | 11 +++++++++++ resources/views/setup/index.blade.php | 1 + 8 files changed, 33 insertions(+) diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php index c656c692..5776e456 100644 --- a/app/Composers/AppComposer.php +++ b/app/Composers/AppComposer.php @@ -81,6 +81,7 @@ class AppComposer $view->withAutomaticLocalization($this->config->get('setting.automatic_localization')); $view->withEnableExternalDependencies($this->config->get('setting.enable_external_dependencies')); $view->withShowTimezone($this->config->get('setting.show_timezone')); + $view->withAppRefreshRate($this->config->get('setting.app_refresh_rate')); $view->withTimezone($this->dates->getTimezone()); $view->withSiteTitle($this->config->get('setting.app_name')); $view->withFontSubset($this->config->get('langs.'.$this->config->get('app.locale').'.subset', 'latin')); diff --git a/app/Console/Commands/DemoSeederCommand.php b/app/Console/Commands/DemoSeederCommand.php index ecddf574..f71847d1 100644 --- a/app/Console/Commands/DemoSeederCommand.php +++ b/app/Console/Commands/DemoSeederCommand.php @@ -393,6 +393,9 @@ EINCIDENT; ], [ 'key' => 'app_incident_days', 'value' => '7', + ], [ + 'key' => 'app_refresh_rate', + 'value' => '0', ], [ 'key' => 'app_analytics', 'value' => 'UA-58442674-3', diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index fdcd9fe3..53bed099 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -106,6 +106,13 @@ $factory->define(Setting::class, function ($faker) { ]; }); +$factory->define(Setting::class, function ($faker) { + return [ + 'name' => 'app_refresh_rate', + 'value' => '0', + ]; +}); + $factory->define(Subscriber::class, function ($faker) { return [ 'email' => $faker->safeEmail, diff --git a/resources/lang/en-US/forms.php b/resources/lang/en-US/forms.php index f8866be1..4c6b56db 100644 --- a/resources/lang/en-US/forms.php +++ b/resources/lang/en-US/forms.php @@ -151,6 +151,7 @@ return [ 'display-graphs' => 'Display graphs on status page?', 'about-this-page' => 'About this page', 'days-of-incidents' => 'How many days of incidents to show?', + 'time_before_refresh' => 'Status page refresh rate (in seconds).', 'banner' => 'Banner Image', 'banner-help' => "It's recommended that you upload files no bigger than 930px wide .", 'subscribers' => 'Allow people to signup to email notifications?', diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index eb8cf3e1..c800d80f 100644 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -151,6 +151,7 @@ return [ 'display-graphs' => 'Display graphs on status page?', 'about-this-page' => 'About this page', 'days-of-incidents' => 'How many days of incidents to show?', + 'time_before_refresh' => 'Status page refresh rate (in seconds).', 'banner' => 'Banner Image', 'banner-help' => "It's recommended that you upload files no bigger than 930px wide .", 'subscribers' => 'Allow people to signup to email notifications?', diff --git a/resources/views/dashboard/settings/app-setup.blade.php b/resources/views/dashboard/settings/app-setup.blade.php index 7facb215..62cc0660 100644 --- a/resources/views/dashboard/settings/app-setup.blade.php +++ b/resources/views/dashboard/settings/app-setup.blade.php @@ -49,6 +49,14 @@ +
+
+
+ + +
+
+
diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index dc056cb2..f9f6a40e 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -63,6 +63,17 @@ diff --git a/resources/views/setup/index.blade.php b/resources/views/setup/index.blade.php index b9dda91c..9957e202 100644 --- a/resources/views/setup/index.blade.php +++ b/resources/views/setup/index.blade.php @@ -212,6 +212,7 @@
+ {{ trans('pagination.previous') }}