mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-26 00:03:16 +00:00
Update app.name config, use config_cache
This commit is contained in:
parent
a76cb5f4f8
commit
911446c03e
20 changed files with 37 additions and 37 deletions
|
@ -1632,7 +1632,7 @@ class ApiV1Controller extends Controller
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'uri' => config('pixelfed.domain.app'),
|
'uri' => config('pixelfed.domain.app'),
|
||||||
'title' => config('app.name'),
|
'title' => config_cache('app.name'),
|
||||||
'short_description' => config_cache('app.short_description'),
|
'short_description' => config_cache('app.short_description'),
|
||||||
'description' => config_cache('app.description'),
|
'description' => config_cache('app.description'),
|
||||||
'email' => config('instance.email'),
|
'email' => config('instance.email'),
|
||||||
|
|
|
@ -69,7 +69,7 @@
|
||||||
<div class="col-12 col-md-6 offset-md-3 my-3">
|
<div class="col-12 col-md-6 offset-md-3 my-3">
|
||||||
<div class="border rounded p-3 border-primary">
|
<div class="border rounded p-3 border-primary">
|
||||||
<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
|
<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
|
||||||
<p class="lead pt-4 text-primary">We want to keep {{config('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
|
<p class="lead pt-4 text-primary">We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -100,4 +100,4 @@
|
||||||
ctx.putImageData(imageData, 0, 0);
|
ctx.putImageData(imageData, 0, 0);
|
||||||
</script>
|
</script>
|
||||||
@endif
|
@endif
|
||||||
@endpush
|
@endpush
|
||||||
|
|
|
@ -70,7 +70,7 @@
|
||||||
<div class="col-12 col-md-6 offset-md-3 my-3">
|
<div class="col-12 col-md-6 offset-md-3 my-3">
|
||||||
<div class="border rounded p-3 border-primary">
|
<div class="border rounded p-3 border-primary">
|
||||||
<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
|
<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
|
||||||
<p class="lead pt-4 text-primary">We want to keep {{config('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
|
<p class="lead pt-4 text-primary">We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -127,4 +127,4 @@
|
||||||
ctx.putImageData(imageData, 0, 0);
|
ctx.putImageData(imageData, 0, 0);
|
||||||
</script>
|
</script>
|
||||||
@endif
|
@endif
|
||||||
@endpush
|
@endpush
|
||||||
|
|
|
@ -62,7 +62,7 @@
|
||||||
<div class="col-12 col-md-6 offset-md-3 my-3">
|
<div class="col-12 col-md-6 offset-md-3 my-3">
|
||||||
<div class="border rounded p-3 border-primary">
|
<div class="border rounded p-3 border-primary">
|
||||||
<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
|
<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
|
||||||
<p class="lead pt-4 text-primary">We want to keep {{config('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
|
<p class="lead pt-4 text-primary">We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12 col-md-6 offset-md-3 mt-4 mb-5">
|
<div class="col-12 col-md-6 offset-md-3 mt-4 mb-5">
|
||||||
|
@ -96,4 +96,4 @@
|
||||||
ctx.putImageData(imageData, 0, 0);
|
ctx.putImageData(imageData, 0, 0);
|
||||||
</script>
|
</script>
|
||||||
@endif
|
@endif
|
||||||
@endpush
|
@endpush
|
||||||
|
|
|
@ -69,7 +69,7 @@
|
||||||
<div class="col-12 col-md-6 offset-md-3 my-3">
|
<div class="col-12 col-md-6 offset-md-3 my-3">
|
||||||
<div class="border rounded p-3 border-primary">
|
<div class="border rounded p-3 border-primary">
|
||||||
<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
|
<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
|
||||||
<p class="lead pt-4 text-primary">We want to keep {{config('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
|
<p class="lead pt-4 text-primary">We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -125,4 +125,4 @@
|
||||||
ctx.putImageData(imageData, 0, 0);
|
ctx.putImageData(imageData, 0, 0);
|
||||||
</script>
|
</script>
|
||||||
@endif
|
@endif
|
||||||
@endpush
|
@endpush
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
@extends('layouts.app',['title' => 'Welcome to ' . config('app.name')])
|
@extends('layouts.app',['title' => 'Welcome to ' . config_cache('app.name')])
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
<div class="container mt-4">
|
<div class="container mt-4">
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
<p class="lead mb-0">Welcome to {{config('app.name')}}!</p>
|
<p class="lead mb-0">Welcome to {{config_cache('app.name')}}!</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
||||||
<meta name="mobile-web-app-capable" content="yes">
|
<meta name="mobile-web-app-capable" content="yes">
|
||||||
|
|
||||||
<title>{{ $title ?? config('app.name', 'Pixelfed') }}</title>
|
<title>{{ $title ?? config_cache('app.name', 'Pixelfed') }}</title>
|
||||||
<link rel="manifest" href="{{url('/manifest.json')}}">
|
<link rel="manifest" href="{{url('/manifest.json')}}">
|
||||||
|
|
||||||
<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
|
<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
|
<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta property="og:type" content="article">
|
<meta property="og:type" content="article">
|
||||||
<meta property="og:url" content="{{url(request()->url())}}">
|
<meta property="og:url" content="{{url(request()->url())}}">
|
||||||
@stack('meta')
|
@stack('meta')
|
||||||
|
|
|
@ -70,11 +70,11 @@
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
||||||
<meta name="mobile-web-app-capable" content="yes">
|
<meta name="mobile-web-app-capable" content="yes">
|
||||||
|
|
||||||
<title>{{ $title ?? config('app.name', 'Pixelfed') }}</title>
|
<title>{{ $title ?? config_cache('app.name', 'Pixelfed') }}</title>
|
||||||
<link rel="manifest" href="/manifest.json">
|
<link rel="manifest" href="/manifest.json">
|
||||||
|
|
||||||
<meta property="og:site_name" content="Pixelfed">
|
<meta property="og:site_name" content="Pixelfed">
|
||||||
<meta property="og:title" content="{{ $ogTitle ?? $title ?? config('app.name', 'pixelfed') }}">
|
<meta property="og:title" content="{{ $ogTitle ?? $title ?? config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta property="og:type" content="{{ $ogType ?? 'article' }}">
|
<meta property="og:type" content="{{ $ogType ?? 'article' }}">
|
||||||
<meta property="og:url" content="{{url(request()->url())}}">
|
<meta property="og:url" content="{{url(request()->url())}}">
|
||||||
@stack('meta')
|
@stack('meta')
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
|
|
||||||
<title>{{ $title ?? config_cache('app.name') }}</title>
|
<title>{{ $title ?? config_cache('app.name') }}</title>
|
||||||
|
|
||||||
<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
|
<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
|
<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta property="og:type" content="article">
|
<meta property="og:type" content="article">
|
||||||
<meta property="og:url" content="{{request()->url()}}">
|
<meta property="og:url" content="{{request()->url()}}">
|
||||||
@stack('meta')
|
@stack('meta')
|
||||||
|
|
|
@ -9,11 +9,11 @@
|
||||||
|
|
||||||
<meta name="mobile-web-app-capable" content="yes">
|
<meta name="mobile-web-app-capable" content="yes">
|
||||||
|
|
||||||
<title>{{ $title ?? config('app.name', 'Laravel') }}</title>
|
<title>{{ $title ?? config_cache('app.name', 'Pixelfed') }}</title>
|
||||||
<link rel="manifest" href="/manifest.json">
|
<link rel="manifest" href="/manifest.json">
|
||||||
|
|
||||||
<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
|
<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
|
<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta property="og:type" content="article">
|
<meta property="og:type" content="article">
|
||||||
<meta property="og:url" content="{{request()->url()}}">
|
<meta property="og:url" content="{{request()->url()}}">
|
||||||
@stack('meta')
|
@stack('meta')
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<a class="navbar-brand d-flex align-items-center" href="{{ url('/') }}">
|
<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="/img/pixelfed-icon-color.svg" height="30px" class="px-2" alt="Pixelfed logo">
|
||||||
<span class="font-weight-bold mb-0" style="font-size:20px;">{{ config('app.name', 'Laravel') }}</span>
|
<span class="font-weight-bold mb-0" style="font-size:20px;">{{ config_cache('app.name', 'Pixelfed') }}</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
|
|
||||||
<title>{!! $title ?? config_cache('app.name') !!}</title>
|
<title>{!! $title ?? config_cache('app.name') !!}</title>
|
||||||
|
|
||||||
<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
|
<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
|
<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta property="og:type" content="article">
|
<meta property="og:type" content="article">
|
||||||
<meta property="og:url" content="{{request()->url()}}">
|
<meta property="og:url" content="{{request()->url()}}">
|
||||||
@stack('meta')
|
@stack('meta')
|
||||||
|
|
|
@ -9,8 +9,8 @@
|
||||||
|
|
||||||
<title>Pixelfed | 404 Embed Not Found</title>
|
<title>Pixelfed | 404 Embed Not Found</title>
|
||||||
|
|
||||||
<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
|
<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
|
<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta name="medium" content="image">
|
<meta name="medium" content="image">
|
||||||
<meta name="theme-color" content="#10c5f8">
|
<meta name="theme-color" content="#10c5f8">
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||||
|
|
|
@ -9,8 +9,8 @@
|
||||||
|
|
||||||
<title>{{ $title ?? config('app.name', 'Pixelfed') }}</title>
|
<title>{{ $title ?? config('app.name', 'Pixelfed') }}</title>
|
||||||
|
|
||||||
<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
|
<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
|
<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta property="og:type" content="article">
|
<meta property="og:type" content="article">
|
||||||
<meta property="og:url" content="{{$profile['url']}}">
|
<meta property="og:url" content="{{$profile['url']}}">
|
||||||
<meta name="medium" content="image">
|
<meta name="medium" content="image">
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
@extends('layouts.app-guest',['title' => $user->username . " on " . config('app.name')])
|
@extends('layouts.app-guest',['title' => $user->username . " on " . config_cache('app.name')])
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
@if (session('error'))
|
@if (session('error'))
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
<meta name="mobile-web-app-capable" content="yes">
|
<meta name="mobile-web-app-capable" content="yes">
|
||||||
|
|
||||||
<title>{{ config('app.name', 'Pixelfed') }}</title>
|
<title>{{ config_cache('app.name', 'Pixelfed') }}</title>
|
||||||
|
|
||||||
<link rel="canonical" href="{{ request()->url() }}" />
|
<link rel="canonical" href="{{ request()->url() }}" />
|
||||||
|
|
||||||
|
|
|
@ -9,8 +9,8 @@
|
||||||
|
|
||||||
<title>Pixelfed | 404 Embed Not Found</title>
|
<title>Pixelfed | 404 Embed Not Found</title>
|
||||||
|
|
||||||
<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
|
<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
|
<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
|
||||||
<meta name="medium" content="image">
|
<meta name="medium" content="image">
|
||||||
<meta name="theme-color" content="#10c5f8">
|
<meta name="theme-color" content="#10c5f8">
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
{{-- Header --}}
|
{{-- Header --}}
|
||||||
@slot('header')
|
@slot('header')
|
||||||
@component('mail::header', ['url' => config('app.url')])
|
@component('mail::header', ['url' => config('app.url')])
|
||||||
{{ config('app.name') }}
|
{{ config_cache('app.name') }}
|
||||||
@endcomponent
|
@endcomponent
|
||||||
@endslot
|
@endslot
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
{{-- Footer --}}
|
{{-- Footer --}}
|
||||||
@slot('footer')
|
@slot('footer')
|
||||||
@component('mail::footer')
|
@component('mail::footer')
|
||||||
© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
|
© {{ date('Y') }} {{ config_cache('app.name') }}. @lang('All rights reserved.')
|
||||||
@endcomponent
|
@endcomponent
|
||||||
@endslot
|
@endslot
|
||||||
@endcomponent
|
@endcomponent
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
{{-- Header --}}
|
{{-- Header --}}
|
||||||
@slot('header')
|
@slot('header')
|
||||||
@component('mail::header', ['url' => config('app.url')])
|
@component('mail::header', ['url' => config('app.url')])
|
||||||
{{ config('app.name') }}
|
{{ config_cache('app.name') }}
|
||||||
@endcomponent
|
@endcomponent
|
||||||
@endslot
|
@endslot
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
{{-- Footer --}}
|
{{-- Footer --}}
|
||||||
@slot('footer')
|
@slot('footer')
|
||||||
@component('mail::footer')
|
@component('mail::footer')
|
||||||
© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
|
© {{ date('Y') }} {{ config_cache('app.name') }}. @lang('All rights reserved.')
|
||||||
@endcomponent
|
@endcomponent
|
||||||
@endslot
|
@endslot
|
||||||
@endcomponent
|
@endcomponent
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<title>{{ config('app.name') }} - Authorization</title>
|
<title>{{ config_cache('app.name') }} - Authorization</title>
|
||||||
<link href="{{ mix('/css/app.css') }}" rel="stylesheet">
|
<link href="{{ mix('/css/app.css') }}" rel="stylesheet">
|
||||||
<style>
|
<style>
|
||||||
.passport-authorize .container {
|
.passport-authorize .container {
|
||||||
|
|
Loading…
Reference in a new issue