[Server Bug]: app.logo is not used in code

7 months ago · a63dbd8436
parent ef6187b917
commit a63dbd8436
25 changed files with 30 additions and 26 deletions
--- a/app/Services/LandingService.php
+++ b/app/Services/LandingService.php
@ -56,6 +56,7 @@ class LandingService
            'open_registration' => (bool) $openReg,
            'curated_onboarding' => (bool) config_cache('instance.curated_registration.enabled'),
            'version' => config('pixelfed.version'),
+            'logo' => config('app.logo'),
            'about' => [
                'banner_image' => config_cache('app.banner_image') ?? url('/storage/headers/default.jpg'),
                'short_description' => config_cache('app.short_description'),
--- a/app/Util/Site/Config.php
+++ b/app/Util/Site/Config.php
@ -30,6 +30,7 @@ class Config
                'version' => config('pixelfed.version'),
                'open_registration' => (bool) config_cache('pixelfed.open_registration'),
                'show_legal_notice_link' => (bool) config('instance.has_legal_notice'),
+                'logo' => config('app.logo'),
                'uploader' => [
                    'max_photo_size' => (int) config_cache('pixelfed.max_photo_size'),
                    'max_caption_length' => (int) config_cache('pixelfed.max_caption_length'),
--- a/resources/assets/components/landing/sections/nav.vue
+++ b/resources/assets/components/landing/sections/nav.vue
@ -2,7 +2,7 @@
    <nav class="navbar navbar-expand-lg navbar-dark fixed-top">
        <div class="container" style="max-width: 600px;">
            <router-link to="/" class="navbar-brand">
-                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Logo">
+                <img :src="config.logo" width="40" height="40" alt="Logo">
                <span class="mr-3">{{ name }}</span>
            </router-link>
            <ul class="navbar-nav mr-auto">
--- a/resources/assets/components/partials/navbar.vue
+++ b/resources/assets/components/partials/navbar.vue
@ -2,7 +2,7 @@
    <nav class="metro-nav navbar navbar-expand navbar-light navbar-laravel sticky-top shadow-none py-1">
        <div class="container-fluid">
                <a class="navbar-brand d-flex align-items-center" href="/i/web" title="Logo">
-                    <img src="/img/pixelfed-icon-color.svg" height="30px" class="px-2" loading="eager" alt="Pixelfed logo">
+                    <img :src="config.logo" height="30px" class="px-2" loading="eager" alt="Pixelfed logo">
                    <span class="font-weight-bold mb-0 d-none d-sm-block" style="font-size:20px;">
                        {{ brandName }}
                    </span>
@ -384,6 +384,7 @@
                user: window._sharedData.user,
                profileLayoutModel: 'grid',
                hasLocalTimeline: true,
+                config: window.App.config,
                hasNetworkTimeline: false
            }
        },
--- a/resources/assets/components/sections/Notifications.vue
+++ b/resources/assets/components/sections/Notifications.vue
@ -40,7 +40,7 @@
 									v-if="n.type === 'autospam.warning'"
 									class="mr-2 rounded-circle shadow-sm p-1"
 									style="border: 2px solid var(--danger)"
-									src="/img/pixelfed-icon-color.svg"
+									:src="config.logo"
 									width="32"
 									height="32"
 									/>
@ -208,6 +208,7 @@
 				isRefreshing: false,
 				hasLoaded: false,
 				isEmpty: false,
+				config: window.App.config,
 				retryTimeout: undefined,
 				retryAttempts: 0
 			}
--- a/resources/assets/js/components/NavMenu.vue
+++ b/resources/assets/js/components/NavMenu.vue
@ -3,7 +3,7 @@
 		<nav class="navbar navbar-expand navbar-light navbar-laravel shadow-none border-bottom sticky-top py-1">
 			<div class="container">
 				<a class="navbar-brand d-flex align-items-center" href="/" title="Logo">
-					<img src="/img/pixelfed-icon-color.svg" height="30px" class="px-2" loading="eager">
+					<img :src="config.logo" height="30px" class="px-2" loading="eager">
 					<span class="font-weight-bold mb-0 d-none d-sm-block" style="font-size:20px;">{{ config.site.name }}</span>
 				</a>
 				<div v-if="loaded && loggedIn" class="collapse navbar-collapse">
