From ec88a74889e695245c70f9caf2c9496ea4332929 Mon Sep 17 00:00:00 2001
From: JulianPrieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Sun, 27 Feb 2022 19:33:19 +0100
Subject: [PATCH] Fixed bug/simplified setup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed bug where users littlelink pages (domain.com/@username) would display a 404 error. This was caused due to the .env config file not containing an App URL. This issue could be solved by simply adding a URL to the config, this is now not necessary anymore, making the setup process easier and less confusing. 

I changed every instance of "{{ config('app.url') }}" to  "{{ url(' ') }}". This effectively automatically uses the correct URL for LittleLink links, even if LittleLink Custom is set up in a subdirectory.

In my testing, I couldn't find any problems this might have caused, so this appears to do the job just as well as setting the URL in the config. If I find any issues with this, I will revert this change.
---
 resources/views/auth/confirm-password.blade.php |  2 +-
 resources/views/auth/forgot-password.blade.php  |  2 +-
 resources/views/auth/login.blade.php            |  2 +-
 resources/views/auth/register.blade.php         |  2 +-
 resources/views/auth/reset-password.blade.php   |  2 +-
 resources/views/auth/verify-email.blade.php     |  2 +-
 resources/views/home.blade.php                  |  4 ++--
 resources/views/layouts/footer.blade.php        |  6 +++---
 resources/views/layouts/sidebar.blade.php       |  8 ++++----
 resources/views/littlelink.blade.php            |  6 +++---
 resources/views/panel/edit-user.blade.php       |  2 +-
 resources/views/panel/users.blade.php           | 10 +++++-----
 resources/views/studio/page.blade.php           |  2 +-
 13 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php
index 921893b..3debd8f 100755
--- a/resources/views/auth/confirm-password.blade.php
+++ b/resources/views/auth/confirm-password.blade.php
@@ -1,7 +1,7 @@
 <x-guest-layout>
     <x-auth-card>
         <x-slot name="logo">
-            <a href="{{ config('app.url') }}">
+            <a href="{{ url('') }}">
                 <x-application-logo class="w-20 h-20 fill-current text-gray-500" />
             </a>
         </x-slot>
diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php
index abf4a4d..19be328 100755
--- a/resources/views/auth/forgot-password.blade.php
+++ b/resources/views/auth/forgot-password.blade.php
@@ -1,7 +1,7 @@
 <x-guest-layout>
     <x-auth-card>
         <x-slot name="logo">
-            <a href="{{ config('app.url') }}">
+            <a href="{{ url('') }}">
                 <x-application-logo class="w-20 h-20 fill-current text-gray-500" />
             </a>
         </x-slot>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 517e0dd..9347838 100755
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -1,7 +1,7 @@
 <x-guest-layout>
     <x-auth-card>
         <x-slot name="logo">
-            <a href="{{ config('app.url') }}">
+            <a href="{{ url('') }}">
                 <x-application-logo class="w-20 h-20 fill-current text-gray-500" />
             </a>
         </x-slot>
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 1d265f4..c4edc68 100755
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -9,7 +9,7 @@ foreach($pages as $page)
 <x-guest-layout>
     <x-auth-card>
         <x-slot name="logo">
-            <a href="{{ config('app.url') }}">
+            <a href="{{ url('') }}">
                 <x-application-logo class="w-20 h-20 fill-current text-gray-500" />
             </a>
         </x-slot>
diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php
index 95a540c..25f8568 100755
--- a/resources/views/auth/reset-password.blade.php
+++ b/resources/views/auth/reset-password.blade.php
@@ -1,7 +1,7 @@
 <x-guest-layout>
     <x-auth-card>
         <x-slot name="logo">
-            <a href="{{ config('app.url') }}">
+            <a href="{{ url('') }}">
                 <x-application-logo class="w-20 h-20 fill-current text-gray-500" />
             </a>
         </x-slot>
diff --git a/resources/views/auth/verify-email.blade.php b/resources/views/auth/verify-email.blade.php
index f8ab0d6..dbb42cb 100755
--- a/resources/views/auth/verify-email.blade.php
+++ b/resources/views/auth/verify-email.blade.php
@@ -1,7 +1,7 @@
 <x-guest-layout>
     <x-auth-card>
         <x-slot name="logo">
