From 5271e4080e6f953c7a02bf0777b2446e57176b8a Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Halili Date: Wed, 11 Dec 2024 11:05:32 +0800 Subject: [PATCH] chore(global): update configs and overrides from the backburner Signed-off-by: Andrei Jiroh Halili --- .gitignore | 4 +++- .gitlab-ci.yml | 12 +++++++----- .vscode/settings.json | 1 + Pipfile | 1 + Pipfile.lock | 11 ++++++++++- mkdocs.yml | 7 ++++++- overrides/partials/content.html | 24 ++++++++++-------------- requirements.txt | 1 + 8 files changed, 39 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 13ed7b2..9735508 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,6 @@ venv node_modules .env *.tar.gz -gmi/api/commit \ No newline at end of file +gmi/api/commit +.env.keys +*.decrypted \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81ea97b..ab059b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,20 +18,22 @@ default: # Global builds and stuff variables: - DEBUG: "1" # MAY HORRIBLY LEAK SECRETS, PROCEED WITH CAUTION + #DEBUG: "1" # MAY HORRIBLY LEAK SECRETS, PROCEED WITH CAUTION + # feature flags FF_ENABLE_COMMIT_DATA: "true" FF_GENERATE_SOCIAL_CARDS: "true" + #FF_GIT_COMMITTERS_API: "true" SECURE_FILES_DOWNLOAD_PATH: .secretskit GIT_DEPTH: "0" + # dotenvx stuff DOTENV_PRIVATE_KEY: $DOTENV_PRIVATE_KEY_CI + MKDOCS_GIT_COMMITTERS_PLUGIN_TOKEN: $CI_JOB_TOKEN pages: stage: build script: - - | - source /tmp/.ssh-agent.env - bash ./bin/build.sh - npm run deploy + - bash ./bin/build.sh + - npm run deploy artifacts: paths: # The folder that contains the files to be exposed at the Page URL diff --git a/.vscode/settings.json b/.vscode/settings.json index 759adae..8c1feac 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -38,6 +38,7 @@ "Autist", "BDFL", "gatekeep", + "SABDFL", "Yubikey" ], "dotenv.enableAutocloaking": false diff --git a/Pipfile b/Pipfile index 12892a6..4f5d93b 100644 --- a/Pipfile +++ b/Pipfile @@ -13,6 +13,7 @@ cairosvg = "*" mkdocs-rss-plugin = "*" mkdocs-git-committers-plugin-2 = "*" mkdocs-autolinks-plugin = "*" +mkdocs-git-authors-plugin = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 3f93057..b14fb01 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "f87d557d02966cbcde3572eae1a8d848cab1ba152503baeb1c06254ec2ecd511" + "sha256": "a053fb975cf504b2febb9d410545e54d02a9f78778292fb828eb79d76a78c726" }, "pipfile-spec": 6, "requires": { @@ -448,6 +448,15 @@ "markers": "python_version >= '3.8'", "version": "==0.2.0" }, + "mkdocs-git-authors-plugin": { + "hashes": [ + "sha256:77f97c321e08a8757beb866293eb257070b11cd5a080976bc6696b249cbade4f", + "sha256:f6cefc4dc832865d26f7f9f944c0a8c7dc852742d79320f3800e0d97814e2a84" + ], + "index": "pypi", + "markers": "python_version >= '3.8'", + "version": "==0.9.2" + }, "mkdocs-git-committers-plugin-2": { "hashes": [ "sha256:ea1f80a79cedc42289e0b8e973276df04fb94f56e0ae3efc5385fb28547cf5cb", diff --git a/mkdocs.yml b/mkdocs.yml index 43ca145..4b3a52b 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -142,7 +142,12 @@ plugins: enabled: true fallback_to_build_date: true enable_creation_date: true - # TODO: Get Insiders for contributors and authors + #- git-committers: + # enabled: !ENV [FF_GIT_COMMITTERS_API, false] + # repository: andreijiroh-dev/website + # branch: main + # token: !ENV ["MKDOCS_GIT_COMMITTERS_PLUGIN_TOKEN"] + - git-authors # makrdown extensions markdown_extensions: diff --git a/overrides/partials/content.html b/overrides/partials/content.html index a8d67b8..b19b510 100644 --- a/overrides/partials/content.html +++ b/overrides/partials/content.html @@ -20,20 +20,16 @@ Why am I seeing this? {% endif %} -{% if "material/tags" in config.plugins and tags %} + + {% if "material/tags" in config.plugins and tags %} {% include "partials/tags.html" %} -{% endif %} -{% include "partials/actions.html" %} -{% if "\x3ch1" not in page.content %} + {% endif %} + {% include "partials/actions.html" %} + {% if "\x3ch1" not in page.content %}

{{ page.title | d(config.site_name, true)}}

-{% endif %} -{{ page.content }} -{% if page.meta and ( -page.meta.git_revision_date_localized or -page.meta.revision_date -) %} - {% include "partials/source-file.html" %} -{% endif %} -{% include "partials/feedback.html" %} -{% include "partials/comments.html" %} + {% endif %} + {{ page.content }} + {% include "partials/source-file.html" %} + {% include "partials/feedback.html" %} + {% include "partials/comments.html" %} diff --git a/requirements.txt b/requirements.txt index 4e40994..a7ba332 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,6 +25,7 @@ mergedeep==1.3.4; python_version >= '3.6' --hash=sha256:0096d52e9dad9939c3d975a7 mkdocs==1.6.1; python_version >= '3.8' --hash=sha256:7b432f01d928c084353ab39c57282f29f92136665bdd6abf7c1ec8d822ef86f2 --hash=sha256:db91759624d1647f3f34aa0c3f327dd2601beae39a366d6e064c03468d35c20e mkdocs-autolinks-plugin==0.7.1; python_version >= '3.4' --hash=sha256:445ddb9b417b7795856c30801bb430773186c1daf210bdeecf8305f55a47d151 --hash=sha256:5c6c17f6649b68e79a9ef0b2648d59f3072e18002b90ee1586a64c505f11ab12 mkdocs-get-deps==0.2.0; python_version >= '3.8' --hash=sha256:162b3d129c7fad9b19abfdcb9c1458a651628e4b1dea628ac68790fb3061c60c --hash=sha256:2bf11d0b133e77a0dd036abeeb06dec8775e46efa526dc70667d8863eefc6134 +mkdocs-git-authors-plugin==0.9.2; python_version >= '3.8' --hash=sha256:77f97c321e08a8757beb866293eb257070b11cd5a080976bc6696b249cbade4f --hash=sha256:f6cefc4dc832865d26f7f9f944c0a8c7dc852742d79320f3800e0d97814e2a84 mkdocs-git-committers-plugin-2==2.4.1; python_version >= '3.8' and python_version < '4' --hash=sha256:ea1f80a79cedc42289e0b8e973276df04fb94f56e0ae3efc5385fb28547cf5cb --hash=sha256:ec9c1d81445606c471337d1c4a1782c643b7377077b545279dc18b86b7362c6d mkdocs-git-revision-date-localized-plugin==1.3.0; python_version >= '3.8' --hash=sha256:439e2f14582204050a664c258861c325064d97cdc848c541e48bb034a6c4d0cb --hash=sha256:c99377ee119372d57a9e47cff4e68f04cce634a74831c06bc89b33e456e840a1 mkdocs-material==9.5.44; python_version >= '3.8' --hash=sha256:47015f9c167d58a5ff5e682da37441fc4d66a1c79334bfc08d774763cacf69ca --hash=sha256:f3a6c968e524166b3f3ed1fb97d3ed3e0091183b0545cedf7156a2a6804c56c0