me/nodejs-website
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request 'Update Checker Refactor, New Menu Style, Lazy Load Photos Pages' (#17) from prod into main

Browse Source 
Reviewed-on: #17
This commit was merged in pull request #17.
This commit is contained in:
Hyperling
2025-12-01 10:02:03 -07:00
parent 8a8845d898 20997473a4
commit e79ab36292
20 changed files with 138 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cronjob.sh → check_git.sh
View File

@@ -25,7 +25,9 @@ function kill-project {
} }
function reload-project { function reload-project {
# Nothing to do, run.sh and main.js automatically uses the latest files. # Not much to do, run.sh and main.js automatically uses the latest files.
rm -v files/photos/index.html
# TBD/TODO: Call check_photos.sh once it has been pulled from run.sh.
log "Project reloaded successfully!" log "Project reloaded successfully!"
} }

46
check_photos.sh Executable file
View File

@@ -0,0 +1,46 @@
#!/usr/bin/env bash
# 2025-10-15 Hyperling
# Create script which does the photo checking so that it can be called by
# scripts other than just run.sh, such as if it needs used in check_git.sh.
## Setup ##
DIR="$(dirname -- "${BASH_SOURCE[0]}")"
PROG="$(basename -- "${BASH_SOURCE[0]}")"
cd $DIR
DIR="`pwd`"
NAME="'$PROG'"
function log {
echo -e "`date` : $NAME - $1"
}
## Parameters ##
ports="$1"
## Main ##
count=1
http_code=0
port="${ports%% *}"
photos_uri=":$port/photos/"
beg_time="$SECONDS"
while [[ $http_code != "200" ]]; do
log "Sleeping for '$count' while waiting for $photos_uri to come up."
sleep $count
log "Checking if $photos_uri is available."
http_code="`curl --silent --fail -w '\n%{http_code}' localhost$photos_uri | tail -n 1`"
log "Check for $photos_uri responded with '$http_code'."
if (( $count >= 10 )); then
log "Giving up on loading $photos_uri after '$count' attempts."
break
else
count=$(( count + 1 ))
fi
done
end_time="$SECONDS"
time="$(( $end_time - $beg_time ))"
log "Finished checking for /photos/ after '$time' seconds."
exit 0

4
pages/apps.php
View File

@@ -1,8 +1,6 @@
#!/usr/bin/php #!/usr/bin/php
<!--
Synonym for home page.
-->
<?php <?php
/* Synonym for home page. */
if (!isset($GLOBALS["HEADER_TITLE"])) { if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Apps"; $GLOBALS["HEADER_TITLE"] = "Apps";
} }

4
pages/books.php
View File

@@ -1,8 +1,6 @@
#!/usr/bin/php #!/usr/bin/php
<!--
Alias for where Books menu item should go.
-->
<?php <?php
/* Alias for where Books menu item should go. */
if (!isset($GLOBALS["HEADER_TITLE"])) { if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Books"; $GLOBALS["HEADER_TITLE"] = "Books";
} }

4
pages/donate.php
View File

@@ -1,8 +1,6 @@
#!/usr/bin/php #!/usr/bin/php
<!--
Alias for the support page with a more common name.
-->
<?php <?php
/* Alias for the support page with a more common name. */
if (!isset($GLOBALS["HEADER_TITLE"])) { if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Donate"; $GLOBALS["HEADER_TITLE"] = "Donate";
} }

6
pages/freedom.php
View File

