Compare commits

...

15 commits

23 changed files with 189 additions and 127 deletions

2
.github/CODEOWNERS vendored
View file

@ -1 +1 @@
* @floppydisk05
* @RoscoeDaWah

View file

@ -1,3 +1,3 @@
<img src="https://git.frzn.dev/fwoppydwisk/diskfloppy.me/raw/branch/master/assets/logo.svg" alt="" height="100" align="center"/>
<img src="https://git.frzn.dev/RoscoeDaWah/wah.moe/raw/branch/master/assets/logo.svg" alt="" height="100" align="center"/>
<hr>
My personal website, developed using the Laravel framework

View file

@ -27,21 +27,7 @@ public function show(): View {
* @throws ValidationException
*/
public function addEntry(Request $request): RedirectResponse {
$this->validate($request, [
'name' => 'required',
'message' => 'required'
]);
GuestbookEntry::insertGuestbookEntry($request);
return back()->with('success', 'Entry submitted successfully!');
}
public function banIP(string $addr) {
// TODO: Add banning system
// $matching_bans = DB::select('SELECT reason FROM guestbook__bans WHERE ip_address = ?', array($request->ip()));
// if (!empty($matching_bans)) {
// return view('errors.guestbook-ipban')->with('reason', $matching_bans[0]->reason);
// }
}
}

View file

