Merge pull request #19 from Illegal-Studio/develop

Bump 0.2.0 version

Author: nahime0

CHANGELOG

@@ -0,0 +1,17 @@
+v0.2.0
+
+Implements all authentication from linky module.
+Correctly support authentication from the main laravel application.
+
+v0.1.1
+
+Bug fixing
+
+v0.1
+
+First realease, with basic functionality.
+It contains:
+    - Links management
+    - Collections management
+    - Pages management
+    - Basic authentication

README.md

@@ -58,10 +58,3 @@ If false, the application will be accessible without authentication.
 #### LINKY_AUTH_MULTI_TENANT
 True or false. If true, the application will be multi-tenant.
 Each user will only be able to access his own contents.
-
-
-#### LINKY_AUTH_LOGIN_ROUTE_NAME
-The route path of the login page.
-
-Configure the route path of the login page of your application, if you have
-configured LINKY_AUTH_USE_LINKY_AUTH to false.

config/linky.php

@@ -6,7 +6,12 @@
         'use_linky_auth'     => env('LINKY_AUTH_USE_LINKY_AUTH', true),
         'require_valid_user' => env('LINKY_AUTH_REQUIRE_VALID_USER', true),
         'multi_tenant'       => env('LINKY_AUTH_MULTI_TENANT', false),
-        'login_route_name'   => env('LINKY_AUTH_LOGIN_ROUTE_NAME', 'login'),
+        'functionalities'    => [
+            'register'           => env('LINKY_AUTH_FUNCTIONALITIES_REGISTER', true),
+            'forgot_password'    => env('LINKY_AUTH_FUNCTIONALITIES_FORGOT_PASSWORD', true),
+            'email_verification' => env('LINKY_AUTH_FUNCTIONALITIES_EMAIL_VERIFICATION', true),
+            'user_profile'       => env('LINKY_AUTH_FUNCTIONALITIES_USER_PROFILE', true),
+        ]
     ],
     'db'        => [
         'prefix' => env('LINKY_DB_PREFIX', 'linky_'),

resources/views/auth/confirm-password.blade.php

@@ -3,7 +3,7 @@
         {{ __('This is a secure area of the application. Please confirm your password before continuing.') }}
     </div>
 
-    <form method="POST" action="{{ route('password.confirm') }}">
+    <form method="POST" action="{{ route('linky.auth.password.confirm') }}">
         @csrf
 
         <!-- Password -->

resources/views/auth/forgot-password.blade.php

@@ -3,7 +3,13 @@
         {{ __('Forgot your password? No problem. Just let us know your email address and we will email you a password reset link that will allow you to choose a new one.') }}
     </div>
 
-    <form method="POST" action="{{ route('password.email') }}">
+    @if (session('status'))
+        <div class="mb-4 font-medium text-sm text-green-600">
+            {{ session('status') }}
+        </div>
+    @endif
+
+    <form method="POST" action="{{ route('linky.auth.password.email') }}">
         @csrf
 
         <!-- Email Address -->

resources/views/auth/login.blade.php

@@ -1,5 +1,5 @@
 <x-linky::layout>
-    <form method="POST" action="{{ route('login') }}">
+    <form method="POST" action="{{ route('linky.auth.login') }}">
         @csrf
 
         <!-- Email Address -->
@@ -30,8 +30,8 @@
         </div>
 
         <div class="flex items-center justify-end mt-4">
-            @if (Route::has('password.request'))
-                <a class="underline text-sm text-gray-600 hover:text-gray-900 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" href="{{ route('password.request') }}">
+            @if (Route::has('linky.auth.password.request'))
+                <a class="underline text-sm text-gray-600 hover:text-gray-900 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" href="{{ route('linky.auth.password.request') }}">
                     {{ __('Forgot your password?') }}
                 </a>
             @endif
@@ -40,5 +40,14 @@
                 {{ __('Log in') }}
             </x-linky::button-primary>
         </div>
+
+        <div class="mt-10 flex flex-col items-center sm:flex-col sm:items-start sm:mt-2">
+            @if (Route::has('linky.auth.register'))
+                <a class="underline text-sm text-gray-600 hover:text-gray-900 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" href="{{ route('linky.auth.register') }}">
+                    {{ __('Dont\'t have an account? Register here') }}
+                </a>
+            @endif
+        </div>
+
     </form>
 </x-linky::layout>

resources/views/auth/register.blade.php

@@ -1,5 +1,5 @@
 <x-linky::layout>
-    <form method="POST" action="{{ route('register') }}">
+    <form method="POST" action="{{ route('linky.auth.register') }}">
         @csrf
 
         <!-- Name -->
@@ -40,9 +40,11 @@
         </div>
 
         <div class="flex items-center justify-end mt-4">
-            <a class="underline text-sm text-gray-600 hover:text-gray-900 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" href="{{ route('login') }}">
-                {{ __('Already registered?') }}
-            </a>
+            @if (Route::has('linky.auth.login'))
+                <a class="underline text-sm text-gray-600 hover:text-gray-900 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" href="{{ route('linky.auth.login') }}">
+                    {{ __('Already registered?') }}
+                </a>
+            @endif
 
             <x-linky::button-primary class="ml-4">
                 {{ __('Register') }}

resources/views/auth/reset-password.blade.php

@@ -1,5 +1,5 @@
 <x-linky::layout>
-    <form method="POST" action="{{ route('password.store') }}">
+    <form method="POST" action="{{ route('linky.auth.password.store') }}">
         @csrf
 
         <!-- Password Reset Token -->

resources/views/auth/verify-email.blade.php

@@ -10,7 +10,7 @@
     @endif
 
     <div class="mt-4 flex items-center justify-between">
-        <form method="POST" action="{{ route('verification.send') }}">
+        <form method="POST" action="{{ route('linky.auth.verification.send') }}">
             @csrf
 
             <div>
@@ -20,12 +20,14 @@
             </div>
         </form>
 
-        <form method="POST" action="{{ route('logout') }}">
-            @csrf
+        @if (Route::has('linky.auth.logout'))
+            <form method="POST" action="{{ route('linky.auth.logout') }}">
+                @csrf
 
-            <button type="submit" class="underline text-sm text-gray-600 hover:text-gray-900 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
-                {{ __('Log Out') }}
-            </button>
-        </form>
+                <button type="submit" class="underline text-sm text-gray-600 hover:text-gray-900 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
+                    {{ __('Log Out') }}
+                </button>
+            </form>
+        @endif
     </div>
 </x-linky::layout>

resources/views/components/menu-button-a.blade.php

@@ -0,0 +1,3 @@
+<a {{ $attributes->merge(['class' => 'inline-flex justify-center rounded-md border border-transparent bg-indigo-500 py-2 px-4 text-sm font-medium text-white shadow-sm hover:bg-opacity-75 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 transition ease-in-out duration-150' ]) }}>
+    {{ $slot }}
+</a>