@@ -1,8 +1,6 @@
#!/usr/bin/php #!/usr/bin/php
<!--
Page to provide links for Freedom eBook.
-->
<?php <?php
/* Page to provide links for Freedom eBook. */
$GLOBALS["ADVISORY"] = false; $GLOBALS["ADVISORY"] = false;
if (!isset($GLOBALS["HEADER_TITLE"])) { if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Freedom"; $GLOBALS["HEADER_TITLE"] = "Freedom";
@@ -29,7 +27,7 @@
<div class="row"> <div class="row">
<div class="col-12 text"> <div class="col-12 text">
<p> <p>
Click the link below to download the 4-page PDF: Use the links below to download the 4-page PDF:
</p> </p>
<ul class="indent"> <ul class="indent">
<li> <li>

6
pages/health.php
View File

@@ -1,8 +1,6 @@
#!/usr/bin/php #!/usr/bin/php
<!--
Page to provide ways people can support me.
-->
<?php <?php
/* Page to provide ways people can support me. */
//$GLOBALS["ADVISORY"] = false; //$GLOBALS["ADVISORY"] = false;
if (!isset($GLOBALS["HEADER_TITLE"])) { if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Health"; $GLOBALS["HEADER_TITLE"] = "Health";
@@ -30,7 +28,7 @@
<div class="row"> <div class="row">
<div class="col-12 text"> <div class="col-12 text">
<p> <p>
Click the link below to download the 10-page PDF: Use the links below to download the 10-page PDF:
</p> </p>
<ul class="indent"> <ul class="indent">
<li> <li>

4
pages/helpers/advisory.php
View File

@@ -1,13 +1,13 @@
#!/usr/bin/php #!/usr/bin/php
<?php <?php
$show_advisory = true; $show_advisory = false;
if ($show_advisory) echo ' if ($show_advisory) echo '
<div class="row"> <div class="row">
<p><!-- Gap Area --></p> <p><!-- Gap Area --></p>
</div> </div>
<div class="row center title" id="advisory"> <div class="row center title" id="advisory">
<i><h2 class="col-12 title">Latest Announcement</h2></i> <h2 class="col-12 title"><i class="purple">Latest Announcement</i></h2>
<a href="/freedom/"> <a href="/freedom/">
<div class="col-12 text"> <div class="col-12 text">
<u class="orange">2025-09-28</u> <u class="orange">2025-09-28</u>

30
pages/helpers/banner.php
View File

@@ -9,24 +9,16 @@
?> ?>
<a href='/about/'> <a href='/about/'>
<div class="row"> <div class="row">
<?php if ($show_pics) echo ' <?php if ($show_pics) echo '
<div class="col-3 header center banner-image banner-image01"> <div class="col-3 header center banner-image banner-image01"></div>
<!-<img src="/files/media/icons/home.jpg" ';?>
alt="<<banner01.jpg>>" <div class="col-<?php echo "$banner_width"; ?> header">
>--> <div class="banner-top">Peace</div>
</div> <div class="banner-middle">Love</div>
';?> <div class="banner-bottom">Happiness</div>
<div class="col-<?php echo "$banner_width"; ?> header"> </div>
<div class="banner-top">Peace</div> <?php if ($show_pics) echo '
<div class="banner-middle">Love</div> <div class="col-3 header center banner-image banner-image02"></div>
<div class="banner-bottom">Happiness</div> ';?>
</div>
<?php if ($show_pics) echo '
<div class="col-3 header center banner-image banner-image02">
<!--<img src="/files/media/icons/contact.jpg"
alt="<<banner02.jpg>>"
>-->
</div>
';?>
</div> </div>
</a> </a>

22
pages/helpers/header.php
View File

@@ -30,16 +30,16 @@
<?php include "banner.css"; ?> <?php include "banner.css"; ?>
</style> </style>
<meta property="og:title" content="Hyperling"/> <meta property="og:title" content="Hyperling">
<meta property="og:description" content="Apps, eBooks, media, and other resources from the brands Hyperling and HyperVegan."/> <meta property="og:description" content="Apps, eBooks, media, and other resources from the brands Hyperling and HyperVegan.">
<meta property="og:site_name" content="Hyperling"/> <meta property="og:site_name" content="Hyperling">
<meta property="og:url" content="https://hyperling.com/"/> <meta property="og:url" content="https://hyperling.com/">
<meta property="og:type" content="website"/> <meta property="og:type" content="website">
<meta property="og:image" content="https://hyperling.com/files/media/icons/home.jpg"/> <meta property="og:image" content="https://hyperling.com/files/media/icons/home.jpg">
<meta name="referrer" content="same-origin"/> <meta name="referrer" content="same-origin">
<meta name="twitter:card" content="summary_large_image" /> <meta name="twitter:card" content="summary_large_image">
<meta name="twitter:title" content="Hyperling" /> <meta name="twitter:title" content="Hyperling">
<meta name="twitter:description" content="Apps, eBooks, media, and other resources from the brands Hyperling and HyperVegan." /> <meta name="twitter:description" content="Apps, eBooks, media, and other resources from the brands Hyperling and HyperVegan.">
<meta name="twitter:image" content="https://hyperling.com/files/media/icons/home.jpg" /> <meta name="twitter:image" content="https://hyperling.com/files/media/icons/home.jpg">
</head> </head>

41
pages/helpers/menu.php
View File

@@ -1,5 +1,6 @@
#!/usr/bin/php #!/usr/bin/php
<div class="row header menu"> <div class="row header menu">
<!--
<ul class="menu-list"> <ul class="menu-list">
<li class="col-3 menu-item"><a href="/">Home</a></li> <li class="col-3 menu-item"><a href="/">Home</a></li>
<li class="col-3 menu-item"><a href="/about/">About</a></li> <li class="col-3 menu-item"><a href="/about/">About</a></li>
@@ -16,4 +17,44 @@
</li> </li>
<li class="col-3 menu-item"><a href="/photos/">Photos</a></li> <li class="col-3 menu-item"><a href="/photos/">Photos</a></li>
</ul> </ul>
-->
<!--
<ul class="menu-list">
<li class="col-3 menu-item"></li>
<li class="col-3 menu-item">
<a href="https://blog.hyperling.com"
target="_blank" rel="noopener noreferrer"
>Blog</a>
</li>
<li class="col-3 menu-item">
<a href="https://recipes.hyperling.com"
target="_blank" rel="noopener noreferrer"
>Recipes</a>
</li>
<li class="col-3 menu-item"></li>
</ul>
-->
<p class="menu-list">
Main :
<a href="/">Home</a>
<a href="/about/">About</a>
<a href="/contact/">Contact</a>
<a href="/support/">Support</a>
| Media :
<a href="/apps/">Apps</a>
<a href="https://git.hyperling.com/me/"
target="_blank" rel="noopener noreferrer">Git</a>
<a href="https://works.hyperling.com/tags/books/"
target="_blank" rel="noopener noreferrer">Books</a>
<a href="https://odysee.com/@HyperVegan:2"
target="_blank" rel="noopener noreferrer">Videos</a>
<a href="/photos/">Photos</a>
| Blog:
<a href="https://recipes.hyperling.com/categories/recipes/"
target="_blank" rel="noopener noreferrer">Recipes</a>
<a href="https://blog.hyperling.com/categories/musings/"
target="_blank" rel="noopener noreferrer">Poetry</a>
<a href="https://blog.hyperling.com/categories/guides/"
target="_blank" rel="noopener noreferrer">Guides</a>
</div> </div>

4
pages/home.php
View File

@@ -1,8 +1,6 @@
#!/usr/bin/php #!/usr/bin/php
<!--
Landing page, keeping it apps and development projects like old WordPress site.
-->
<?php <?php
/* Landing page, keeping it apps and development projects like old WordPress site. */
if (!isset($GLOBALS["HEADER_TITLE"])) { if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Announcements"; $GLOBALS["HEADER_TITLE"] = "Announcements";
} }

4
pages/media.php
View File

@@ -1,8 +1,6 @@
#!/usr/bin/php #!/usr/bin/php
<!--
Page for my video links.
-->
<?php <?php
/* Page for my video links. */
if (!isset($GLOBALS["HEADER_TITLE"])) { if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Media"; $GLOBALS["HEADER_TITLE"] = "Media";
} }

