From 80c65791361d6c001eded55ab992416f1b3759fc Mon Sep 17 00:00:00 2001 From: Victor Westerlund Date: Mon, 18 Nov 2024 20:53:29 +0000 Subject: [PATCH] chore: add support for Vegvisir 3.1 (#11) This PR adds basic support for the upcoming release Vegvisir 3.1 Reviewed-on: https://codeberg.org/vlw/vlw.se/pulls/11 Co-authored-by: Victor Westerlund Co-committed-by: Victor Westerlund --- install.sh | 6 +++--- public/about.php | 10 +++++----- public/about/battlestation-retired.php | 6 +++--- public/about/battlestation.php | 14 +++++++------- {assets => public/assets}/css/fonts.css | 0 {assets => public/assets}/css/pages/about.css | 0 .../css/pages/about/battlestation-retired.css | 0 .../assets}/css/pages/about/battlestation.css | 0 {assets => public/assets}/css/pages/contact.css | 0 {assets => public/assets}/css/pages/error.css | 0 {assets => public/assets}/css/pages/index.css | 0 {assets => public/assets}/css/pages/search.css | 0 {assets => public/assets}/css/pages/work.css | 0 .../document.css => public/assets/css/shell.css | 0 .../assets}/fonts/roboto-mono.woff2 | Bin .../assets}/js/modules/glitch/Generator.mjs | 0 .../assets}/js/modules/glitch/Glitch.mjs | 0 .../assets}/js/modules/glitch/GlitchWorker.js | 0 public/assets/js/modules/npm/Elevent.mjs | 1 + {assets => public/assets}/js/pages/about.js | 0 .../js/pages/about/battlestation-retired.js | 0 .../assets}/js/pages/about/battlestation.js | 0 {assets => public/assets}/js/pages/contact.js | 0 {assets => public/assets}/js/pages/error.js | 0 {assets => public/assets}/js/pages/index.js | 2 +- {assets => public/assets}/js/pages/search.js | 0 {assets => public/assets}/js/pages/work.js | 0 .../document.js => public/assets/js/shell.js | 0 .../assets}/media/battlestation.svg | 0 {assets => public/assets}/media/gazing.jpg | Bin .../assets}/media/glitch_b64/1.txt | 0 .../assets}/media/glitch_b64/2.txt | 0 .../assets}/media/glitch_b64/3.txt | 0 .../assets}/media/glitch_b64/4.txt | 0 .../assets}/media/icons/chevron.svg | 0 {assets => public/assets}/media/icons/close.svg | 0 .../assets}/media/icons/codeberg.svg | 0 {assets => public/assets}/media/icons/email.svg | 0 .../assets}/media/icons/libera.svg | 0 .../assets}/media/icons/matrix.svg | 0 {assets => public/assets}/media/icons/pin.svg | 0 .../assets}/media/icons/search.svg | 0 {assets => public/assets}/media/line.svg | 0 {assets => public/assets}/media/ogp.jpg | Bin {assets => public/assets}/media/travolta.gif | Bin {assets => public/assets}/media/vw.svg | 0 public/contact.php | 16 ++++++++-------- public/error.php | 4 ++-- public/index.php | 14 +++++++------- public/search.php | 12 ++++++------ shells/document.php => public/shell.php | 16 ++++++++-------- public/work.php | 6 +++--- 52 files changed, 54 insertions(+), 53 deletions(-) rename {assets => public/assets}/css/fonts.css (100%) mode change 100755 => 100644 rename {assets => public/assets}/css/pages/about.css (100%) mode change 100755 => 100644 rename {assets => public/assets}/css/pages/about/battlestation-retired.css (100%) rename {assets => public/assets}/css/pages/about/battlestation.css (100%) rename {assets => public/assets}/css/pages/contact.css (100%) mode change 100755 => 100644 rename {assets => public/assets}/css/pages/error.css (100%) mode change 100755 => 100644 rename {assets => public/assets}/css/pages/index.css (100%) mode change 100755 => 100644 rename {assets => public/assets}/css/pages/search.css (100%) mode change 100755 => 100644 rename {assets => public/assets}/css/pages/work.css (100%) mode change 100755 => 100644 rename assets/css/shells/document.css => public/assets/css/shell.css (100%) rename {assets => public/assets}/fonts/roboto-mono.woff2 (100%) rename {assets => public/assets}/js/modules/glitch/Generator.mjs (100%) mode change 100755 => 100644 rename {assets => public/assets}/js/modules/glitch/Glitch.mjs (100%) mode change 100755 => 100644 rename {assets => public/assets}/js/modules/glitch/GlitchWorker.js (100%) mode change 100755 => 100644 create mode 120000 public/assets/js/modules/npm/Elevent.mjs rename {assets => public/assets}/js/pages/about.js (100%) mode change 100755 => 100644 rename {assets => public/assets}/js/pages/about/battlestation-retired.js (100%) rename {assets => public/assets}/js/pages/about/battlestation.js (100%) rename {assets => public/assets}/js/pages/contact.js (100%) mode change 100755 => 100644 rename {assets => public/assets}/js/pages/error.js (100%) mode change 100755 => 100644 rename {assets => public/assets}/js/pages/index.js (96%) mode change 100755 => 100644 rename {assets => public/assets}/js/pages/search.js (100%) mode change 100755 => 100644 rename {assets => public/assets}/js/pages/work.js (100%) mode change 100755 => 100644 rename assets/js/shells/document.js => public/assets/js/shell.js (100%) rename {assets => public/assets}/media/battlestation.svg (100%) rename {assets => public/assets}/media/gazing.jpg (100%) mode change 100755 => 100644 rename {assets => public/assets}/media/glitch_b64/1.txt (100%) mode change 100755 => 100644 rename {assets => public/assets}/media/glitch_b64/2.txt (100%) mode change 100755 => 100644 rename {assets => public/assets}/media/glitch_b64/3.txt (100%) mode change 100755 => 100644 rename {assets => public/assets}/media/glitch_b64/4.txt (100%) mode change 100755 => 100644 rename {assets => public/assets}/media/icons/chevron.svg (100%) rename {assets => public/assets}/media/icons/close.svg (100%) mode change 100755 => 100644 rename {assets => public/assets}/media/icons/codeberg.svg (100%) rename {assets => public/assets}/media/icons/email.svg (100%) mode change 100755 => 100644 rename {assets => public/assets}/media/icons/libera.svg (100%) mode change 100755 => 100644 rename {assets => public/assets}/media/icons/matrix.svg (100%) rename {assets => public/assets}/media/icons/pin.svg (100%) mode change 100755 => 100644 rename {assets => public/assets}/media/icons/search.svg (100%) mode change 100755 => 100644 rename {assets => public/assets}/media/line.svg (100%) mode change 100755 => 100644 rename {assets => public/assets}/media/ogp.jpg (100%) rename {assets => public/assets}/media/travolta.gif (100%) rename {assets => public/assets}/media/vw.svg (100%) mode change 100755 => 100644 rename shells/document.php => public/shell.php (79%) diff --git a/install.sh b/install.sh index 3e887ba..7879587 100644 --- a/install.sh +++ b/install.sh @@ -3,8 +3,8 @@ composer install --optimize-autoloader npm install # (Re)create public NPM modules folder -rm -r assets/js/modules/npm -mkdir assets/js/modules/npm +rm -r public/assets/js/modules/npm +mkdir public/assets/js/modules/npm # Create link to Elevent MJS from public JS modules folder -ln -sr node_modules/elevent/src/Elevent.mjs assets/js/modules/npm/Elevent.mjs \ No newline at end of file +ln -sr node_modules/elevent/src/Elevent.mjs public/assets/js/modules/npm/Elevent.mjs \ No newline at end of file diff --git a/public/about.php b/public/about.php index bfee38b..37cecd9 100644 --- a/public/about.php +++ b/public/about.php @@ -1,4 +1,4 @@ - +

Victor Westerlund

@@ -17,7 +17,7 @@

Personal

Coffee, of course.. and..

At times, I become a true, amateur, armchair detective for a variety of your typical-nerdy topics that I find interesting. And will spend a disproportionate to real-world-personal-use amount of time reading about that stuff too.

-

Another silent passion of mine that comes out every few years is building computers and fiddling with weird networking stuff.

+

Another silent passion of mine that comes out every few years is building computers and fiddling with weird networking stuff.

And then of course I don't mind some occational gaming, and watching movies and TV-series.

@@ -25,7 +25,7 @@

Here are some projects I'm working on right now:

* Vegvisir: A web navigation framework for PHP.

* Reflect: A REST API framework for PHP developers.

-

There is more stuff on my works page and even more stuff on my Codeberg profile.

+

There is more stuff on my works page and even more stuff on my Codeberg profile.

and even EVEN more stuff on my Forgejo

@@ -37,7 +37,7 @@
-

Let's work on something together or just have a chat? Write me a line!

+

Let's work on something together or just have a chat? Write me a line!

- + diff --git a/public/about/battlestation-retired.php b/public/about/battlestation-retired.php index 82d5ad0..e8bcb75 100644 --- a/public/about/battlestation-retired.php +++ b/public/about/battlestation-retired.php @@ -1,4 +1,4 @@ - +

Retired components

I'd be happy to send you any component that you find here for "free". The only thing I ask in return is that you pay for shipping.

@@ -29,8 +29,8 @@

Please note; I can't guarantee the thing you want will work as expected, or work at all! But I will test the compontent for you if I still have means at hand to do so.

- +
- \ No newline at end of file + \ No newline at end of file diff --git a/public/about/battlestation.php b/public/about/battlestation.php index 008ad39..21a753f 100644 --- a/public/about/battlestation.php +++ b/public/about/battlestation.php @@ -55,15 +55,15 @@ $config = $api->call(Endpoints::BATTLESTATION->value)->get(); ?> - + ok): ?>

