aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfloppydiskette <floppydisk@hyprcat.net>2025-01-16 19:54:20 +0000
committerfloppydiskette <floppydisk@hyprcat.net>2025-01-16 19:54:20 +0000
commit3821e58e1021f7f44ee0aa23cca88f1abb95dbdd (patch)
tree89e476e1350308c12a572080bdd6eb74d654231b
parentcebb14f59cb54b24861a9aef03b9fcbf57465967 (diff)
two of them
-rw-r--r--app/Http/Controllers/RoscoLekoController.php (renamed from app/Http/Controllers/RoscoController.php)6
-rw-r--r--config/app.php2
-rw-r--r--public/css/master.css16
-rw-r--r--public/images/rosco-leko/filters.jpg (renamed from public/images/rosco/filters.jpg)bin551395 -> 551395 bytes
-rw-r--r--public/images/rosco-leko/gel-drawer.jpg (renamed from public/images/rosco/gel-drawer.jpg)bin600658 -> 600658 bytes
-rw-r--r--public/images/rosco-leko/lxdesk.jpg (renamed from public/images/rosco/lxdesk.jpg)bin764019 -> 764019 bytes
-rw-r--r--public/images/rosco-leko/pa_meister.jpg (renamed from public/images/rosco/pa_meister.jpg)bin6907549 -> 6907549 bytes
-rw-r--r--public/images/rosco-leko/projectionist.jpg (renamed from public/images/rosco/projectionist.jpg)bin431758 -> 431758 bytes
-rw-r--r--public/images/rosco-leko/technician.jpg (renamed from public/images/rosco/technician.jpg)bin2066996 -> 2066996 bytes
-rw-r--r--public/images/rosco-leko/two-of-them.pngbin0 -> 6684014 bytes
-rw-r--r--resources/views/components/navigation.blade.php2
-rw-r--r--resources/views/rosco-leko.blade.php (renamed from resources/views/rosco.blade.php)6
-rw-r--r--routes/web.php5
13 files changed, 18 insertions, 19 deletions
diff --git a/app/Http/Controllers/RoscoController.php b/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 @@ namespace App\Http\Controllers;
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 @@ class RoscoController extends Controller {
* @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 @@ 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/filters.jpg b/public/images/rosco-leko/filters.jpg
index a19d958..a19d958 100644
--- a/public/images/rosco/filters.jpg
+++ b/public/images/rosco-leko/filters.jpg
Binary files differ
diff --git a/public/images/rosco/gel-drawer.jpg b/public/images/rosco-leko/gel-drawer.jpg
index abdcc51..abdcc51 100644
--- a/public/images/rosco/gel-drawer.jpg
+++ b/public/images/rosco-leko/gel-drawer.jpg
Binary files differ
diff --git a/public/images/rosco/lxdesk.jpg b/public/images/rosco-leko/lxdesk.jpg
index c85da3d..c85da3d 100644
--- a/public/images/rosco/lxdesk.jpg
+++ b/public/images/rosco-leko/lxdesk.jpg
Binary files differ
diff --git a/public/images/rosco/pa_meister.jpg b/public/images/rosco-leko/pa_meister.jpg
index 4a50065..4a50065 100644
--- a/public/images/rosco/pa_meister.jpg
+++ b/public/images/rosco-leko/pa_meister.jpg
Binary files differ
diff --git a/public/images/rosco/projectionist.jpg b/public/images/rosco-leko/projectionist.jpg
index dcb1186..dcb1186 100644
--- a/public/images/rosco/projectionist.jpg
+++ b/public/images/rosco-leko/projectionist.jpg
Binary files differ
diff --git a/public/images/rosco/technician.jpg b/public/images/rosco-leko/technician.jpg
index 29b9e92..29b9e92 100644
--- a/public/images/rosco/technician.jpg
+++ b/public/images/rosco-leko/technician.jpg
Binary files 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
--- /dev/null
+++ b/public/images/rosco-leko/two-of-them.png
Binary files 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 @@
<a href="/bookmarks">bookmarks</a> |
<a href="/guestbook">guestbook</a> |
<a href="/music">music</a> |
- <a href="/rosco">rosco</a>
+ <a href="/rosco-leko">rosco &amp; leko</a>
</nav>
diff --git a/resources/views/rosco.blade.php b/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 @@
<x-layout>
- <x-slot:title>Rosco</x-slot:title>
- <div class="rosco-gallery">
+ <x-slot:title>Rosco and Leko</x-slot:title>
+ <div class="rosco-leko-gallery">
@foreach($images as $image)
- <div class="rosco">
+ <div>
<img src="{{ $image["path"] }}" @if(isset($image["description"])) alt="{{ $image["description"] }}" @endif>
@if(isset($image["description"]))
<p>{{$image["description"]}}</p>
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');