From b0d5306023aac78416ac9373b55565b975826ecf Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 8 Oct 2016 16:39:53 +0100 Subject: [PATCH 01/13] Add remember me functionality to login --- app/Http/Controllers/AuthController.php | 11 +++++------ resources/lang/en/forms.php | 1 + resources/views/auth/login.blade.php | 6 ++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 2c9e0689..ecfec734 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -44,26 +44,25 @@ class AuthController extends Controller */ public function postLogin() { - $loginData = Binput::only(['username', 'password']); + $loginData = Binput::only(['username', 'password', 'remember_me']); // Login with username or email. $loginKey = filter_var($loginData['username'], FILTER_VALIDATE_EMAIL) ? 'email' : 'username'; $loginData[$loginKey] = array_pull($loginData, 'username'); + $rememberUser = array_pull($loginData, 'remember_me') === '1'; + // Validate login credentials. if (Auth::validate($loginData)) { - // Log the user in for one request. Auth::once($loginData); - // Do we have Two Factor Auth enabled? + if (Auth::user()->hasTwoFactor) { - // Temporarily store the user. Session::put('2fa_id', Auth::user()->id); return Redirect::route('auth.two-factor'); } - // We probably want to add support for "Remember me" here. - Auth::attempt($loginData); + Auth::attempt($loginData, $rememberUser); event(new UserLoggedInEvent(Auth::user())); diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index 6064a1a8..b2acf8d0 100644 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -40,6 +40,7 @@ return [ 'invalid-token' => 'Invalid token', 'cookies' => 'You must enable cookies to login.', 'rate-limit' => 'Rate limit exceeded.', + 'remember_me' => 'Remember me', ], // Incidents form fields diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index a4537f53..28d2d60e 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -27,6 +27,12 @@ +
+ + +
From e0fa69bc375882b8013792ae1640e08d9b91f6fc Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 8 Oct 2016 15:40:07 +0000 Subject: [PATCH 02/13] Applied fixes from StyleCI [ci skip] [skip ci] --- app/Http/Controllers/AuthController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index ecfec734..5593310a 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -19,7 +19,6 @@ use GrahamCampbell\Binput\Facades\Binput; use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Redirect; -use Illuminate\Support\Facades\Request; use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\View; use PragmaRX\Google2FA\Vendor\Laravel\Facade as Google2FA; From 22cbe1600730d2efaf7dd0db06f65ea02d606413 Mon Sep 17 00:00:00 2001 From: Abhimanyu Sharma Date: Sat, 8 Oct 2016 21:39:39 +0530 Subject: [PATCH 03/13] Minor HTML tweaks --- resources/views/dashboard/components/edit.blade.php | 2 +- resources/views/dashboard/incidents/add.blade.php | 4 ++-- resources/views/dashboard/incidents/update.blade.php | 2 +- resources/views/dashboard/schedule/add.blade.php | 4 ++-- resources/views/dashboard/schedule/edit.blade.php | 2 +- resources/views/dashboard/subscribers/add.blade.php | 2 +- resources/views/dashboard/subscribers/index.blade.php | 2 +- resources/views/dashboard/team/add.blade.php | 2 +- resources/views/dashboard/team/invite.blade.php | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/views/dashboard/components/edit.blade.php b/resources/views/dashboard/components/edit.blade.php index 429a35e9..6bcd63d8 100644 --- a/resources/views/dashboard/components/edit.blade.php +++ b/resources/views/dashboard/components/edit.blade.php @@ -66,7 +66,7 @@ - +
diff --git a/resources/views/dashboard/incidents/add.blade.php b/resources/views/dashboard/incidents/add.blade.php index 4bf09009..0b2c393f 100644 --- a/resources/views/dashboard/incidents/add.blade.php +++ b/resources/views/dashboard/incidents/add.blade.php @@ -65,8 +65,8 @@
@if(!$components_in_groups->isEmpty() || !$components_out_groups->isEmpty()) diff --git a/resources/views/dashboard/incidents/update.blade.php b/resources/views/dashboard/incidents/update.blade.php index b1e29028..0d4f1c18 100644 --- a/resources/views/dashboard/incidents/update.blade.php +++ b/resources/views/dashboard/incidents/update.blade.php @@ -49,7 +49,7 @@
- id }}> +
diff --git a/resources/views/dashboard/schedule/add.blade.php b/resources/views/dashboard/schedule/add.blade.php index b9869e7e..1ad5cfbe 100644 --- a/resources/views/dashboard/schedule/add.blade.php +++ b/resources/views/dashboard/schedule/add.blade.php @@ -14,7 +14,7 @@
@include('dashboard.partials.errors') -
+
@@ -35,7 +35,7 @@
-
+
diff --git a/resources/views/dashboard/schedule/edit.blade.php b/resources/views/dashboard/schedule/edit.blade.php index fff6cecc..a336c16f 100644 --- a/resources/views/dashboard/schedule/edit.blade.php +++ b/resources/views/dashboard/schedule/edit.blade.php @@ -14,7 +14,7 @@
@include('dashboard.partials.errors') - +
diff --git a/resources/views/dashboard/subscribers/add.blade.php b/resources/views/dashboard/subscribers/add.blade.php index 3f8aa444..3f479a0e 100644 --- a/resources/views/dashboard/subscribers/add.blade.php +++ b/resources/views/dashboard/subscribers/add.blade.php @@ -24,7 +24,7 @@
-
+
{{ trans('forms.cancel') }}
diff --git a/resources/views/dashboard/subscribers/index.blade.php b/resources/views/dashboard/subscribers/index.blade.php index 33b24522..4ce72880 100644 --- a/resources/views/dashboard/subscribers/index.blade.php +++ b/resources/views/dashboard/subscribers/index.blade.php @@ -36,7 +36,7 @@
@if($subscriber->subscriptions->count() > 0) {!! $subscriber->subscriptions->map(function ($subscription) { - return ''.$subscription->component->name.''; + return sprintf('%s', $subscription->component->name); })->implode(' ') !!} @else

