From e1b80ae0969cbeee584427b376bc27d450d3b68f Mon Sep 17 00:00:00 2001
From: Andy Heathershaw <andy@andys.eu>
Date: Mon, 10 Apr 2017 21:04:10 +0100
Subject: [PATCH] #12: Added a page for the current user to change their
 password - still needs hooking up to the controller

---
 .../Auth/ChangePasswordController.php         | 35 +++++++++++
 resources/lang/en/auth.php                    |  2 +
 resources/lang/en/navigation.php              |  1 +
 .../auth/passwords/change_password.blade.php  | 61 +++++++++++++++++++
 .../themes/base/partials/navbar.blade.php     |  1 +
 routes/web.php                                | 19 +-----
 6 files changed, 101 insertions(+), 18 deletions(-)
 create mode 100644 app/Http/Controllers/Auth/ChangePasswordController.php
 create mode 100644 resources/views/themes/base/auth/passwords/change_password.blade.php

diff --git a/app/Http/Controllers/Auth/ChangePasswordController.php b/app/Http/Controllers/Auth/ChangePasswordController.php
new file mode 100644
index 0000000..9eb10d8
--- /dev/null
+++ b/app/Http/Controllers/Auth/ChangePasswordController.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Facade\Theme;
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\ResetsPasswords;
+use Illuminate\Http\Request;
+
+class ChangePasswordController extends Controller
+{
+    use ResetsPasswords;
+
+    /**
+     * Where to redirect users after a password reset.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function showChangePasswordForm(Request $request)
+    {
+        return Theme::render('auth.passwords.change_password');
+    }
+}
\ No newline at end of file
diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
index de97503..5a61ca2 100644
--- a/resources/lang/en/auth.php
+++ b/resources/lang/en/auth.php
@@ -20,6 +20,8 @@ return [
         'and password you provided when you registered.',
     'activation_required_message' => 'An e-mail containing an activation link has been sent to the e-mail address you provided. ' .
         'Please click the link in this e-mail to activate your account.',
+    'change_password_action' => 'Change password',
+    'change_password_title' => 'Change your password',
     'forgot_password_action' => 'Send Reset E-mail',
     'forgot_password_link' => 'Forgotten your password?',
     'forgot_password_title' => 'Send password reset link',
diff --git a/resources/lang/en/navigation.php b/resources/lang/en/navigation.php
index 4a1ff51..a6cbc24 100644
--- a/resources/lang/en/navigation.php
+++ b/resources/lang/en/navigation.php
@@ -24,6 +24,7 @@ return [
     'navbar' => [
         'admin' => 'Manage',
         'albums' => 'Albums',
+        'change_password' => 'Change password',
         'login' => 'Login',
         'logout' => 'Logout',
         'register' => 'Register'
diff --git a/resources/views/themes/base/auth/passwords/change_password.blade.php b/resources/views/themes/base/auth/passwords/change_password.blade.php
new file mode 100644
index 0000000..6f4ad71
--- /dev/null
+++ b/resources/views/themes/base/auth/passwords/change_password.blade.php
@@ -0,0 +1,61 @@
+@extends('themes.base.layout')
+
+@section('title', trans('auth.change_password_title'))
+@section('content')
+    <div class="container">
+        <div class="row">
+            <div class="col-md-8 offset-md-2">
+                <div class="card">
+                    <div class="card-header">
+                        <ul class="nav nav-tabs card-header-tabs">
+                            <li class="nav-item">
+                                <a class="nav-link active" href="{{ url('/password/change') }}">@yield('title')</a>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="card-block">
+                        <form role="form" method="POST" action="{{ url('/password/change') }}">
+                            {{ csrf_field() }}
+
+                            <div class="form-group row{{ $errors->has('password') ? ' has-danger' : '' }}">
+                                <label for="password" class="col-md-4 col-form-label text-md-right">@lang('forms.password_label')</label>
+
+                                <div class="col-md-6">
+                                    <input id="password" type="password" class="form-control" name="password">
+
+                                    @if ($errors->has('password'))
+                                        <div class="form-control-feedback">
+                                            <strong>{{ $errors->first('password') }}</strong>
+                                        </div>
+                                    @endif
+                                </div>
+                            </div>
+
+                            <div class="form-group row{{ $errors->has('password_confirmation') ? ' has-danger' : '' }}">
+                                <label for="password-confirm" class="col-md-4 col-form-label text-md-right">@lang('forms.password_confirm_label')</label>
+                                <div class="col-md-6">
+                                    <input id="password-confirm" type="password" class="form-control" name="password_confirmation">
+
+                                    @if ($errors->has('password_confirmation'))
+                                        <div class="form-control-feedback">
+                                            <strong>{{ $errors->first('password_confirmation') }}</strong>
+                                        </div>
+                                    @endif
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <div class="col-md-6 offset-md-4 text-right">
+                                    <a href="{{ url('/login') }}" class="btn btn-link">@lang('forms.cancel_action')</a>
+                                    <button type="submit" class="btn btn-success">
+                                        <i class="fa fa-fw fa-check"></i> @lang('auth.change_password_action')
+                                    </button>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
diff --git a/resources/views/themes/base/partials/navbar.blade.php b/resources/views/themes/base/partials/navbar.blade.php
index dd6a5cb..0b5b99b 100644
--- a/resources/views/themes/base/partials/navbar.blade.php
+++ b/resources/views/themes/base/partials/navbar.blade.php
@@ -41,6 +41,7 @@
                         {{--<img class="avatar" src="{{ Theme::gravatarUrl(Auth::user()->email, 42) }}" alt="{{ Auth::user()->name }}" title="{{ Auth::user()->name }}" />--}}
                     </a>
                     <div class="dropdown-menu">
+                        <a class="dropdown-item" href="{{ route('auth.changePassword') }}">@lang('navigation.navbar.change_password')</a>
                         <a class="dropdown-item" href="{{ url('/logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">@lang('navigation.navbar.logout')</a>
                         <form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
                             {{ csrf_field() }}
diff --git a/routes/web.php b/routes/web.php
index 23316ac..17ba082 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -13,24 +13,6 @@
 
 Auth::routes();
 
-Route::get('/openstack-test', function ()
-{
-    $credentials = new \Aws\Credentials\Credentials('vyUv2MDny84Q3VD6Zvg0', 'TuQSzRbx3f6Rmnnf_N4LXod5DCtgUfGwprot7UpQ');
-
-    $client = new \Aws\S3\S3Client(array(
-        'endpoint' => 'https://objects-us-west-1.dream.io',
-        'credentials' => $credentials,
-        'version' => 'latest',
-        'region' => 'xxx'
-    ));
-
-    $blist = $client->listBuckets();
-    echo "   Buckets belonging to " . $blist['Owner']['ID'] . ":\n";
-    foreach ($blist['Buckets'] as $b) {
-        echo "{$b['Name']}\t{$b['CreationDate']}\n";
-    }
-});
-
 // Administration
 Route::group(['prefix' => 'admin'], function () {
     Route::get('/', 'Admin\DefaultController@index')->name('admin');
@@ -82,6 +64,7 @@ Route::group(['prefix' => 'install'], function () {
 // Gallery
 Route::get('/', 'Gallery\DefaultController@index')->name('home');
 Route::get('/activate/{token}', 'Auth\ActivateController@activate')->name('auth.activate');
+Route::get('/password/change', 'Auth\ChangePasswordController@showChangePasswordForm')->name('auth.changePassword');
 Route::get('{albumUrlAlias}', 'Gallery\AlbumController@index')->name('viewAlbum');
 Route::get('{albumUrlAlias}/{photoFilename}', 'Gallery\PhotoController@show')->name('viewPhoto');
 Route::get('photo/{albumUrlAlias}/{photoFilename}', 'Gallery\PhotoController@download')->name('downloadPhoto');
\ No newline at end of file