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

Page Titles & All Photos Page #5

Merged
me merged 14 commits from dev into main 2025-06-06 08:02:52 -07:00
Conversation 0 Commits 14 Files Changed 19 +400 -161
19 changed files with 400 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
files/photos/README.md
View File

@ -1,3 +1,9 @@
# Hyperling.com - files/photos/
Used by `http://localhost:8080/photos` to build albums for sharing.
## index.html
Used by `http://localhost:8080/photos` to build and show list of albums.
## all.html
Used by `http://localhost:8080/photos-all` to show all albums at once.

11
main.js
View File

@ -141,6 +141,7 @@ async function main() {
/* AUTOMATIC METHOD BASED ON OBJECT/ARRAY OF WEB SCRIPTS
// Creates routes with the URL of the key and location of the value.
*/
// TBD/TODO would be great to log this as "DATE: ADDRESS hit ROUTER requesting RESOURCE"
for (let key in pages) {
console.log(" * Creating router for", key);
router.get("/" + key, function (req,res) {
@ -182,6 +183,7 @@ async function main() {
`;
// Provide sitemap.xml file for "SEO".
// TBD/TODO would be great to log this as "DATE: ADDRESS hit ROUTER requesting RESOURCE"
console.log(" * Creating router for sitemap.xml");
router.get('/sitemap.xml', function (req, res) {
console.log("sitemap.xml being provided to", req.socket.remoteAddress)
@ -190,6 +192,7 @@ async function main() {
});
// Provide human-usable sitemap links.
// TBD/TODO would be great to log this as "DATE: ADDRESS hit ROUTER requesting RESOURCE"
console.log(" * Creating router for sitemap*");
router.get('/sitemap*', function (req, res) {
console.log("sitemap.html being provided to", req.socket.remoteAddress)
@ -197,6 +200,7 @@ async function main() {
});
// Return a resource from the files folder.
// TBD/TODO would be great to log this as "DATE: ADDRESS hit ROUTER requesting RESOURCE"
console.log(" * Creating router for files");
router.get('/files*', function (req, res) {
console.log("file response to", req.socket.remoteAddress, "asking for", req.url)
@ -212,7 +216,8 @@ async function main() {
case "apk":
mime = "application/vnd.android.package-archive";
break;
case "jpg" || "jpeg":
case "jpg":
case "jpeg":
mime = "image/jpeg";
break;
case "png":
@ -224,7 +229,9 @@ async function main() {
case "zip":
mime = "application/zip";
break;
case "txt" || "csv" || "md":
case "md":
case "txt":
case "csv":
mime = "text/*";
break;
default:

3
pages/about.php
View File

@ -1,5 +1,8 @@
#!/usr/bin/php
<?php
if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "About";
}
include "helpers/body_open.php";
?>

3
pages/apps.php
View File

@ -3,5 +3,8 @@
Synonym for home page.
-->
<?php
if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Apps";
}
include "home.php";
?>

3
pages/contact.php
View File

@ -1,5 +1,8 @@
#!/usr/bin/php
<?php
if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Contact";
}
include "helpers/body_open.php";
?>

3
pages/donate.php
View File

@ -3,5 +3,8 @@
Alias for the support page with a more common name.
-->
<?php
if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Donate";
}
include "support.php";
?>

3
pages/health.php
View File

@ -4,6 +4,9 @@
-->
<?php
$GLOBALS["ADVISORY"] = false;
if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Health";
}
include "helpers/body_open.php";
?>

9
pages/helpers/header.php
View File

@ -1,8 +1,15 @@
#!/usr/bin/php
<?php
if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "";
} else {
$GLOBALS["HEADER_TITLE"] = ": " . $GLOBALS["HEADER_TITLE"];
}
?>
<!DOCTYPE html>
<html lang="en">
<head>
<title>Hyperling</title>
<title>Hyperling<?php echo($GLOBALS["HEADER_TITLE"]); ?></title>
<link rel="icon" sizes="32x32"
href="/files/media/icons/favicon.ico"
>

3
pages/home.php
View File

@ -3,6 +3,9 @@
Landing page, keeping it apps and development projects like old WordPress site.
-->
<?php
if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Home";
}
include "helpers/body_open.php";
?>

2
pages/journey.sh
View File

@ -4,7 +4,7 @@
cd `dirname $0`
# Create the necessary HTML components for a web page.
./helpers/body_open.php
./helpers/body_open.php | sed -e 's/Hyperling/Hyperling: Journey/'
#Content for this page
cat << EOF

3
pages/lists.php
View File

@ -3,6 +3,9 @@
Lists of items which I'd like to share such as gear and frequently used apps.
-->
<?php
if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Lists";
}
include "helpers/body_open.php";
?>

3
pages/media.php
View File

@ -3,6 +3,9 @@
Page for my video links.
-->
<?php
if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Media";
}
include "helpers/body_open.php";
?>

20
pages/photos-all.sh Executable file
View File

@ -0,0 +1,20 @@
#!/bin/bash
# Alias for new All Photos feed.
# Move to main directory.
DIR=`dirname $0`
cd $DIR/..
# Locations of photo scripts.
photos_all=./files/photos/all.html
photos=./pages/photos.sh
# If the all script does not exist,call the generator and ignore its output.
if [[ ! -e $photos_all ]]; then
$photos > /dev/null
fi
## Main ##
cat $photos_all
exit 0

197
pages/photos.sh
View File

@ -2,12 +2,11 @@
# 2024-01-21 Hyperling
# Transition away from PhotoPrism. Helps to save system resources and downsize.
# Static Variables
## Static Variables ##
DIR=`dirname $0`
header="<html>\n\t<header>\n\t\t<title>ALBUM</title>\n\t</header>\n\t<body>"
footer="\n\t</body>\n</html>"
a="a target='_blank' rel='noopener noreferrer'"
# Functions
## Functions ##
function remove_problem_strings {
file="$1"
sed -i -e 's/#!\/usr\/bin\/php//g' $file
@ -20,6 +19,7 @@ cd $DIR/..
HELPER_DIR=./pages/helpers
PHOTOS_DIR=./files/photos
mainpage=$PHOTOS_DIR/index.html
allpage=$PHOTOS_DIR/all.html
# Use the cached version if available.
if [[ -e $mainpage ]]; then
@ -28,28 +28,48 @@ if [[ -e $mainpage ]]; then
exit 0
fi
# Create the necessary HTML components for a web page.
$HELPER_DIR/body_open.php > $mainpage
echo "" >> $mainpage
## Start the main /photos/ page. ##
function start_main_page {
# Create the necessary HTML components for a web page.
$HELPER_DIR/body_open.php > $mainpage
sed -i -e 's/Hyperling/Hyperling: Photos/' $mainpage
echo "" >> $mainpage
# Give the page a description.
echo -e "\t\t<div class='row'>" >> $mainpage
echo -e "\t\t\t<h1 class='col-12 title'>Albums</h1>" >> $mainpage
echo -e "\t\t</div>" >> $mainpage
# Give the page a description.
echo -e "\t\t<div class='row'>" >> $mainpage
echo -e "\t\t\t<h1 class='col-12 title'>Albums</h1>" >> $mainpage
echo -e "\t\t</div>" >> $mainpage
echo -e "\t\t<div class='row'>" >> $mainpage
echo -e "\t\t\t<div class='col-12 text'>" >> $mainpage
echo -en "\t\t\t\t<p>You may click on an album name to " >> $mainpage
echo -en "view all of its files, or click on a specific image to bring up the " >> $mainpage
echo -en "full resolution. On the album pages you may also click an image or " >> $mainpage
echo -e "video name to pull up the full resolution for download.</p>" >> $mainpage
echo -e "\t\t\t</div>" >> $mainpage
echo -e "\t\t</div>" >> $mainpage
echo -e "\t\t<div class='row'>" >> $mainpage
echo -e "\t\t\t<div class='col-12 text'>" >> $mainpage
echo -en "\t\t\t\t<p>You may click on an album name to " >> $mainpage
echo -en "view all of its files, or click on a specific image to bring up the " >> $mainpage
echo -en "full resolution. On the album pages you may also click an image or " >> $mainpage
echo -e "video name to pull up the full resolution for download.</p>" >> $mainpage
echo -e "\t\t\t</div>" >> $mainpage
echo -e "\t\t</div>" >> $mainpage
# Display the album names descending.
ls $PHOTOS_DIR/ | sort -r | while read album; do
echo -e "\t\t<div class='row'>" >> $mainpage
echo -e "\t\t\t<$a href='/photos-all'" >> $mainpage
echo -e "\t\t\t\tclass='col-12 header'>Click Here for the Full Photo Feed" >> $mainpage
echo -e "\t\t\t</a>" >> $mainpage
echo -e "\t\t</div>" >> $mainpage
}
## Close out the main page after the sub pages are done being added. ##
function end_main_page {
# Finish the main /photos/ page.
$HELPER_DIR/body_close.php >> $mainpage
echo "<!-- Built on `date`. -->" >> $mainpage
remove_problem_strings $mainpage
}
## Create the album pages. ##
function build_album_pages {
# Display the album names descending.
ls $PHOTOS_DIR/ | sort -r | while read album; do
# Skip files, only read directories.
if [[ ! -d $PHOTOS_DIR/$album ]]; then
if [[ ! -d "$PHOTOS_DIR/$album" || "$album" == "all" ]]; then
continue
fi
@ -59,8 +79,8 @@ ls $PHOTOS_DIR/ | sort -r | while read album; do
album_name=${album_name//-/ }
echo -e "\t\t<div class='row'>" >> $mainpage
echo -en "\t\t\t<h2 class='col-12 title'>" >> $mainpage
echo -en "<a href='/files/photos/$album/index.html' " >> $mainpage
echo -e "target='_blank' rel='noopener noreferrer'>$album_name</a></h2>" >> $mainpage
echo -en "<$a href='/files/photos/$album/index.html'>" >> $mainpage
echo -e "$album_name</a></h2>" >> $mainpage
echo -e "\t\t</div>" >> $mainpage
# Catch all the upcoming photo records.
@ -70,6 +90,8 @@ ls $PHOTOS_DIR/ | sort -r | while read album; do
page=""
subpage="$PHOTOS_DIR/$album/index.html"
$HELPER_DIR/body_open.php > $subpage
sed -i -e "s/Hyperling/Hyperling: $album_name/" $subpage
echo "" >> $subpage
# Add a back button
echo -en "\n\t\t<div class='row'>\n\t\t\t<a href='/photos'>" >> $subpage
@ -101,8 +123,7 @@ ls $PHOTOS_DIR/ | sort -r | while read album; do
echo -e "\t\t\t\t<p>`cat $photo`</p>" >> $mainpage
else
# Otherwise put in the PHOTOS page list.
echo -en "\t\t\t\t<li class='indent'><a href=/$photo target='_blank' " >> $mainpage
echo -en "rel='noopener noreferrer'>$filename" >> $mainpage
echo -en "\t\t\t\t<li class='indent'><$a href='/$photo'>$filename" >> $mainpage
if [[ $photo == *".mp4" ]]; then
echo -en " [VIDEO]" >> $mainpage
fi
@ -120,8 +141,7 @@ ls $PHOTOS_DIR/ | sort -r | while read album; do
fi
# Add the container for the image and its text.
echo -e "\t\t\t<div class='col-6 center'>" >> $subpage
echo -en "\t\t\t\t<a href=/$photo target='_blank' " >> $subpage
echo -e "rel='noopener noreferrer'>" >> $subpage
echo -en "\t\t\t\t<$a href='/$photo'>" >> $subpage
# Determine what type of media it is, and how to display it.
if [[ $photo == *".mp4" ]]; then
echo -e "\t\t\t\t\t<video width='320px' controls>" >> $subpage
@ -131,7 +151,7 @@ ls $PHOTOS_DIR/ | sort -r | while read album; do
elif [[ $photo == *".md" || $photo == *".txt" ]]; then
echo -e "\t\t\t\t\t<p>`cat $photo`</p>" >> $subpage
else
echo -e "\t\t\t\t\t<img src='/$photo'/ alt="">" >> $subpage
echo -e "\t\t\t\t\t<img src='/$photo' alt=''>" >> $subpage
fi
# Check if it needs an extra descriptive detail.
echo -en "\t\t\t\t\t<p>$filename" >> $subpage
@ -159,15 +179,122 @@ ls $PHOTOS_DIR/ | sort -r | while read album; do
# Close out the ALBUM's page.
$HELPER_DIR/body_close.php >> $subpage
echo "<!-- Built on `date`. -->" >> $subpage
remove_problem_strings $subpage
done
done
}
# Finish the web page.
$HELPER_DIR/body_close.php >> $mainpage
echo "<!-- Built on `date`. -->" >> $mainpage
## Create an ALL page. ##
function build_all_page {
# - Shows all photos in descending order, as an overall feed.
# - Four images wide.
# - Has 2 URLs below the image. One to the album, and one to the image.
# - Image is a URL to itself as with other pages.
# - Images are shown at maximum 500px or so vertical for quick scrolling.
remove_problem_strings $mainpage
# Create/overwrite file.
$HELPER_DIR/body_open.php > $allpage
sed -i -e 's/Hyperling/Hyperling: All Photos/' $allpage
echo "" >> $allpage
# Add header.
echo -e "\t\t<div class='row'>" >> $allpage
echo -e "\t\t\t<h1 class='col-12 title'>All Photo Feed</h1>" >> $allpage
echo -e "\t\t</div>" >> $allpage
# Add images to the page
find $PHOTOS_DIR/ ! -name "*".html | sort -r | while read media_file; do
if [[ -d $media_file
|| "$media_file" == *"/photos/README.md"
]]; then
continue
fi
# Remove the initial '.' from the URI.
media_uri="${media_file//\.\//\/}"
# Path to the image home.
dir_uri="`dirname $media_uri`"
# Prepare variables which will be used throughout the loop.
media_name="`basename $media_uri`"
dir_name="`basename $dir_uri`"
# This must be after the dir_name has been pulled.
dir_uri="$dir_uri/index.html"
# Do not show the file extension for the filename.
media_name="${media_name%%.*}"
# Change underscores and dashes to be spaces for better overflow.
media_name="${media_name//_/ }"
media_name="${media_name//-/ }"
dir_name="${dir_name//_/ }"
dir_name="${dir_name//-/ }"
media="<img src='$media_uri' alt='' style='width:100%'>"
# Determine how to show the file.
if [[ $media_uri == *".mp4" ]]; then
media="<video controls style='width:100%'>"
media="${media}<source src='$media_uri' type=video/mp4>"
media="${media}Your browser does not support videos."
media="${media}</video>"
media_name="$media_name [VIDEO]"
elif [[ $media_uri == *".md" || $media_uri == *".txt" ]]; then
media="<p>`cat $media_file`</p>"
fi
# Add a row if count has reset.
if [[ -z $count ]]; then
count=0
fi
if [[ $count == 0 ]]; then
echo -e "\t\t<div class=row text>" >> $allpage
fi
# Add a column.
echo -e "\t\t\t<div class=col-3>" >> $allpage
# Add the image.
echo -e "\t\t\t\t<div class=center>" >> $allpage
echo -e "\t\t\t\t\t<$a href='$media_uri'>$media</a>" >> $allpage
echo -e "\t\t\t\t</div>" >> $allpage
# Add the URLs.
echo -e "\t\t\t\t<div class=center>" >> $allpage
echo -e "\t\t\t\t\t<p><$a href='$dir_uri'>$dir_name</a></p>" >> $allpage
echo -e "\t\t\t\t</div>" >> $allpage
echo -e "\t\t\t\t<div class=center>" >> $allpage
echo -e "\t\t\t\t\t<p><$a href='$media_uri'>$media_name</a></p>" >> $allpage
echo -e "\t\t\t\t</div>" >> $allpage
# Close the column.
echo -e "\t\t\t</div>" >> $allpage
# Close the row and reset the the count if full.
if [[ $count == 3 ]]; then
echo -e "\t\t</div>" >> $allpage
count=0
else
count=$(( count + 1 ))
fi
done
# Add a final back button.
echo -en "\n\t\t<div class='row'>\n\t\t\t<a href='/photos'>" >> $allpage
echo -e "<h3 class='col-12 title'>Back</h3></a>\n\t\t</div>" >> $allpage
# Finish the ALL page.
$HELPER_DIR/body_close.php >> $allpage
echo "<!-- Built on `date`. -->" >> $allpage
remove_problem_strings $allpage
}
## Main ##
start_main_page
build_album_pages
build_all_page
end_main_page
cat $mainpage
exit 0

3
pages/resume.php
View File

@ -3,6 +3,9 @@
Page for my resume and work skill links.
-->
<?php
if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Resume";
}
include "helpers/body_open.php";
?>

3
pages/support.php
View File

@ -3,6 +3,9 @@
Page to provide ways people can support me.
-->
<?php
if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Support";
}
include "helpers/body_open.php";
?>

24
pages/test.sh
View File

@ -4,27 +4,33 @@
cd `dirname $0`
# Create the necessary HTML components for a web page.
./helpers/body_open.php
echo -e "\t\t<h1>This is a web page written in BASH!!!</h1>"
./helpers/body_open.php | sed -e 's/Hyperling/Hyperling: Test Page!/'
echo -e "\t\t<div class='row'>"
echo -e "\t\t\t<h1 class='col-12 title'>This is a web page written in BASH!!!</h1>"
cat << EOF
<p>
<p class="col-12 text">
Look at all the fancy things we can do!
</p>
<h2>Current Time</h2>
<h2 class="col-12 header">Current Time</h2>
<div class="col-12 text">
<p>
We can use the date command to spit out the time!
</p>
<p>
`date`
</p>
</div>
EOF
# Create a subsection
echo -e "\t\t<h2>Server Neofetch</h2>"
echo -e "\t\t<p>"
#neofetch --stdout
echo "jk lol"
echo -e "\t\t</p>"
echo -e "\t\t\t<h2 class='col-12 header'>Server Neofetch</h2>"
echo -en "\t\t\t<p class='col-12 text'>"
#neofetch --stdout | sed -e 's/\n/<br>/g'
echo -n "jk lol"
echo -e "</p>"
echo -e "\t\t</div>"
# Finish the web page
./helpers/body_close.php

3
pages/videos.php
View File

@ -4,5 +4,8 @@
Deprecated 2024-03-06 for /media.
-->
<?php
if (!isset($GLOBALS["HEADER_TITLE"])) {
$GLOBALS["HEADER_TITLE"] = "Videos";
}
include "media.php";
?>

45
run.sh
View File

@ -21,6 +21,11 @@ function usage {
exit $1
}
function log {
message="$1"
echo -e "`date` - $message"
}
## Parameters ##
while getopts ':p:h' opt; do
@ -36,6 +41,10 @@ while getopts ':p:h' opt; do
esac
done
if [[ -z $ports ]]; then
ports=8080
fi
## Build Environment ##
# Ensure we are executing from this file's directory.
@ -43,11 +52,11 @@ cd $DIR
sudo=""
if [[ $LOGNAME != "root" ]]; then
echo "`date` - Using sudo since user is '$LOGNAME'."
log "Using sudo since user is '$LOGNAME'."
sudo="sudo"
fi
echo "`date` - Check if any system dependencies need installed."
log "Check if any system dependencies need installed."
if [[ ! `which php` ]]; then
echo "- Installing PHP"
$sudo apt-get install -y php-cli
@ -62,7 +71,7 @@ if [[ ! `which npm` ]]; then
fi
# Directories and allowed page types are executable, others are not.
echo "`date` - Fix any strange file permissions."
log "Fix any strange file permissions."
find ./pages/ | while read file; do
if [[ $file == *".php" || $file == *".sh" || -d $file ]]; then
mode=755
@ -72,16 +81,40 @@ find ./pages/ | while read file; do
chmod -c $mode $file
done
echo "`date` - Check if any node modules need updated/installed."
log "Check if any node modules need updated/installed."
npm install
# Reset generated index files.
log "Removing old index files."
find files/photos/ -name "*".html -print -delete
{
count=1
http_code=0
port="${ports%% *}"
photos_uri=":$port/photos/"
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
log "Finished checking for /photos/."
} &
## Main ##
echo "`date` - Start website API."
log "Start website API."
node ./main.js $ports
status=$?
## Finish ##
echo "`date` - Exiting with status '$status'."
log "Exiting with status '$status'."
exit $status