From d9b6b877240171c6bd355cc510ffe145f6ed984b Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Halili Date: Fri, 24 Mar 2023 17:36:48 +0000 Subject: [PATCH] chore(global): :construction_worker: improve 404 page and Gitpod config, plus some VSC ws config changes Also in this commit, we also apply changes needed for the use of social cards in the theme we do use. Signed-off-by: Andrei Jiroh Halili --- .build.yml | 15 ++++++++++----- .gitignore | 3 ++- .gitpod.Dockerfile | 13 +++++++++++++ .gitpod.yml | 12 +++++++++++- .vscode/settings.json | 15 ++++++++++++++- overrides/404.html | 3 ++- 6 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 .gitpod.Dockerfile diff --git a/.build.yml b/.build.yml index a047eee..550f54c 100644 --- a/.build.yml +++ b/.build.yml @@ -1,12 +1,19 @@ image: alpine/edge environment: FF_ENABLE_COMMIT_DATA: "true" + FF_GENERATE_SOCIAL_CARDS: "true" packages: - openssh-client - python3 - py3-pip - py3-wheel - py3-setuptools + - cairo-dev + - freetype-dev + - libffi-dev + - jpeg-dev + - libpng-dev + - zlib-dev sources: - https://git.sr.ht/~ajhalili2006/tildeweb secrets: @@ -32,12 +39,10 @@ tasks: cd tildeweb && pip3 install -r requirements.txt --user export PATH="$PATH:$HOME/.local/bin" - mkdocs build -d public -f mkdocs.yml \ - && mkdocs build -d public_ctrl-c -f mkdocs.ctrl-c.yml \ - && mkdocs build -d public_pages.dev -f mkdocs.pages.dev.yml + mkdocs build -d public -f mkdocs.yml - generate-archive: | cd tildeweb - tar cvzf tildeweb-prod-build.tar.gz public public_ctrl-c public_pages.dev + tar cvzf tildeweb-prod-build.tar.gz public - deploy: | if [ "$BUILD_REASON" == "patchset" ] && [ "$BUILD_SUBMITTER" == "hub.sr.ht" ]; then complete-build @@ -51,7 +56,7 @@ tasks: echo "StrictHostKeyChecking=no" >> ~/.ssh/config eval $(ssh-agent) && ssh-add ~/.ssh/passwordless-auth-sshfs rsync -rP public ajhalili2006@vern.cc:/home/ajhalili2006/public_html/ || true - rsync -rP public_ctrl-c ajhalili2006@ctrl-c.club:/home/ajhalili2006/public_html/ || true + rsync -rP public ajhalili2006@ctrl-c.club:/home/ajhalili2006/public_html/ || true #rsync -rP gmi ajhalili2006@vern.cc:/home/ajhalili2006/public_gemini/ #rsync -rP gmi ajhalili2006@ctrl-c.club:/home/ajhalili2006/public_gemini/ diff --git a/.gitignore b/.gitignore index 85a7029..4cd44a2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ public_html public_ctrl-c site venv -.venv \ No newline at end of file +.venv +.cache \ No newline at end of file diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile new file mode 100644 index 0000000..8cf2ce8 --- /dev/null +++ b/.gitpod.Dockerfile @@ -0,0 +1,13 @@ +FROM gitpod/workspace-full + +# https://squidfunk.github.io/mkdocs-material/setup/setting-up-social-cards/#linux +RUN sudo install-packages \ + libcairo2-dev \ + libfreetype6-dev \ + libffi-dev \ + libjpeg-dev \ + libpng-dev \ + libz-dev + +# brew maintenance + install ShellCheck and Hadolint +RUN brew update && brew install hadolint shellcheck \ No newline at end of file diff --git a/.gitpod.yml b/.gitpod.yml index fd74751..ef55ace 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -4,12 +4,22 @@ # Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart +checkoutLocation: tildeweb-ajhalili2006 + +image: + file: .gitpod.Dockerfile + tasks: - init: | python3 -m venv .venv source .venv/bin/activate pip3 install -r requirements.txt - command: mkdocs serve + command: | + # since it might not be carried on venv shell, we did this instead + FF_ENABLE_COMMIT_DATA=true mkdocs serve + name: site-localdev + env: + FF_ENABLE_COMMIT_DATA: "true" # Required to use git-revision-date-localized, like in prod. ports: - port: 8000 diff --git a/.vscode/settings.json b/.vscode/settings.json index 3eec7fe..afaadec 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,5 +4,18 @@ }, "marquee.widgets.npm-stats.packageNames": [ "@ajhalili2006/tildeverse-web" - ] + ], + "conventionalCommits.scopes": [ + "mkdocs.yml", + "gitlab-ci", + "builds.sr.ht", + "docker", + "markdown", + "readme", + "meta", + "global" + ], + "conventionalCommits.autoCommit": false, + "conventionalCommits.promptCI": true, + "git.alwaysSignOff": true } \ No newline at end of file diff --git a/overrides/404.html b/overrides/404.html index 8d9d57f..95f3aa0 100644 --- a/overrides/404.html +++ b/overrides/404.html @@ -5,7 +5,8 @@ {% extends "main.html" %} {% block content %}

404 - Not found

+

Either the URL has been moved without redirects, taken down for any reasons, or it doesn't exist (yet).

Troubleshooting tips

Try checking the URL for any misspellings or improper use of dashes, underscores and periods.

-

If you're developing this site and you hit an URL that's

+

If you're working in this site and you hit an URL configured for redirects (at Cloudflare Pages or similiar), try configuring redirects in the config first.

{% endblock %}