mkrieger/byos_laravel
1
0
Fork 0
mirror of https://github.com/usetrmnl/byos_laravel.git synced 2026-01-13 15:07:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore: pint
Some checks are pending
tests / ci (push) Waiting to run
Details

Browse source
This commit is contained in:
Benjamin Nussbaum 2025-09-22 12:04:33 +02:00
parent 2d76afee6f
commit 8958e65ec2
3 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Models/DeviceModel.php
View file

@ -31,7 +31,7 @@ final class DeviceModel extends Model
return null;
}
//if higher then 4 return 4bit
// if higher then 4 return 4bit
if ($this->bit_depth > 4) {
return '4bit';
}
@ -39,7 +39,7 @@ final class DeviceModel extends Model
return $this->bit_depth.'bit';
}
/**
/**
* Returns the scale level based on the device width.
*/
public function getScaleLevelAttribute(): ?string

17
app/Models/Plugin.php
View file

@ -350,15 +350,16 @@ class Plugin extends Model
'scaleLevel' => $device?->deviceModel?->scale_level,
'slot' => $renderedContent,
])->render();
} else {
return view('trmnl-layouts.mashup', [
'mashupLayout' => $this->getPreviewMashupLayoutForSize($size),
'colorDepth' => $device?->deviceModel?->color_depth,
'deviceVariant' => $device?->deviceModel->name ?? 'og',
'scaleLevel' => $device?->deviceModel?->scale_level,
'slot' => $renderedContent,
])->render();
}
return view('trmnl-layouts.mashup', [
'mashupLayout' => $this->getPreviewMashupLayoutForSize($size),
'colorDepth' => $device?->deviceModel?->color_depth,
'deviceVariant' => $device?->deviceModel->name ?? 'og',
'scaleLevel' => $device?->deviceModel?->scale_level,
'slot' => $renderedContent,
])->render();
}
return $renderedContent;

46
app/Services/PluginImportService.php
View file

@ -267,38 +267,38 @@ class PluginImportService
// If zipEntryPath is specified, look for files in that specific directory first
if ($zipEntryPath) {
$targetDir = $tempDir . '/' . $zipEntryPath;
$targetDir = $tempDir.'/'.$zipEntryPath;
if (File::exists($targetDir)) {
// Check if files are directly in the target directory
if (File::exists($targetDir . '/settings.yml')) {
$settingsYamlPath = $targetDir . '/settings.yml';
if (File::exists($targetDir . '/full.liquid')) {
$fullLiquidPath = $targetDir . '/full.liquid';
} elseif (File::exists($targetDir . '/full.blade.php')) {
$fullLiquidPath = $targetDir . '/full.blade.php';
if (File::exists($targetDir.'/settings.yml')) {
$settingsYamlPath = $targetDir.'/settings.yml';
if (File::exists($targetDir.'/full.liquid')) {
$fullLiquidPath = $targetDir.'/full.liquid';
} elseif (File::exists($targetDir.'/full.blade.php')) {
$fullLiquidPath = $targetDir.'/full.blade.php';
}
if (File::exists($targetDir . '/shared.liquid')) {
$sharedLiquidPath = $targetDir . '/shared.liquid';
if (File::exists($targetDir.'/shared.liquid')) {
$sharedLiquidPath = $targetDir.'/shared.liquid';
}
}
// Check if files are in src subdirectory of target directory
if (!$settingsYamlPath && File::exists($targetDir . '/src/settings.yml')) {
$settingsYamlPath = $targetDir . '/src/settings.yml';
if (File::exists($targetDir . '/src/full.liquid')) {
$fullLiquidPath = $targetDir . '/src/full.liquid';
} elseif (File::exists($targetDir . '/src/full.blade.php')) {
$fullLiquidPath = $targetDir . '/src/full.blade.php';
if (! $settingsYamlPath && File::exists($targetDir.'/src/settings.yml')) {
$settingsYamlPath = $targetDir.'/src/settings.yml';
if (File::exists($targetDir.'/src/full.liquid')) {
$fullLiquidPath = $targetDir.'/src/full.liquid';
} elseif (File::exists($targetDir.'/src/full.blade.php')) {
$fullLiquidPath = $targetDir.'/src/full.blade.php';
}
if (File::exists($targetDir . '/src/shared.liquid')) {
$sharedLiquidPath = $targetDir . '/src/shared.liquid';
if (File::exists($targetDir.'/src/shared.liquid')) {
$sharedLiquidPath = $targetDir.'/src/shared.liquid';
}
}
// If we found the required files in the target directory, return them
if ($settingsYamlPath && $fullLiquidPath) {
return [