From 801a7cb67f6a356540348e21d912ac2821d3d554 Mon Sep 17 00:00:00 2001 From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com> Date: Sat, 26 Nov 2022 18:40:12 +0100 Subject: [PATCH] Optimized internal favicon API --- resources/views/components/favicon.blade.php | 9 +++++++++ .../views/components/pageitems/link-display.blade.php | 4 +--- resources/views/home.blade.php | 6 ++---- resources/views/littlelink.blade.php | 6 ++---- resources/views/studio/button-editor.blade.php | 8 +++----- resources/views/studio/links.blade.php | 4 +--- routes/web.php | 3 +++ 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/resources/views/components/favicon.blade.php b/resources/views/components/favicon.blade.php index 6176557..6a40ce6 100644 --- a/resources/views/components/favicon.blade.php +++ b/resources/views/components/favicon.blade.php @@ -2432,4 +2432,13 @@ foreach($dom->find('link') as $e) return $favicon; } +?> + + \ No newline at end of file diff --git a/resources/views/components/pageitems/link-display.blade.php b/resources/views/components/pageitems/link-display.blade.php index 4bd0c3a..eb62b5f 100644 --- a/resources/views/components/pageitems/link-display.blade.php +++ b/resources/views/components/pageitems/link-display.blade.php @@ -3,11 +3,9 @@ @endphp -@include('components.favicon') - @if($params->GetSiteIcon ?? true) - button-icon + button-icon @endif {{ $link->title }} diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 74b5ecd..0574780 100755 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -128,8 +128,6 @@ return $path;} } -@include('components.favicon') - @@ -215,9 +213,9 @@ foreach($pages as $page) @elseif($button['button'] === "buy me a coffee")
button-iconBuy me a Coffee
@elseif($button['button'] === "custom_website" and ($button['custom_css'] === "" or $button['custom_css'] === "NULL") or (theme('allow_custom_buttons') == "false" and $button['button'] === "custom_website")) -
button-icon{{ $button['title'] }}
+
button-icon{{ $button['title'] }}
@elseif($button['button'] === "custom_website" and $button['custom_css'] != "") -
button-icon{{ $button['title'] }}
+
button-icon{{ $button['title'] }}
@elseif($button['button'] === "space") @endif -@include('components.favicon') - @if(config('advanced-config.display_share_button') != '') @@ -277,9 +275,9 @@ function get_operating_system() { @elseif($link->name === "mastodon")
button-icon{{ $link->title }}
@elseif($link->name === "custom_website"and $link->custom_css === "" or $link->custom_css === "NULL" or (theme('allow_custom_buttons') == "false" and $link->name === "custom")) -
button-icon{{ $link->title }}
+
button-icon{{ $link->title }}
@elseif($link->name === "custom_website" and $link->custom_css != "") -
button-icon{{ $link->title }}
+
button-icon{{ $link->title }}
@elseif($link->name === "space") title) and $link->title < 10) diff --git a/resources/views/studio/button-editor.blade.php b/resources/views/studio/button-editor.blade.php index 33c5d92..b27e865 100644 --- a/resources/views/studio/button-editor.blade.php +++ b/resources/views/studio/button-editor.blade.php @@ -1,8 +1,6 @@ @if(env('ENABLE_BUTTON_EDITOR') === true) @extends('layouts.sidebar') -@include('components.favicon') - @section('content') @push('sidebar-scripts') @@ -218,7 +216,7 @@ var button_css = { @if($buttonId == 1)
{{ $title }}
@else -
{{ $title }}
+
{{ $title }}
@endif @@ -257,9 +255,9 @@ NULL @if($custom_css === "" or $custom_css === "NULL" and $buttonId == 1)
{{ $title }}
@elseif($custom_css === "" or $custom_css === "NULL" and $buttonId == 2) -
{{ $title }}
+
{{ $title }}
@elseif($custom_css != "" and $buttonId == 2) -
{{ $title }}
+
{{ $title }}
@else
{{ $title }}
@endif diff --git a/resources/views/studio/links.blade.php b/resources/views/studio/links.blade.php index 1537240..6601779 100755 --- a/resources/views/studio/links.blade.php +++ b/resources/views/studio/links.blade.php @@ -30,8 +30,6 @@ @endpush -@include('components.favicon') -
10 | 20 | 30 | all
@@ -70,7 +68,7 @@ button_id); if(isset($button->name)){$buttonName = $button->name;}else{$buttonName = 0;} ?> @if($button->name == "custom_website") - button-icon + button-icon @elseif($button->name == "space")   @elseif($button->name == "heading") diff --git a/routes/web.php b/routes/web.php index 24e8847..68b8104 100755 --- a/routes/web.php +++ b/routes/web.php @@ -82,6 +82,9 @@ Route::get('/@{littlelink}', [UserController::class, 'littlelink'])->name('littl Route::get('/pages/{name}', [AdminController::class, 'pages'])->name('pages'); Route::get('/theme/@{littlelink}', [UserController::class, 'theme'])->name('theme'); +//API +Route::get('/ico', function () {return view('components.favicon');}); + //User route Route::group([ 'middleware' => env('REGISTER_AUTH'),