From 8e81858470c2b09e22b383e14ee5439cfc4e6e53 Mon Sep 17 00:00:00 2001 From: Frankie B Date: Wed, 26 Jul 2023 00:08:58 +0100 Subject: Update --- resources/views/components/lastfm.blade.php | 2 +- resources/views/errors/generic-error.blade.php | 2 +- resources/views/errors/guestbook-ipban.blade.php | 4 +- .../views/errors/guestbook-ratelimit.blade.php | 4 +- resources/views/errors/no-auth.blade.php | 2 +- resources/views/includes/footer.blade.php | 6 +- resources/views/includes/header.blade.php | 23 +++-- .../pages/admin/guestbook-del-confirm.blade.php | 2 +- resources/views/pages/admin/guestbook.blade.php | 8 +- resources/views/pages/bookmarks.blade.php | 48 ++++++--- resources/views/pages/calculators.blade.php | 2 +- resources/views/pages/computers.blade.php | 2 +- resources/views/pages/guestbook.blade.php | 112 ++++++++++++--------- resources/views/pages/home.blade.php | 91 ++++++++++++----- resources/views/pages/projects.blade.php | 6 +- 15 files changed, 200 insertions(+), 114 deletions(-) (limited to 'resources/views') diff --git a/resources/views/components/lastfm.blade.php b/resources/views/components/lastfm.blade.php index a44afc5..83312e1 100644 --- a/resources/views/components/lastfm.blade.php +++ b/resources/views/components/lastfm.blade.php @@ -16,6 +16,6 @@ $count = 0; @break @endif {{ str_pad($count+1, 2, '0', STR_PAD_LEFT) }}] {{ $track->name }} • {{ $track->artist }} - ({{ $track->plays }} plays)
+ ({{ $track->plays }} plays)
@php $count++ @endphp @endforeach diff --git a/resources/views/errors/generic-error.blade.php b/resources/views/errors/generic-error.blade.php index 9764a02..6f08ea5 100644 --- a/resources/views/errors/generic-error.blade.php +++ b/resources/views/errors/generic-error.blade.php @@ -2,7 +2,7 @@ @section('title', 'Error 401: Unauthorized User!') @section('content')

{{ $error }}

-
+
@if(isset($description))

{{ $description }}

@endif diff --git a/resources/views/errors/guestbook-ipban.blade.php b/resources/views/errors/guestbook-ipban.blade.php index 257dd72..386d22a 100644 --- a/resources/views/errors/guestbook-ipban.blade.php +++ b/resources/views/errors/guestbook-ipban.blade.php @@ -2,11 +2,11 @@ @section('title', 'Error 403: IP Blocked!') @section('content')

Error 403: IP Blocked!

-
+

Your IP has been banned from submitting to the guestbook.

@if (isset($reason))

Reason: {{ $reason }}

@endif -
+
Click here to go back to the guestbook. @stop diff --git a/resources/views/errors/guestbook-ratelimit.blade.php b/resources/views/errors/guestbook-ratelimit.blade.php index 1890789..7fecd97 100644 --- a/resources/views/errors/guestbook-ratelimit.blade.php +++ b/resources/views/errors/guestbook-ratelimit.blade.php @@ -2,9 +2,9 @@ @section('title', 'Error 429: Overclocking Detected!') @section('content')

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. @stop diff --git a/resources/views/errors/no-auth.blade.php b/resources/views/errors/no-auth.blade.php index 8682010..1d99498 100644 --- a/resources/views/errors/no-auth.blade.php +++ b/resources/views/errors/no-auth.blade.php @@ -2,7 +2,7 @@ @section('title', 'Error 401: Unauthorized User!') @section('content')

Error 401: Unauthorized User!

-
+

Woah there! Only authorized users can access this page. Please log in to proceed.

Ended up here on accident? Click here to return to the homepage!