8
pages/photos.sh
View File

@@ -146,14 +146,14 @@ function build_album_pages {
echo -en "\t\t\t\t<$a href='/$photo'>" >> $subpage echo -en "\t\t\t\t<$a href='/$photo'>" >> $subpage
# Determine what type of media it is, and how to display it. # Determine what type of media it is, and how to display it.
if [[ $photo == *".mp4" ]]; then if [[ $photo == *".mp4" ]]; then
echo -e "\t\t\t\t\t<video width='320px' controls>" >> $subpage echo -e "\t\t\t\t\t<video width='320px' preload='none' controls>" >> $subpage
echo -e "\t\t\t\t\t\t<source src='/$photo' type=video/mp4>" >> $subpage echo -e "\t\t\t\t\t\t<source src='/$photo' type=video/mp4>" >> $subpage
echo -e "\t\t\t\t\t\tYour browser does not support videos." >> $subpage echo -e "\t\t\t\t\t\tYour browser does not support videos." >> $subpage
echo -e "\t\t\t\t\t</video>" >> $subpage echo -e "\t\t\t\t\t</video>" >> $subpage
elif [[ $photo == *".md" || $photo == *".txt" ]]; then elif [[ $photo == *".md" || $photo == *".txt" ]]; then
echo -e "\t\t\t\t\t<p>`cat $photo`</p>" >> $subpage echo -e "\t\t\t\t\t<p>`cat $photo`</p>" >> $subpage
else else
echo -e "\t\t\t\t\t<img src='/$photo' alt=''>" >> $subpage echo -e "\t\t\t\t\t<img loading='lazy' alt='' src='/$photo'>" >> $subpage
fi fi
# Check if it needs an extra descriptive detail. # Check if it needs an extra descriptive detail.
echo -en "\t\t\t\t\t<p>$filename" >> $subpage echo -en "\t\t\t\t\t<p>$filename" >> $subpage
@@ -229,11 +229,11 @@ function build_all_page {
dir_name="${dir_name//_/ }" dir_name="${dir_name//_/ }"
dir_name="${dir_name//-/ }" dir_name="${dir_name//-/ }"
media="<img src='$media_uri' alt='' style='width:100%'>" media="<img style='width:100%' loading='lazy' alt='' src='$media_uri'>"
# Determine how to show the file. # Determine how to show the file.
if [[ $media_uri == *".mp4" ]]; then if [[ $media_uri == *".mp4" ]]; then
media="<video controls style='width:100%'>" media="<video style='width:100%' preload='none' controls>"
media="${media}<source src='$media_uri' type=video/mp4>" media="${media}<source src='$media_uri' type=video/mp4>"
media="${media}Your browser does not support videos." media="${media}Your browser does not support videos."
media="${media}</video>" media="${media}</video>"

4
pages/resources.php
View File

@@ -1,8 +1,6 @@
#!/usr/bin/php #!/usr/bin/php
<!--
Lists of items which I'd like to share such as gear and frequently used apps.
-->
<?php <?php
/* Lists of items which I'd like to share such as gear and frequently used apps. */
if (!isset($GLOBALS["HEADER_TITLE"])) { if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Resources"; $GLOBALS["HEADER_TITLE"] = "Resources";
} }

4
pages/resume.php
View File

@@ -1,8 +1,6 @@
#!/usr/bin/php #!/usr/bin/php
<!--
Page for my resume and work skill links.
-->
<?php <?php
/* Page for my resume and work skill links. */
if (!isset($GLOBALS["HEADER_TITLE"])) { if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Resume"; $GLOBALS["HEADER_TITLE"] = "Resume";
} }

