Added login/register message partials for easier use via theme system

Related to #608

diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index de99bb3f29feeb55babaa3f13020c474978f4a1f..6278adcd7a89eeb19c626b4ed4d1907f2d64e2cc 100644 (file)
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -9,6 +9,8 @@
         <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ Str::title(trans('auth.log_in')) }}</h1>
 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ Str::title(trans('auth.log_in')) }}</h1>
 

+            @include('auth.parts.login-message')
+

             @include('auth.parts.login-form-' . $authMethod)
 
             @if(count($socialDrivers) > 0)
             @include('auth.parts.login-form-' . $authMethod)
 
             @if(count($socialDrivers) > 0)

diff --git a/resources/views/auth/parts/login-message.blade.php b/resources/views/auth/parts/login-message.blade.php
new file mode 100644 (file)
index 0000000..4711989
--- /dev/null
+++ b/resources/views/auth/parts/login-message.blade.php
@@ -0,0 +1,2 @@
+{{-- This is a placeholder template file provided as a --}}
+{{-- convenience to users of the visual theme system. --}}
\ No newline at end of file

diff --git a/resources/views/auth/parts/register-message.blade.php b/resources/views/auth/parts/register-message.blade.php
new file mode 100644 (file)
index 0000000..4711989
--- /dev/null
+++ b/resources/views/auth/parts/register-message.blade.php
@@ -0,0 +1,2 @@
+{{-- This is a placeholder template file provided as a --}}
+{{-- convenience to users of the visual theme system. --}}
\ No newline at end of file

diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 91ec0b621f12f2190edd676c31e3ff1310db7dc2..d345b037aaa0c0dfb18927d845f6af7a9a07a4bb 100644 (file)
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -8,6 +8,8 @@
         <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ Str::title(trans('auth.sign_up')) }}</h1>
 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ Str::title(trans('auth.sign_up')) }}</h1>
 

+            @include('auth.parts.register-message')
+

             <form action="{{ url("/register") }}" method="POST" class="mt-l stretch-inputs">
                 {!! csrf_field() !!}
 
             <form action="{{ url("/register") }}" method="POST" class="mt-l stretch-inputs">
                 {!! csrf_field() !!}
 

diff --git a/tests/ThemeTest.php b/tests/ThemeTest.php
index 4d612a870b2e393f6f468c719ec83fe256c3e9ab..efab53379f3d72a83d5af45d7fe4aa47de51b2d1 100644 (file)
--- a/tests/ThemeTest.php
+++ b/tests/ThemeTest.php
@@ -338,6 +338,23 @@ class ThemeTest extends TestCase
         });
     }
 
         });
     }
 

+    public function test_login_and_register_message_template_files_can_be_used()
+    {
+        $loginMessage = 'Welcome to this instance, login below you scallywag';
+        $registerMessage = 'You want to register? Enter the deets below you numpty';
+
+        $this->usingThemeFolder(function (string $folder) use ($loginMessage, $registerMessage) {
+            $viewDir = theme_path('auth/parts');
+            mkdir($viewDir, 0777, true);
+            file_put_contents($viewDir . '/login-message.blade.php', $loginMessage);
+            file_put_contents($viewDir . '/register-message.blade.php', $registerMessage);
+            $this->setSettings(['registration-enabled' => 'true']);
+
+            $this->get('/login')->assertSee($loginMessage);
+            $this->get('/register')->assertSee($registerMessage);
+        });
+    }
+

     protected function usingThemeFolder(callable $callback)
     {
         // Create a folder and configure a theme
     protected function usingThemeFolder(callable $callback)
     {
         // Create a folder and configure a theme