From 9148636d6669397f262954360d8276eb3ca67795 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Mon, 1 Apr 2024 23:06:51 -0700 Subject: [PATCH 01/10] add missing apt-get install jq --- .forgejo/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 4b901ad..47eb3e0 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -15,6 +15,8 @@ jobs: fetch-depth: 0 - name: Install latest mdbook run: | + apt-get update -qq + apt-get install -qq --yes jq tag="$(curl 'https://api.github.com/repos/rust-lang/mdbook/releases/latest' | jq -r '.tag_name')" url="https://github.com/rust-lang/mdbook/releases/download/${tag}/mdbook-${tag}-x86_64-unknown-linux-gnu.tar.gz" mkdir mdbook From 8e4420b93b8ff44389ae299794ae14906abda348 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Mon, 1 Apr 2024 23:22:21 -0700 Subject: [PATCH 02/10] update deploy.yml --- .forgejo/workflows/deploy.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 47eb3e0..99dfb84 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -16,7 +16,7 @@ jobs: - name: Install latest mdbook run: | apt-get update -qq - apt-get install -qq --yes jq + apt-get install -qq jq tag="$(curl 'https://api.github.com/repos/rust-lang/mdbook/releases/latest' | jq -r '.tag_name')" url="https://github.com/rust-lang/mdbook/releases/download/${tag}/mdbook-${tag}-x86_64-unknown-linux-gnu.tar.gz" mkdir mdbook @@ -28,11 +28,15 @@ jobs: - name: Push to rendered branch run: | hash="$(git log -n 1 --format=reference)" - git branch -D rendered || true - git worktree add -b rendered --orphan dist + git branch -D rendered &> /dev/null || true + git worktree add --detach --no-checkout dist mv dist/.git book/.git + rmdir dist mv book/ dist/ cd dist + git switch --orphan=rendered git add . + git config user.name "CI" + git config user.email "ci@noreply.libre-chip.org" git commit -n -m "rendered version of $hash" git push -f origin rendered \ No newline at end of file From edbbdd8860bf611f25f90cbca830599495bd75b7 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Mon, 1 Apr 2024 23:36:29 -0700 Subject: [PATCH 03/10] set remote url --- .forgejo/workflows/deploy.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 99dfb84..0c5d6e9 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -39,4 +39,6 @@ jobs: git config user.name "CI" git config user.email "ci@noreply.libre-chip.org" git commit -n -m "rendered version of $hash" - git push -f origin rendered \ No newline at end of file + [[ "${{ github.server_url }}" =~ ^"https://"(.*)$ ]] + git remote set-url origin "https://x-access-token:${{ github.token }}@${BASH_REMATCH[1]}/${{ github.repository }}" + git push -f origin rendered From 46a3eacae5059aba7ec33e3f0922b4836320d623 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Tue, 2 Apr 2024 15:06:42 -0700 Subject: [PATCH 04/10] add Conduct.md --- src/Conduct.md | 3 +++ src/SUMMARY.md | 1 + 2 files changed, 4 insertions(+) create mode 100644 src/Conduct.md diff --git a/src/Conduct.md b/src/Conduct.md new file mode 100644 index 0000000..b0f526b --- /dev/null +++ b/src/Conduct.md @@ -0,0 +1,3 @@ +This project adopts the [Rust Code of conduct](https://www.rust-lang.org/policies/code-of-conduct). + +Because we are just starting, we don't have a Moderation Team yet. \ No newline at end of file diff --git a/src/SUMMARY.md b/src/SUMMARY.md index 4078caf..1b0cd95 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -1,4 +1,5 @@ * [Libre-Chip](README.md) +* [Conduct](Conduct.md) * [License](LICENSE.md) * [GPL 3.0](gpl-3.0.md) * [LGPL 3.0](lgpl-3.0.md) From ed34789a1dce6d32d8cac69f6775ef2b88029fb0 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Tue, 2 Apr 2024 15:20:38 -0700 Subject: [PATCH 05/10] add conduct link to main page --- src/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/README.md b/src/README.md index 343dcad..3a1740e 100644 --- a/src/README.md +++ b/src/README.md @@ -6,3 +6,5 @@ We're just starting and our website doesn't have a whole lot on it yet... * [Libre-Chip's Git](https://git.libre-chip.org/) * Chat at [#libre-chip:matrix.org](https://matrix.to/#/#libre-chip:matrix.org) or at #libre-chip on [OFTC IRC](https://www.oftc.net/) + +* We have a [Code of Conduct](Conduct.md) From 188c393ebce5530c728ddcc329faec854e1a0249 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Wed, 10 Apr 2024 01:10:40 -0700 Subject: [PATCH 06/10] add link to announement subscription system --- src/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/README.md b/src/README.md index 3a1740e..e8ca3df 100644 --- a/src/README.md +++ b/src/README.md @@ -4,7 +4,10 @@ Libre-Chip is a project for creating [Free/Libre](https://en.wikipedia.org/wiki/ We're just starting and our website doesn't have a whole lot on it yet... +* [Subscribe for Announcements via E-Mail](https://libre-chip.org/subscription)[^subscribe] * [Libre-Chip's Git](https://git.libre-chip.org/) * Chat at [#libre-chip:matrix.org](https://matrix.to/#/#libre-chip:matrix.org) or at #libre-chip on [OFTC IRC](https://www.oftc.net/) * We have a [Code of Conduct](Conduct.md) + +[^subscribe]: We don't have sending announcement emails working yet, though you can still sign-up for when we get that working! \ No newline at end of file From bfa8bd253cb9ba1bcc1358891767f8c2411a63fe Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Thu, 11 Apr 2024 00:11:57 -0700 Subject: [PATCH 07/10] add subscription page, used as a template for subscribe-list --- book.toml | 6 ++++- src/README.md | 2 +- src/SUMMARY.md | 1 + src/custom.css | 49 +++++++++++++++++++++++++++++++++++++++ src/subscription/index.md | 38 ++++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 src/custom.css create mode 100644 src/subscription/index.md diff --git a/book.toml b/book.toml index 94084ce..edcb5f0 100644 --- a/book.toml +++ b/book.toml @@ -17,4 +17,8 @@ no-section-label = true git-repository-url = "https://git.libre-chip.org/libre-chip/website" git-repository-icon = "fa-git" # edit-url-template = "https://git.libre-chip.org/libre-chip/website/FIXME/{path}" -input-404 = "404.md" \ No newline at end of file +input-404 = "404.md" +additional-css = ["src/custom.css"] + +[output.html.print] +enable = false \ No newline at end of file diff --git a/src/README.md b/src/README.md index e8ca3df..3a3d91e 100644 --- a/src/README.md +++ b/src/README.md @@ -4,7 +4,7 @@ Libre-Chip is a project for creating [Free/Libre](https://en.wikipedia.org/wiki/ We're just starting and our website doesn't have a whole lot on it yet... -* [Subscribe for Announcements via E-Mail](https://libre-chip.org/subscription)[^subscribe] +* [Subscribe for Announcements via E-Mail](subscription/index.md)[^subscribe] * [Libre-Chip's Git](https://git.libre-chip.org/) * Chat at [#libre-chip:matrix.org](https://matrix.to/#/#libre-chip:matrix.org) or at #libre-chip on [OFTC IRC](https://www.oftc.net/) diff --git a/src/SUMMARY.md b/src/SUMMARY.md index 1b0cd95..7bbd56b 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -1,4 +1,5 @@ * [Libre-Chip](README.md) +* [Subscribe for Announcements via E-Mail](subscription/index.md) * [Conduct](Conduct.md) * [License](LICENSE.md) * [GPL 3.0](gpl-3.0.md) diff --git a/src/custom.css b/src/custom.css new file mode 100644 index 0000000..2ff17af --- /dev/null +++ b/src/custom.css @@ -0,0 +1,49 @@ +.subscribe_list_buttons { + gap: .5rem !important; + flex-wrap: wrap !important; + flex-direction: column !important; + align-items: center !important; + display: flex !important; + padding: 1rem !important; + border: solid 1px !important; + border-radius: 0.5rem !important; + border-color: var(--theme-popup-border) !important; +} + +.subscribe_list_buttons a { + color: var(--fg) !important; + cursor: pointer !important; + text-align: center !important; + min-height: 1em !important; + margin: 0 0.25em 0 0 !important; + padding: 0.75em 1.5em !important; + text-decoration: none !important; + background: var(--table-header-bg) !important; + border: solid 1px !important; + border-radius: 0.5rem !important; + border-color: var(--theme-popup-border) !important; + width: 50%; +} + +.subscribe_list_buttons a.subscribe_list_delete_account { + color: var(--fg) !important; + cursor: pointer !important; + text-align: center !important; + min-height: 1em !important; + margin: 0 0.25em 0 0 !important; + padding: 0.75em 1.5em !important; + text-decoration: none !important; + background: var(--table-header-bg) !important; + border: solid 3px !important; + border-radius: 0.5rem !important; + border-color: var(--warning-border) !important; + width: 50%; +} + +.subscribe_list_buttons a:active { + background: var(--theme-hover) !important; +} + +.subscribe_list_buttons a:hover { + background: var(--theme-hover) !important; +} \ No newline at end of file diff --git a/src/subscription/index.md b/src/subscription/index.md new file mode 100644 index 0000000..89a5cc8 --- /dev/null +++ b/src/subscription/index.md @@ -0,0 +1,38 @@ +# Subscribe for Announcements via E-Mail + + + + +