diff --git a/.gitignore b/.gitignore index a14cfc4..801bd05 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ yarn-error.log /log /storage /tmp +/public/pub diff --git a/app/View/Components/wah.php b/app/View/Components/wah.php new file mode 100644 index 0000000..c8ee36c --- /dev/null +++ b/app/View/Components/wah.php @@ -0,0 +1,39 @@ +json(); + return "https://tinyfox.dev".$data["loc"]; + } catch (Exception $ex) { + return ""; + } + + } + + /** + * Get the view / contents that represent the component. + */ + public function render(): View|Closure|string { + return view('components.wah', [ + 'wah' => $this->getWah(), + ]); + } +} diff --git a/public/css/master.css b/public/css/master.css index 6c91fc1..51b6bbd 100644 --- a/public/css/master.css +++ b/public/css/master.css @@ -1,75 +1,65 @@ -@font-face { - font-family: 'BigBlue TerminalPlus'; - src: url('/fonts/BigBlue_TerminalPlus.woff2') format('woff2'), - url('/fonts/BigBlue_TerminalPlus.woff') format('woff'); - font-weight: normal; - font-style: normal; - font-display: swap; +:root { + --background: #f2efbd; + --foreground: #2a271c; + --border-color: #f27405; + --border: var(--border-color) 2px solid; + --shadow-color: hsla(11, 96%, 43%, 0.4); + --shadow: drop-shadow(8px 8px var(--shadow-color)); + --shadow-small: drop-shadow(3px 3px var(--shadow-color)); + --links: hsl(183, 93%, 27%); + --links-hover: hsl(183, 93%, 15%); + --table-header: hsla(11, 96%, 43%, 0.2); } -@font-face { - font-family: pixel nes; - src: url("/fonts/Pixel_NES.eot?") format("eot"), - url("/fonts/Pixel_NES.woff") format("woff"), - url("/fonts/Pixel_NES.ttf") format("truetype"); - font-style: normal; - font-weight: 400; -} - -@font-face { - font-family: nec_apc3; - src: url("/fonts/Web437_NEC_APC3_8x16.woff") format("woff"); - font-style: normal; - font-weight: 400; -} - -@font-face { - font-family: nec_apc3; - src: url("/fonts/Web437_Nix8810_M16.woff") format("woff"); - font-style: normal; - font-weight: 700; -} - -@supports (-moz-appearance:none) { - h2 { - text-shadow: var(--firefox-shadow) var(--shadow) !important; - } -} - -html, -body, -.container { +html { height: 100%; + color-scheme: light; } body { - background-color: var(--background); color: var(--foreground); + min-height: 100%; + background-color: hsla(0, 0%, 0%, 0); + padding: 10px; } -body, -button, -select { - font-family: russiangothic, ms ui gothic, "nec_apc3", Tahoma, sans-serif; -} - -h1, -h2 { - font-family: "pixel nes", sans-serif; +/*noinspection CssUnknownTarget*/ +body::before { + content: ""; + position: fixed; + top: 0; + left: 0; + background-image: url("/images/background.jpg"); + width: 100%; + height: 100%; + z-index: -1; + opacity: 0.8; + background-size: cover; + background-attachment: fixed; + overflow: hidden; } h1, h2, h3, h4, +h5, +h6 { + margin: 20px 0 0 0; +} + +p, ul, -p { +ol, +dl, +menu, +dir { margin: 0; } hr { border: none; - border-top: 1px solid var(--foreground); + border-top: var(--border); } a { @@ -78,266 +68,170 @@ a { } a:hover { - text-decoration: underline; + color: var(--links-hover); + text-decoration: underline solid; } -ul { - list-style: square; - padding-left: 0; - list-style-position: inside; +div.page-container { + width: 800px; + margin: 5px auto; } -.container { - display: flex; - /*align-items: center;*/ - justify-content: center; -} - -.page { - min-width: var(--page-width); - max-width: var(--page-width); -} - -.navbar { - border: var(--foreground) solid 1px; -} - -.navbar ul { - list-style-type: none; - margin: 0; - padding: 0; - overflow: hidden; -} - -.navbar li { - float: left; - border-right: solid var(--foreground) 1px; -} - -.navbar li a { - display: block; - text-align: center; - color: var(--foreground); - text-decoration: none; - padding: 5px 7px 5px 5px; -} - -.navbar li a:hover { - background-color: var(--foreground); - color: var(--background); -} - -.pathbar { - border: 1px solid var(--foreground); - padding: 5px; -} - -.content { - display: flex; - flex-wrap: wrap; - gap: 10px; - padding: 0; -} - -.section { - border: var(--foreground) 1px solid; - padding: 10px; -} - -.sidebar { - flex-basis: var(--sidebar-width); - flex-grow: 1; -} - -main { - flex-basis: 0; - flex-grow: 999; - min-inline-size: 50%; -} - -.navbar, -.content, -header, -footer { - margin: 10px 10px 0 0; -} - -header, -footer, -.navbar { - padding: 5px; -} - -footer { - display: grid; - grid-template-columns: repeat(2, auto); - grid-template-rows: 1fr; - grid-column-gap: 0; - grid-row-gap: 0; -} - -footer div:last-child { - text-align: right; -} - -select { - background-color: var(--background-secondary); - border: 1px solid var(--foreground); - color: var(--foreground); - padding: 0.25em; -} - -button { +div.page-container > div { background-color: var(--background); - color: var(--foreground); - border: 1px solid var(--foreground); - padding: 0.25em 0.5em; + filter: var(--shadow); + padding: 10px; + border: var(--border); + margin-bottom: 20px; + /* temporary */ + /* height: 600px; */ } -button:hover { - background-color: var(--foreground); - color: var(--background); -} - -img.pixel { - image-rendering: pixelated; -} - -a.button, -a.button:hover { - text-decoration: none; -} - -a.button:hover img { - opacity: 80%; -} - -main > .section, -.sidebar > .section { - margin-bottom: 10px; -} - -main > .section:last-child, -.sidebar > .section:last-child { +div.page-container > div:last-child { margin-bottom: 0; } -.navbar-icon { - margin-right: 0.25em; +div#header h1 { + margin: 0; + font-style: italic; } -.navlinks { - padding-left: 10px; -} - -.online-status { +div#header h1, +div#header p { display: inline; } -.centerbox { - text-align: center; +div#content { + position: relative; } -.quote { - padding-left: 10px; - border-left: solid 2px var(--foreground); +div#content::after { + display: block; + content: ""; + clear: both; } -.music-top10 { - width: 100%; -} - -.music-top10 td, -.music-top10 th { - border: none; - border-left: 1px dotted var(--foreground); - padding: 2px 5px -} - -.music-top10 tr:nth-child(1) th { - border-bottom: 1px dotted var(--foreground); -} - -.music-top10 tr:nth-child(2) td { - padding-top: 5px; -} - -.music-top10 td:first-child, -.music-top10 th:first-child { - border: none; -} - -.music-top10 tr th:first-child { - text-align: right; -} - -.music-top10 td { - max-width: 200px; - white-space: nowrap; - text-overflow:ellipsis; - overflow: hidden; -} - -.music-top10 tr td:first-child { - text-align: right; -} - -.music-top10 tr td:nth-child(2), -.music-top10 tr td:nth-child(3) { -} - - -.current-track h2 { - margin: 0; -} - -table.computers { - table-layout: auto; - width: 75%; -} - -table.computers td ul { - margin: 0; - padding-left: 20px; -} - -table.computers .section-title { - text-decoration: underline; - font-style: italic; - font-weight: bold; -} - -table.computers p.description { - font-style: italic; - margin: 5px 0 2px 0; -} - -table.computers th { - background-color: var(--background-secondary); -} - -table.computers td:first-child { - white-space: nowrap; -} - -table.computers td, -table.computers th { - border: var(--foreground) solid 1px; +div.wah { + float: right; + border: var(--border); padding: 5px; + filter: var(--shadow-small); + background-color: var(--background); } -.calculator-spec-table td { - border: var(--foreground) solid 1px; +div.wah img { + display: block; } -.calculator-spec-table td { - padding: 5px 10px 5px 5px; +div.wah h3, +div.wah p { + text-align: center; + margin: 5px 0; + font-style: italic; } -.calculator-spec-table tr td:first-child { - background-color: var(--background-secondary); +div.wah p { + margin-bottom: 0; } -.sidebar > .section > button { - margin-top: 5px; +div.wah img { + width: 250px; +} + +div#footer { + display: grid; + grid-template-columns: auto 1fr; + grid-template-rows: 1fr; + grid-column-gap: 0px; + grid-row-gap: 0px; + align-items: center; +} + +div#footer div:last-child { + text-align: right; +} + +div#footer div:last-child img { + image-rendering: pixelated; + margin: 0; + padding: 0; + width: 88px; + height: 31px; +} + +/** Guestbook **/ +table.form input, +table.form textarea, +table.form button { + background-color: var(--background); + border: var(--border); + filter: var(--shadow-small); +} + +table.form input, +table.form textarea { + width: 250px; +} + +table.form button:hover { + background-color: var(--border-color); + color: var(--background); + filter: none; +} + +table.form tr td, +table.gb-entry-form-container td:last-child { + vertical-align: top; +} + +div.gb-entry { + border: var(--border); + filter: var(--shadow-small); + background-color: var(--background); + width: 75%; + padding: 10px; +} + +/** Music **/ +table.music-top10 { + border: var(--border); + filter: var(--shadow-small); + background-color: var(--background); + border-collapse: collapse; +} + +table.music-top10 th, +table.music-top10 td { + padding: 2px 5px; +} + +table.music-top10 th:first-child { + text-align: left; +} + +table.music-top10 tr:first-child th { + border-right: var(--border); + border-bottom: var(--border); +} + +table.music-top10 tr:first-child th:last-child { + border-right: none; +} + +table.music-top10 tr td { + border-right: var(--border); +} + +table.music-top10 tr td:last-child { + border-right: none; +} +table.music-top10 tr:first-child th, +table.music-top10 tr td:first-child { + background-color: var(--table-header); +} + + +/** Bookmarks **/ +div.bookmark-category:first-child h2 { + margin: 0; } diff --git a/public/images/background.jpg b/public/images/background.jpg new file mode 100644 index 0000000..4e94b27 Binary files /dev/null and b/public/images/background.jpg differ diff --git a/public/images/background.svg b/public/images/background.svg new file mode 100644 index 0000000..a3244dd --- /dev/null +++ b/public/images/background.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/images/buttons/csshard.gif b/public/images/buttons/csshard.gif new file mode 100644 index 0000000..24fb8d5 Binary files /dev/null and b/public/images/buttons/csshard.gif differ diff --git a/public/images/buttons/thnlqd.png b/public/images/buttons/thnlqd.png new file mode 100644 index 0000000..ec17caa Binary files /dev/null and b/public/images/buttons/thnlqd.png differ diff --git a/public/images/buttons/transrights.gif b/public/images/buttons/transrights.gif new file mode 100644 index 0000000..7f705aa Binary files /dev/null and b/public/images/buttons/transrights.gif differ diff --git a/public/images/buttons/yuri.gif b/public/images/buttons/yuri.gif new file mode 100644 index 0000000..3e3c5d6 Binary files /dev/null and b/public/images/buttons/yuri.gif differ diff --git a/public/images/noik.png b/public/images/noik.png new file mode 100644 index 0000000..42b94a4 Binary files /dev/null and b/public/images/noik.png differ diff --git a/public/pub b/public/pub deleted file mode 120000 index dfdd58e..0000000 --- a/public/pub +++ /dev/null @@ -1 +0,0 @@ -/srv/pubfiles \ No newline at end of file diff --git a/public/sitemap.xml b/public/sitemap.xml index 45b926a..b36b17e 100644 --- a/public/sitemap.xml +++ b/public/sitemap.xml @@ -3,37 +3,27 @@ https://www.diskfloppy.me/ - 2024-09-01T17:44:54+01:00 + 2024-11-27T23:59:26+00:00 1.0 https://www.diskfloppy.me/pub/ - 2024-09-01T17:44:54+01:00 + 2024-11-27T23:59:26+00:00 0.8 - - https://www.diskfloppy.me/computers - 2024-09-01T17:44:56+01:00 - 1.0 - - - https://www.diskfloppy.me/calculators - 2024-09-01T17:44:56+01:00 - 1.0 - https://www.diskfloppy.me/bookmarks - 2024-09-01T17:44:57+01:00 + 2024-11-27T23:59:26+00:00 1.0 https://www.diskfloppy.me/guestbook - 2024-09-01T17:44:57+01:00 + 2024-11-27T23:59:26+00:00 1.0 https://www.diskfloppy.me/music - 2024-09-01T17:44:58+01:00 + 2024-11-27T23:59:26+00:00 1.0 - \ No newline at end of file + diff --git a/resources/views/bookmarks.blade.php b/resources/views/bookmarks.blade.php index f75e9b4..24c0a05 100644 --- a/resources/views/bookmarks.blade.php +++ b/resources/views/bookmarks.blade.php @@ -1,7 +1,7 @@ Bookmarks @foreach($categories as $category) -
+

{{ $category->name }}

@if($category->id == 1)

(These are shuffled every load)

diff --git a/resources/views/components/current-track.blade.php b/resources/views/components/current-track.blade.php index 0770240..50d3367 100644 --- a/resources/views/components/current-track.blade.php +++ b/resources/views/components/current-track.blade.php @@ -1,4 +1,4 @@ -
+

Last/Current Track:

{{ $track["title"] }} • {{ $track["artist"] }}
diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php index 2ac3632..199ee55 100644 --- a/resources/views/components/layout.blade.php +++ b/resources/views/components/layout.blade.php @@ -1,6 +1,3 @@ -@php // Get colorscheme from cookie and apply immediately - $colorscheme = request()->cookie('colorscheme', 'catppuccin-macchiato'); -@endphp @@ -8,13 +5,10 @@ - - + - - {!! (intval(date('n')) == 12) ? '' : '' !!} @@ -22,83 +16,41 @@ - -
-
-
-

{{ str_replace("www.", "", Request::getHost()) }}

-
-
+ +
+ -
-
- {{ $slot }} -
-
-
-
-
-
-
+
+ {{ $slot }}
-
+
+
-
diff --git a/resources/views/components/minimal.blade.php b/resources/views/components/minimal.blade.php index e69de29..37e6e03 100644 --- a/resources/views/components/minimal.blade.php +++ b/resources/views/components/minimal.blade.php @@ -0,0 +1,16 @@ + + + + + + + + + + + {{ $title ?? 'Unknown' }} + + +{{ $slot }} + + diff --git a/resources/views/components/navigation.blade.php b/resources/views/components/navigation.blade.php index 6c99e8c..502dd35 100644 --- a/resources/views/components/navigation.blade.php +++ b/resources/views/components/navigation.blade.php @@ -1,30 +1,9 @@ -

Navigation:

-
- - Home -
- - Git -
- - Public Files -
- - Computers -
- - Calculators -
- - Bookmarks -
- - Guestbook -
- - Weather -
- - Music -
-
+ diff --git a/resources/views/components/top-tracks.blade.php b/resources/views/components/top-tracks.blade.php index 0b563b4..a8c94f2 100644 --- a/resources/views/components/top-tracks.blade.php +++ b/resources/views/components/top-tracks.blade.php @@ -1,4 +1,3 @@ -

Top 10 Tracks (Last 30 days):

@@ -15,4 +14,3 @@ @endforeach
-
diff --git a/resources/views/components/wah.blade.php b/resources/views/components/wah.blade.php new file mode 100644 index 0000000..cea770e --- /dev/null +++ b/resources/views/components/wah.blade.php @@ -0,0 +1,5 @@ +
+

Random Wah!

+ +

Image "stolen" from tinyfox.dev

+
diff --git a/resources/views/errors/guestbook-ratelimit.blade.php b/resources/views/errors/guestbook-ratelimit.blade.php index cb24d9e..3f4820b 100644 --- a/resources/views/errors/guestbook-ratelimit.blade.php +++ b/resources/views/errors/guestbook-ratelimit.blade.php @@ -1,9 +1,13 @@ Error 429: Overclocking Detected! -

Error 429: Overclocking Detected!

-
-

Whoa there! Your submissions are going at warp speed.

-

Remember you can only submit an entry once every hour!

-
- Click here to go back to the guestbook. +
+
+

Error 429: Overclocking Detected!

+
+

Whoa there! Your submissions are going at warp speed.

+

Remember you can only submit an entry once every hour!

+
+ Click here to go back to the guestbook. +
+
diff --git a/resources/views/guestbook.blade.php b/resources/views/guestbook.blade.php index f9f04ca..667eba8 100644 --- a/resources/views/guestbook.blade.php +++ b/resources/views/guestbook.blade.php @@ -56,7 +56,7 @@ @php $user_agent = $parser->parse($entry->agent); @endphp -
+
Submitted by {{ $entry->name }} on {{ $entry->created_at->format('Y-m-d') }} at {{ $entry->created_at->format('h:i:s A (e)') }} diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 1b17b0f..002f8b2 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,42 +1,45 @@ Home -
-

About Me

-
-

Hi! This is my personal homepage on the World Wide Web.

-
-

QuickFacts™:

-
    -
  • {{ $age }} y/o, he/him, British
    • -
  • Theatre Technician, "Web Developer" and NixOS User
    • -
  • Loves ETC desks, prefers Generics to LEDs for some reason
    • -
  • Has a crippling Soundcraft addiction
    • -
  • Spends way too much time on his computer
    • -
  • Favorite games: OneShot, Minecraft, Stardew Valley, N++ and Starbound
    • -
  • CWOP member
    • -
-
-

Interests:

-
    -
  • Tech Theatre - Lighting, Stage Management, etc. (ControlBooth)
    • -
  • Programming - HTML, CSS, JavaScript, C#, Java, PHP, Ruby, Python (GitHub)
    • -
  • Photography - Flickr
    • -
  • Gaming - Steam Profile
    • -
-
-
-

Random Quote

-
- -
-
-

Contact

-
-

- E-mail: contact@diskfloppy.me
- Mastodon: @floppydisk@c.im
- Matrix: @floppydisk:arcticfoxes.net -

-
+ +

Hi! This is my personal homepage on the World Wide + Web. +

+
+

Some quick facts about me:

+
    +
  • 19 y/o, he/him, British
    • +
  • Theatre Technician and "Web Developer"
    • +
  • Loves ETC desks, prefers Generics to LEDs for some reason
    • +
  • Spends way too much time on his computer
    • +
  • Favorite games: OneShot, + Minecraft, Stardew Valley, N++ and Starbound
    • +
  • CWOP member
    • +
+
+

Interests:

+
    +
  • Tech Theatre - Lighting, Stage Management, etc. (ControlBooth)
    • +
  • Programming - HTML, CSS, JavaScript, C#, Java, PHP, Ruby, Python (GitHub)
    • +
  • Photography - Flickr
    • +
  • Gaming - Steam Profile +
    • +
+ +{{--
--}} +{{--

Random Quote

--}} +{{--
--}} +{{-- --}} +{{--
--}} +{{--
--}} +{{--

Contact

--}} +{{--
--}} +{{--

--}} +{{-- E-mail: contact@diskfloppy.me
--}} +{{-- Mastodon: @floppydisk@c.im
--}} +{{-- Matrix: @floppydisk:arcticfoxes.net--}} +{{--

--}} +{{--
--}}