Battle­stations

I'd be happy to send you, dear reader, any component that you find here for "free" that hasn't been retired yet. The only thing I ask in return is that you pay for shipping.

I can't guarantee the thing you want will work as expected, or work at all! But I will test the compontent for you if I still have means at hand to do so.

- - + +
@@ -93,7 +93,7 @@ data-drives-twodotfive="value), MbStorageSlotFormfactorEnum::TWODOTFIVE->value)) ?>" data-drives-threedotfive="value), MbStorageSlotFormfactorEnum::THREEDOTFIVE->value)) ?>" > - +
@@ -345,7 +345,7 @@

DRAM

- +
@@ -424,7 +424,7 @@

Storage

- +
@@ -493,4 +493,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/css/fonts.css b/public/assets/css/fonts.css old mode 100755 new mode 100644 similarity index 100% rename from assets/css/fonts.css rename to public/assets/css/fonts.css diff --git a/assets/css/pages/about.css b/public/assets/css/pages/about.css old mode 100755 new mode 100644 similarity index 100% rename from assets/css/pages/about.css rename to public/assets/css/pages/about.css diff --git a/assets/css/pages/about/battlestation-retired.css b/public/assets/css/pages/about/battlestation-retired.css similarity index 100% rename from assets/css/pages/about/battlestation-retired.css rename to public/assets/css/pages/about/battlestation-retired.css diff --git a/assets/css/pages/about/battlestation.css b/public/assets/css/pages/about/battlestation.css similarity index 100% rename from assets/css/pages/about/battlestation.css rename to public/assets/css/pages/about/battlestation.css diff --git a/assets/css/pages/contact.css b/public/assets/css/pages/contact.css old mode 100755 new mode 100644 similarity index 100% rename from assets/css/pages/contact.css rename to public/assets/css/pages/contact.css diff --git a/assets/css/pages/error.css b/public/assets/css/pages/error.css old mode 100755 new mode 100644 similarity index 100% rename from assets/css/pages/error.css rename to public/assets/css/pages/error.css diff --git a/assets/css/pages/index.css b/public/assets/css/pages/index.css old mode 100755 new mode 100644 similarity index 100% rename from assets/css/pages/index.css rename to public/assets/css/pages/index.css diff --git a/assets/css/pages/search.css b/public/assets/css/pages/search.css old mode 100755 new mode 100644 similarity index 100% rename from assets/css/pages/search.css rename to public/assets/css/pages/search.css diff --git a/assets/css/pages/work.css b/public/assets/css/pages/work.css old mode 100755 new mode 100644 similarity index 100% rename from assets/css/pages/work.css rename to public/assets/css/pages/work.css diff --git a/assets/css/shells/document.css b/public/assets/css/shell.css similarity index 100% rename from assets/css/shells/document.css rename to public/assets/css/shell.css diff --git a/assets/fonts/roboto-mono.woff2 b/public/assets/fonts/roboto-mono.woff2 similarity index 100% rename from assets/fonts/roboto-mono.woff2 rename to public/assets/fonts/roboto-mono.woff2 diff --git a/assets/js/modules/glitch/Generator.mjs b/public/assets/js/modules/glitch/Generator.mjs old mode 100755 new mode 100644 similarity index 100% rename from assets/js/modules/glitch/Generator.mjs rename to public/assets/js/modules/glitch/Generator.mjs diff --git a/assets/js/modules/glitch/Glitch.mjs b/public/assets/js/modules/glitch/Glitch.mjs old mode 100755 new mode 100644 similarity index 100% rename from assets/js/modules/glitch/Glitch.mjs rename to public/assets/js/modules/glitch/Glitch.mjs diff --git a/assets/js/modules/glitch/GlitchWorker.js b/public/assets/js/modules/glitch/GlitchWorker.js old mode 100755 new mode 100644 similarity index 100% rename from assets/js/modules/glitch/GlitchWorker.js rename to public/assets/js/modules/glitch/GlitchWorker.js diff --git a/public/assets/js/modules/npm/Elevent.mjs b/public/assets/js/modules/npm/Elevent.mjs new file mode 120000 index 0000000..899f42b --- /dev/null +++ b/public/assets/js/modules/npm/Elevent.mjs @@ -0,0 +1 @@ +../../../../../node_modules/elevent/src/Elevent.mjs \ No newline at end of file diff --git a/assets/js/pages/about.js b/public/assets/js/pages/about.js old mode 100755 new mode 100644 similarity index 100% rename from assets/js/pages/about.js rename to public/assets/js/pages/about.js diff --git a/assets/js/pages/about/battlestation-retired.js b/public/assets/js/pages/about/battlestation-retired.js similarity index 100% rename from assets/js/pages/about/battlestation-retired.js rename to public/assets/js/pages/about/battlestation-retired.js diff --git a/assets/js/pages/about/battlestation.js b/public/assets/js/pages/about/battlestation.js similarity index 100% rename from assets/js/pages/about/battlestation.js rename to public/assets/js/pages/about/battlestation.js diff --git a/assets/js/pages/contact.js b/public/assets/js/pages/contact.js old mode 100755 new mode 100644 similarity index 100% rename from assets/js/pages/contact.js rename to public/assets/js/pages/contact.js diff --git a/assets/js/pages/error.js b/public/assets/js/pages/error.js old mode 100755 new mode 100644 similarity index 100% rename from assets/js/pages/error.js rename to public/assets/js/pages/error.js diff --git a/assets/js/pages/index.js b/public/assets/js/pages/index.js old mode 100755 new mode 100644 similarity index 96% rename from assets/js/pages/index.js rename to public/assets/js/pages/index.js index 1fb023f..5d22581 --- a/assets/js/pages/index.js +++ b/public/assets/js/pages/index.js @@ -103,6 +103,6 @@ import { Elevent } from "/assets/js/modules/npm/Elevent.mjs"; }); // Reset color on navigation - vv.Navigation.rootShellElement.addEventListener(vv.Navigation.EVENTS.STARTED, () => updateColor(), { once: true }); + vv.Navigation.shellElement.addEventListener(vv.Navigation.EVENTS.STARTED, () => updateColor(), { once: true }); } } \ No newline at end of file diff --git a/assets/js/pages/search.js b/public/assets/js/pages/search.js old mode 100755 new mode 100644 similarity index 100% rename from assets/js/pages/search.js rename to public/assets/js/pages/search.js diff --git a/assets/js/pages/work.js b/public/assets/js/pages/work.js old mode 100755 new mode 100644 similarity index 100% rename from assets/js/pages/work.js rename to public/assets/js/pages/work.js diff --git a/assets/js/shells/document.js b/public/assets/js/shell.js similarity index 100% rename from assets/js/shells/document.js rename to public/assets/js/shell.js diff --git a/assets/media/battlestation.svg b/public/assets/media/battlestation.svg similarity index 100% rename from assets/media/battlestation.svg rename to public/assets/media/battlestation.svg diff --git a/assets/media/gazing.jpg b/public/assets/media/gazing.jpg old mode 100755 new mode 100644 similarity index 100% rename from assets/media/gazing.jpg rename to public/assets/media/gazing.jpg diff --git a/assets/media/glitch_b64/1.txt b/public/assets/media/glitch_b64/1.txt old mode 100755 new mode 100644 similarity index 100% rename from assets/media/glitch_b64/1.txt rename to public/assets/media/glitch_b64/1.txt diff --git a/assets/media/glitch_b64/2.txt b/public/assets/media/glitch_b64/2.txt old mode 100755 new mode 100644 similarity index 100% rename from assets/media/glitch_b64/2.txt rename to public/assets/media/glitch_b64/2.txt diff --git a/assets/media/glitch_b64/3.txt b/public/assets/media/glitch_b64/3.txt old mode 100755 new mode 100644 similarity index 100% rename from assets/media/glitch_b64/3.txt rename to public/assets/media/glitch_b64/3.txt diff --git a/assets/media/glitch_b64/4.txt b/public/assets/media/glitch_b64/4.txt old mode 100755 new mode 100644 similarity index 100% rename from assets/media/glitch_b64/4.txt rename to public/assets/media/glitch_b64/4.txt diff --git a/assets/media/icons/chevron.svg b/public/assets/media/icons/chevron.svg similarity index 100% rename from assets/media/icons/chevron.svg rename to public/assets/media/icons/chevron.svg diff --git a/assets/media/icons/close.svg b/public/assets/media/icons/close.svg old mode 100755 new mode 100644 similarity index 100% rename from assets/media/icons/close.svg rename to public/assets/media/icons/close.svg diff --git a/assets/media/icons/codeberg.svg b/public/assets/media/icons/codeberg.svg similarity index 100% rename from assets/media/icons/codeberg.svg rename to public/assets/media/icons/codeberg.svg diff --git a/assets/media/icons/email.svg b/public/assets/media/icons/email.svg old mode 100755 new mode 100644 similarity index 100% rename from assets/media/icons/email.svg rename to public/assets/media/icons/email.svg diff --git a/assets/media/icons/libera.svg b/public/assets/media/icons/libera.svg old mode 100755 new mode 100644 similarity index 100% rename from assets/media/icons/libera.svg rename to public/assets/media/icons/libera.svg diff --git a/assets/media/icons/matrix.svg b/public/assets/media/icons/matrix.svg similarity index 100% rename from assets/media/icons/matrix.svg rename to public/assets/media/icons/matrix.svg diff --git a/assets/media/icons/pin.svg b/public/assets/media/icons/pin.svg old mode 100755 new mode 100644 similarity index 100% rename from assets/media/icons/pin.svg rename to public/assets/media/icons/pin.svg diff --git a/assets/media/icons/search.svg b/public/assets/media/icons/search.svg old mode 100755 new mode 100644 similarity index 100% rename from assets/media/icons/search.svg rename to public/assets/media/icons/search.svg diff --git a/assets/media/line.svg b/public/assets/media/line.svg old mode 100755 new mode 100644 similarity index 100% rename from assets/media/line.svg rename to public/assets/media/line.svg diff --git a/assets/media/ogp.jpg b/public/assets/media/ogp.jpg similarity index 100% rename from assets/media/ogp.jpg rename to public/assets/media/ogp.jpg diff --git a/assets/media/travolta.gif b/public/assets/media/travolta.gif similarity index 100% rename from assets/media/travolta.gif rename to public/assets/media/travolta.gif diff --git a/assets/media/vw.svg b/public/assets/media/vw.svg old mode 100755 new mode 100644 similarity index 100% rename from assets/media/vw.svg rename to public/assets/media/vw.svg diff --git a/public/contact.php b/public/contact.php index 65d9a94..51c2e6d 100644 --- a/public/contact.php +++ b/public/contact.php @@ -55,28 +55,28 @@ $date = new Date(); ?> - +