{{ trans('dashboard.subscribers.no_subscriptions') }}

diff --git a/resources/views/dashboard/team/add.blade.php b/resources/views/dashboard/team/add.blade.php index a0da1dcb..8aac628a 100644 --- a/resources/views/dashboard/team/add.blade.php +++ b/resources/views/dashboard/team/add.blade.php @@ -41,7 +41,7 @@
-
+
{{ trans('forms.cancel') }}
diff --git a/resources/views/dashboard/team/invite.blade.php b/resources/views/dashboard/team/invite.blade.php index 861ff1d9..5331ca57 100644 --- a/resources/views/dashboard/team/invite.blade.php +++ b/resources/views/dashboard/team/invite.blade.php @@ -35,7 +35,7 @@
-
+
{{ trans('forms.cancel') }}
From 0371d86be0a1413da702ad8feb4c24cc0433c6ca Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 8 Oct 2016 17:30:32 +0100 Subject: [PATCH 04/13] Making changes to the setup screen --- app/Http/Controllers/SetupController.php | 43 +++++++++++++- resources/lang/en/forms.php | 1 + resources/views/setup/index.blade.php | 71 +++++++++++++++--------- 3 files changed, 87 insertions(+), 28 deletions(-) diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index 5c27b0c1..281548f1 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -64,6 +64,20 @@ class SetupController extends Controller 'log' => 'Log (Testing)', ]; + /** + * Array of queue drivers. + * + * @var string[] + */ + protected $queueDrivers = [ + "null" => "None", + "sync" => "Synchronous", + "database" => "Database", + "beanstalkd" => "Beanstalk", + "sqs" => "Amazon SQS", + "redis" => "Redis", + ]; + /** * Array of step1 rules. * @@ -95,6 +109,7 @@ class SetupController extends Controller $this->rulesStep1 = [ 'env.cache_driver' => 'required|in:'.implode(',', array_keys($this->cacheDrivers)), 'env.session_driver' => 'required|in:'.implode(',', array_keys($this->cacheDrivers)), + 'env.queue_driver' => 'required|in:'.implode(',', array_keys($this->queueDrivers)), 'env.mail_driver' => 'required|in:'.implode(',', array_keys($this->mailDrivers)), ]; @@ -132,12 +147,38 @@ class SetupController extends Controller } } + // Since .env may already be configured, we should show that data! + $cacheConfig = [ + 'driver' => Config::get('cache.default'), + ]; + + $sessionConfig = [ + 'driver' => Config::get('session.driver'), + ]; + + $queueConfig = [ + 'driver' => Config::get('queue.default'), + ]; + + $mailConfig = [ + 'driver' => Config::get('mail.driver'), + 'host' => Config::get('mail.host'), + 'from' => Config::get('mail.from'), + 'username' => Config::get('mail.username'), + 'password' => Config::get('mail.password'), + ]; + return View::make('setup.index') ->withPageTitle(trans('setup.setup')) ->withCacheDrivers($this->cacheDrivers) + ->withQueueDrivers($this->queueDrivers) ->withMailDrivers($this->mailDrivers) ->withUserLanguage($userLanguage) - ->withAppUrl(Request::root()); + ->withAppUrl(Request::root()) + ->withCacheConfig($cacheConfig) + ->withSessionConfig($sessionConfig) + ->withQueueConfig($queueConfig) + ->withMailConfig($mailConfig); } /** diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index 6064a1a8..d8378c1b 100644 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -22,6 +22,7 @@ return [ 'site_locale' => 'Select your language', 'enable_google2fa' => 'Enable Google Two Factor Authentication', 'cache_driver' => 'Cache Driver', + 'queue_driver' => 'Queue Driver', 'session_driver' => 'Session Driver', 'mail_driver' => 'Mail Driver', 'mail_host' => 'Mail Host', diff --git a/resources/views/setup/index.blade.php b/resources/views/setup/index.blade.php index e6fd6009..f6ae2ede 100644 --- a/resources/views/setup/index.blade.php +++ b/resources/views/setup/index.blade.php @@ -31,35 +31,52 @@
- - - @if($errors->has('env.cache_driver')) - {{ $errors->first('env.cache_driver') }} - @endif -
-
- - - @if($errors->has('env.session_driver')) - {{ $errors->first('env.session_driver') }} - @endif +
+
+ + + @if($errors->has('env.cache_driver')) + {{ $errors->first('env.cache_driver') }} + @endif +
+
+ + + @if($errors->has('env.queue_driver')) + {{ $errors->first('env.queue_driver') }} + @endif +
+
+ + + @if($errors->has('env.session_driver')) + {{ $errors->first('env.session_driver') }} + @endif +
+
+
@if($errors->has('env.mail_driver')) @@ -68,28 +85,28 @@
- + @if($errors->has('env.mail_host')) {{ $errors->first('env.mail_host') }} @endif
- + @if($errors->has('env.mail_address')) {{ $errors->first('env.mail_address') }} @endif
- + @if($errors->has('env.mail_username')) {{ $errors->first('env.mail_username') }} @endif
- + @if($errors->has('env.mail_password')) {{ $errors->first('env.mail_password') }} @endif From b457f5d7a264feade4a8169a2e5907b57c08a916 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 8 Oct 2016 16:30:44 +0000 Subject: [PATCH 05/13] Applied fixes from StyleCI [ci skip] [skip ci] --- app/Http/Controllers/SetupController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index 281548f1..b2aa4f8f 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -70,12 +70,12 @@ class SetupController extends Controller * @var string[] */ protected $queueDrivers = [ - "null" => "None", - "sync" => "Synchronous", - "database" => "Database", - "beanstalkd" => "Beanstalk", - "sqs" => "Amazon SQS", - "redis" => "Redis", + 'null' => 'None', + 'sync' => 'Synchronous', + 'database' => 'Database', + 'beanstalkd' => 'Beanstalk', + 'sqs' => 'Amazon SQS', + 'redis' => 'Redis', ]; /** From a5d3a710638eac701b4f2a9bf9bd3aca056db2da Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 8 Oct 2016 17:45:40 +0100 Subject: [PATCH 06/13] Formatting --- resources/views/partials/analytics.blade.php | 42 +++++++------- .../views/partials/component_input.blade.php | 8 +-- resources/views/partials/components.blade.php | 4 +- .../views/partials/components_form.blade.php | 56 +++++++++---------- 4 files changed, 54 insertions(+), 56 deletions(-) diff --git a/resources/views/partials/analytics.blade.php b/resources/views/partials/analytics.blade.php index 5287c3e4..67281fae 100644 --- a/resources/views/partials/analytics.blade.php +++ b/resources/views/partials/analytics.blade.php @@ -1,35 +1,35 @@ @if($enable_external_dependencies) @if($app_analytics) @endif @if($app_analytics_go_squared) @endif @if($app_analytics_piwik_url) @endif diff --git a/resources/views/partials/component_input.blade.php b/resources/views/partials/component_input.blade.php index 599d525e..a70c77b3 100644 --- a/resources/views/partials/component_input.blade.php +++ b/resources/views/partials/component_input.blade.php @@ -9,9 +9,9 @@ checked="checked" @endif /> {{ $component->name }} - -
- @if($component->description) + +
+ @if($component->description) - @endif + @endif diff --git a/resources/views/partials/components.blade.php b/resources/views/partials/components.blade.php index 76a2d6cf..2a06ff47 100644 --- a/resources/views/partials/components.blade.php +++ b/resources/views/partials/components.blade.php @@ -23,9 +23,7 @@ @if($ungrouped_components->count() > 0)
    -
  • - {{ trans('cachet.components.group.other') }} -
  • +
  • {{ trans('cachet.components.group.other') }}
  • @foreach($ungrouped_components as $component) @include('partials.component', compact($component)) @endforeach diff --git a/resources/views/partials/components_form.blade.php b/resources/views/partials/components_form.blade.php index 2c260d70..4aea735d 100644 --- a/resources/views/partials/components_form.blade.php +++ b/resources/views/partials/components_form.blade.php @@ -1,33 +1,33 @@ @if($component_groups->count() > 0) - @foreach($component_groups as $componentGroup) -
      - @if($componentGroup->enabled_components->count() > 0) -
    • - - {{ $componentGroup->name }} -
      - Select All -  |  - Deselect All -
      -
    • -
      - @foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component) - @include('partials.component_input', compact($component)) - @endforeach -
      - @endif -
    - @endforeach +@foreach($component_groups as $componentGroup) +
      + @if($componentGroup->enabled_components->count() > 0) +
    • + + {{ $componentGroup->name }} +
      + Select All +  |  + Deselect All +
      +
    • +
      + @foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component) + @include('partials.component_input', compact($component)) + @endforeach +
      + @endif +
    +@endforeach @endif @if($ungrouped_components->count() > 0) -
      -
    • - {{ trans('cachet.components.group.other') }} -
    • - @foreach($ungrouped_components as $component) - @include('partials.component_input', compact($component)) - @endforeach -
    +
      +
    • + {{ trans('cachet.components.group.other') }} +
    • + @foreach($ungrouped_components as $component) + @include('partials.component_input', compact($component)) + @endforeach +
    @endif From 8b8114576d40109e9a959793cbf635c319525b8a Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 8 Oct 2016 17:55:46 +0100 Subject: [PATCH 07/13] Don't use the config facade for settings --- app/Composers/AppComposer.php | 1 + resources/views/partials/footer.blade.php | 2 +- resources/views/partials/nav.blade.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php index c136124c..5c0c2b7b 100644 --- a/app/Composers/AppComposer.php +++ b/app/Composers/AppComposer.php @@ -85,5 +85,6 @@ class AppComposer $view->withSiteTitle($this->config->get('setting.app_name')); $view->withFontSubset($this->config->get('langs.'.$this->config->get('app.locale').'.subset', 'latin')); $view->withOnlyDisruptedDays($this->config->get('setting.only_disrupted_days')); + $view->withDashboardLink($this->config->get('setting.dashboard_login_link')); } } diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php index 3b44beb2..33cdd7fb 100644 --- a/resources/views/partials/footer.blade.php +++ b/resources/views/partials/footer.blade.php @@ -16,7 +16,7 @@
    - @if($current_user || Config::get('setting.dashboard_login_link')) + @if($current_user || $dashboard_link)
  • {{ trans('dashboard.dashboard') }}
  • diff --git a/resources/views/partials/nav.blade.php b/resources/views/partials/nav.blade.php index 878c7813..6f11b5b7 100644 --- a/resources/views/partials/nav.blade.php +++ b/resources/views/partials/nav.blade.php @@ -19,7 +19,7 @@
  • {{ trans('dashboard.logout') }}
- @elseif(Config::get('setting.dashboard_login_link')) + @elseif($dashboard_link)
  • {{ trans('dashboard.dashboard') }}
  • @endif From 1794622ed09fb72478217be9f3c198c823e7fc8c Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 8 Oct 2016 18:24:45 +0100 Subject: [PATCH 08/13] Use route helper more --- resources/views/dashboard/partials/sidebar.blade.php | 4 ++-- resources/views/partials/nav.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/dashboard/partials/sidebar.blade.php b/resources/views/dashboard/partials/sidebar.blade.php index 097038ac..ee19cd25 100644 --- a/resources/views/dashboard/partials/sidebar.blade.php +++ b/resources/views/dashboard/partials/sidebar.blade.php @@ -1,10 +1,10 @@