From 9e02da4ae23edb320ee3da6bfcdd88ca1a0741af Mon Sep 17 00:00:00 2001 From: flashwave Date: Sun, 25 Sep 2022 03:22:21 +0000 Subject: [PATCH] Removed outdated elements. --- pages/contact.php | 80 --------------------------- pages/etcetera.php | 129 ------------------------------------------- pages/index.php | 58 ++++++-------------- pages/related.php | 130 -------------------------------------------- public/css/2021.css | 4 +- public/index.php | 5 -- 6 files changed, 19 insertions(+), 387 deletions(-) delete mode 100644 pages/etcetera.php delete mode 100644 pages/related.php diff --git a/pages/contact.php b/pages/contact.php index 7b62996..ba31e24 100644 --- a/pages/contact.php +++ b/pages/contact.php @@ -55,13 +55,6 @@ $router->get('/contact', function() { 'display' => 'flashwave', 'link' => '//github.com/flashwave', ], - [ - 'id' => 'twitch', - 'name' => 'Twitch.tv', - 'icon' => 'fmi fmi-twitch', - 'display' => 'flashwave0', - 'link' => '//twitch.tv/flashwave0', - ], [ 'id' => 'lastfm', 'name' => 'Last.fm', @@ -71,79 +64,6 @@ $router->get('/contact', function() { ], ], ], - - [ - 'id' => 'gaming', - 'title' => 'Gaming', - 'items' => [ - [ - 'id' => 'steam', - 'name' => 'Steam', - 'icon' => 'fmi fmi-steam', - 'display' => 'flashwave_', - 'link' => '//steamcommunity.com/id/flashwave_', - ], - [ - 'id' => 'nin-sw', - 'name' => 'Nintendo Switch (EU)', - 'icon' => 'fmi fmi-switch', - 'display' => 'SW-7446-8163-4902', - ], - [ - 'id' => 'nin-sw', - 'name' => 'Nintendo Switch (JP)', - 'icon' => 'fmi fmi-switch', - 'display' => 'SW-6001-2763-7822', - ], - [ - 'id' => 'nin-3ds', - 'name' => 'Nintendo 3DS', - 'icon' => 'fmi fmi-n3ds', - 'display' => '4013-0352-0648', - ], - [ - 'id' => 'nin-wiiu', - 'name' => 'Wii U / NNID', - 'icon' => 'fmi fmi-wiiu', - 'display' => 'flashwave0', - ], - [ - 'id' => 'osu', - 'name' => 'osu!', - 'icon' => 'fmi fmi-osu', - 'display' => 'flash', - 'link' => '//osu.ppy.sh/u/flash', - ], - [ - 'id' => 'tetrio', - 'name' => 'TETR.IO', - 'icon' => 'fmi fmi-tetrio', - 'display' => 'flash', - 'link' => '//ch.tetr.io/u/flash', - ], - ], - ], - - [ - 'id' => 'support', - 'title' => 'Support me', - 'items' => [ - [ - 'id' => 'paypal', - 'name' => 'Paypal Donation', - 'icon' => 'fmi fmi-paypal', - 'display' => 'flashwave', - 'link' => '//paypal.me/flashwave', - ], - [ - 'id' => 'patreon', - 'name' => 'Patreon', - 'icon' => 'fmi fmi-patreon', - 'display' => 'flashwave', - 'link' => '//patreon.com/flashwave', - ], - ], - ], ]; $body = fm_component('header', [ diff --git a/pages/etcetera.php b/pages/etcetera.php deleted file mode 100644 index 3365091..0000000 --- a/pages/etcetera.php +++ /dev/null @@ -1,129 +0,0 @@ -get('/etc.php', mkiRedirect('/etc')); -$router->get('/etc.html', mkiRedirect('/etc')); -$router->get('/etcetera', mkiRedirect('/etc')); -$router->get('/etcetera.html', mkiRedirect('/etc')); -$router->get('/etcetera.php', mkiRedirect('/etc')); -$router->get('/misc', mkiRedirect('/etc')); -$router->get('/misc.html', mkiRedirect('/etc')); -$router->get('/misc.php', mkiRedirect('/etc')); - -$router->get('/etc', function() { - $links = [ - [ - 'title' => 'ASCII Table', - 'desc' => 'ASCII character set table with minor filtering functionality.', - 'link' => '//flash.moe/ascii.php', - ], - [ - 'title' => 'IP Address Display', - 'desc' => 'Looks up both your IPv4 and IPv6 addresses and display them to you.', - 'link' => '//ip.flash.moe', - ], - [ - 'title' => 'MIDI Collection', - 'desc' => 'My collection of MIDI and SF2 files.', - 'link' => '//flash.moe/midis', - ], - [ - 'title' => 'Randomised Keys', - 'desc' => 'Generates a number of random keys at various lengths using a secure random number generator.', - 'link' => '//flash.moe/key.php', - ], - [ - 'title' => 'Forum Archive', - 'desc' => 'Temporary archive of the flash.moe message board.', - 'link' => '//forum.flash.moe', - ], - [ - 'title' => 'The Abyss', - 'desc' => 'Accumulated collection of historical trash. Beware that the things here are unaltered products of their time.', - 'link' => '//abyss.flash.moe', - ], - ]; - - $historical = [ - [ - 'title' => 'flash.moe / 2014', - 'desc' => 'The first iteration of flash.moe. Very simple and to the point.', - 'link' => '//2014.flash.moe', - ], - [ - 'title' => 'flash.moe / 2015', - 'desc' => 'My first attempt to make something with a properly thought out design. It\'s definitely a first attempt.', - 'link' => '//2015.flash.moe', - ], - [ - 'title' => 'flash.moe / 2018', - 'desc' => 'An attempt at a redesign that didn\'t go anywhere. I wanted to go all in on the pixel grid aesthetic but phones made it difficult so this was never used.', - 'link' => '//2018.flash.moe', - ], - [ - 'title' => 'flash.moe / 2019', - 'desc' => 'A return to basics. Just a blog, a bar with links and a list of projects. I attempted to add the necessary fallbacks to make this version of the site work well in IE5.5 and Netscape 4.', - 'link' => '//2019.flash.moe', - ], - [ - 'title' => 'flash.moe / 2020', - 'desc' => 'A refinement of the 2019 design, largely based on the same code also. Added more subpages but with a more consistent look.', - 'link' => '//2020.flash.moe', - ], - [ - 'title' => 'flash.moe / 2021', - 'desc' => 'I always thought previous iterations of flash.moe lacked personality. I threw out a lot of preconceptions when making the 2021 design and I think it paid off. Currently this is still the face of flash.moe but the backend is pretty much entirely different, I\'m planning an overhaul that puts more focus on the blog again and also fixes the JSON trash navigation issues.', - 'link' => '//2021.flash.moe', - ], - ]; - - $body = fm_component('header', [ - 'title' => 'flash.moe / etcetera', - ]); - - $body .= << -
-
-

Etcetera

-
- -HTML; - - foreach($links as $link) { - $body .= << -
- -

{$link['title']}

-

{$link['desc']}

-
- -HTML; - } - - $body .= << -
-
-

Historical

-
- -HTML; - - foreach($historical as $link) { - $body .= << -
- -

{$link['title']}

-

{$link['desc']}

-
- -HTML; - } - - $body .= fm_component('footer'); - - return $body; -}); diff --git a/pages/index.php b/pages/index.php index 75fa8d8..3857387 100644 --- a/pages/index.php +++ b/pages/index.php @@ -6,10 +6,26 @@ $router->get('/about.html', mkiRedirect('/')); $router->get('/about.php', mkiRedirect('/')); $router->get('/index.php', mkiRedirect('/')); $router->get('/index.html', mkiRedirect('/')); +$router->get('/related.php', mkiRedirect('/')); +$router->get('/related.html', mkiRedirect('/')); +$router->get('/friends', mkiRedirect('/')); +$router->get('/friends.php', mkiRedirect('/')); +$router->get('/friends.html', mkiRedirect('/')); +$router->get('/related', mkiRedirect('/')); +$router->get('/etc.php', mkiRedirect('/')); +$router->get('/etc.html', mkiRedirect('/')); +$router->get('/etcetera', mkiRedirect('/')); +$router->get('/etcetera.html', mkiRedirect('/')); +$router->get('/etcetera.php', mkiRedirect('/')); +$router->get('/misc', mkiRedirect('/')); +$router->get('/misc.html', mkiRedirect('/')); +$router->get('/misc.php', mkiRedirect('/')); +$router->get('/etc', mkiRedirect('/')); $router->get('/365', mkiRedirect('/?fw365')); -$router->get('/donate', mkiRedirect('https://paypal.me/flashwave')); +//$router->get('/donate', mkiRedirect('https://paypal.me/flashwave')); +$router->get('/donate', mkiRedirect('/')); $router->get('/header-bgs.json', function() { return json_encode(FM_BGS); @@ -167,13 +183,6 @@ $router->get('/', function() use ($db) { 'display' => '@smugwave', 'link' => '//twitter.com/smugwave', ], - [ - 'id' => 'github', - 'name' => 'Github', - 'icon' => 'fmi fmi-github', - 'display' => 'flashwave', - 'link' => '//github.com/flashwave', - ], ]; $body = fm_component('header', [ @@ -197,42 +206,9 @@ $router->get('/', function() use ($db) { $body .= <<
-
-
- -
Blog
-
More
-
-
HTML; - $blogCount = 0; - foreach($blogInfo as $blogPost) { - if($blogCount++ >= 5) - break; - - $dateTimeC = date('c', $blogPost->post_published); - $dateTimeR = date('r', $blogPost->post_published); - $timeElapsed = time_elapsed($blogPost->post_published); - $paragraph = first_paragraph($blogPost->post_text); - - $body .= << - -
-
{$blogPost->post_title}
-
-
-
- {$paragraph} -
-
-HTML; - } - $body .= << -
diff --git a/pages/related.php b/pages/related.php deleted file mode 100644 index 6acac13..0000000 --- a/pages/related.php +++ /dev/null @@ -1,130 +0,0 @@ -get('/related.php', mkiRedirect('/related')); -$router->get('/related.html', mkiRedirect('/related')); -$router->get('/friends', mkiRedirect('/related')); -$router->get('/friends.php', mkiRedirect('/related')); -$router->get('/friends.html', mkiRedirect('/related')); - -$router->get('/related', function() { - $related = [ - [ - 'id' => 'own', - 'name' => 'Other sites I own', - 'sites' => [ - [ - 'name' => 'Flashii.net', - 'url' => '//flashii.net', - 'desc' => 'Community site that I run, a lot of my projects relate to it in one way or another. Pronounced as flashy, it\'s not a sequel.', - ], - [ - 'name' => 'Railgun', - 'url' => '//railgun.sh', - 'desc' => 'Website for my chat protocol and server related things, documentation for Sock Chat can be found here.', - ], - [ - 'name' => 'YTKNS', - 'url' => '//ytkns.com', - 'desc' => 'Utility that lets people make very minimal micro sites with music and images. I use this to test certain ideas or to just get back in my element.', - ], - [ - 'name' => 'Takozone', - 'url' => '//tako.zone', - 'desc' => 'A domain I wanted because it\'s available, generally used for shortening urls.', - ], - ], - ], - [ - 'id' => 'friends', - 'name' => 'Personal sites from friends', - 'sites' => [ - [ - 'name' => 'nook / unko', - 'url' => 'https://nook.zone', - ], - [ - 'name' => 'osk', - 'url' => 'https://osk.sh', - ], - [ - 'name' => 'reemo / malloc', - 'url' => 'http://aroltd.com', - ], - [ - 'name' => 'szymszl', - 'url' => 'https://szymszl.xyz', - ], - ], - ], - [ - 'id' => 'useful', - 'name' => 'Useful sites', - 'sites' => [ - [ - 'name' => 'cppreference.com', - 'url' => 'https://en.cppreference.com/w/', - 'desc' => 'Great stdlib documentation for pretty much all standard C and C++ versions.', - ], - [ - 'name' => 'devkitPro', - 'url' => 'https://devkitpro.org/', - 'desc' => 'Amazing homebrew toolchains for Nintendo hardware.', - ], - [ - 'name' => 'DeepL', - 'url' => 'https://www.deepl.com/translator', - 'desc' => 'A machine translator that doesn\'t exclusively produce garbage.', - ], - [ - 'name' => 'ImgOps', - 'url' => 'https://imgops.com/', - 'desc' => 'Provides quick links to various image reverse search utilities.', - ], - [ - 'name' => 'TETOMOMOWARP', - 'url' => 'https://aidn.jp/tetomomowarp/', - 'desc' => 'tet', - ], - [ - 'name' => 'Peppy\'s Windows XP Resources', - 'url' => 'https://web.archive.org/web/20011202115409/xp.xyu.ca/', - 'desc' => 'Useful resources for Windows XP, including news and downloads!', - ], - ], - ], - ]; - - $body = fm_component('header', [ - 'title' => 'flash.moe / related', - ]); - - foreach($related as $section) { - $body .= << -
-
-

{$section['name']}

-
-
-HTML; - - foreach($section['sites'] as $site) { - $body .= << -
- -

{$site['name']}

-HTML; - - if(isset($site['desc'])) - $body .= "

{$site['desc']}

"; - - $body .= '
'; - } - } - - $body .= fm_component('footer'); - - return $body; -}); diff --git a/public/css/2021.css b/public/css/2021.css index 6928ae1..9e1da33 100644 --- a/public/css/2021.css +++ b/public/css/2021.css @@ -318,7 +318,7 @@ body { .index-featured { display: grid; - grid-template-columns: 1fr 1fr 1fr; + grid-template-columns: 1fr 1fr; flex: 1 1 auto; overflow: hidden; margin: 5px auto; @@ -327,7 +327,7 @@ body { column-gap: 10px; row-gap: 10px; width: 100%; - max-width: 1500px; + max-width: 1000px; } @media(max-width: 900px) { .index-featured { grid-template-columns: 1fr; overflow: visible; } } .index-feature { diff --git a/public/index.php b/public/index.php index f37d86f..5d61eac 100644 --- a/public/index.php +++ b/public/index.php @@ -10,11 +10,8 @@ require_once __DIR__ . '/../makai.php'; define('FM_NAV', [ ['title' => 'Home', 'link' => '/'], - ['title' => 'Blog', 'link' => '/old-blog'], ['title' => 'Projects', 'link' => '/projects'], ['title' => 'Contact', 'link' => '/contact'], - ['title' => 'Related', 'link' => '/related'], - ['title' => 'Etcetera', 'link' => '/etc'], ]); define('FM_BGS', [ @@ -175,10 +172,8 @@ function mkiRedirect(string $to): callable { require_once MKI_DIR_PAGES . '/blog.php'; require_once MKI_DIR_PAGES . '/contact.php'; -require_once MKI_DIR_PAGES . '/etcetera.php'; require_once MKI_DIR_PAGES . '/index.php'; require_once MKI_DIR_PAGES . '/projects.php'; -require_once MKI_DIR_PAGES . '/related.php'; require_once MKI_DIR_PAGES . '/ssh.php'; header('X-Powered-By: Makai');