--- a/resources/assets/js/components/StoryCompose.vue
+++ b/resources/assets/js/components/StoryCompose.vue
@ -10,7 +10,7 @@
 			<!-- LANDING -->
 			<div v-if="page == 'landing'" class="card card-body bg-transparent border-0 shadow-none d-flex justify-content-center" style="height: 90vh;">
 				<div class="text-center flex-fill pt-3">
-					<img class="mb-2" src="/img/pixelfed-icon-color.svg" width="70" height="70">
+					<img class="mb-2" :src="config.logo" width="70" height="70">
 					<p class="lead text-lighter font-weight-light mb-0">Stories</p>
 				</div>
 				<div class="flex-fill py-4">
@ -93,7 +93,7 @@

 			<div v-else-if="page == 'error'" class="card card-body bg-transparent border-0 shadow-none d-flex justify-content-center align-items-center" style="height: 90vh;">
 				<div class="text-center flex-fill pt-3">
-					<img class="mb-2" src="/img/pixelfed-icon-color.svg" width="70" height="70">
+					<img class="mb-2" :src="config.logo" width="70" height="70">
 					<p class="lead text-lighter font-weight-light mb-0">Stories</p>
 				</div>
 				<div class="flex-fill text-center">
@ -119,7 +119,7 @@

 			<div v-else-if="page == 'preview'" class="card card-body bg-transparent border-0 shadow-none d-flex justify-content-center align-items-center" style="height: 90vh;">
 				<div class="text-center flex-fill pt-3">
-					<img class="mb-2" src="/img/pixelfed-icon-color.svg" width="70" height="70">
+					<img class="mb-2" :src="config.logo" width="70" height="70">
 					<p class="lead text-lighter font-weight-light mb-0">Stories</p>
 				</div>
 				<div class="flex-fill">
@ -204,7 +204,7 @@

 			<div v-else-if="page == 'createPoll'" class="card card-body bg-transparent border-0 shadow-none d-flex justify-content-center" style="height: 90vh;">
 				<div class="text-center pt-3">
-					<img class="mb-2" src="/img/pixelfed-icon-color.svg" width="70" height="70">
+					<img class="mb-2" :src="config.logo" width="70" height="70">
 					<p class="lead text-lighter font-weight-light mb-0">Stories</p>
 				</div>
 				<div class="flex-fill mt-3">
--- a/resources/views/admin/partial/sidenav.blade.php
+++ b/resources/views/admin/partial/sidenav.blade.php
@ -2,7 +2,7 @@
 	<div class="scrollbar-inner">
 		<div class="sidenav-header  align-items-center">
 			<a class="navbar-brand" href="/i/web">
-				<img src="/img/pixelfed-icon-color.svg" class="navbar-brand-img">
+				<img src="{{ config('app.logo') }}" class="navbar-brand-img">
 			</a>
 		</div>
 		<div class="navbar-inner">
--- a/resources/views/auth/curated-register/concierge.blade.php
+++ b/resources/views/auth/curated-register/concierge.blade.php
@ -5,7 +5,7 @@
    <div class="row justify-content-center align-items-center">
        <div class="col-12 col-md-7">
            <div class="logo">
-                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <img src="{{ config('app.logo') }}" width="40" height="40" alt="Pixelfed Logo">
                <p class="font-weight-bold mb-0">Pixelfed</p>
            </div>

--- a/resources/views/auth/curated-register/concierge_form.blade.php
+++ b/resources/views/auth/curated-register/concierge_form.blade.php
@ -5,7 +5,7 @@
    <div class="row justify-content-center align-items-center">
        <div class="col-12 col-md-7">
            <div class="logo">
-                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <img src="{{ config('app.logo') }}" width="40" height="40" alt="Pixelfed Logo">
                <p class="font-weight-bold mb-0">Pixelfed</p>
            </div>

--- a/resources/views/auth/curated-register/confirm_email.blade.php
+++ b/resources/views/auth/curated-register/confirm_email.blade.php
@ -5,7 +5,7 @@
    <div class="row justify-content-center align-items-center">
        <div class="col-12 col-md-7">
            <div class="logo">