-            <a href="{{ config('app.url') }}">
+            <a href="{{ url('') }}">
                 <x-application-logo class="w-20 h-20 fill-current text-gray-500" />
             </a>
         </x-slot>
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 92fd395..605ae5a 100755
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -103,11 +103,11 @@ foreach($pages as $page)
         <div class="updated" style="display:none">
         @foreach($updatedPages as $page)
           @if(file_exists(base_path("img/$page->littlelink_name" . ".png" )))
-          <a href="{{ config('app.url') }}/@<?= $page->littlelink_name ?>" target="_blank">
+          <a href="{{ url('') }}/@<?= $page->littlelink_name ?>" target="_blank">
           <img src="{{ asset("img/$page->littlelink_name" . ".png") }}" srcset="{{ asset("img/$page->littlelink_name" . "@2x.png 2x") }}" width="50px" height="50px">
           </a>
           @else
-          <a href="{{ config('app.url') }}/@<?= $page->littlelink_name ?>" target="_blank">
+          <a href="{{ url('') }}/@<?= $page->littlelink_name ?>" target="_blank">
           <img src="{{ asset('littlelink/images/logo.svg') }}" srcset="{{ asset('littlelink/images/avatar@2x.png 2x') }}" width="50px" height="50px">
           </a>
           @endif
diff --git a/resources/views/layouts/footer.blade.php b/resources/views/layouts/footer.blade.php
index e45edc6..3b0f60a 100755
--- a/resources/views/layouts/footer.blade.php
+++ b/resources/views/layouts/footer.blade.php
@@ -1,6 +1,6 @@
 <div class="footer" style="margin:5% 0px 35px 0px;">
     <!--<a href="/">Home</a>
-    <a href="{{ config('app.url') }}/pages/terms">Terms</a>
-    <a href="{{ config('app.url') }}/pages/privacy">Privacy</a>
-    <a href="{{ config('app.url') }}/pages/contact">Contact</a>-->
+    <a href="{{ url('') }}/pages/terms">Terms</a>
+    <a href="{{ url('') }}/pages/privacy">Privacy</a>
+    <a href="{{ url('') }}/pages/contact">Contact</a>-->
 </div>
diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index 76c0f11..94d3894 100755
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -103,9 +103,9 @@
 	        	<p>
 			    Copyright &copy; @php echo date('Y'); @endphp <i class="icon-heart" aria-hidden="true"></i> </br>
                <a href="/" target="_blank">Home</a> .
-               <a href="{{ config('app.url') }}/pages/terms" target="_blank">Terms</a> .
-               <a href="{{ config('app.url') }}/pages/privacy" target="_blank">Privacy</a> .
-               <a href="{{ config('app.url') }}/pages/contact" target="_blank">Contact</a>
+               <a href="{{ url('') }}/pages/terms" target="_blank">Terms</a> .
+               <a href="{{ url('') }}/pages/privacy" target="_blank">Privacy</a> .
+               <a href="{{ url('') }}/pages/contact" target="_blank">Contact</a>
             </p>
 	        </div>
 	      </div>
@@ -161,7 +161,7 @@
 				@endif
             <! –– #### end update detection #### ––>
 
-                    <a class="nav-link" href="{{ config('app.url') }}/@<?= Auth::user()->littlelink_name ?>" target="_blank">Watch Page</a>
+                    <a class="nav-link" href="{{ url('') }}/@<?= Auth::user()->littlelink_name ?>" target="_blank">Watch Page</a>
                   </div>
                 </li>
               </ul>
diff --git a/resources/views/littlelink.blade.php b/resources/views/littlelink.blade.php
index 9dc6fd7..64aac37 100644
--- a/resources/views/littlelink.blade.php
+++ b/resources/views/littlelink.blade.php
@@ -11,7 +11,7 @@
   <!-- This shows a preview for title, description and avatar image of users profiles if shared on social media sites -->
 
     <!-- Facebook Meta Tags -->
