diff --git a/public/static/img/logo.png b/public/static/img/logo.png deleted file mode 100644 index e10fbac..0000000 Binary files a/public/static/img/logo.png and /dev/null differ diff --git a/public/static/js/snow.js b/public/static/js/snow.js deleted file mode 100644 index 586c980..0000000 --- a/public/static/js/snow.js +++ /dev/null @@ -1,96 +0,0 @@ -// Cool snow that was TOTALLY NOT stolen from someone else :-) - -// Amount of Snowflakes -var snowMax = 64; - -// Snowflake Colours -var snowColor = ["#fff"]; - -// Snow Entity -var snowEntity = "*"; - -// Falling Velocity -var snowSpeed = 0.75; - -// Minimum Flake Size -var snowMinSize = 16; - -// Maximum Flake Size -var snowMaxSize = 32; - -// Refresh Rate (in milliseconds) -var snowRefresh = 75; - -// Additional Styles -var snowStyles = "z-index: 0; cursor: default; user-select: none;"; - -/* -// End of Configuration -// ---------------------------------------- -// Do not modify the code below this line -*/ - -var snow = [], - pos = [], - coords = [], - lefr = [], - marginBottom, - marginRight; - -function randomise(range) { - rand = Math.floor(range * Math.random()); - return rand; -} - -function initSnow() { - var snowSize = snowMaxSize - snowMinSize; - marginBottom = document.body.scrollHeight - 5; - marginRight = document.body.clientWidth - 15; - - for (i = 0; i <= snowMax; i++) { - coords[i] = 0; - lefr[i] = Math.random() * 15; - pos[i] = 0.03 + Math.random() / 10; - snow[i] = document.getElementById("flake" + i); - snow[i].style.fontFamily = "inherit"; - snow[i].size = randomise(snowSize) + snowMinSize; - snow[i].style.fontSize = snow[i].size + "px"; - snow[i].style.color = snowColor[randomise(snowColor.length)]; - snow[i].style.zIndex = -1; - snow[i].sink = snowSpeed * snow[i].size / 5; - snow[i].posX = randomise(marginRight - snow[i].size); - snow[i].posY = randomise(2 * marginBottom - marginBottom - 2 * snow[i].size); - snow[i].style.left = snow[i].posX + "px"; - snow[i].style.top = snow[i].posY + "px"; - } - - moveSnow(); -} - -function resize() { - marginBottom = document.body.scrollHeight - 5; - marginRight = document.body.clientWidth - 15; -} - -function moveSnow() { - for (i = 0; i <= snowMax; i++) { - coords[i] += pos[i]; - snow[i].posY += snow[i].sink; - snow[i].style.left = snow[i].posX + lefr[i] * Math.sin(coords[i]) + "px"; - snow[i].style.top = snow[i].posY + "px"; - - if (snow[i].posY >= marginBottom - 2 * snow[i].size || parseInt(snow[i].style.left) > (marginRight - 3 * lefr[i])) { - snow[i].posX = randomise(marginRight - snow[i].size); - snow[i].posY = 0; - } - } - - setTimeout("moveSnow()", snowRefresh); -} - -for (i = 0; i <= snowMax; i++) { - document.write("" + snowEntity + ""); -} - -window.addEventListener('resize', resize); -window.addEventListener('load', initSnow); \ No newline at end of file diff --git a/public/static/style/main.css b/public/static/style/main.css index 66a59d9..beb20cb 100644 --- a/public/static/style/main.css +++ b/public/static/style/main.css @@ -1,28 +1,44 @@ -html, body { - height: 100%; -} body { - margin: 0; - background: midnightblue; color: #111; - font-size: 1rem; - font-family: Arial, Helvetica, sans-serif; + background: #fff; line-height: 1.5; + font-size: 1rem; + font-family: Arial, sans-serif; + margin: 0; } + +/* text based browsers */ +hr { + display: none; +} + a { - color: blue; + color: #00f; } -.container { + +h1, h2, h3, h4, h5, h6 { + font-weight: normal; +} + +header { + background: #eee; +} +header > nav { + padding: 1rem; margin: auto; max-width: 37rem; - background: #fff; - padding: 1rem; } + +main { + padding: 0 1rem 0 1rem; + margin: auto; + max-width: 37rem; +} + img { display: block; - max-width: 100%; - max-height: 10rem; height: auto; + max-width: 100%; } table { @@ -31,22 +47,16 @@ table { } td, th { text-align: left; - padding: 8px; + padding: .5rem; } tr:nth-child(even) { background: #eee; } -@media (max-width: 39rem) { - .container { - min-height: 100%; - } -} pre, code { font-family: "DejaVu Sans Mono", Consolas, monospace; - background: #111; - color: #fff; - padding: .5rem; + background: #eee; + padding: .5rem; max-width: 100%; display: block; overflow-x: auto; diff --git a/routes/start.php b/routes/start.php index 4e29f8e..c3b0e39 100644 --- a/routes/start.php +++ b/routes/start.php @@ -8,12 +8,17 @@ ErrorHandler::register(function($error_messages) { }); Route::get('/', fn() => view('pages/home')); + Route::get('/matrix', fn() => view('pages/matrix')); + Route::get('/test/$whatever?', function($whatever = 'Default Value') { echo htmlspecialchars($whatever); }); + Route::get('/error', fn() => 1 / 0); // since no route was matched we show a page not found error http_response_code(404); -view('errors/404'); \ No newline at end of file +view('templates/header', ['title' => 'Page not found']); +view('errors/404'); +view('templates/footer'); \ No newline at end of file diff --git a/views/errors/404.php b/views/errors/404.php index bfb13e6..ac4beab 100644 --- a/views/errors/404.php +++ b/views/errors/404.php @@ -1,12 +1,3 @@ - - - - - - - Page not found - - -

