Fix the URL for health priority worksheet on journey page.

Reviewed-on: #17

check_git.sh

@@ -25,7 +25,9 @@ function kill-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!"
 }
 

check_photos.sh

@@ -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

pages/about.php

@@ -55,8 +55,8 @@
 		</div>
 <?php
 	include "subpages/about/notice.php";
-	include "subpages/about/health.php";
 	include "subpages/about/stance.php";
+	include "subpages/about/health.php";
 
 	include "helpers/body_close.php";
 ?>

pages/apps.php

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

pages/books.php

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

pages/contact.php

@@ -47,6 +47,12 @@
 				<ul class="indent"><li>
 					<a href="mailto:me@hyperling.com">me@hyperling.com</a>
 				</li></ul>
+				<p>
+					Other methods such as a few messaging clients can be found here:
+				</p>
+				<ul class="indent"><li>
+					<a href="https://blog.hyperling.com/contact">blog.hyperling.com/contact</a>
+				</li></ul>
 			</div>
 		</div>
 <?php

pages/donate.php

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

pages/freedom.php

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

pages/health.php

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

pages/helpers/advisory.php

@@ -1,13 +1,13 @@
 #!/usr/bin/php
 <?php
-	$show_advisory = true;
+	$show_advisory = false;
 	if ($show_advisory) echo '
 		<div class="row">
 			<p><!-- Gap Area --></p>
 		</div>
 
 		<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/">
 				<div class="col-12 text">
 					<u class="orange">2025-09-28</u>

pages/helpers/banner.php

@@ -10,11 +10,7 @@
 		<a href='/about/'>
 			<div class="row">
 				<?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>
 				';?>
 				<div class="col-<?php echo "$banner_width"; ?> header">
 					<div class="banner-top">Peace</div>
@@ -22,11 +18,7 @@
 					<div class="banner-bottom">Happiness</div>
 				</div>
 				<?php if ($show_pics) echo '
-			<div class="col-3 header center banner-image banner-image02">
+				<div class="col-3 header center banner-image banner-image02"></div>
-				<!--<img src="/files/media/icons/contact.jpg"
-					alt="<<banner02.jpg>>"
-				>-->
-			</div>
 				';?>
 			</div>
 		</a>

pages/helpers/header.php

@@ -30,16 +30,16 @@
 			<?php include "banner.css"; ?>
 		</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>

pages/helpers/menu.php

@@ -1,5 +1,6 @@
 #!/usr/bin/php
 		<div class="row header menu">
+			<!--
 			<ul class="menu-list">
 				<li class="col-3 menu-item"><a href="/">Home</a></li>
 				<li class="col-3 menu-item"><a href="/about/">About</a></li>
@@ -16,4 +17,45 @@
 				</li>
 				<li class="col-3 menu-item"><a href="/photos/">Photos</a></li>
 			</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="/apps/">Apps</a>
+				<a href="/about/">About</a>
+				<a href="/contact/">Contact</a>
+				<a href="/support/">Support</a>
+				| Media:
+				<a href="https://git.hyperling.com/me/"
+					target="_blank" rel="noopener noreferrer">Code</a>
+				<a href="https://works.hyperling.com/tags/books/"
+					target="_blank" rel="noopener noreferrer">Books</a>
+				<a href="https://works.hyperling.com/videos/"
+					target="_blank" rel="noopener noreferrer">Videos</a>
+				<a href="/photos/">Photos</a>
+				| Blog:
+				<a href="https://blog.hyperling.com/categories/articles/"
+					target="_blank" rel="noopener noreferrer">Articles</a>
+				<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://recipes.hyperling.com/categories/guides/"
+					target="_blank" rel="noopener noreferrer">Guides</a>
 		</div>

pages/home.php

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

pages/journey.sh

@@ -111,7 +111,7 @@ cat << EOF
 					Speaking of lifestyle, that is something else I learned from listening
 					to my new role models. "Sleep Water Sugar" as Durianrider used to say.
 					The
-					<a href="https://files.hyperling.com/media/HealthPriorities.pdf"
+					<a href="/files/media/documents/HealthPriorities.pdf"
 						target="_blank">PDF</a>
 					on my main
 					<a href="/about/#health" target="_blank">Health</a>

pages/media.php

@@ -1,8 +1,6 @@
 #!/usr/bin/php
-<!--
-	Page for my video links.
--->
 <?php
+	/* Page for my video links. */
 	if (!isset($GLOBALS["HEADER_TITLE"])) {
 		$GLOBALS["HEADER_TITLE"] = "Media";
 	}
@@ -109,7 +107,7 @@
 		<div class="row">
 			<div class="col-12 text">
 				<p>
-					I don't have social media, so where do my photos and videos go?
+					I don't have social media, so where do my personal photos and videos go?
 					Try right here!
 				</p>
 				<ul class="indent"><li>

pages/photos.sh

@@ -2,6 +2,10 @@
 # 2024-01-21 Hyperling
 # Transition away from PhotoPrism. Helps to save system resources and downsize.
 
+## TBD ##
+# - Have links at the top of the ALL page for jumping between years.
+## End TBD
+
 ## Static Variables ##
 DIR=`dirname $0`
 a="a target='_blank' rel='noopener noreferrer'"
@@ -146,14 +150,14 @@ function build_album_pages {
 			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
+				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\tYour browser does not support videos." >> $subpage
 				echo -e "\t\t\t\t\t</video>" >> $subpage
 			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 loading='lazy' alt='' src='/$photo'>" >> $subpage
 			fi
 			# Check if it needs an extra descriptive detail.
 			echo -en "\t\t\t\t\t<p>$filename" >> $subpage
@@ -229,11 +233,11 @@ function build_all_page {
 		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.
 		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}Your browser does not support videos."
 			media="${media}</video>"

pages/resources.php

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

pages/resume.php

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

pages/subpages/home/announcements.php

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

pages/support.php

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

pages/videos.php

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

run.sh

@@ -123,35 +123,15 @@ log "Removing old index files."
 find files/photos/ -name "*".html -print -delete
 {
 	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 ##
 
-log "Start local cronjob."
+log "Start check_git."
 while true; do
-	check_main cronjob
+	check_main check_git
-	$DIR/cronjob.sh
+	$DIR/check_git.sh
 	sleep 30
 done &