-    <meta property="og:url" content="{{ config('app.url') }}/@littlelink_name">
+    <meta property="og:url" content="{{ url('') }}/@littlelink_name">
     <meta property="og:type" content="website">
     <meta property="og:title" content="{{ $userinfo->littlelink_name }}">
     <meta property="og:description" content="{{ $userinfo->littlelink_description }}">
@@ -23,8 +23,8 @@
     
     <!-- Twitter Meta Tags -->
     <meta name="twitter:card" content="summary_large_image">
-    <meta property="twitter:domain" content="{{ config('app.url') }}/@littlelink_name">
-    <meta property="twitter:url" content="{{ config('app.url') }}/@littlelink_name">
+    <meta property="twitter:domain" content="{{ url('') }}/@littlelink_name">
+    <meta property="twitter:url" content="{{ url('') }}/@littlelink_name">
     <meta name="twitter:title" content="{{ $userinfo->littlelink_name }}">
     <meta name="twitter:description" content="{{ $userinfo->littlelink_description }}">
     @if(file_exists(base_path("img/$littlelink_name" . ".png" )))
diff --git a/resources/views/panel/edit-user.blade.php b/resources/views/panel/edit-user.blade.php
index f1eb44b..14b2121 100755
--- a/resources/views/panel/edit-user.blade.php
+++ b/resources/views/panel/edit-user.blade.php
@@ -43,7 +43,7 @@
             <label>Page URL</label>
 	          <div class="input-group">
 				  <div class="input-group-prepend">
-					<div class="input-group-text">{{ config('app.url') }}/@</div>
+					<div class="input-group-text">{{ url('') }}/@</div>
 				  </div>
 				  <input type="text" class="form-control" name="littlelink_name" value="{{ $user->littlelink_name }}">
 			  </div>
diff --git a/resources/views/panel/users.blade.php b/resources/views/panel/users.blade.php
index d11d56a..f8bf97e 100755
--- a/resources/views/panel/users.blade.php
+++ b/resources/views/panel/users.blade.php
@@ -12,10 +12,10 @@
           </div>
         </form>
         Users: 
-        <a href="{{ config('app.url') }}/panel/users/all">All</a> - 
-        <a href="{{ config('app.url') }}/panel/users/user">User</a> - 
-        <a href="{{ config('app.url') }}/panel/users/vip">Vip</a> - 
-        <a href="{{ config('app.url') }}/panel/users/admin">Admin</a> 
+        <a href="{{ url('') }}/panel/users/all">All</a> - 
+        <a href="{{ url('') }}/panel/users/user">User</a> - 
+        <a href="{{ url('') }}/panel/users/vip">Vip</a> - 
+        <a href="{{ url('') }}/panel/users/admin">Admin</a> 
 
         <table class="table table-bordered">
           <thead>
@@ -31,7 +31,7 @@
           @foreach($users as $user)
             <tr>
               <td> {{ $user->name }} </td>
-              <td><a href="{{ config('app.url') }}/@<?= $user->littlelink_name ?>" target="_blank" class="text-info"><i class="bi bi-box-arrow-up-right"></i>&nbsp; {{ $user->littlelink_name }} </a></td>
+              <td><a href="{{ url('') }}/@<?= $user->littlelink_name ?>" target="_blank" class="text-info"><i class="bi bi-box-arrow-up-right"></i>&nbsp; {{ $user->littlelink_name }} </a></td>
               <td>{{ $user->role }}</td>
               <td><a href="{{ route('editUser', $user->id ) }}">Edit</a></td>
               <td><a href="{{ route('blockUser', ['block' => $user->block, 'id' => $user->id] ) }}" class="text-danger">{{ $user->block }}</a></td>
diff --git a/resources/views/studio/page.blade.php b/resources/views/studio/page.blade.php
index b89d29c..cfbfdb0 100755
--- a/resources/views/studio/page.blade.php
+++ b/resources/views/studio/page.blade.php
@@ -29,7 +29,7 @@
             <label>Page URL</label>
 	          <div class="input-group">
 				  <div class="input-group-prepend">
-					<div class="input-group-text">{{ config('app.url') }}/@</div>
+					<div class="input-group-text">{{ url('') }}/@</div>
 				  </div>
 				  <input type="text" class="form-control" name="pageName" value="{{ $page->littlelink_name ?? '' }}">
 			  </div>