1
pages/subpages/home/announcements.php
View File

@@ -54,7 +54,6 @@
>Watch the announcement here | (HyperVegan: "Expense Tracker App")</a> >Watch the announcement here | (HyperVegan: "Expense Tracker App")</a>
</p> </p>
</div> </div>
</a>
</div> </div>
<div class="row"> <div class="row">

4
pages/support.php
View File

@@ -1,8 +1,6 @@
#!/usr/bin/php #!/usr/bin/php
<!--
Page to provide ways people can support me.
-->
<?php <?php
/* Page to provide ways people can support me. */
if (!isset($GLOBALS["HEADER_TITLE"])) { if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Support"; $GLOBALS["HEADER_TITLE"] = "Support";
} }

8
pages/videos.php
View File

@@ -1,9 +1,9 @@
#!/usr/bin/php #!/usr/bin/php
<!--
Old page for my video links.
Deprecated 2024-03-06 for /media.
-->
<?php <?php
/*
Old page for my video links.
Deprecated 2024-03-06 for /media.
*/
if (!isset($GLOBALS["HEADER_TITLE"])) { if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Videos"; $GLOBALS["HEADER_TITLE"] = "Videos";
} }

28
run.sh
View File

@@ -123,35 +123,15 @@ log "Removing old index files."
find files/photos/ -name "*".html -print -delete find files/photos/ -name "*".html -print -delete
{ {
check_main photos check_main photos
count=1 $DIR/check_photos.sh "$ports"
http_code=0
port="${ports%% *}"
photos_uri=":$port/photos/"
beg_time="$SECONDS"
while [[ $http_code != "200" ]]; do
log "Sleeping for '$count' while waiting for $photos_uri to come up."
sleep $count
log "Checking if $photos_uri is available."
http_code="`curl --silent --fail -w '\n%{http_code}' localhost$photos_uri | tail -n 1`"
log "Check for $photos_uri responded with '$http_code'."
if (( $count >= 10 )); then
log "Giving up on loading $photos_uri after '$count' attempts."
break
else
count=$(( count + 1 ))
fi
done
end_time="$SECONDS"
time="$(( $end_time - $beg_time ))"
log "Finished checking for /photos/ after '$time' seconds."
} & } &
## Main ## ## Main ##
log "Start local cronjob." log "Start check_git."
while true; do while true; do
check_main cronjob check_main check_git
$DIR/cronjob.sh $DIR/check_git.sh
sleep 30 sleep 30
done & done &