Page not found

- - \ No newline at end of file +

Page not found

+

The page you requested could not be found on this server

+Go home \ No newline at end of file diff --git a/views/pages/home.php b/views/pages/home.php index 3b14e70..8da1f7d 100644 --- a/views/pages/home.php +++ b/views/pages/home.php @@ -29,7 +29,7 @@

Flirt with the WEBMASTER

-

Send me a nice and positive message on matrix: @william:willy.club

+

Send me a nice and positive message on matrix: @william:willy.club

Awesome webring or something

diff --git a/views/pages/matrix.php b/views/pages/matrix.php index 430a31e..499a05a 100644 --- a/views/pages/matrix.php +++ b/views/pages/matrix.php @@ -1,8 +1,10 @@ 'Matrix Homeserver'])?> - +

Matrix Homeserver

-

Come hang out with the other terminally online losers and bitch about all of the worlds problems on the Willy Club matrix homeserver. You can also use it to communicate freely or whatever.

+

REGISTRATIONS CLOSED FOR THE TIME BEING!

+ +

Come hang out with the other terminally online losers on the Willy Club matrix homeserver. You can also use it to communicate freely or whatever.

You can register on a client that supports it by adding:

@@ -10,7 +12,4 @@

as the homeserver, have fun and be nice!

-

There is an Element web client hosted here but it's recommended you use your own client for security as a compromised client may leak your private keys potentially allowing hackers to decrypt messages in the case of a data breach or by logging into your account.

-
- \ No newline at end of file diff --git a/views/templates/footer.php b/views/templates/footer.php index 972114f..743d55b 100644 --- a/views/templates/footer.php +++ b/views/templates/footer.php @@ -1,4 +1,3 @@ - \ No newline at end of file diff --git a/views/templates/header.php b/views/templates/header.php index 1353331..0280ed9 100644 --- a/views/templates/header.php +++ b/views/templates/header.php @@ -1,36 +1,20 @@ - - <?=htmlspecialchars($title)?> + <?=htmlspecialchars($title)?> - the Willy Club - - - - -
- - - - - -
+
-
+ + +
\ No newline at end of file