@ -25,10 +25,18 @@ public function getCurrentTrack() {
$data = $response->json();
error_log($response->body());
$track_data = $data["recenttracks"]["track"][0];
// $image = array_column($track_data["image"], null, 'size')['large'] ?? false;
$image = $track_data["image"][(array_key_last($track_data["image"]))] ?? false;
$now_playing = false;
if (array_key_exists("@attr", $track_data)) {
$now_playing = $track_data["@attr"]["nowplaying"] == "true" ?? ["url"=>null];
}
$current_track = [
'title' => $track_data["name"],
'artist' => $track_data["artist"]["#text"],
'url' => $track_data["url"],
'image' => $image["#text"],
'header' => $now_playing ? "Now Playing" : "Last Track",
];
Cache::put('current_track', $current_track, now()->addSeconds(15));
return $current_track;

View file

@ -47,6 +47,7 @@ class Kernel extends HttpKernel
protected $routeMiddleware = [
'rate_limit' => \App\Http\Middleware\RateLimiter::class,
'validator' => \App\Http\Middleware\GuestbookValidate::class,
];

View file

@ -0,0 +1,37 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
use Symfony\Component\HttpFoundation\Response;
class GuestbookValidate
{
/**
* Handle an incoming request.
*
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
*/
public function handle(Request $request, Closure $next): Response
{
if (
!$request->validate([
'name' => 'required',
'message' => 'required'
]) ||
$this->containsUrl($request->get('message')) ||
$this->containsUrl($request->get('name'))
) {
return response()->view('errors.guestbook-invalid', [], 400);
}
return $next($request);
}
public function containsUrl($str) {
$matches = [];
$pattern = '/\b(?:https?|ftp|www)(:\/\/)*[-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i';
preg_match_all($pattern, $str, $matches);
return count($matches[0]);
}
}

View file

@ -20,8 +20,8 @@ class GuestbookEntry extends Model
*/
public static function insertGuestbookEntry(Request $request) {
$newEntry = new GuestbookEntry;
$newEntry->name = htmlspecialchars($request->get('name'));
$newEntry->message = htmlspecialchars($request->get('message'));
$newEntry->name = $request->get('name');
$newEntry->message = $request->get('message');
$newEntry->ip = $request->ip();
$newEntry->agent = $request->userAgent();
$newEntry->admin = auth()->check();

View file

@ -3,24 +3,32 @@
namespace App\View\Components;
use Closure;
use DateTime;
use Illuminate\Contracts\View\View;
use Illuminate\View\Component;
class Layout extends Component
{
class Layout extends Component {
/**
* Create a new component instance.
*/
public function __construct()
{
//
}
public function __construct() {}
/**
* Get the view / contents that represent the component.
*/
public function render(): View|Closure|string
{
return view('components.layout');
public function render(): View|Closure|string {
return view('components.layout', [
'isChristmas' => $this->isItChristmas()
]);
}
public function isItChristmas() : bool {
$currentDate = new DateTime();
$currentYear = intval($currentDate->format('Y'));
$startDate = new DateTime("$currentYear-11-10");
$endDate = new DateTime(($currentYear + 1) . "-01-01");
return $currentDate >= $startDate && $currentDate < $endDate;
}
}

View file

@ -1,50 +1,44 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 2797 339" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g id="Artboard1" transform="matrix(1.0925,0,0,0.235401,0,0)">
<rect x="0" y="0" width="2560" height="1440" style="fill:none;"/>
<clipPath id="_clip1">
<rect x="0" y="0" width="2560" height="1440"/>
</clipPath>
<g clip-path="url(#_clip1)">
<g transform="matrix(0.900331,0.765949,-0.165039,4.17845,-302.854,-1622.91)">
<path d="M442.969,579.781C443.665,592.993 450.271,598.556 461.745,601.338C464.179,601.686 466.961,602.033 469.742,602.729C486.084,605.51 502.426,606.901 518.42,606.901C617.167,606.901 703.397,553.008 703.397,454.609C703.397,435.137 699.92,413.58 692.27,390.284C672.451,329.437 610.909,304.055 552.147,304.055C531.633,304.055 511.119,307.184 493.038,313.095L437.406,316.224C432.886,316.224 429.409,320.396 429.409,324.917L442.969,579.781ZM519.811,381.244C527.808,379.158 536.501,377.767 544.846,377.767C609.17,377.767 609.518,446.612 609.518,452.522C609.518,496.68 576.139,525.539 535.805,525.539C533.024,525.539 530.242,525.539 527.461,525.192L519.811,381.244Z" style="fill:rgb(82,178,207);fill-rule:nonzero;stroke:white;stroke-width:8.5px;"/>
<svg width="100%" height="100%" viewBox="0 0 1893 339" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g transform="matrix(1,0,0,1,0,-420.871)">
<g id="Artboard2" transform="matrix(0.73917,0,0,0.235401,0,420.871)">
<rect x="0" y="0" width="2560" height="1440" style="fill:none;"/>
<g transform="matrix(1.62833,0,0,5.11304,-84.1879,-2332.06)">
<g transform="matrix(0.9823,0.187314,-0.187314,0.9823,115.768,-33.3744)">
<path d="M326.769,715.888C330.602,715.888 334.435,713.529 335.909,711.76C377.188,663.11 403.135,488.853 403.135,488.263C403.135,483.545 401.071,479.418 395.764,478.238L343.281,467.918C342.101,467.624 340.922,467.624 339.742,467.624C336.204,467.624 334.14,469.098 332.961,472.931C329.717,484.135 308.783,589.987 302.001,607.383C300.822,610.921 299.643,612.395 298.463,612.395C297.284,612.395 296.104,610.921 295.515,607.972L273.991,526.594C272.516,522.466 268.388,519.222 262.491,519.222L261.607,519.222L223.276,521.581C214.136,522.171 210.303,526.299 210.008,530.427C204.111,614.754 202.047,615.344 198.509,615.344C197.329,615.344 196.15,614.164 195.265,612.1L138.949,482.661C138.064,480.597 135.116,477.648 130.398,477.648C129.219,477.648 128.039,477.943 126.86,478.238L70.249,497.993C67.3,498.878 65.826,502.416 65.826,505.954C65.826,507.134 66.121,508.608 66.711,509.787L159.883,718.836C161.063,721.49 165.191,724.144 170.203,724.144L171.088,724.144L214.431,721.785C222.687,721.785 229.173,718.836 249.518,644.239L273.106,712.939C273.991,715.593 278.413,718.247 283.426,718.247L284.31,718.247L326.769,715.888Z" style="fill:rgb(223,80,0);fill-rule:nonzero;stroke:rgb(249,247,204);stroke-width:7.06px;"/>
</g>
<g transform="matrix(0.996964,-0.077866,0.077866,0.996964,-83.3213,42.4174)">
<path d="M650.81,701.735C653.758,700.556 655.233,697.312 655.233,694.364C655.233,692.889 654.643,691.12 654.053,689.941L551.74,481.776C550.561,479.123 545.548,476.174 539.356,476.174L496.603,476.174C492.18,476.174 487.757,478.238 485.988,479.712C437.928,524.53 387.508,690.236 387.508,699.376C387.508,703.799 389.867,707.337 395.469,709.106L440.581,722.08C442.35,722.669 443.825,722.964 445.299,722.964C448.837,722.964 451.196,720.9 452.67,717.362C453.555,714.708 457.683,703.799 463.285,689.646L517.832,692.3L518.422,692.3C522.255,692.3 525.203,689.056 525.498,685.518L529.036,632.74L529.036,632.15C529.036,628.317 526.088,625.074 522.255,625.074L488.642,623.305C507.218,576.423 510.461,568.168 512.82,568.168C513.704,568.168 514.589,569.052 515.473,571.116L580.93,717.952C581.815,720.016 585.353,722.669 590.071,722.669C591.545,722.669 593.314,722.375 594.788,721.785L650.81,701.735Z" style="fill:rgb(255,152,0);fill-rule:nonzero;stroke:rgb(249,247,204);stroke-width:7.06px;"/>
</g>
<g transform="matrix(0.997179,0.0750623,-0.0750623,0.997179,-50.4766,-58.4735)">
<path d="M899.664,721.785C903.497,721.785 906.74,718.836 907.035,715.003L919.124,485.02C919.124,481.187 916.175,477.648 912.342,477.648L853.077,474.405L852.488,474.405C848.655,474.405 845.706,477.648 845.411,481.187L841.283,560.502L778.48,557.258L777.89,557.258C774.352,557.258 771.109,560.502 770.814,564.04L768.455,615.639L768.455,616.228C768.455,619.767 771.404,623.01 775.237,623.305L838.04,626.253L833.322,711.17C833.322,715.003 836.271,718.247 840.104,718.541L899.664,721.785ZM750.764,720.311C754.597,720.311 757.841,717.067 757.841,713.234L757.841,482.956C757.841,479.123 754.597,475.879 750.764,475.879L690.909,475.879C687.076,475.879 683.833,479.123 683.833,482.956L683.833,713.234C683.833,717.067 687.076,720.311 690.909,720.311L750.764,720.311Z" style="fill:rgb(223,80,0);fill-rule:nonzero;stroke:rgb(249,247,204);stroke-width:7.06px;"/>
</g>
<g transform="matrix(0.991478,-0.130275,0.130275,0.991478,-201.194,134.945)">
<path d="M1022.32,629.497C1025.86,629.497 1028.22,626.843 1028.81,623.305C1033.53,596.178 1038.24,558.732 1038.24,523.94C1038.24,477.059 1033.82,476.174 1028.51,476.174L965.415,476.174C961.877,476.174 959.518,479.123 959.518,482.366C959.813,523.055 964.236,597.063 966.005,623.305C966.3,626.843 968.954,629.497 972.492,629.497L1022.32,629.497ZM996.67,726.208C1019.67,726.208 1038.54,707.337 1038.54,684.044C1038.54,660.751 1019.67,641.88 996.67,641.88C973.376,641.88 954.506,660.751 954.506,684.044C954.506,707.337 973.376,726.208 996.67,726.208Z" style="fill:rgb(255,152,0);fill-rule:nonzero;stroke:rgb(249,247,204);stroke-width:7.06px;"/>
</g>
</g>
<g transform="matrix(0.904463,-0.652716,0.140641,4.19763,-493.033,-677.805)">
<path d="M835.175,598.556C839.695,598.556 843.52,594.732 843.52,590.212L843.52,318.658C843.52,314.138 839.695,310.313 835.175,310.313L758.333,310.313C753.813,310.313 749.989,314.138 749.989,318.658L749.989,590.212C749.989,594.732 753.813,598.556 758.333,598.556L835.175,598.556Z" style="fill:rgb(126,196,207);fill-rule:nonzero;stroke:white;stroke-width:8.5px;"/>
</g>
<g transform="matrix(0.909603,0.474567,-0.102255,4.22148,-417.761,-1667.16)">
<path d="M893.589,596.123C894.632,600.643 898.804,604.467 903.324,604.467C906.801,604.815 909.931,604.815 913.408,604.815C973.56,604.815 1042.75,570.74 1042.75,513.022C1042.75,495.637 1036.49,476.166 1021.89,454.609C1005.9,432.008 997.203,415.666 997.203,403.844C997.203,384.026 1018.41,375.681 1041.01,375.681L1043.1,375.681C1045.19,375.681 1050.4,373.595 1050.4,368.031C1050.4,367.336 1050.4,366.293 1050.05,365.25L1037.88,313.79C1035.8,306.488 1028.84,305.098 1015.28,305.098C956.87,305.098 894.284,336.043 894.284,390.98C894.284,408.017 900.543,427.488 914.798,449.045C933.574,478.252 939.833,488.683 939.833,500.157C939.833,522.062 914.103,534.58 890.459,534.58L889.069,534.58C886.982,534.58 881.767,536.318 881.767,541.534C881.767,542.229 881.767,543.272 882.115,543.968L893.589,596.123Z" style="fill:rgb(82,178,207);fill-rule:nonzero;stroke:white;stroke-width:8.5px;"/>
</g>
<g transform="matrix(0.906906,-0.57507,0.12391,4.20897,-550.726,-504.967)">
<path d="M1335.86,576.304C1340.73,574.217 1342.12,570.74 1342.12,567.263C1342.12,551.617 1281.97,438.614 1260.41,438.614C1256.93,438.614 1253.81,440.353 1250.33,441.744L1206.17,457.738C1246.5,428.879 1307.7,385.416 1322.3,375.681C1326.13,373.247 1328.21,370.118 1328.21,366.641C1328.21,364.207 1327.17,361.773 1325.08,359.339L1287.53,312.747C1284.4,308.922 1281.62,307.532 1278.84,307.532C1263.19,307.532 1177.31,382.982 1173.14,386.807L1173.14,318.31C1173.14,314.138 1169.66,311.009 1165.84,311.009L1092.82,311.009C1088.65,311.009 1085.52,314.138 1085.52,318.31L1085.52,591.255C1085.52,595.079 1088.65,598.556 1092.82,598.556L1165.84,598.556C1169.66,598.556 1173.14,595.079 1173.14,591.255L1173.14,481.034L1187.39,470.951C1187.39,471.298 1187.74,471.994 1188.09,472.341C1202,490.074 1255.2,577.694 1269.45,597.513C1271.89,600.643 1274.32,602.033 1277.1,602.033C1279.88,602.033 1282.66,600.643 1286.14,599.252L1335.86,576.304Z" style="fill:rgb(126,196,207);fill-rule:nonzero;stroke:white;stroke-width:8.5px;"/>
</g>
<g transform="matrix(0.912779,0.317071,-0.0683193,4.23623,-499.273,-1679.62)">
<path d="M1444.69,597.861C1449.21,597.861 1453.04,594.384 1453.39,589.864L1458.25,495.637L1513.88,501.548L1514.58,501.548C1519.1,501.548 1522.93,498.071 1523.27,493.899L1530.92,435.485L1530.92,434.442C1530.92,430.27 1527.79,426.793 1523.27,426.097L1462.43,419.839L1463.82,393.066L1547.27,397.586L1547.96,397.586C1552.48,397.586 1556.31,393.761 1556.31,389.589L1559.78,323.873L1559.78,323.178C1559.78,318.658 1555.96,314.833 1551.79,314.833L1455.82,309.618L1454.43,309.618L1391.15,306.141C1386.28,306.141 1382.45,309.618 1382.45,314.138L1368.2,585.344L1368.2,586.039C1368.2,590.212 1371.68,594.036 1375.85,594.036L1444.69,597.861Z" style="fill:rgb(82,178,207);fill-rule:nonzero;stroke:white;stroke-width:8.5px;"/>
</g>
<g transform="matrix(0.896303,-0.861703,0.185671,4.15976,-621.087,269.662)">
<path d="M1761.8,602.729C1766.32,602.729 1769.79,598.904 1770.14,594.732L1774.31,524.496C1774.31,519.976 1770.84,515.804 1765.97,515.456L1684.95,511.284L1695.04,319.353C1695.04,314.486 1691.56,310.661 1687.04,310.313L1615.07,306.836L1614.37,306.836C1609.85,306.836 1606.37,310.313 1606.03,314.486L1591.77,585.692C1591.77,590.559 1595.25,594.384 1599.77,594.732L1672.09,598.209L1673.48,598.209L1761.1,602.729L1761.8,602.729Z" style="fill:rgb(126,196,207);fill-rule:nonzero;stroke:white;stroke-width:8.5px;"/>
</g>
<g transform="matrix(0.906701,0.582018,-0.125407,4.20802,-532.373,-2342.54)">
<path d="M2115.41,453.566C2115.41,395.5 2073.68,303.707 1962.42,303.707C1901.22,303.707 1835.16,332.914 1812.56,397.934C1805.26,419.491 1801.78,440.005 1801.78,459.129C1801.78,545.706 1871.32,604.12 1950.6,604.12C2021.18,604.12 2115.41,549.183 2115.41,453.566ZM1962.42,527.278C1926.61,527.278 1893.23,497.376 1893.23,453.218C1893.23,421.577 1910.61,378.462 1961.03,378.462C2009.36,378.462 2027.79,418.796 2027.79,453.218C2027.79,492.508 2003.8,527.278 1962.42,527.278Z" style="fill:rgb(82,178,207);fill-rule:nonzero;stroke:white;stroke-width:8.5px;"/>
</g>
<g transform="matrix(0.904845,-0.641214,0.138162,4.1994,-697.118,258.125)">
<path d="M2228.06,601.338C2231.54,601.338 2234.67,598.209 2235.01,594.384L2238.49,522.41C2251.7,526.235 2265.96,528.321 2280.56,528.321C2352.89,528.321 2396.7,483.468 2396.7,419.143C2396.7,352.037 2338.63,304.402 2274.3,304.402C2260.74,304.402 2246.84,306.836 2232.93,311.356L2169.3,308.227L2168.61,308.227C2164.78,308.227 2161.65,311.356 2161.65,314.833L2147.39,589.864C2147.39,594.036 2150.18,597.166 2154.35,597.513L2227.37,601.338L2228.06,601.338ZM2245.79,380.201C2251.36,378.81 2256.92,378.115 2261.79,378.115C2287.52,378.115 2306.99,395.152 2306.99,419.491C2306.99,421.925 2306.99,459.129 2268.74,459.129C2259.35,459.129 2249.62,456.695 2241.97,453.218L2245.79,380.201Z" style="fill:rgb(126,196,207);fill-rule:nonzero;stroke:white;stroke-width:8.5px;"/>
</g>
<g transform="matrix(0.90412,0.662859,-0.142826,4.19604,-608.115,-2888.11)">
<path d="M2506.92,601.338C2510.39,601.338 2513.52,598.209 2513.87,594.384L2517.35,522.41C2530.56,526.235 2544.82,528.321 2559.42,528.321C2631.74,528.321 2675.55,483.468 2675.55,419.143C2675.55,352.037 2617.49,304.402 2553.16,304.402C2539.6,304.402 2525.69,306.836 2511.78,311.356L2448.16,308.227L2447.46,308.227C2443.64,308.227 2440.51,311.356 2440.51,314.833L2426.25,589.864C2426.25,594.036 2429.03,597.166 2433.2,597.513L2506.22,601.338L2506.92,601.338ZM2524.65,380.201C2530.21,378.81 2535.78,378.115 2540.64,378.115C2566.37,378.115 2585.85,395.152 2585.85,419.491C2585.85,421.925 2585.85,459.129 2547.6,459.129C2538.21,459.129 2528.47,456.695 2520.83,453.218L2524.65,380.201Z" style="fill:rgb(82,178,207);fill-rule:nonzero;stroke:white;stroke-width:8.5px;"/>
</g>
<g transform="matrix(0.894756,-0.895654,0.192986,4.15258,-746.093,1363.07)">
<path d="M2864.35,600.643C2869.22,600.643 2873.39,597.166 2873.74,592.646L2878.61,500.157C2932.5,446.959 2983.96,347.865 2983.96,337.781C2983.96,334.304 2982.22,331.871 2977.7,330.132L2920.33,308.575C2918.25,307.879 2916.86,307.532 2915.12,307.532C2911.64,307.532 2909.21,309.27 2907.12,312.399C2898.43,326.655 2845.58,407.669 2840.36,407.669C2839.32,407.669 2838.28,406.626 2836.88,404.888L2772.91,311.356C2771.52,309.27 2767.69,306.141 2762.48,306.141C2761.43,306.141 2760.04,306.488 2758.65,306.836L2694.33,325.612C2690.85,326.655 2689.11,329.784 2689.11,332.914C2689.11,334.304 2689.46,335.695 2690.16,336.738L2784.73,491.117L2779.51,587.778L2779.51,588.473C2779.51,592.993 2783.34,596.47 2787.86,596.818L2864.35,600.643Z" style="fill:rgb(126,196,207);fill-rule:nonzero;stroke:white;stroke-width:8.5px;"/>
</g>
<g transform="matrix(0.915332,0,0,4.24807,-717.873,-1220.78)">
<path d="M3011.78,561.005C3011.78,537.014 2992.31,517.195 2968.32,517.195C2943.98,517.195 2924.5,537.014 2924.5,561.005C2924.5,584.996 2943.98,604.467 2968.32,604.467C2992.31,604.467 3011.78,584.996 3011.78,561.005Z" style="fill:rgb(82,178,207);fill-rule:nonzero;stroke:white;stroke-width:8.5px;"/>
</g>
<g transform="matrix(0.902541,0.707708,-0.15249,4.18871,-632.817,-3479.27)">
<path d="M3378.95,601.338C3384.16,601.338 3387.99,596.123 3388.34,591.255L3400.16,321.787L3400.16,321.092C3400.16,317.267 3398.07,312.399 3391.47,312.052L3322.27,308.575L3321.58,308.575C3316.71,308.575 3311.15,311.356 3309.76,313.095C3292.72,333.261 3260.03,384.373 3231.52,433.399C3230.83,434.442 3230.48,435.137 3229.78,435.137C3229.09,435.137 3228.74,434.79 3228.05,433.747C3199.53,384.721 3166.85,333.261 3149.81,313.095C3148.42,311.356 3141.47,308.575 3136.6,308.575L3135.91,308.575L3067.41,312.399C3060.8,313.095 3058.72,318.31 3058.72,322.135L3072.28,591.255C3072.28,596.123 3076.1,601.338 3081.66,601.338L3082.01,601.338L3148.77,595.775C3156.42,595.079 3161.29,587.778 3161.29,583.953L3161.29,583.605L3145.64,435.833L3145.64,433.399C3145.64,431.313 3145.99,429.922 3146.68,429.922C3147.73,429.922 3148.77,430.965 3150.16,432.704C3156.77,441.744 3182.15,493.899 3199.53,525.887C3201.62,530.06 3205.1,535.275 3211.36,535.275L3247.17,533.884C3254.82,533.537 3258.64,528.669 3260.03,525.887C3277.07,493.899 3302.45,439.658 3308.71,430.965C3310.1,429.227 3311.15,428.183 3311.84,428.183C3312.89,428.183 3313.23,429.574 3313.23,432.008L3313.23,433.747L3296.89,583.953L3296.89,584.301C3296.89,588.125 3300.37,595.775 3308.02,596.123L3378.6,601.338L3378.95,601.338Z" style="fill:rgb(126,196,207);fill-rule:nonzero;stroke:white;stroke-width:8.5px;"/>
</g>
<g transform="matrix(0.910865,-0.41918,0.0903206,4.22734,-803.541,271.709)">
<path d="M3625.12,594.036C3629.99,593.689 3633.47,589.516 3633.47,584.996L3631.03,524.496C3631.03,520.324 3627.21,516.499 3622.69,516.499L3621.99,516.499L3537.5,521.019L3535.76,488.683L3593.48,488.683C3598.35,488.683 3601.82,484.859 3602.17,479.991L3602.87,426.793L3602.87,426.097C3602.87,421.577 3598.7,418.1 3594.52,418.1L3532.28,418.1L3530.55,388.198L3611.56,384.026C3615.73,383.678 3619.56,379.853 3619.56,375.681L3619.56,374.985L3616.78,314.486C3616.43,310.313 3612.6,306.488 3608.43,306.488L3607.74,306.488L3515.25,311.356L3513.86,311.356L3450.57,314.833C3446.4,314.833 3442.58,318.658 3442.58,322.83L3442.58,323.526L3456.83,594.732C3457.18,598.904 3460.66,602.729 3464.83,602.729L3465.53,602.729L3533.33,599.252C3533.68,599.252 3534.37,598.904 3534.72,598.904L3625.12,594.036Z" style="fill:rgb(82,178,207);fill-rule:nonzero;stroke:white;stroke-width:8.5px;"/>
<g transform="matrix(1.08899,0,0,3.41949,182.218,-900.313)">
<path d="M1220.95,663.011C1221.88,662.394 1222.96,661.778 1222.96,660.544C1222.96,659.928 1222.65,659.157 1221.88,658.232C1212.94,647.902 1197.06,623.541 1197.06,593.784C1197.06,565.415 1212.01,541.055 1221.26,530.108C1222.34,528.874 1222.65,527.949 1222.65,527.024C1222.65,525.945 1221.88,525.174 1220.8,524.403L1216.64,522.09C1216.02,521.782 1215.4,521.474 1214.94,521.474C1213.4,521.474 1212.16,522.553 1211.24,523.632C1202.45,533.5 1183.8,557.089 1183.8,593.784C1183.8,631.096 1203.22,654.84 1211.7,664.399C1212.78,665.632 1213.71,666.095 1214.63,666.095C1215.25,666.095 1215.71,665.941 1216.33,665.632L1220.95,663.011Z" style="fill:rgb(223,80,0);fill-rule:nonzero;stroke:rgb(249,247,204);stroke-width:5.59px;"/>
<g transform="matrix(0.990492,-0.137573,0.137573,0.990492,-69.4464,184.165)">
<path d="M1242.85,649.597C1243.15,655.456 1246.09,657.923 1251.17,659.157C1252.25,659.311 1253.49,659.465 1254.72,659.773C1261.96,661.007 1269.21,661.624 1276.3,661.624C1320.09,661.624 1358.33,637.726 1358.33,594.093C1358.33,585.459 1356.79,575.899 1353.39,565.569C1344.61,538.588 1317.32,527.333 1291.26,527.333C1282.16,527.333 1273.07,528.72 1265.05,531.341L1240.38,532.729C1238.38,532.729 1236.83,534.579 1236.83,536.583L1242.85,649.597ZM1276.92,561.561C1280.47,560.635 1284.32,560.019 1288.02,560.019C1316.55,560.019 1316.7,590.546 1316.7,593.168C1316.7,612.748 1301.9,625.545 1284.01,625.545C1282.78,625.545 1281.55,625.545 1280.31,625.391L1276.92,561.561Z" style="fill:rgb(255,152,0);fill-rule:nonzero;stroke:rgb(249,247,204);stroke-width:5.59px;"/>
</g>
<g transform="matrix(0.999241,0.0389517,-0.0389517,0.999241,24.2226,-55.6835)">
<path d="M1510.66,593.63C1510.66,567.882 1492.16,527.178 1442.82,527.178C1415.68,527.178 1386.39,540.13 1376.37,568.961C1373.13,578.52 1371.59,587.617 1371.59,596.097C1371.59,634.488 1402.42,660.39 1437.58,660.39C1468.88,660.39 1510.66,636.03 1510.66,593.63ZM1442.82,626.316C1426.94,626.316 1412.14,613.057 1412.14,593.476C1412.14,579.445 1419.85,560.327 1442.2,560.327C1463.63,560.327 1471.81,578.212 1471.81,593.476C1471.81,610.898 1461.17,626.316 1442.82,626.316Z" style="fill:rgb(223,80,0);fill-rule:nonzero;stroke:rgb(249,247,204);stroke-width:5.59px;"/>
</g>
<g transform="matrix(0.998795,-0.0490748,0.0490748,0.998795,-27.2616,77.677)">
<path d="M1590.68,657.769C1592.53,657.615 1594.22,656.073 1594.22,654.069L1594.22,653.915L1589.6,565.723L1613.96,564.49C1616.12,564.336 1617.66,562.486 1617.66,560.481L1616.27,532.266C1616.27,530.108 1614.27,528.566 1612.26,528.566L1551.21,531.804L1522.38,533.346C1520.37,533.5 1518.83,535.042 1518.83,536.892L1518.83,537.2L1520.22,565.723C1520.22,567.728 1522.07,569.27 1524.23,569.27L1549.51,567.882L1554.14,655.919C1554.14,657.769 1555.68,659.465 1557.68,659.465L1557.99,659.465L1590.68,657.769Z" style="fill:rgb(255,152,0);fill-rule:nonzero;stroke:rgb(249,247,204);stroke-width:5.59px;"/>
</g>
<g transform="matrix(0.993146,-0.116878,0.116878,0.993146,-57.3371,210.711)">
<path d="M1834.28,659.157C1836.6,659.157 1838.29,656.844 1838.44,654.685L1843.69,535.196L1843.69,534.887C1843.69,533.191 1842.76,531.033 1839.83,530.879L1809.15,529.337L1808.84,529.337C1806.68,529.337 1804.22,530.57 1803.6,531.341C1796.05,540.284 1781.55,562.948 1768.91,584.688C1768.6,585.15 1768.45,585.459 1768.14,585.459C1767.83,585.459 1767.68,585.304 1767.37,584.842C1754.73,563.102 1740.23,540.284 1732.68,531.341C1732.06,530.57 1728.98,529.337 1726.82,529.337L1726.51,529.337L1696.14,531.033C1693.21,531.341 1692.28,533.654 1692.28,535.35L1698.3,654.685C1698.3,656.844 1699.99,659.157 1702.46,659.157L1702.61,659.157L1732.22,656.69C1735.61,656.381 1737.77,653.144 1737.77,651.448L1737.77,651.293L1730.83,585.767L1730.83,584.688C1730.83,583.763 1730.98,583.146 1731.29,583.146C1731.75,583.146 1732.22,583.608 1732.83,584.379C1735.76,588.388 1747.02,611.515 1754.73,625.7C1755.65,627.55 1757.19,629.862 1759.97,629.862L1775.85,629.246C1779.24,629.092 1780.94,626.933 1781.55,625.7C1789.11,611.515 1800.36,587.463 1803.14,583.608C1803.76,582.837 1804.22,582.375 1804.53,582.375C1804.99,582.375 1805.14,582.992 1805.14,584.071L1805.14,584.842L1797.9,651.448L1797.9,651.602C1797.9,653.298 1799.44,656.69 1802.83,656.844L1834.13,659.157L1834.28,659.157Z" style="fill:rgb(223,80,0);fill-rule:nonzero;stroke:rgb(249,247,204);stroke-width:5.59px;"/>
</g>
<g transform="matrix(0.994193,0.107609,-0.107609,0.994193,75.0929,-204.041)">
<path d="M1997.71,593.63C1997.71,567.882 1979.21,527.178 1929.87,527.178C1902.74,527.178 1873.44,540.13 1863.42,568.961C1860.18,578.52 1858.64,587.617 1858.64,596.097C1858.64,634.488 1889.48,660.39 1924.63,660.39C1955.93,660.39 1997.71,636.03 1997.71,593.63ZM1929.87,626.316C1913.99,626.316 1899.19,613.057 1899.19,593.476C1899.19,579.445 1906.9,560.327 1929.26,560.327C1950.69,560.327 1958.86,578.212 1958.86,593.476C1958.86,610.898 1948.22,626.316 1929.87,626.316Z" style="fill:rgb(255,152,0);fill-rule:nonzero;stroke:rgb(249,247,204);stroke-width:5.59px;"/>
</g>
<g transform="matrix(0.99192,-0.126865,0.126865,0.99192,-58.7652,265.507)">
<path d="M2093.61,655.919C2095.77,655.765 2097.31,653.915 2097.31,651.91L2096.24,625.083C2096.24,623.233 2094.54,621.537 2092.53,621.537L2092.23,621.537L2054.76,623.541L2053.99,609.202L2079.58,609.202C2081.74,609.202 2083.28,607.506 2083.44,605.348L2083.75,581.758L2083.75,581.45C2083.75,579.445 2081.9,577.904 2080.05,577.904L2052.45,577.904L2051.68,564.644L2087.6,562.794C2089.45,562.64 2091.15,560.944 2091.15,559.094L2091.15,558.785L2089.91,531.958C2089.76,530.108 2088.06,528.412 2086.21,528.412L2085.91,528.412L2044.89,530.57L2044.28,530.57L2016.22,532.112C2014.37,532.112 2012.67,533.808 2012.67,535.658L2012.67,535.967L2018.99,656.227C2019.14,658.077 2020.69,659.773 2022.54,659.773L2022.85,659.773L2052.91,658.232C2053.06,658.232 2053.37,658.077 2053.53,658.077L2093.61,655.919Z" style="fill:rgb(223,80,0);fill-rule:nonzero;stroke:rgb(249,247,204);stroke-width:5.59px;"/>
</g>
<path d="M2115.35,665.632C2115.97,665.941 2116.43,666.095 2117.05,666.095C2117.97,666.095 2118.9,665.632 2119.98,664.399C2128.46,654.84 2147.89,631.096 2147.89,593.784C2147.89,557.089 2129.23,533.5 2120.44,523.632C2119.52,522.553 2118.28,521.474 2116.74,521.474C2116.28,521.474 2115.66,521.782 2115.05,522.09L2110.88,524.403C2109.8,525.174 2109.03,525.945 2109.03,527.024C2109.03,527.949 2109.34,528.874 2110.42,530.108C2119.67,541.055 2134.63,565.415 2134.63,593.784C2134.63,623.541 2118.74,647.902 2109.8,658.232C2109.03,659.157 2108.72,659.928 2108.72,660.544C2108.72,661.778 2109.8,662.394 2110.73,663.011L2115.35,665.632Z" style="fill:rgb(255,152,0);fill-rule:nonzero;stroke:rgb(249,247,204);stroke-width:5.59px;"/>
</g>
</g>
</g>

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View file

@ -1,5 +1,5 @@
{
"name": "floppydisk05/diskfloppy.me",
"name": "RoscoeDaWah/wah.moe",
"type": "project",
"description": "My personal website, developed using the Laravel framework.",
"keywords": ["laravel", "framework"],

View file

@ -5,7 +5,7 @@
return [
'name' => env('APP_NAME', 'diskfloppy.me'),
'version' => '2024.12.19',
'version' => '2025.01.01',
'env' => env('APP_ENV', 'production'),
'debug' => (bool) env('APP_DEBUG', false),
'url' => env('APP_URL', 'http://localhost'),

View file

@ -252,6 +252,21 @@ table.music-top10 tr td:first-child {
background-color: var(--table-header);
}
div.current-track {
display: grid;
grid-template-columns: 180px auto;
grid-template-rows: 1fr;
grid-column-gap: 10px;
align-items: center;
}
div.current-track img {
float: left;
filter: var(--shadow-small);
border: var(--border);
width: 174px;
height: 174px;
}
/** Bookmarks **/
div.bookmark-category:first-child h2 {

Binary file not shown.

After

Width:  |  Height:  |  Size: 478 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 MiB

View file

@ -19,3 +19,11 @@ Disallow: /
User-Agent: PerplexityBot
Disallow: /
User-agent: anthropic-ai
Disallow: /
User-agent: Claude-Web
Disallow: /
User-agent: ClaudeBot
Disallow: /

View file

@ -1,29 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- created with www.mysitemapgenerator.com -->
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://www.diskfloppy.me/</loc>
<lastmod>2024-11-27T23:59:26+00:00</lastmod>
<priority>1.0</priority>
</url>
<url>
<loc>https://www.diskfloppy.me/pub/</loc>
<lastmod>2024-11-27T23:59:26+00:00</lastmod>
<priority>0.8</priority>
</url>
<url>
<loc>https://www.diskfloppy.me/bookmarks</loc>
<lastmod>2024-11-27T23:59:26+00:00</lastmod>
<priority>1.0</priority>
</url>
<url>
<loc>https://www.diskfloppy.me/guestbook</loc>
<lastmod>2024-11-27T23:59:26+00:00</lastmod>
<priority>1.0</priority>
</url>
<url>
<loc>https://www.diskfloppy.me/music</loc>
<lastmod>2024-11-27T23:59:26+00:00</lastmod>
<priority>1.0</priority>
</url>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://wah.moe/</loc>
<lastmod>2024-12-28T18:33:23+01:00</lastmod>
<priority>1.0</priority>
</url>
<url>
<loc>https://wah.moe/bookmarks</loc>
<lastmod>2024-12-28T18:33:23+01:00</lastmod>
<priority>1.0</priority>
</url>
<url>
<loc>https://wah.moe/guestbook</loc>
<lastmod>2024-12-28T18:33:23+01:00</lastmod>
<priority>1.0</priority>
</url>
<url>
<loc>https://wah.moe/music</loc>
<lastmod>2024-12-28T18:33:23+01:00</lastmod>
<priority>1.0</priority>
</url>
<url>
<loc>https://wah.moe/rosco</loc>
<lastmod>2024-12-28T18:33:23+01:00</lastmod>
<priority>1.0</priority>
</url>
</urlset>

View file

@ -1,4 +1,10 @@
<div class="current-track">
<h2>Last/Current Track:</h2>
<a href="{{ $track["url"] }}">{{ $track["title"] }} {{ $track["artist"] }}</a><br>
<div>
<img src="{{ $track["image"] }}" alt="Album cover for {{ $track["title"] }} by {{ $track["artist"] }}">
</div>
<div>
<h2>{{ $track["header"] }}:</h2>
<a href="{{ $track["url"] }}">{{ $track["title"] }}</a><br>
by {{ $track["artist"] }}<br>
</div>
</div>

View file

@ -10,7 +10,8 @@
<link rel="stylesheet" href="{{ asset('/css/master.css') }}"/>
<link rel="icon" type="image/png" href="{{ asset('/favicon-32x32.png') }}" sizes="32x32"/>
<link rel="icon" type="image/png" href="{{ asset('/favicon-16x16.png') }}" sizes="16x16"/>
{!! (intval(date('n')) == 12) ? '<script src="/js/christmas/snowstorm.js"></script>' : '' !!}
@if ($isChristmas)<script src="{{ asset('/js/christmas/snowstorm.js') }}"></script>@endif
<!-- Page-specific -->
<meta property="og:title" content="wah! (dot moe) - {{ $title }}">
@ -36,8 +37,8 @@
<div id="footer">
<div>
<span>
&copy; floppydisk 2021-{{ date('Y') }}<br>
v{{ config('app.version') }}, <a href="https://git.frzn.dev/fwoppydwisk/diskfloppy.me/releases/latest">Source</a><br>
&copy; RoscoeDaWah 2021-{{ date('Y') }}<br>
v{{ config('app.version') }}, <a href="https://git.frzn.dev/RoscoeDaWah/wah.moe/releases/latest">Source</a><br>
Served by {{ gethostname() }}
</span>
</div>
@ -50,7 +51,7 @@
<a href="https://dimden.dev/"><img src="https://dimden.dev/services/images/88x31.gif" alt="dimden.dev"></a><br>
<a href="https://developer.mozilla.org/en-US/docs/Web/CSS"><img src="{{ URL::asset('images/buttons/csshard.gif') }}" alt="CSS is hard"></a>
<a href="https://linux.org/"><img src="{{ URL::asset('images/buttons/linuxnow.gif') }}" alt="Linux NOW!"></a>
<img src="{{ URL::asset('images/buttons/paws.gif') }}" alt="Made with my own two paws">
<img src="{{ URL::asset('images/buttons/paws-aliased.png') }}" alt="Made with my own two paws">
<img src="{{ URL::asset('images/buttons/transrights.gif') }}" alt="Trans Rights NOW!">
<a href="https://www.vim.org/"><img src="{{ URL::asset('images/buttons/vim.gif') }}" alt="Vim"></a>
<img src="{{ URL::asset('images/buttons/aliasing.png') }}" alt="I Heart Aliasing">

View file

@ -23,6 +23,6 @@
Agent: &nbsp;&nbsp;Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:122.0) Gecko/20100101 Firefox/122.0 </code>
</td></tr></table>
<hr align="left">
<p>&copy; floppydisk 2021-2024</p>
<p>&copy; RoscoeDaWah 2021-2024</p>
</body>
</html>

View file

@ -1,6 +1,7 @@
<nav>
<strong>Pages:</strong>
<a href="/">home</a> |
<a href="//wiki.wah.moe">wah-ki</a> |
<a href="//git.wah.moe">git</a> |
<a href="/pub">files</a> |
<a href="/bookmarks">bookmarks</a> |

View file

@ -0,0 +1,12 @@
<x-minimal>
<x-slot:title>Error dsdf!</x-slot:title>
<div class="page-container">
<div>
<h1 style="margin-top: 0">Error 400: Invalid message!</h1>
<hr>
<p>Whoa there! Your form submission seems to contain a URL (or one of the fields was left blank)!</p>
<br>
Click <a href="/guestbook">here</a> to go back to the guestbook.
</div>
</div>
</x-minimal>

View file

@ -8,11 +8,11 @@
<br>
<p>Some quick facts about me:</p>
<ul>
<li>19 y/o, he/him, British</li>
<li>{{ $age }} y/o, he/him, British</li>
<li>Theatre Technician and &quot;Web Developer&quot;</li>
<li>Loves ETC desks, prefers Generics to LEDs for some reason</li>
<li>Spends way too much time on his computer</li>
<li>Favorite games: <a href="https://steamcommunity.com/id/fwoppydwisk/recommended/420530/">OneShot</a>,
<li>Favorite games: <a href="https://steamcommunity.com/id/RoscoeDaWah/recommended/420530/">OneShot</a>,
Minecraft, Stardew Valley, N++ and Starbound</li>
<li><a href="http://wxqa.com/">CWOP</a> member</li>
</ul>
@ -22,24 +22,9 @@
<li><strong>Tech Theatre</strong> - Lighting, Stage Management, etc. (<a
href="https://www.controlbooth.com/members/floppydisk.28673/">ControlBooth</a>)</li>
<li><strong>Programming</strong> - HTML, CSS, JavaScript, C#, Java, PHP, Ruby, Python (<a
href="https://github.com/floppydisk05">GitHub</a>)</li>
<li><strong>Photography</strong> - <a href="https://www.flickr.com/photos/floppydisk/">Flickr</a></li>
<li><strong>Gaming</strong> - <a href="https://steamcommunity.com/id/fwoppydwisk/">Steam Profile</a>
href="https://github.com/RoscoeDaWah">GitHub</a>)</li>
<li><strong>Photography</strong> - <a href="https://www.flickr.com/photos/roscoedawah/">Flickr</a></li>
<li><strong>Gaming</strong> - <a href="https://steamcommunity.com/id/RoscoeDaWah/">Steam Profile</a>
</li>
</ul>
{{-- <div class="section">--}}
{{-- <h2>Random Quote</h2>--}}
{{-- <hr>--}}
{{-- <x-toh-quote/>--}}
{{-- </div>--}}
{{-- <div class="section">--}}
{{-- <h2>Contact</h2>--}}
{{-- <hr>--}}
{{-- <p>--}}
{{-- <strong>E-mail:</strong> <a href="mailto:contact@diskfloppy.me">contact@diskfloppy.me</a><br>--}}
{{-- <strong>Mastodon:</strong> <a rel="me" href="https://c.im/@floppydisk">@floppydisk@c.im</a><br>--}}
{{-- <strong>Matrix:</strong> <a href="https://matrix.to/#/@floppydisk:arcticfoxes.net">@floppydisk:arcticfoxes.net</a>--}}
{{-- </p>--}}
{{-- </div>--}}
</x-layout>

View file

@ -25,4 +25,5 @@
Route::get('/music', [MusicController::class, 'show']);
Route::get('/rosco', [RoscoController::class, 'show']);
Route::post('/guestbook', [GuestbookController::class, 'addEntry'])
->middleware('validator')
->middleware('rate_limit');