commit a540e98c242e937e33b62038c195f11d28cd4147
parent 3447a93a3871ee0e39ffaf52bd4cd98b29824514
Author: Wim Dupont <wim@wimdupont.com>
Date: Wed, 27 Nov 2024 23:47:49 +0100
updated layout and added software
Diffstat:
10 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/generate.sh b/generate.sh
@@ -1,14 +1,16 @@
#!/bin/bash
readonly NGINX_DIR=/usr/share/nginx/html
-readonly ARTICLES_DEST_DIR=$NGINX_DIR/articles
-readonly GUIDE_DEST_DIR=$NGINX_DIR/guide
+readonly BLOG_DEST_DIR=$NGINX_DIR/blog
+readonly GUIDES_DEST_DIR=$NGINX_DIR/guides
+readonly SOFTWARE_DEST_DIR=$NGINX_DIR/software
readonly RSS_DEST_FILE=$NGINX_DIR/rss.xml
readonly REPO_PATH=$(echo "$(dirname -- "$(readlink -f "${BASH_SOURCE}")")")
readonly PAGES_REPO_DIR=$REPO_PATH/pages
readonly BLOG_REPO_DIR=$PAGES_REPO_DIR/blog
readonly GUIDE_REPO_DIR=$PAGES_REPO_DIR/guides
+readonly SOFTWARE_REPO_DIR=$PAGES_REPO_DIR/software
readonly ERROR_REPO_DIR=$PAGES_REPO_DIR/error
readonly BOOKLIST_FILE=$REPO_PATH/content/booklist.csv
readonly LINKS_FILE=$REPO_PATH/content/links.csv
@@ -19,8 +21,9 @@ rm -rf $NGINX_DIR/*
mkdir -p $NGINX_DIR/files
mkdir -p $NGINX_DIR/stylesheets
-mkdir -p $ARTICLES_DEST_DIR
-mkdir -p $GUIDE_DEST_DIR
+mkdir -p $BLOG_DEST_DIR
+mkdir -p $GUIDES_DEST_DIR
+mkdir -p $SOFTWARE_DEST_DIR
cp -rf $REPO_PATH/images "$NGINX_DIR/files"
cp $REPO_PATH/pubkey.gpg "$NGINX_DIR/files"
@@ -77,22 +80,24 @@ as_href() {
generate_href_page() {
name=$1
- root_ref=$2
+ title=$2
ref_dir=$3
with_date=$4
cd $ref_dir
get_page_header "${name}" > "$NGINX_DIR/$name.adoc"
+ test -n "${title}" && echo -e "[.subheader]\n${title}\n" >> "$NGINX_DIR/$name.adoc"
+
readarray -t files < <(stat -c '%Y %n' * | sort -n -r)
for file in "${files[@]#* }" ; do
filename=$(echo "${file##*/}" | sed 's/.html//')
if [[ $with_date -eq 1 ]]; then
date=$(date -r "$file" "+%Y-%m-%d")
- art_fileref=$(as_href "$root_ref" "$filename" "$date")
+ art_fileref=$(as_href "$name" "$filename" "$date")
else
- art_fileref=$(as_href "$root_ref" "$filename")
+ art_fileref=$(as_href "$name" "$filename")
fi
echo "* $art_fileref" >> "$NGINX_DIR/$name.adoc"
done
@@ -198,10 +203,12 @@ generate_books_page
generate_links_page
generate_pages $PAGES_REPO_DIR $NGINX_DIR
-generate_pages $GUIDE_REPO_DIR $GUIDE_DEST_DIR "../" 1
-generate_pages $BLOG_REPO_DIR $ARTICLES_DEST_DIR "../" 1
+generate_pages $GUIDE_REPO_DIR $GUIDES_DEST_DIR "../" 1
+generate_pages $SOFTWARE_REPO_DIR $SOFTWARE_DEST_DIR "../" 1
+generate_pages $BLOG_REPO_DIR $BLOG_DEST_DIR "../" 1
-generate_href_page "guides" "guide" $GUIDE_DEST_DIR
-generate_href_page "blog" "articles" $ARTICLES_DEST_DIR 1
+generate_href_page "guides" "" $GUIDES_DEST_DIR
+generate_href_page "software" "Shameless advertisement of some of my easy hackable software" $SOFTWARE_DEST_DIR
+generate_href_page "blog" "" $BLOG_DEST_DIR 1
generate_rss
diff --git a/images/cex-view.png b/images/cex-view.png
Binary files differ.
diff --git a/images/home.png b/images/home.png
Binary files differ.
diff --git a/images/scal-view.png b/images/scal-view.png
Binary files differ.
diff --git a/main.css b/main.css
@@ -50,6 +50,16 @@ a:hover {
padding: 1em;
}
+.nav img {
+ margin-bottom: 0.5em;
+}
+
+.nav.emoji a {
+ font-size: 25px;
+ color: transparent;
+ text-shadow: 0 0 0 #56c8ff;
+}
+
.subheader {
color: #bdbdbd;
text-align: center;
@@ -68,6 +78,11 @@ a:hover {
text-align: right;
}
+.imageblock.bordered img {
+ margin-top: 1.5em;
+ border: 1px solid #56c8ff;
+}
+
.center {
text-align: center;
}
diff --git a/pages/donate.adoc b/pages/donate.adoc
@@ -1,4 +1,7 @@
[.subheader]
+Digital information and software should be free of charge, but here are some options to donate if you'd really want to
+
+[.subheader]
--
[discrete]
== Monero (XMR)
diff --git a/pages/footer/footer.adoc b/pages/footer/footer.adoc
@@ -1,6 +1,11 @@
[.nav]
--
+image:{root_nav}files/images/home.png[title=Home,alt=Home,width=25,height=25,link="{root_nav}home"]
image:{root_nav}files/images/git.png[title=Git,alt=Git,width=25,height=25,link="https://git.wimdupont.com"]
image:{root_nav}files/images/rssfeed.png[title=RSS,alt=RSS,width=25,height=25,link="{root_nav}rss.xml"]
+
+
+link:{root_nav}contact[Contact]
+link:{root_nav}donate[Donate]
--
diff --git a/pages/header/header.adoc b/pages/header/header.adoc
@@ -8,11 +8,9 @@
[.nav]
--
-link:{root_nav}home[Home]
-link:{root_nav}books[Books]
link:{root_nav}blog[Blog]
link:{root_nav}guides[Guides]
+link:{root_nav}software[Software]
+link:{root_nav}books[Books]
link:{root_nav}links[Links]
-link:{root_nav}contact[Contact]
-link:{root_nav}donate[Donate]
--
diff --git a/pages/software/cex.adoc b/pages/software/cex.adoc
@@ -0,0 +1,11 @@
+:figure-caption!:
+
+C/Curses file EXplorer (link:https://git.wimdupont.com/cex/files[source code])
+
+A small TUI file manager for awesome people like you to play with.
+Has navigation with default vim-like bindings, preview of files, make, copy, move, delete files and directories,
+search by name in current directory, change permissions,...
+
+[.bordered]
+image::../files/images/cex-view.png[title=cex screenshot,alt=cex screenshot]
+
diff --git a/pages/software/scal.adoc b/pages/software/scal.adoc
@@ -0,0 +1,9 @@
+:figure-caption!:
+
+Simple calendar (link:https://git.wimdupont.com/scal/files[source code])
+
+A small TUI program to manage your appointments. Create/delete notes for specific dates, these can also be weekly/monthly/yearly. The data is persisted in a readable file.
+
+[.bordered]
+image::../files/images/scal-view.png[title=scal screenshot,alt=scal screenshot]
+
