From dd0366296893a0e8da8ae0365387dd4823d53451 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 8 Oct 2019 16:17:06 +0200
Subject: Rebuild password reset

---
 resources/views/emails/mail.twig                  |  8 +++---
 resources/views/emails/password-reset.twig        |  3 +++
 resources/views/macros/form.twig                  | 18 +++++++++++++
 resources/views/pages/login.twig                  |  2 +-
 resources/views/pages/password/reset-form.twig    | 18 +++++++++++++
 resources/views/pages/password/reset-success.twig | 12 +++++++++
 resources/views/pages/password/reset.twig         | 32 +++++++++++++++++++++++
 7 files changed, 88 insertions(+), 5 deletions(-)
 create mode 100644 resources/views/emails/password-reset.twig
 create mode 100644 resources/views/macros/form.twig
 create mode 100644 resources/views/pages/password/reset-form.twig
 create mode 100644 resources/views/pages/password/reset-success.twig
 create mode 100644 resources/views/pages/password/reset.twig

(limited to 'resources/views')

diff --git a/resources/views/emails/mail.twig b/resources/views/emails/mail.twig
index ec70f594..e0ad7b64 100644
--- a/resources/views/emails/mail.twig
+++ b/resources/views/emails/mail.twig
@@ -1,6 +1,6 @@
-{{ __('Hi %s,', [username]) }}
+{% block title %}{{ __('Hi %s,', [username]) }}{% endblock %}
 
-{{ __('here is a message for you from the %s:', [config('app_name')]) }}
-{{ message|raw }}
+{% block introduction %}{{ __('here is a message for you from the %s:', [config('app_name')]) }}{% endblock %}
+{% block message %}{{ message|raw }}{% endblock %}
 
-{{ __('This email is autogenerated and has not been signed. You got this email because you are registered in the %s.', [config('app_name')]) }}
+{% block footer %}{{ __('This email is autogenerated and has not been signed. You got this email because you are registered in the %s.', [config('app_name')]) }}{% endblock %}
diff --git a/resources/views/emails/password-reset.twig b/resources/views/emails/password-reset.twig
new file mode 100644
index 00000000..30b613b4
--- /dev/null
+++ b/resources/views/emails/password-reset.twig
@@ -0,0 +1,3 @@
+{% extends "emails/mail.twig" %}
+
+{% block message %}{{ __('Please visit %s to recover your password.', [url('/password/reset/') ~ reset.token]) }}{% endblock %}
diff --git a/resources/views/macros/form.twig b/resources/views/macros/form.twig
new file mode 100644
index 00000000..5d41b085
--- /dev/null
+++ b/resources/views/macros/form.twig
@@ -0,0 +1,18 @@
+{% macro input(name, label, type, required) %}
+    <div class="form-group">
+        {% if label %}
+            <label for="{{ name }}">{{ label }}</label>
+        {% endif %}
+        <input type="{{ type|default('text') }}" class="form-control" id="{{ name }}" name="{{ name }}"
+                {%- if required|default(false) %} required="required"{% endif -%}
+        >
+    </div>
+{% endmacro %}
+
+{% macro hidden(name, value) %}
+    <input type="hidden" id="{{ name }}" name="{{ name }}" value="{{ value }}">
+{% endmacro %}
+
+{% macro submit(label) %}
+    <button type="submit" class="btn btn-default">{{ label|default(__('form.submit')) }}</button>
+{% endmacro %}
diff --git a/resources/views/pages/login.twig b/resources/views/pages/login.twig
index 6160508f..34dbd63f 100644
--- a/resources/views/pages/login.twig
+++ b/resources/views/pages/login.twig
@@ -62,7 +62,7 @@
                             </div>
 
                             <div class="text-center">
-                                <a href="{{ url('user-password-recovery') }}" class="">
+                                <a href="{{ url('/password/reset') }}" class="">
                                     {{ __('I forgot my password') }}
                                 </a>
                             </div>
diff --git a/resources/views/pages/password/reset-form.twig b/resources/views/pages/password/reset-form.twig
new file mode 100644
index 00000000..60eb2499
--- /dev/null
+++ b/resources/views/pages/password/reset-form.twig
@@ -0,0 +1,18 @@
+{% extends "pages/password/reset.twig" %}
+{% import 'macros/base.twig' as m %}
+{% import 'macros/form.twig' as f %}
+
+{% block row_content %}
+    <div class="col-md-8">
+        <form action="" enctype="multipart/form-data" method="post">
+            {{ csrf() }}
+
+            {{ f.input('password', __('Password'), 'password', true) }}
+            {{ f.input('password_confirmation', __('Confirm password'), 'password', true) }}
+
+            <div class="form-group">
+                {{ f.submit(__('Save')) }}
+            </div>
+        </form>
+    </div>
+{% endblock %}
diff --git a/resources/views/pages/password/reset-success.twig b/resources/views/pages/password/reset-success.twig
new file mode 100644
index 00000000..19b8a93e
--- /dev/null
+++ b/resources/views/pages/password/reset-success.twig
@@ -0,0 +1,12 @@
+{% extends "pages/password/reset.twig" %}
+{% import 'macros/base.twig' as m %}
+
+{% block row_content %}
+    <div class="col-md-12">
+        {% if type == 'email' %}
+            {{ m.alert(__('We sent you an email containing your password recovery link.'), 'info') }}
+        {% elseif type == 'reset' %}
+            {{ m.alert(__('Password saved.'), 'success') }}
+        {% endif %}
+    </div>
+{% endblock %}
diff --git a/resources/views/pages/password/reset.twig b/resources/views/pages/password/reset.twig
new file mode 100644
index 00000000..289152ea
--- /dev/null
+++ b/resources/views/pages/password/reset.twig
@@ -0,0 +1,32 @@
+{% extends 'layouts/app.twig' %}
+{% import 'macros/base.twig' as m %}
+{% import 'macros/form.twig' as f %}
+
+{% block title %}{{ __('Password recovery') }}{% endblock %}
+
+{% block content %}
+    <div class="container">
+        <h1>{{ __('Password recovery') }}</h1>
+
+        {% for message in errors|default([]) %}
+            {{ m.alert(__(message), 'danger') }}
+        {% endfor %}
+
+        <div class="row">
+            {% block row_content %}
+                <div class="col-md-8">
+                    <form action="" enctype="multipart/form-data" method="post">
+                        {{ csrf() }}
+
+                        {{ __('We will send you an e-mail with a password recovery link. Please use the email address you used for registration.') }}
+                        {{ f.input('email', __('E-Mail'), 'email', true) }}
+
+                        <div class="form-group">
+                            {{ f.submit(__('Recover')) }}
+                        </div>
+                    </form>
+                </div>
+            {% endblock %}
+        </div>
+    </div>
+{% endblock %}
-- 
cgit v1.3.1