diff --git a/app/Http/Controllers/RoscoController.php b/app/Http/Controllers/RoscoLekoController.php similarity index 87% rename from app/Http/Controllers/RoscoController.php rename to app/Http/Controllers/RoscoLekoController.php index 9986831..7058a26 100644 --- a/app/Http/Controllers/RoscoController.php +++ b/app/Http/Controllers/RoscoLekoController.php @@ -5,10 +5,10 @@ use Illuminate\Support\Facades\File; use Illuminate\View\View; -class RoscoController extends Controller { +class RoscoLekoController extends Controller { public function getImages(): array { $images = []; - foreach (File::glob(public_path('images/rosco').'/*') as $path) { + foreach (File::glob(public_path('images/rosco-leko').'/*') as $path) { $image_data = []; try { $exif = exif_read_data($path); @@ -41,7 +41,7 @@ public function getImages(): array { * @return View */ public function show(): View { - return view('rosco', [ + return view('rosco-leko', [ 'images' => $this->getImages(), ]); } diff --git a/config/app.php b/config/app.php index b184e1d..63c8b38 100644 --- a/config/app.php +++ b/config/app.php @@ -5,7 +5,7 @@ return [ 'name' => env('APP_NAME', 'diskfloppy.me'), - 'version' => '2025.01.01', + 'version' => '2025.01.16', 'env' => env('APP_ENV', 'production'), 'debug' => (bool) env('APP_DEBUG', false), 'url' => env('APP_URL', 'http://localhost'), diff --git a/public/css/master.css b/public/css/master.css index 3733d79..541eb62 100644 --- a/public/css/master.css +++ b/public/css/master.css @@ -98,7 +98,7 @@ div#header { grid-template-columns: 66px 1fr; grid-template-rows: 1fr; grid-column-gap: 15px; - grid-row-gap: 0px; + grid-row-gap: 0; align-items: center; } @@ -132,8 +132,8 @@ div#footer { display: grid; grid-template-columns: auto 1fr; grid-template-rows: 1fr; - grid-column-gap: 0px; - grid-row-gap: 0px; + grid-column-gap: 0; + grid-row-gap: 0; align-items: center; } @@ -274,14 +274,14 @@ div.bookmark-category:first-child h2 { } -/** Rosco **/ -div.rosco-gallery { +/** Rosco & Leko **/ +div.rosco-leko-gallery { display: flex; flex-wrap: wrap; align-items: flex-start; } -div.rosco { +div.rosco-leko-gallery > div { border: var(--border); padding: 5px; filter: var(--shadow-small); @@ -290,7 +290,7 @@ div.rosco { height: auto; } -div.rosco, -div.rosco img { +div.rosco-leko-gallery > div, +div.rosco-leko-gallery > div img { max-width: 220px; } diff --git a/public/images/rosco/filters.jpg b/public/images/rosco-leko/filters.jpg similarity index 100% rename from public/images/rosco/filters.jpg rename to public/images/rosco-leko/filters.jpg diff --git a/public/images/rosco/gel-drawer.jpg b/public/images/rosco-leko/gel-drawer.jpg similarity index 100% rename from public/images/rosco/gel-drawer.jpg rename to public/images/rosco-leko/gel-drawer.jpg diff --git a/public/images/rosco/lxdesk.jpg b/public/images/rosco-leko/lxdesk.jpg similarity index 100% rename from public/images/rosco/lxdesk.jpg rename to public/images/rosco-leko/lxdesk.jpg diff --git a/public/images/rosco/pa_meister.jpg b/public/images/rosco-leko/pa_meister.jpg similarity index 100% rename from public/images/rosco/pa_meister.jpg rename to public/images/rosco-leko/pa_meister.jpg diff --git a/public/images/rosco/projectionist.jpg b/public/images/rosco-leko/projectionist.jpg similarity index 100% rename from public/images/rosco/projectionist.jpg rename to public/images/rosco-leko/projectionist.jpg diff --git a/public/images/rosco/technician.jpg b/public/images/rosco-leko/technician.jpg similarity index 100% rename from public/images/rosco/technician.jpg rename to public/images/rosco-leko/technician.jpg diff --git a/public/images/rosco-leko/two-of-them.png b/public/images/rosco-leko/two-of-them.png new file mode 100644 index 0000000..96464e2 Binary files /dev/null and b/public/images/rosco-leko/two-of-them.png differ diff --git a/resources/views/components/navigation.blade.php b/resources/views/components/navigation.blade.php index c70b442..5fa3f28 100644 --- a/resources/views/components/navigation.blade.php +++ b/resources/views/components/navigation.blade.php @@ -7,5 +7,5 @@ bookmarks | guestbook | music | - rosco + rosco & leko diff --git a/resources/views/rosco.blade.php b/resources/views/rosco-leko.blade.php similarity index 77% rename from resources/views/rosco.blade.php rename to resources/views/rosco-leko.blade.php index c834b67..fc21aab 100644 --- a/resources/views/rosco.blade.php +++ b/resources/views/rosco-leko.blade.php @@ -1,8 +1,8 @@ - Rosco -
+ Rosco and Leko +
@foreach($images as $image) -
+
{{ $image[ @if(isset($image["description"]))

{{$image["description"]}}

diff --git a/routes/web.php b/routes/web.php index 09837dd..7f32c3d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -4,8 +4,7 @@ use App\Http\Controllers\GuestbookController; use App\Http\Controllers\HomeController; use App\Http\Controllers\MusicController; -use App\Http\Controllers\PrivacyController; -use App\Http\Controllers\RoscoController; +use App\Http\Controllers\RoscoLekoController; use Illuminate\Support\Facades\Route; /* @@ -23,7 +22,7 @@ Route::get('/bookmarks', [BookmarksController::class, 'show']); Route::get('/guestbook', [GuestbookController::class, 'show']); Route::get('/music', [MusicController::class, 'show']); -Route::get('/rosco', [RoscoController::class, 'show']); +Route::get('/rosco-leko', [RoscoLekoController::class, 'show']); Route::post('/guestbook', [GuestbookController::class, 'addEntry']) ->middleware('validator') ->middleware('rate_limit');