From c9299b5410a55fa867826e389d16a48479a78504 Mon Sep 17 00:00:00 2001 From: Frankie B Date: Tue, 11 Jun 2024 18:02:01 +0100 Subject: Merge MVC rewrite into master (#21) * Just commit it all * Require auth * crap * Update homepage * Block AI scrapers * Update cache update script * Add dummy file * Remove unnecessary lastfm config var * Use withQueryParameters for LastFM API * Fix embeds * Update example env * Smard --- .../pages/admin/guestbook-del-confirm.blade.php | 33 -- resources/views/pages/admin/guestbook.blade.php | 32 -- resources/views/pages/admin/index.blade.php | 9 - resources/views/pages/bookmarks.blade.php | 52 --- resources/views/pages/bot.blade.php | 7 - resources/views/pages/calculators.blade.php | 110 ----- resources/views/pages/computers.blade.php | 442 --------------------- resources/views/pages/guestbook.blade.php | 102 ----- resources/views/pages/home.blade.php | 88 ---- resources/views/pages/music.blade.php | 66 --- resources/views/pages/projects.blade.php | 16 - resources/views/pages/template.blade.php | 6 - resources/views/pages/weather.blade.php | 61 --- 13 files changed, 1024 deletions(-) delete mode 100644 resources/views/pages/admin/guestbook-del-confirm.blade.php delete mode 100644 resources/views/pages/admin/guestbook.blade.php delete mode 100644 resources/views/pages/admin/index.blade.php delete mode 100644 resources/views/pages/bookmarks.blade.php delete mode 100644 resources/views/pages/bot.blade.php delete mode 100644 resources/views/pages/calculators.blade.php delete mode 100644 resources/views/pages/computers.blade.php delete mode 100644 resources/views/pages/guestbook.blade.php delete mode 100644 resources/views/pages/home.blade.php delete mode 100644 resources/views/pages/music.blade.php delete mode 100644 resources/views/pages/projects.blade.php delete mode 100644 resources/views/pages/template.blade.php delete mode 100644 resources/views/pages/weather.blade.php (limited to 'resources/views/pages') diff --git a/resources/views/pages/admin/guestbook-del-confirm.blade.php b/resources/views/pages/admin/guestbook-del-confirm.blade.php deleted file mode 100644 index de920e0..0000000 --- a/resources/views/pages/admin/guestbook-del-confirm.blade.php +++ /dev/null @@ -1,33 +0,0 @@ -@extends('layouts.minimal') -@section('title', 'Delete confirm') -@section('content') -

Delete Confirmation

-
-

Are you sure you want to delete this entry?

- -

Entry Details:

- - - - - - - - - - - - - - - - - -
ID:{{ $entry->id }}
Name:{{ $entry->name }}
Date:{{ gmdate("H:i:s - Y-m-d", $entry->timestamp) }}
Message:{{ $entry->message }}
- -
- @csrf - - -
-@stop diff --git a/resources/views/pages/admin/guestbook.blade.php b/resources/views/pages/admin/guestbook.blade.php deleted file mode 100644 index 85460cc..0000000 --- a/resources/views/pages/admin/guestbook.blade.php +++ /dev/null @@ -1,32 +0,0 @@ -@extends('layouts.default-admin') -@section('title', 'Guestbook') -@section('content') - @php - $entries = DB::select(' - SELECT id, name, timestamp, message, ip_address - FROM guestbook__entries - ORDER BY id DESC - '); - @endphp -

Entries ({{ count($entries) }} total)

- @foreach ($entries as $entry) - - - - - - - -
- Name: {{ $entry->name }}
- IP:   {{ $entry->ip_address }}
- Date: {{ gmdate("H:i:s - Y-m-d", $entry->timestamp) }} - 		- del -
-
- {{ htmlspecialchars($entry->message) }} -
- @endforeach -@stop - diff --git a/resources/views/pages/admin/index.blade.php b/resources/views/pages/admin/index.blade.php deleted file mode 100644 index fd34313..0000000 --- a/resources/views/pages/admin/index.blade.php +++ /dev/null @@ -1,9 +0,0 @@ -@extends('layouts.default-admin') -@section('title', 'Page Title') -@section('description', 'Page description goes here') -@php - $user = auth()->user(); -@endphp -@section('content') -

You are logged in as {{ $user->name }} ({{ $user->email }})

-@stop diff --git a/resources/views/pages/bookmarks.blade.php b/resources/views/pages/bookmarks.blade.php deleted file mode 100644 index 55cc801..0000000 --- a/resources/views/pages/bookmarks.blade.php +++ /dev/null @@ -1,52 +0,0 @@ -@extends('layouts.default') -@section('title', 'Bookmarks') -@section('description', 'This is the personal homepage of floppydisk.') -@section('content') - @php - $db_alive = true; - try { - DB::connection()->getPdo(); - } catch (Exception $e) { - $db_alive = false; - } - @endphp - @if (!$db_alive) - @include('components.errors.db-error') - @else - @php - $categories = DB::select(' - SELECT id, name - FROM bookmark__categories - ORDER BY priority ASC - '); - @endphp - - @foreach ($categories as $category) - - - - - @php - $sites = DB::select( - ' - SELECT name, url, description - FROM bookmark__sites - WHERE category_id = ? ORDER BY priority ASC - ', - [$category->id], - ); - @endphp - @foreach ($sites as $site) - - - - @endforeach - -
- @endforeach - @endif -@stop diff --git a/resources/views/pages/bot.blade.php b/resources/views/pages/bot.blade.php deleted file mode 100644 index b9475fc..0000000 --- a/resources/views/pages/bot.blade.php +++ /dev/null @@ -1,7 +0,0 @@ -@extends('layouts.default') -@section('title', 'Discord Bot') -@section('description', '') -@section('content') -

The diskfloppy.me Discord bot blah blah blah blah blah

-

Maybe I'll finish this page later idk

-@stop diff --git a/resources/views/pages/calculators.blade.php b/resources/views/pages/calculators.blade.php deleted file mode 100644 index 5d629ed..0000000 --- a/resources/views/pages/calculators.blade.php +++ /dev/null @@ -1,110 +0,0 @@ -@extends('layouts.default') -@section('title', 'Calculators') -@section('description', 'C a l c u l a t o r s.') -@section('content') -

CASIO fx-CG50

-

TBD

-

Pictures

-

Click images to view full size

- - - - - -

CASIO fx-120 (1977-78)

-

TBD

-

Specifications

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Size8.4cm x 16.2cm x 2.4cm
Weight (w/ battery)209g
TypeScientific
CPUHitachi HD38111A
Registers2 standard
1 constant
4 bracket
1 memory
Features%, +/-, RV, F, Sci, ab⁄c, Sqr, x2, pi, 1⁄x, trig,
hyp, DMS-DD, log, yx, SD, nCr, P-R, n!
Display12-digit VFD (NEC LD8197A)
-

Pictures

-

Click images to view full size

- - - - - -

CASIO fx-82 (1982-85)

-

TBD

-

Pictures

-

Click images to view full size

- - - - - -

Texas Instruments TI-30 (1976-90)

-

TBD

-

Pictures

-

Click images to view full size

- - - - - -

Texet 880 Executive (1977-78)

- -

The calculator measures 74.2mm x 135mm x 22.2mm. It weighs 86g without the battery installed, which is a 9v PP3-type battery. Rather than the usual press-stud type holder, the housing has two metal slide clips. There is also what I assume to be a sponge at one end which is supposed to aid in holding the battery in, however it appears to have gone completely hard and I will most likely replace it in the future. There's small adaptor hole at the top, of which the input isn't specified (though it's generally agreed that it's 4.5v centre-positive).

-

The case is black & silvery colored with a thin brushed metallic front panel. The eight-digit bubble display has an absolutely terrible viewing angle, which means you either have to be holding it under your coat or against your face to read it!

- The keypad is particularly strange in the way that it has 3 cancel buttons, 
[CE]
, 
[C]
and 
[CA]
, while the 
[CS]
button is a Clear Sign button, not another cancel! The keys themselves are particularly stiff and you really have to push them to get them to register. Many 880s suffered something referred to as the "pseudo fixed decimal bug" where, if you typed in 
1 + 1.00 =
, it would display 
2.00
instead of the expected 
2
-

Specifications

- - - - - - - - - - - - - - - - - - - - - - - - - -
Size7.4cm x 13.5cm x 2.2cm
Weight (w/o battery)86
TypeArithmetic
LogicAlgebraic
Power SourcePP3 9v
Display8-digit LED
-

Pictures

-

Click images to view full size

- - - - -@stop diff --git a/resources/views/pages/computers.blade.php b/resources/views/pages/computers.blade.php deleted file mode 100644 index a7cec24..0000000 --- a/resources/views/pages/computers.blade.php +++ /dev/null @@ -1,442 +0,0 @@ -@extends('layouts.default') -@section('title', 'Computers') -@section('description', 'Computers I own or have owned.') -@section('content') - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PICTURESSPECS & DESCRIPTION
2023 MacBook Pro 14" - Quick Specs -
    -
  • Apple M3 Pro
    • -
  • 18GB RAM
    • -
  • 500GB SSD
    • -
  • macOS Sonoma
    • -
-

WHAT

-
2018 MacBook Pro 13" - Quick Specs -
    -
  • Intel i5-8259U @ 2.3GHz
    • -
  • Intel Iris Plus Graphics 655
    • -
  • 8GB RAM
    • -
  • 250GB SSD
    • -
  • macOS Sonoma
    • -
-
2012 Lenovo ThinkPad T430 - Quick Specs -
    -
  • Intel Core i7
    • -
  • 16GB RAM
    • -
  • Windows 7 Professional
    • -
-
2005 IBM ThinkPad X41T - Quick Specs -
    -
  • Intel Pentium M @ 1.6GHz
    • -
  • Mobile Intel Express Chipset Family (128MB)
    • -
  • 1.5GB RAM
    • -
  • 40GB HDD
    • -
  • Windows XP Tablet PC Edition
    • -
-
1999 Dell OptiPlex GX1 - Quick Specs -
    -
  • Intel Pentium II (Deschutes) @ 400MHz
    • -
  • ATI 3D Rage Pro (4MB)
    • -
  • 639MB
    • -
  • 40GB HDD
    • -
  • MS-DOS 6.22 & WFW 3.10
    • -
-
2003 IBM ThinkPad T40 - Quick Specs -
    -
  • Intel Pentium M @ 1.3GHz
    • -
  • ATI Mobility Radeon 7500 (32MB)
    • -
  • 1GB RAM
    • -
  • 30GB HDD
    • -
  • Windows 2000 Professional
    • -
-
2010 HP Compaq Elite 8100 - Quick Specs -
    -
  • Intel Core i7
    • -
  • 16GB RAM
    • -
  • some SSD and an HDD
    • -
  • Windows Vista Ultimate (64-bit)
    • -
-
2014 Mac mini - Quick Specs -
    -
  • Intel Core i5-4278U @ 2.6GHz
    • -
  • Intel Iris Graphics
    • -
  • 8GB RAM
    • -
  • 1TB HDD
    • -
  • VMware ESXi 6.7.0u3
    • -
-
1996 Fujitsu Milan - Quick Specs -
    -
  • Intel Pentium
    • -
  • 32MB RAM
    • -
  • 1215MB HDD
    • -
  • Windows 98 SE
    • -
-
1999 Compaq Armada M300 - Quick Specs -
    -
  • Intel Pentium III
    • -
-
- - -@stop diff --git a/resources/views/pages/guestbook.blade.php b/resources/views/pages/guestbook.blade.php deleted file mode 100644 index a2c39fb..0000000 --- a/resources/views/pages/guestbook.blade.php +++ /dev/null @@ -1,102 +0,0 @@ -@extends('layouts.default') -@section('title', 'Guestbook') -@section('content') - @php - use UAParser\Parser; - $parser = Parser::create(); - $db_alive = true; - try { - DB::connection()->getPdo(); - } catch (Exception $e) { - $db_alive = false; - } - @endphp - @if (!$db_alive) - @include('components.errors.db-error') - @else -
- - - - - - - - -
- @php - $entries = DB::select(' - SELECT name, timestamp, message, agent - FROM guestbook__entries - ORDER BY id DESC - '); - @endphp -

Entries ({{ count($entries) }} total)

- @foreach ($entries as $entry) - @php - $user_agent = $parser->parse($entry->agent); - @endphp - - - - - -
- @endforeach - @endif -@stop diff --git a/resources/views/pages/home.blade.php b/resources/views/pages/home.blade.php deleted file mode 100644 index 01831d6..0000000 --- a/resources/views/pages/home.blade.php +++ /dev/null @@ -1,88 +0,0 @@ -@extends('layouts.default') -@section('title', 'Home') -@section('description', 'This is the personal homepage of floppydisk.') -@section('content') - -

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

- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- - - - - - - - - - - - - - - - -@stop diff --git a/resources/views/pages/music.blade.php b/resources/views/pages/music.blade.php deleted file mode 100644 index dba0750..0000000 --- a/resources/views/pages/music.blade.php +++ /dev/null @@ -1,66 +0,0 @@ -@extends('layouts.default') -@section('title', 'Music') -@section('description', '') -@section('content') - @php - - $cfg = app('config')->get('services')['lastfm']; - $api_root = app('config')->get('app')['api_root']; - - $api_alive = true; - - try { - $data = file_get_contents($api_root.'/lastfm/current'); - } catch (Exception $e) { - $api_alive = false; - } - @endphp - @if (!$api_alive) - @include('components.errors.api-error') - @else - - @php - $current_track = json_decode(file_get_contents($api_root . '/lastfm/current')); - $top_tracks = json_decode(file_get_contents($api_root . '/lastfm/top')); - $count = 0; - @endphp - - - - - - - - -
- - - - - - - - - - - @foreach ($top_tracks as $track) - @php $count++ @endphp - @if ($count >= $cfg['toptracks']+1) - @break - @endif - - - - - - - @endforeach -
-

Top {{ $cfg['toptracks'] }} Tracks (Last 7 days)

-
#TrackArtistPlays
{{ $count }}{{ $track->title }}{{ $track->artist }}{{ $track->playcount }}
- @endif -@stop diff --git a/resources/views/pages/projects.blade.php b/resources/views/pages/projects.blade.php deleted file mode 100644 index aad454b..0000000 --- a/resources/views/pages/projects.blade.php +++ /dev/null @@ -1,16 +0,0 @@ -get('projects'); ?> -@extends('layouts.default') -@section('title', 'Projects') -@section('description', 'My projects') -@section('content') - @foreach ($categories as $category) -

{{ $category['name']}}

- @foreach ($category['projects'] as $project) -
- {{ $project['name'] }} - {{ $project['description'] }}
- Languages: {{ implode(", ", $project['languages']) }} -
-
- @endforeach -@endforeach -@stop diff --git a/resources/views/pages/template.blade.php b/resources/views/pages/template.blade.php deleted file mode 100644 index 18fe585..0000000 --- a/resources/views/pages/template.blade.php +++ /dev/null @@ -1,6 +0,0 @@ -@extends('layouts.default') -@section('title', 'Page Title') -@section('description', 'Page description goes here') -@section('content') -

page content

-@stop diff --git a/resources/views/pages/weather.blade.php b/resources/views/pages/weather.blade.php deleted file mode 100644 index a759534..0000000 --- a/resources/views/pages/weather.blade.php +++ /dev/null @@ -1,61 +0,0 @@ -@extends('layouts.default') -@section('title', 'Weather') -@section('description', 'Data from my weather station') -@section('content') -@php -$api_root = app('config')->get('app')['api_root']; - -function degreesToCompassDirection($degrees) { - $cardinalDirections = [ - 'N', 'NNE', 'NE', 'ENE', 'E', 'ESE', 'SE', 'SSE', - 'S', 'SSW', 'SW', 'WSW', 'W', 'WNW', 'NW', 'NNW', 'N' - ]; - return $cardinalDirections[round($degrees*16/360)]; -} - -$api_alive = true; - -try { - $data = file_get_contents($api_root.'/weather'); -} catch (Exception $e) { - $api_alive = false; -} -@endphp -@if (!$api_alive) - @include('components.errors.api-error') -@else - @php - $data = json_decode(file_get_contents($api_root.'/weather')); - $updated = gmdate('H:i Y-m-d', $data->updated); - $data = $data->current; - @endphp - - - - - - - - - - - - - - - - - - - - - - - -
-(Last Update: {{ $updated }}) -@endif -@stop -- cgit v1.2.3-54-g00ecf