From 3821e58e1021f7f44ee0aa23cca88f1abb95dbdd Mon Sep 17 00:00:00 2001 From: floppydiskette Date: Thu, 16 Jan 2025 19:54:20 +0000 Subject: two of them --- app/Http/Controllers/RoscoController.php | 48 ------------------------ app/Http/Controllers/RoscoLekoController.php | 48 ++++++++++++++++++++++++ config/app.php | 2 +- public/css/master.css | 16 ++++---- public/images/rosco-leko/filters.jpg | Bin 0 -> 551395 bytes public/images/rosco-leko/gel-drawer.jpg | Bin 0 -> 600658 bytes public/images/rosco-leko/lxdesk.jpg | Bin 0 -> 764019 bytes public/images/rosco-leko/pa_meister.jpg | Bin 0 -> 6907549 bytes public/images/rosco-leko/projectionist.jpg | Bin 0 -> 431758 bytes public/images/rosco-leko/technician.jpg | Bin 0 -> 2066996 bytes public/images/rosco-leko/two-of-them.png | Bin 0 -> 6684014 bytes public/images/rosco/filters.jpg | Bin 551395 -> 0 bytes public/images/rosco/gel-drawer.jpg | Bin 600658 -> 0 bytes public/images/rosco/lxdesk.jpg | Bin 764019 -> 0 bytes public/images/rosco/pa_meister.jpg | Bin 6907549 -> 0 bytes public/images/rosco/projectionist.jpg | Bin 431758 -> 0 bytes public/images/rosco/technician.jpg | Bin 2066996 -> 0 bytes resources/views/components/navigation.blade.php | 2 +- resources/views/rosco-leko.blade.php | 13 +++++++ resources/views/rosco.blade.php | 13 ------- routes/web.php | 5 +-- 21 files changed, 73 insertions(+), 74 deletions(-) delete mode 100644 app/Http/Controllers/RoscoController.php create mode 100644 app/Http/Controllers/RoscoLekoController.php create mode 100644 public/images/rosco-leko/filters.jpg create mode 100644 public/images/rosco-leko/gel-drawer.jpg create mode 100644 public/images/rosco-leko/lxdesk.jpg create mode 100644 public/images/rosco-leko/pa_meister.jpg create mode 100644 public/images/rosco-leko/projectionist.jpg create mode 100644 public/images/rosco-leko/technician.jpg create mode 100644 public/images/rosco-leko/two-of-them.png delete mode 100644 public/images/rosco/filters.jpg delete mode 100644 public/images/rosco/gel-drawer.jpg delete mode 100644 public/images/rosco/lxdesk.jpg delete mode 100644 public/images/rosco/pa_meister.jpg delete mode 100644 public/images/rosco/projectionist.jpg delete mode 100644 public/images/rosco/technician.jpg create mode 100644 resources/views/rosco-leko.blade.php delete mode 100644 resources/views/rosco.blade.php diff --git a/app/Http/Controllers/RoscoController.php b/app/Http/Controllers/RoscoController.php deleted file mode 100644 index 9986831..0000000 --- a/app/Http/Controllers/RoscoController.php +++ /dev/null @@ -1,48 +0,0 @@ - $dateA; - }); - - return $images; - } - - /** - * Shows the page - * @return View - */ - public function show(): View { - return view('rosco', [ - 'images' => $this->getImages(), - ]); - } -} diff --git a/app/Http/Controllers/RoscoLekoController.php b/app/Http/Controllers/RoscoLekoController.php new file mode 100644 index 0000000..7058a26 --- /dev/null +++ b/app/Http/Controllers/RoscoLekoController.php @@ -0,0 +1,48 @@ + $dateA; + }); + + return $images; + } + + /** + * Shows the page + * @return View + */ + public function show(): View { + 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 @@ use Illuminate\Support\ServiceProvider; 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-leko/filters.jpg b/public/images/rosco-leko/filters.jpg new file mode 100644 index 0000000..a19d958 Binary files /dev/null and b/public/images/rosco-leko/filters.jpg differ diff --git a/public/images/rosco-leko/gel-drawer.jpg b/public/images/rosco-leko/gel-drawer.jpg new file mode 100644 index 0000000..abdcc51 Binary files /dev/null and b/public/images/rosco-leko/gel-drawer.jpg differ diff --git a/public/images/rosco-leko/lxdesk.jpg b/public/images/rosco-leko/lxdesk.jpg new file mode 100644 index 0000000..c85da3d Binary files /dev/null and b/public/images/rosco-leko/lxdesk.jpg differ diff --git a/public/images/rosco-leko/pa_meister.jpg b/public/images/rosco-leko/pa_meister.jpg new file mode 100644 index 0000000..4a50065 Binary files /dev/null and b/public/images/rosco-leko/pa_meister.jpg differ diff --git a/public/images/rosco-leko/projectionist.jpg b/public/images/rosco-leko/projectionist.jpg new file mode 100644 index 0000000..dcb1186 Binary files /dev/null and b/public/images/rosco-leko/projectionist.jpg differ diff --git a/public/images/rosco-leko/technician.jpg b/public/images/rosco-leko/technician.jpg new file mode 100644 index 0000000..29b9e92 Binary files /dev/null and b/public/images/rosco-leko/technician.jpg differ 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/public/images/rosco/filters.jpg b/public/images/rosco/filters.jpg deleted file mode 100644 index a19d958..0000000 Binary files a/public/images/rosco/filters.jpg and /dev/null differ diff --git a/public/images/rosco/gel-drawer.jpg b/public/images/rosco/gel-drawer.jpg deleted file mode 100644 index abdcc51..0000000 Binary files a/public/images/rosco/gel-drawer.jpg and /dev/null differ diff --git a/public/images/rosco/lxdesk.jpg b/public/images/rosco/lxdesk.jpg deleted file mode 100644 index c85da3d..0000000 Binary files a/public/images/rosco/lxdesk.jpg and /dev/null differ diff --git a/public/images/rosco/pa_meister.jpg b/public/images/rosco/pa_meister.jpg deleted file mode 100644 index 4a50065..0000000 Binary files a/public/images/rosco/pa_meister.jpg and /dev/null differ diff --git a/public/images/rosco/projectionist.jpg b/public/images/rosco/projectionist.jpg deleted file mode 100644 index dcb1186..0000000 Binary files a/public/images/rosco/projectionist.jpg and /dev/null differ diff --git a/public/images/rosco/technician.jpg b/public/images/rosco/technician.jpg deleted file mode 100644 index 29b9e92..0000000 Binary files a/public/images/rosco/technician.jpg and /dev/null 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-leko.blade.php b/resources/views/rosco-leko.blade.php new file mode 100644 index 0000000..fc21aab --- /dev/null +++ b/resources/views/rosco-leko.blade.php @@ -0,0 +1,13 @@ + + Rosco and Leko +
+ @foreach($images as $image) +
+ {{ $image[ + @if(isset($image["description"])) +

{{$image["description"]}}

+ @endif +
+ @endforeach +
+ diff --git a/resources/views/rosco.blade.php b/resources/views/rosco.blade.php deleted file mode 100644 index c834b67..0000000 --- a/resources/views/rosco.blade.php +++ /dev/null @@ -1,13 +0,0 @@ - - Rosco -
- @foreach($images as $image) -
- {{ $image[ - @if(isset($image["description"])) -

{{$image["description"]}}

- @endif -
- @endforeach -
- 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\BookmarksController; 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('/', [HomeController::class, 'show']); 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'); -- cgit v1.2.3-54-g00ecf