-                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <img src="{{ config('app.logo') }}" width="40" height="40" alt="Pixelfed Logo">
                <p class="font-weight-bold mb-0">Pixelfed</p>
            </div>

--- a/resources/views/auth/curated-register/email_confirmed.blade.php
+++ b/resources/views/auth/curated-register/email_confirmed.blade.php
@ -5,7 +5,7 @@
    <div class="row justify-content-center align-items-center">
        <div class="col-12 col-md-7">
            <div class="logo">
-                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <img src="{{ config('app.logo') }}" width="40" height="40" alt="Pixelfed Logo">
                <p class="font-weight-bold mb-0">Pixelfed</p>
            </div>

--- a/resources/views/auth/curated-register/index.blade.php
+++ b/resources/views/auth/curated-register/index.blade.php
@ -5,7 +5,7 @@
    <div class="row justify-content-center align-items-center">
        <div class="col-12 col-md-7">
            <div class="logo">
-                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <img src="{{ config('app.logo') }}" width="40" height="40" alt="Pixelfed Logo">
                <p class="font-weight-bold mb-0">Pixelfed</p>
            </div>

--- a/resources/views/auth/curated-register/resend-confirmation.blade.php
+++ b/resources/views/auth/curated-register/resend-confirmation.blade.php
@ -5,7 +5,7 @@
    <div class="row justify-content-center align-items-center">
        <div class="col-12 col-md-7">
            <div class="logo">
-                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <img src="{{ config('app.logo') }}" width="40" height="40" alt="Pixelfed Logo">
                <p class="font-weight-bold mb-0">Pixelfed</p>
            </div>

--- a/resources/views/auth/curated-register/resent-confirmation.blade.php
+++ b/resources/views/auth/curated-register/resent-confirmation.blade.php
@ -5,7 +5,7 @@
    <div class="row justify-content-center align-items-center">
        <div class="col-12 col-md-7">
            <div class="logo">
-                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <img src="{{ config('app.logo') }}" width="40" height="40" alt="Pixelfed Logo">
                <p class="font-weight-bold mb-0">Pixelfed</p>
            </div>

--- a/resources/views/auth/curated-register/user_response_sent.blade.php
+++ b/resources/views/auth/curated-register/user_response_sent.blade.php
@ -5,7 +5,7 @@
    <div class="row justify-content-center align-items-center">
        <div class="col-12 col-md-7">
            <div class="logo">
-                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <img src="{{ config('app.logo') }}" width="40" height="40" alt="Pixelfed Logo">
                <p class="font-weight-bold mb-0">Pixelfed</p>
            </div>

--- a/resources/views/auth/two-factor.blade.php
+++ b/resources/views/auth/two-factor.blade.php
@ -5,7 +5,7 @@
 	<div class="row justify-content-center">
 		<div class="col-lg-5">
 			<div class="text-center">
-				<img src="/img/pixelfed-icon-color.svg" height="60px">
+				<img src="{{ config('app.logo') }}" height="60px">
 				<p class="font-weight-light h3 py-4">Verify Two Factor Code</p>
 			</div>
 			<div class="alert alert-info small">
--- a/resources/views/installer/index.blade.php
+++ b/resources/views/installer/index.blade.php
@ -58,7 +58,7 @@
 					<div class="col-12">
 						<p class="text-center py-3">
 							<a href="/installer">
-								<img src="/img/pixelfed-icon-color.svg" width="60" height="60">
+								<img src="{{ config('app.logo') }}" width="60" height="60">
 							</a>
 						</p>

--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@ -1,7 +1,7 @@
 <nav class="navbar navbar-expand navbar-light navbar-laravel shadow-none border-bottom sticky-top py-1">
 	<div class="container">
 			<a class="navbar-brand d-flex align-items-center" href="{{ config('app.url') }}" title="Logo">
-				<img src="/img/pixelfed-icon-color.svg" height="30px" class="px-2" loading="eager" alt="Pixelfed logo">
+				<img src="{{ config('app.logo') }}" height="30px" class="px-2" loading="eager" alt="Pixelfed logo">
 				<span class="font-weight-bold mb-0 d-none d-sm-block" style="font-size:20px;">{{ config_cache('app.name') }}</span>
 			</a>

