From ceb2c90e55bb3dba0134cf3e293f643b483d27ce Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Sat, 24 Jun 2023 15:39:16 +0200
Subject: [PATCH] Fixed footer links

---
 resources/views/home.blade.php            |  6 +--
 resources/views/layouts/footer.blade.php  |  6 +--
 resources/views/layouts/guest.blade.php   | 45 +++--------------------
 resources/views/layouts/sidebar.blade.php |  6 +--
 resources/views/pages.blade.php           |  4 +-
 routes/web.php                            |  6 +--
 6 files changed, 18 insertions(+), 55 deletions(-)

diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 103084d..66b432b 100755
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -222,9 +222,9 @@
                 <ul class="left-panel list-inline mb-0 p-0">
                   @if(env('DISPLAY_FOOTER') === true)
                     @if(env('DISPLAY_FOOTER_HOME') === true)<li class="list-inline-item"><a class="list-inline-item" href="@if(str_replace('"', "", EnvEditor::getKey('HOME_FOOTER_LINK')) === "" ){{ url('') }}@else{{ str_replace('"', "", EnvEditor::getKey('HOME_FOOTER_LINK')) }}@endif">{{footer('Home')}}</a></li>@endif
-                    @if(env('DISPLAY_FOOTER_TERMS') === true)<li class="list-inline-item"><a class="list-inline-item" href="{{ url('') }}/pages/{{ strtolower(env('TITLE_FOOTER_TERMS')) }}">{{footer('Terms')}}</a></li>@endif
-                    @if(env('DISPLAY_FOOTER_PRIVACY') === true)<li class="list-inline-item"><a class="list-inline-item" href="{{ url('') }}/pages/{{ strtolower(env('TITLE_FOOTER_PRIVACY')) }}">{{footer('Privacy')}}</a></li>@endif
-                    @if(env('DISPLAY_FOOTER_CONTACT') === true)<li class="list-inline-item"><a class="list-inline-item" href="{{ url('') }}/pages/{{ strtolower(env('TITLE_FOOTER_CONTACT')) }}">{{footer('Contact')}}</a></li>@endif
+                    @if(env('DISPLAY_FOOTER_TERMS') === true)<li class="list-inline-item"><a class="list-inline-item" href="{{ url('') }}/pages/{{ strtolower(footer('Terms')) }}">{{footer('Terms')}}</a></li>@endif
+                    @if(env('DISPLAY_FOOTER_PRIVACY') === true)<li class="list-inline-item"><a class="list-inline-item" href="{{ url('') }}/pages/{{ strtolower(footer('Privacy')) }}">{{footer('Privacy')}}</a></li>@endif
+                    @if(env('DISPLAY_FOOTER_CONTACT') === true)<li class="list-inline-item"><a class="list-inline-item" href="{{ url('') }}/pages/{{ strtolower(footer('Contact')) }}">{{footer('Contact')}}</a></li>@endif
                   @endif
                 </ul>
                 <div class="right-panel">
diff --git a/resources/views/layouts/footer.blade.php b/resources/views/layouts/footer.blade.php
index 4b746e7..1bb1586 100755
--- a/resources/views/layouts/footer.blade.php
+++ b/resources/views/layouts/footer.blade.php
@@ -2,9 +2,9 @@
 	<div class="footer fadein" style="margin:5% 0px 35px 0px;">
 	@if(env('DISPLAY_FOOTER') === true)
 		@if(env('DISPLAY_FOOTER_HOME') === true)<a class="footer-hover spacing" href="@if(str_replace('"', "", EnvEditor::getKey('HOME_FOOTER_LINK')) === "" ){{ url('') }}@else{{ str_replace('"', "", EnvEditor::getKey('HOME_FOOTER_LINK')) }}@endif">{{footer('Home')}}</a>@endif
-		@if(env('DISPLAY_FOOTER_TERMS') === true)<a class="footer-hover spacing" href="{{ url('') }}/pages/{{ strtolower(env('TITLE_FOOTER_TERMS')) }}">{{env('TITLE_FOOTER_TERMS')}}</a>@endif
-		@if(env('DISPLAY_FOOTER_PRIVACY') === true)<a class="footer-hover spacing" href="{{ url('') }}/pages/{{ strtolower(env('TITLE_FOOTER_PRIVACY')) }}">{{env('TITLE_FOOTER_PRIVACY')}}</a>@endif
-		@if(env('DISPLAY_FOOTER_CONTACT') === true)<a class="footer-hover spacing" href="{{ url('') }}/pages/{{ strtolower(env('TITLE_FOOTER_CONTACT')) }}">{{env('TITLE_FOOTER_CONTACT')}}</a>@endif
+		@if(env('DISPLAY_FOOTER_TERMS') === true)<a class="footer-hover spacing" href="{{ url('') }}/pages/{{ strtolower(footer('Terms')) }}">{{footer('Terms')}}</a>@endif
+		@if(env('DISPLAY_FOOTER_PRIVACY') === true)<a class="footer-hover spacing" href="{{ url('') }}/pages/{{ strtolower(footer('Privacy')) }}">{{footer('Privacy')}}</a>@endif
+		@if(env('DISPLAY_FOOTER_CONTACT') === true)<a class="footer-hover spacing" href="{{ url('') }}/pages/{{ strtolower(footer('Contact')) }}">{{footer('Contact')}}</a>@endif
 	@endif
 	</div>
 
diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php
index e86970c..e466acc 100755
--- a/resources/views/layouts/guest.blade.php
+++ b/resources/views/layouts/guest.blade.php
@@ -18,8 +18,8 @@
 
         <title>{{ config('app.name') }}</title>
 
-        <!-- Fonts -->
-        <link rel="stylesheet" href="https://fonts.bunny.net/css2?family=Nunito:wght@400;600;700&display=swap">
+      <!-- Fonts -->
+      @include('layouts.fonts')
 
       <!-- Library / Plugin Css Build -->
       <link rel="stylesheet" href="{{asset('assets/css/core/libs.min.css')}}" />
@@ -27,8 +27,6 @@
       <!-- Aos Animation Css -->
       <link rel="stylesheet" href="{{asset('assets/vendor/aos/dist/aos.css')}}" />
       
-      @include('layouts.fonts')
-      
       <!-- Hope Ui Design System Css -->
       <link rel="stylesheet" href="{{asset('assets/css/hope-ui.min.css?v=2.0.0')}}" />
       
@@ -48,43 +46,10 @@
       <!-- RTL Css -->
       <link rel="stylesheet" href="{{asset('assets/css/rtl.min.css')}}" />
 
-        <!-- Scripts -->
-        <script src="{{ asset('assets/js/app.js') }}" defer></script>
+      <!-- Scripts -->
+      <script src="{{ asset('assets/js/app.js') }}" defer></script>
 
-		<link rel="stylesheet" href="{{ asset('assets/external-dependencies/bootstrap-icons.css') }}">
-        
-  {{-- <!-- begin dark mode detection -->
-	<script src="{{ asset('assets/linkstack/js/js.cookie.min.js') }}"></script>
-	<script>
-		// code to set the `color_scheme` cookie
-		var $color_scheme = Cookies.get("color_scheme");
-		function get_color_scheme() {
-		return (window.matchMedia && window.matchMedia("(prefers-color-scheme: dark)").matches) ? "dark" : "light";
-		}
-		function update_color_scheme() {
-		Cookies.set("color_scheme", get_color_scheme());
-		}
-		// read & compare cookie `color-scheme`
-		if ((typeof $color_scheme === "undefined") || (get_color_scheme() != $color_scheme))
-		update_color_scheme();
-		// detect changes and change the cookie
-		if (window.matchMedia)
-		window.matchMedia("(prefers-color-scheme: dark)").addListener( update_color_scheme );
-		// reloads page to apply the dark mode cookie
-		window.onload = function() {
-		    if(!window.location.hash && get_color_scheme() == "dark" && (get_color_scheme() != $color_scheme)) {
-		        window.location = window.location + '#dark';
-		        window.location.reload();
-		    }
-		}
-	</script>
-		<?php // loads dark mode CSS if dark mode detected
-		     $color_scheme = isset($_COOKIE["color_scheme"]) ? $_COOKIE["color_scheme"] : false; 
-			 $color_scheme_override = isset($_COOKIE["color_scheme_override"]) ? $_COOKIE["color_scheme_override"] : false; ?>
-		@if ($color_scheme == 'dark' and config('advanced-config.theme') != 'light' and $color_scheme_override != 'light' or $color_scheme_override == 'dark' or config('advanced-config.theme') == 'dark')
-		<link rel="stylesheet" href="{{ asset('css/app-dark.css') }}">
-		@endif
-  <!-- end dark mode detection --> --}}
+	  <link rel="stylesheet" href="{{ asset('assets/external-dependencies/bootstrap-icons.css') }}">
     </head>
     <body>
 
diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index 3263ce2..e504803 100755
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -514,9 +514,9 @@ $usrhandl = Auth::user()->littlelink_name;
               <ul class="left-panel list-inline mb-0 p-0">
                 @if(env('DISPLAY_FOOTER') === true)
                   @if(env('DISPLAY_FOOTER_HOME') === true)<li class="list-inline-item"><a class="list-inline-item" href="@if(str_replace('"', "", EnvEditor::getKey('HOME_FOOTER_LINK')) === "" ){{ url('') }}@else{{ str_replace('"', "", EnvEditor::getKey('HOME_FOOTER_LINK')) }}@endif">{{footer('Home')}}</a></li>@endif
-                  @if(env('DISPLAY_FOOTER_TERMS') === true)<li class="list-inline-item"><a class="list-inline-item" href="{{ url('') }}/pages/{{ strtolower(env('TITLE_FOOTER_TERMS')) }}">{{footer('Terms')}}</a></li>@endif
-                  @if(env('DISPLAY_FOOTER_PRIVACY') === true)<li class="list-inline-item"><a class="list-inline-item" href="{{ url('') }}/pages/{{ strtolower(env('TITLE_FOOTER_PRIVACY')) }}">{{footer('Privacy')}}</a></li>@endif
-                  @if(env('DISPLAY_FOOTER_CONTACT') === true)<li class="list-inline-item"><a class="list-inline-item" href="{{ url('') }}/pages/{{ strtolower(env('TITLE_FOOTER_CONTACT')) }}">{{footer('Contact')}}</a></li>@endif
+                  @if(env('DISPLAY_FOOTER_TERMS') === true)<li class="list-inline-item"><a class="list-inline-item" href="{{ url('') }}/pages/{{ strtolower(footer('Terms')) }}">{{footer('Terms')}}</a></li>@endif
+                  @if(env('DISPLAY_FOOTER_PRIVACY') === true)<li class="list-inline-item"><a class="list-inline-item" href="{{ url('') }}/pages/{{ strtolower(footer('Privacy')) }}">{{footer('Privacy')}}</a></li>@endif
+                  @if(env('DISPLAY_FOOTER_CONTACT') === true)<li class="list-inline-item"><a class="list-inline-item" href="{{ url('') }}/pages/{{ strtolower(footer('Contact')) }}">{{footer('Contact')}}</a></li>@endif
                 @endif
               </ul>
               <div class="right-panel">
diff --git a/resources/views/pages.blade.php b/resources/views/pages.blade.php
index 9ca8980..54efb90 100755
--- a/resources/views/pages.blade.php
+++ b/resources/views/pages.blade.php
@@ -2,12 +2,10 @@
 @include('layouts.lang')
 <head>
   <meta charset="utf-8">
-  <title>{{env('TITLE_FOOTER_'.strtoupper($name))}} - {{env('APP_NAME')}}</title>
+  <title>{{ucfirst(Request::segment(2))}} - {{env('APP_NAME')}}</title>
 
 @include('layouts.analytics')
 
-  <title>{{ config('app.name') }}</title>
-
       <!-- Favicon -->
       @if(file_exists(base_path("assets/linkstack/images/").findFile('favicon')))
       <link rel="icon" type="image/png" href="{{ asset('assets/linkstack/images/'.findFile('favicon')) }}">
diff --git a/routes/web.php b/routes/web.php
index 855c4d8..2cef788 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -88,9 +88,9 @@ $custom_prefix = config('advanced-config.custom_url_prefix');
 Route::get('/going/{id?}', [UserController::class, 'clickNumber'])->where('link', '.*')->name('clickNumber');
 if($custom_prefix != ""){Route::get('/' . $custom_prefix . '{littlelink}', [UserController::class, 'littlelink'])->name('littlelink');}}
 Route::get('/@{littlelink}', [UserController::class, 'littlelink'])->name('littlelink');
-Route::get('/pages/'.strtolower(env('TITLE_FOOTER_TERMS')), [AdminController::class, 'pagesTerms'])->name('pagesTerms');
-Route::get('/pages/'.strtolower(env('TITLE_FOOTER_PRIVACY')), [AdminController::class, 'pagesPrivacy'])->name('pagesPrivacy');
-Route::get('/pages/'.strtolower(env('TITLE_FOOTER_CONTACT')), [AdminController::class, 'pagesContact'])->name('pagesContact');
+Route::get('/pages/'.strtolower(footer('Terms')), [AdminController::class, 'pagesTerms'])->name('pagesTerms');
+Route::get('/pages/'.strtolower(footer('Privacy')), [AdminController::class, 'pagesPrivacy'])->name('pagesPrivacy');
+Route::get('/pages/'.strtolower(footer('Contact')), [AdminController::class, 'pagesContact'])->name('pagesContact');
 Route::get('/theme/@{littlelink}', [UserController::class, 'theme'])->name('theme');
 Route::get('/vcard/{id?}', [UserController::class, 'vcard'])->name('vcard');