@stop diff --git a/resources/views/includes/footer.blade.php b/resources/views/includes/footer.blade.php index f9d3590..60d3f46 100644 --- a/resources/views/includes/footer.blade.php +++ b/resources/views/includes/footer.blade.php @@ -4,7 +4,7 @@ Linux NOW!  vim  Valid CSS!  - Valid HTML 4.01!
- This site is best viewed at 1024x768 with 16-bit color or better
- © floppydisk 2021-{{ date('Y') }}, Site Version {{ config('app.version') }}, GitHub
+ Valid HTML 4.01!
+ This site is best viewed at 1024x768 with 16-bit color or better
+ © floppydisk 2021-{{ date('Y') }}, Site Version {{ config('app.version') }}, GitHub
diff --git a/resources/views/includes/header.blade.php b/resources/views/includes/header.blade.php index 01de256..1804077 100644 --- a/resources/views/includes/header.blade.php +++ b/resources/views/includes/header.blade.php @@ -1,18 +1,27 @@ diff --git a/resources/views/pages/admin/guestbook-del-confirm.blade.php b/resources/views/pages/admin/guestbook-del-confirm.blade.php index 99d2a4c..ebdafd2 100644 --- a/resources/views/pages/admin/guestbook-del-confirm.blade.php +++ b/resources/views/pages/admin/guestbook-del-confirm.blade.php @@ -2,7 +2,7 @@ @section('title', 'Delete confirm') @section('content')

Delete Confirmation

-
+

Are you sure you want to delete this entry?

Entry Details:

diff --git a/resources/views/pages/admin/guestbook.blade.php b/resources/views/pages/admin/guestbook.blade.php index 1480ea9..a3b073f 100644 --- a/resources/views/pages/admin/guestbook.blade.php +++ b/resources/views/pages/admin/guestbook.blade.php @@ -1,5 +1,5 @@ @extends('layouts.default-admin') -@section('title', 'guestbook') +@section('title', 'Guestbook') @section('content') @php $entries = DB::select(' @@ -13,8 +13,8 @@
- Name: {{ $entry->name }}
- IP:   {{ $entry->ip_address }}
+ Name: {{ $entry->name }}
+ IP:   {{ $entry->ip_address }}
Date: {{ gmdate("H:i:s - Y-m-d", $entry->timestamp) }} 		@@ -23,7 +23,7 @@
-
+
{{ htmlspecialchars($entry->message) }}
diff --git a/resources/views/pages/bookmarks.blade.php b/resources/views/pages/bookmarks.blade.php index ee91334..cbc67ee 100644 --- a/resources/views/pages/bookmarks.blade.php +++ b/resources/views/pages/bookmarks.blade.php @@ -1,28 +1,46 @@ @extends('layouts.default') -@section('title', 'bookmarks') +@section('title', 'Bookmarks') @section('description', 'This is the personal homepage of floppydisk.') @section('content') -@php - $categories = DB::select(' + @php + $categories = DB::select(' SELECT id, name FROM bookmark__categories ORDER BY priority ASC '); -@endphp + @endphp -@foreach ($categories as $category) -

{{ $category->name }}

- @php - $sites = DB::select(' + @foreach ($categories as $category) + + + + + + + + + + @php + $sites = DB::select( + ' SELECT name, url, description FROM bookmark__sites WHERE category_id = ? ORDER BY priority ASC - ', array($category->id)); - @endphp - + + + @endforeach +
+

{{ $category->name }}

+
+
+
{{ $site->name }} + - {{ $site->description }}
+
@endforeach - -@endforeach @stop diff --git a/resources/views/pages/calculators.blade.php b/resources/views/pages/calculators.blade.php index b90d8ef..5d629ed 100644 --- a/resources/views/pages/calculators.blade.php +++ b/resources/views/pages/calculators.blade.php @@ -1,5 +1,5 @@ @extends('layouts.default') -@section('title', 'calculators') +@section('title', 'Calculators') @section('description', 'C a l c u l a t o r s.') @section('content')

CASIO fx-CG50

diff --git a/resources/views/pages/computers.blade.php b/resources/views/pages/computers.blade.php index 4d32de9..667dd03 100644 --- a/resources/views/pages/computers.blade.php +++ b/resources/views/pages/computers.blade.php @@ -1,5 +1,5 @@ @extends('layouts.default') -@section('title', 'computers') +@section('title', 'Computers') @section('description', 'Computers I own or have owned.') @section('content') diff --git a/resources/views/pages/guestbook.blade.php b/resources/views/pages/guestbook.blade.php index 4a6fdca..a0112c1 100644 --- a/resources/views/pages/guestbook.blade.php +++ b/resources/views/pages/guestbook.blade.php @@ -1,47 +1,58 @@ @extends('layouts.default') -@section('title', 'guestbook') +@section('title', 'Guestbook') @section('content') -
- - @csrf - -
- - - - - - - - - - - - - -
- - - - - {{ $errors->first('name') }} -
- - - - - {{ $errors->first('message') }} -
- -
- -

A few things to note:

- -
+
+ + + + + +
+
+ @csrf + + + + + + + + + + + + + + + + +
+ + + + + {{ $errors->first('name') }} +
+ + + + + {{ $errors->first('message') }} +
+ +
+ +
+

A few things to note:

+
    +
  • You can submit an entry once every hour.
    • +
  • Your IP address is logged but not publically displayed.
    • +
  • Any entries that appear to be spam will be removed.
    • +
+
+ + +
@php $entries = DB::select(' SELECT name, timestamp, message @@ -51,11 +62,16 @@ @endphp

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

@foreach ($entries as $entry) -
- Name: {{ $entry->name }}
- Date: {{ gmdate("H:i:s - Y-m-d", $entry->timestamp) }}

- {{ $entry->message }} -
+ + + + +
+ Submitted by {{ $entry->name }} + on {{ gmdate('H:i:s - Y-m-d', $entry->timestamp) }} +
+ {{ $entry->message }} +
+
@endforeach @stop - diff --git a/resources/views/pages/home.blade.php b/resources/views/pages/home.blade.php index 6ad3013..9471a9e 100644 --- a/resources/views/pages/home.blade.php +++ b/resources/views/pages/home.blade.php @@ -1,18 +1,37 @@ @extends('layouts.default') -@section('title', 'home') +@section('title', 'Home') @section('description', 'This is the personal homepage of floppydisk.') @section('content') -

About me

-

Hi!
- This is the personal homepage of floppydisk. -

-

Interests

-

- ◆ Tech Theatre - Lighting, Stage Management, etc.
- ◆ Programming  - HTML, JavaScript, C#, Java, PHP, Ruby
- ◆ Photography  - Flickr -

+

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

+ + + + + + + + + + + + + + + + + + + +
+

Interests

+
+
+
◆ Tech Theatre- Lighting, Stage Management, etc.
◆ Programming- HTML, JavaScript, C#, Java, PHP, Ruby
◆ Photography- Flickr
+
+ + {{-- @include('components.lastfm') @@ -21,18 +40,42 @@ @include('components.git') + --}} -

Contact

-

Mail: contact@diskfloppy.me
- IRC:  floppydisk @ r-type
-

- -

Elsewhere

-

Mastodon: @floppydisk@c.im
- Matrix:   @floppydisk:arcticfoxes.net
- Twitter:  @floppydisk__
- GitHub:   floppydisk05
- SDF:      ~floppydisk
- profile for floppydisk at Stack Overflow, Q&A for professional and enthusiast programmers -

+ + + + + + + + + + + + + + + + + + + + + + + + +
+

Contact & social

+
+
+
E-mailcontact (at) diskfloppy (dot) me
Mastodon:@floppydisk@c.im
Matrix:@floppydisk:arcticfoxes.net
GitHub:floppydisk05
@stop diff --git a/resources/views/pages/projects.blade.php b/resources/views/pages/projects.blade.php index 08185bf..26a9a0d 100644 --- a/resources/views/pages/projects.blade.php +++ b/resources/views/pages/projects.blade.php @@ -1,16 +1,16 @@ get('projects'); ?> @extends('layouts.default') -@section('title', 'projects') +@section('title', 'Projects') @section('description', 'My projects') @section('content') @foreach ($categories as $category)

{{ $category['name']}}

@foreach ($category['projects'] as $project)
- {{ $project['name'] }} - {{ $project['description'] }}
+ {{ $project['name'] }} - {{ $project['description'] }}
Languages: {{ implode(", ", $project['languages']) }}
-
+
@endforeach @endforeach @stop -- cgit v1.2.3-54-g00ecf