--- a/resources/views/layouts/partial/noauthnav.blade.php
+++ b/resources/views/layouts/partial/noauthnav.blade.php
@ -1,7 +1,7 @@
 <nav class="navbar navbar-expand navbar-light navbar-laravel shadow-none border-bottom sticky-top">
    <div class="container">
        <a class="navbar-brand d-flex align-items-center" href="{{ url('/') }}">
-            <img src="/img/pixelfed-icon-color.svg" height="30px" class="px-2" alt="Pixelfed logo">
+            <img src="{{ config('app.logo') }}" height="30px" class="px-2" alt="Pixelfed logo">
            <span class="font-weight-bold mb-0" style="font-size:20px;">{{ config_cache('app.name', 'Pixelfed') }}</span>
        </a>
    </div>
--- a/resources/views/profile/embed-removed.blade.php
+++ b/resources/views/profile/embed-removed.blade.php
@ -40,7 +40,7 @@
 	<div class="embed-card border">
 		<div class="card status-card-embed card-md-rounded-0 card-body shadow-none rounded-0">
 			<div class="text-center p-5">
-				<img src="/img/pixelfed-icon-color.svg" width="40px" height="40px">
+				<img src="{{ config('app.logo') }}" width="40px" height="40px">
 				<p class="h2 py-3 font-weight-bold">Pixelfed</p>
 				<p style="font-size:14px;font-weight: 500;" class="px-2 py-4">Cannot display profile embed, it may be deleted or set to private.</p>
 				<p><a href="{{config('app.url')}}" class="font-weight-bold" target="_blank">Visit Pixelfed</a></p>
--- a/resources/views/profile/embed.blade.php
+++ b/resources/views/profile/embed.blade.php
@ -29,7 +29,7 @@
                </div>
                <div>
                    <a class="small font-weight-bold text-muted pr-1" href="{{config('app.url')}}" target="_blank">{{config('pixelfed.domain.app')}}</a>
-                    <img src="/img/pixelfed-icon-color.svg" width="26" height="26">
+                    <img src="{{ config('app.logo') }}" width="26" height="26">
                </div>
            </div>
            <div class="card-body pb-1">
--- a/resources/views/site/about.blade.php
+++ b/resources/views/site/about.blade.php
@ -34,7 +34,7 @@
 		</div>
 		<div class="px-4 py-5 my-5 text-center">
 			<a href="/">
-				<img class="d-block mx-auto mb-4" src="/img/pixelfed-icon-color.svg" alt="" width="72" height="57">
+				<img class="d-block mx-auto mb-4" src="{{ config('app.logo') }}" alt="" width="72" height="57">
 			</a>
 			
 			<h1 class="display-4 font-weight-bold py-3">{{ config_cache('about.title') ?? __('site.photo_sharing_for_everyone') }}</h1>
--- a/resources/views/status/embed-removed.blade.php
+++ b/resources/views/status/embed-removed.blade.php
@ -40,7 +40,7 @@
 	<div class="embed-card border">
 		<div class="card status-card-embed card-md-rounded-0 card-body shadow-none rounded-0">
 			<div class="text-center p-5">
-				<img src="/img/pixelfed-icon-color.svg" width="40px" height="40px">
+				<img src="{{ config('app.logo') }}" width="40px" height="40px">
 				<p class="h2 py-3 font-weight-bold">Pixelfed</p>
 				<p style="font-size:14px;font-weight: 500;" class="p-2">The link to this photo or video may be broken, or the post may have been removed.</p>
 				<p><a href="{{config('app.url')}}" class="font-weight-bold" target="_blank">Visit Pixelfed</a></p>
--- a/resources/views/status/embed.blade.php
+++ b/resources/views/status/embed.blade.php
@ -68,7 +68,7 @@
                </div>
                <div>
                    <a class="small font-weight-bold text-muted pr-1" href="{{config('app.url')}}" target="_blank">{{config('pixelfed.domain.app')}}</a>
-                    <img src="/img/pixelfed-icon-color.svg" width="26" height="26" />
+                    <img src="{{ config('app.logo') }}" width="26" height="26" />
                </div>
            </div>
        </div>