diff --git a/.gitignore b/.gitignore index cea25e9..801bd05 100644 --- a/.gitignore +++ b/.gitignore @@ -11,18 +11,14 @@ .phpunit.result.cache Homestead.json Homestead.yaml +auth.json npm-debug.log yarn-error.log +/.fleet +/.idea +/.vscode **/.DS_Store /log /storage /tmp - -# IDE Config Files -/.fleet -/.idea -/.vscode -/.nova - -# Project-specific /public/pub diff --git a/app/View/Components/Layout.php b/app/View/Components/Layout.php index 216d272..440f2fc 100644 --- a/app/View/Components/Layout.php +++ b/app/View/Components/Layout.php @@ -4,7 +4,6 @@ use Closure; use DateTime; -use DateTimeZone; use Illuminate\Contracts\View\View; use Illuminate\View\Component; @@ -18,16 +17,13 @@ public function __construct() {} * Get the view / contents that represent the component. */ public function render(): View|Closure|string { - $event = ''; - if ($this->isItChristmas()) $event = 'christmas'; - if ($this->isItAprilFools()) $event = 'april-fools'; if (isLegacy()) { return view('components.layout-legacy', [ - 'event' => $event + 'isChristmas' => $this->isItChristmas() ]); } else { return view('components.layout', [ - 'event' => $event + 'isChristmas' => $this->isItChristmas() ]); } } @@ -41,15 +37,4 @@ public function isItChristmas() : bool { return $currentDate >= $startDate && $currentDate < $endDate; } - - public function isItAprilFools() : bool { - $tz = new DateTimeZone("Europe/London"); - $currentDate = new DateTime("now", $tz); - $currentDate->setTime(0, 0); - $currentYear = intval($currentDate->format('Y')); - - $aprilFools = new DateTime("$currentYear-04-01", $tz); - - return $currentDate == $aprilFools; - } } diff --git a/config/app.php b/config/app.php index 88bdeae..2809204 100644 --- a/config/app.php +++ b/config/app.php @@ -5,7 +5,7 @@ return [ 'name' => env('APP_NAME', 'wah.moe'), - 'version' => '2026.03.31-patch0', + 'version' => '2026.02.24-patch0', 'env' => env('APP_ENV', 'production'), 'debug' => (bool)env('APP_DEBUG', false), 'url' => env('APP_URL', 'http://localhost'), diff --git a/public/css/alternate/aprilfools.css b/public/css/alternate/aprilfools.css deleted file mode 100644 index 6c6cc7c..0000000 --- a/public/css/alternate/aprilfools.css +++ /dev/null @@ -1,61 +0,0 @@ -* { - font-family: "Comic Sans MS", cursive ; -} - -body { - background: url('/images/roscoe_tile_rainbow.jpg'); -} - -button:hover, -footer img:hover { - animation: rotater 2s linear infinite; -} - -div.page-container, -div.wah, -table.music-top10, -form button, -form input, -form textarea, -div.rosco-leko-gallery > div{ - background-color: #FAF8F6; -} - -table.music-top10, -table.music-top10 tr td { - border: rgb(250, 122, 110); -} -table.music-top10 tr:first-child th { - border-right: rgb(250, 122, 110); - border-bottom: rgb(250, 122, 110); -} - -table.music-top10 tr:first-child th, -table.music-top10 tr td:first-child { - background-color: rgba(250, 110, 210, 0.5); -} - -hr, -div.page-container, -div.wah, -form button, -form input, -form textarea, -div.gb-entry, -div.current-track img, -div.rosco-leko-gallery > div { - border: 5px solid transparent; - border-image: linear-gradient(to bottom right, #b827fc 0%, #2c90fc 25%, #b8fd33 50%, #fec837 75%, #fd1892 100%); - border-image-slice: 1; -} - -hr { - border-bottom: none; - border-right: none; - border-left: none; -} - -@keyframes rotater { - 0% { transform: rotate(0deg) } - 100% { transform: rotate(360deg) } -} diff --git a/public/images/logo-rainbow.gif b/public/images/logo-rainbow.gif deleted file mode 100644 index 680fa56..0000000 Binary files a/public/images/logo-rainbow.gif and /dev/null differ diff --git a/public/images/logo-rainbow.png b/public/images/logo-rainbow.png deleted file mode 100644 index 60e453d..0000000 Binary files a/public/images/logo-rainbow.png and /dev/null differ diff --git a/public/images/logo-v2-rainbow.gif b/public/images/logo-v2-rainbow.gif deleted file mode 100644 index 14fcfeb..0000000 Binary files a/public/images/logo-v2-rainbow.gif and /dev/null differ diff --git a/public/images/roscoe_tile_rainbow.jpg b/public/images/roscoe_tile_rainbow.jpg deleted file mode 100644 index c695c51..0000000 Binary files a/public/images/roscoe_tile_rainbow.jpg and /dev/null differ diff --git a/resources/views/components/layout-legacy.blade.php b/resources/views/components/layout-legacy.blade.php index 76d50fb..56379f9 100644 --- a/resources/views/components/layout-legacy.blade.php +++ b/resources/views/components/layout-legacy.blade.php @@ -6,16 +6,15 @@ wah! (dot moe) - {{ $title }} -@if($event === 'april-fools') - - + +
+ - + @@ -64,21 +63,21 @@ - + - + @@ -100,99 +99,4 @@
- + wah! (dot moe)
@@ -28,21 +27,21 @@ -
 
 
- +
- - + - +
  +     
 
 
 
 
- +
- - + - +
  +     
 
 
- @else - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - wah! (dot moe)
- "i mean it looks alright, but then you realise its all tables" ~ alice -
-
 
- - - - - - -
  - -  
-
 
 
- - - - - - -
  - {{ $slot }} -  
-
 
 
- - - - - - -
  - -  
-
 
 
- - - - - - -
  - © RoscoeDaWah 2021-2025 -  
-
 
- -@endif diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php index f59705f..36a4add 100644 --- a/resources/views/components/layout.blade.php +++ b/resources/views/components/layout.blade.php @@ -11,8 +11,8 @@ - @if ($event == 'christmas')@endif - @if ($event == 'april-fools')@endif + @if ($isChristmas)@endif + @@ -26,8 +26,7 @@
- @if($event == 'april-fools')A pixel art depiction of a paw, in rainbow colours. - @else A pixel art depiction of a paw, in three alternating shades of blue.@endif + A pixel art depiction of a paw, in three alternating shades of blue.

wah!

@@ -75,7 +74,7 @@ < the basename ring >
- v{{ config('app.version') }} + v{{ config('app.version') }}, served by {{ gethostname() }}