banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-19 21:04:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove get_fonts, Fix docker container console font selection (#1329)

Browse Source 
* Update `get_fonts`

This should fix docker, Has to be changed as we use alpine for docker which does not support GLOB_BRACE

* #2?

* #3

* FINAL BOSS FIGHT

Fixes Docker image <3

* Update resources/views/filament/components/server-console.blade.php

Co-authored-by: Lance Pioch <git@lance.sh>

---------

Co-authored-by: Lance Pioch <git@lance.sh>
This commit is contained in:
Charles 2025-05-02 08:37:27 -04:00 committed by GitHub
parent 7f0266be5e
commit 2d581c7cbd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile.dev
View File

@ -86,6 +86,7 @@ RUN chown root:www-data ./ \
&& ln -s /pelican-data/database/database.sqlite ./database/database.sqlite \ && ln -s /pelican-data/database/database.sqlite ./database/database.sqlite \
&& ln -sf /var/www/html/storage/app/public /var/www/html/public/storage \ && ln -sf /var/www/html/storage/app/public /var/www/html/public/storage \
&& ln -s /pelican-data/storage/avatars /var/www/html/storage/app/public/avatars \ && ln -s /pelican-data/storage/avatars /var/www/html/storage/app/public/avatars \
&& ln -s /pelican-data/storage/fonts /var/www/html/storage/app/public/fonts \
# Allow www-data write permissions where necessary # Allow www-data write permissions where necessary
&& chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \ && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
&& chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord

15
app/Filament/Pages/Auth/EditProfile.php
View File

@ -39,6 +39,7 @@ use Filament\Support\Enums\MaxWidth;
use Filament\Support\Exceptions\Halt; use Filament\Support\Exceptions\Halt;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Support\HtmlString; use Illuminate\Support\HtmlString;
use Illuminate\Validation\Rules\Password; use Illuminate\Validation\Rules\Password;
@ -375,7 +376,17 @@ class EditProfile extends BaseEditProfile
->default(30), ->default(30),
Select::make('console_font') Select::make('console_font')
->label(trans('profile.font')) ->label(trans('profile.font'))
->options(fn () => get_fonts(storage_path('app\public\fonts'))) ->options(function () {
$fonts = [];
foreach (File::allFiles(public_path('storage/fonts')) as $file) {
if ($file->getExtension() === 'ttf') {
$name = pathinfo($file->getFilename(), PATHINFO_FILENAME);
$fonts[$name] = $name;
}
}
return $fonts;
})
->reactive() ->reactive()
->afterStateUpdated(fn ($state, callable $set) => $set('font_preview', $state)), ->afterStateUpdated(fn ($state, callable $set) => $set('font_preview', $state)),
Placeholder::make('font_preview') Placeholder::make('font_preview')
@ -383,7 +394,7 @@ class EditProfile extends BaseEditProfile
->content(function (Get $get) { ->content(function (Get $get) {
$fontName = $get('console_font') ?? 'No font selected.'; $fontName = $get('console_font') ?? 'No font selected.';
$fontUrl = asset("fonts/{$fontName}.ttf"); $fontUrl = asset("storage/fonts/{$fontName}.ttf");
$fontSize = $get('console_font_size') . 'px'; $fontSize = $get('console_font_size') . 'px';
return new HtmlString(<<<HTML return new HtmlString(<<<HTML

14
app/helpers.php
View File

@ -67,17 +67,3 @@ if (!function_exists('resolve_path')) {
return implode('/', $absolutes); return implode('/', $absolutes);
} }
} }
if (!function_exists('get_fonts')) {
/**
* @return array<string, string>
*/
function get_fonts(?string $directory = null): array
{
$directory ??= public_path('fonts');
return collect(glob($directory . '/*.ttf', GLOB_BRACE) ?: [])
->mapWithKeys(fn ($file) => [$name = pathinfo($file, PATHINFO_FILENAME) => $name])
->all();
}
}

20
resources/views/filament/components/server-console.blade.php
View File

@ -5,6 +5,18 @@
$userFontSize = auth()->user()->getCustomization()['console_font_size'] ?? 14; $userFontSize = auth()->user()->getCustomization()['console_font_size'] ?? 14;
$userRows = auth()->user()->getCustomization()['console_rows'] ?? 30; $userRows = auth()->user()->getCustomization()['console_rows'] ?? 30;
@endphp @endphp
@if ($userFont === 'ComicMono')
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/comic-mono@0.0.1/index.css">
@else
<link rel="preload" href="{{ asset("storage/fonts/{$userFont}.ttf") }}" as="font" crossorigin>
<style>
@font-face {
font-family: '{{ $userFont }}';
src: url('{{ asset("storage/fonts/{$userFont}.ttf") }}');
}
</style>
@endif
<script src="https://cdn.jsdelivr.net/npm/@xterm/xterm/lib/xterm.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/@xterm/xterm/lib/xterm.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@xterm/addon-fit/lib/addon-fit.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/@xterm/addon-fit/lib/addon-fit.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@xterm/addon-web-links/lib/addon-web-links.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/@xterm/addon-web-links/lib/addon-web-links.min.js"></script>
@ -12,14 +24,6 @@
<script src="https://cdn.jsdelivr.net/npm/xterm-addon-search-bar/lib/xterm-addon-search-bar.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/xterm-addon-search-bar/lib/xterm-addon-search-bar.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@xterm/xterm/css/xterm.min.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@xterm/xterm/css/xterm.min.css">
<link rel="stylesheet" href="{{ asset('/css/filament/server/console.css') }}"> <link rel="stylesheet" href="{{ asset('/css/filament/server/console.css') }}">
<link rel="preload" href="{{ asset("storage/fonts/{$userFont}.ttf") }}" as="font" crossorigin>
<style>
@font-face {
font-family: '{{ $userFont }}';
src: url('{{ asset("storage/fonts/{$userFont}.ttf") }}');
}
</style>
@endassets @endassets
<div id="terminal" wire:ignore></div> <div id="terminal" wire:ignore></div>

BIN
storage/app/public/fonts/ComicMono.ttf
View File

Binary file not shown.