Let's chat!

The best way to get in touch is definitely by email, or through the form on this page. The time in Sweden is format("h:i a") ?> right now, I am currently is_available() ? "available" : "not available" ?> and will hopefully reply in about get_estimated_reply_hours() ?> hours.

- +
- +

encrypt your message with PGP

Please consider encrypting your message with my PGP key, even if your message doesn't contain anything sensitive. The key is also available via WKD, and is listed on the openPGP key server for victor@vlw.se.

Fingerprint for victor@vlw.se
DCE987311CB5D2A252F58951D0AD730E1057DFC6

@@ -90,7 +90,7 @@

For reference only, please don't send personal emails to this address

DC603DA049903D707B7F1DB39AF727FB576F5A00

- + @@ -133,4 +133,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/public/error.php b/public/error.php index 9b8e7ba..36e4c84 100644 --- a/public/error.php +++ b/public/error.php @@ -1,6 +1,6 @@ - +

404

- \ No newline at end of file + \ No newline at end of file diff --git a/public/index.php b/public/index.php index 24ec29c..1280b29 100644 --- a/public/index.php +++ b/public/index.php @@ -7,15 +7,15 @@ } ?> - +
- + -
  • work
    •  -
  • about
    •  -
  • contact
    •  +
  • work
    •  +
  • about
    •  +
  • contact
    •      - +
    A portrait of Victor with a pair of cartoon glasses drawn in the shape of two V's over his eyes - \ No newline at end of file + \ No newline at end of file diff --git a/public/search.php b/public/search.php index 6a0d6d0..fd4f7d0 100644 --- a/public/search.php +++ b/public/search.php @@ -26,7 +26,7 @@ $response = $api->call(Endpoints::SEARCH->value)->params([SEARCH_PARAM => $_GET[SEARCH_PARAM]])->get(); ?> - +
    @@ -34,7 +34,7 @@
    - +
    @@ -45,7 +45,7 @@ value]): ?>
    -

    Work

     +

    Work

    value]) ?> search result(s) from my public work

    @@ -67,7 +67,7 @@ value]): ?> - + @@ -89,11 +89,11 @@
    - +

    Start typing to search

    - \ No newline at end of file + \ No newline at end of file diff --git a/shells/document.php b/public/shell.php similarity index 79% rename from shells/document.php rename to public/shell.php index a9e1927..6599b23 100644 --- a/shells/document.php +++ b/public/shell.php @@ -38,8 +38,8 @@ - - + + Victor Westerlund @@ -47,16 +47,16 @@
    - + - +
    @@ -64,13 +64,13 @@
    - +

    start typing to search

     - + \ No newline at end of file diff --git a/public/work.php b/public/work.php index b6e45ae..7c5f1e7 100644 --- a/public/work.php +++ b/public/work.php @@ -31,10 +31,10 @@ } ?> - +
    - +

    Most of my free open-source software has been moved from GitHub to Codeberg. I also have a mirror of everything and some smaller projects on Forgejo.

    @@ -178,4 +178,4 @@

    Something went wrong!

    - \ No newline at end of file + \ No newline at end of file