From 8382708a2b9c6c7d399ff201e01fa564e0b09ac4 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Wed, 31 Jan 2024 14:33:51 +0400 Subject: [PATCH 01/12] docs(en): Update roadmap --- content/en/docs/About us/roadmap.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/en/docs/About us/roadmap.md b/content/en/docs/About us/roadmap.md index d7c5749..f4b9923 100644 --- a/content/en/docs/About us/roadmap.md +++ b/content/en/docs/About us/roadmap.md @@ -13,9 +13,9 @@ Tasks in **bold** are sponsored, for example, by NlNet. Tasks in *italic* are in ## SP Nix flake format -- [ ] ***Restructure the NixOS configuration to use Nix flakes and migrate to newer NixOS version*** ([nixos-config#38](https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config/issues/38)) -- [ ] *Migrate to NixOS 23.05* -- [ ] *Package the SelfPrivacy API into a flake* ([selfprivacy-api#63](https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api/issues/63)) +- [x] **Restructure the NixOS configuration to use Nix flakes and migrate to newer NixOS version** ([nixos-config#38](https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config/issues/38)) +- [x] Migrate to NixOS 23.05 +- [x] Package the SelfPrivacy API into a flake ([selfprivacy-api#63](https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api/issues/63)) - [ ] ***Develop the manifest format for packaging services to work with SelfPrivacy*** ([nixos-config#40](https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config/issues/40)) - [ ] **Move existing services to SP Modules** - [ ] Email server ([nixos-config#41](https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config/issues/41)) @@ -119,5 +119,5 @@ While cloud server providers offer APIs that allow us to perform almost fully au ## Publishing -- [ ] Publish on Google Play +- [x] Publish on Google Play - [ ] Publish on Apple App Store From 4e1eab2139c8100500075d062cdbce4e84a67e7e Mon Sep 17 00:00:00 2001 From: nevfy Date: Sun, 4 Feb 2024 18:11:15 +0400 Subject: [PATCH 02/12] fix: change hover color and bg --- assets/scss/_styles_project.scss | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index 0ca446c..8be412e 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -64,10 +64,34 @@ ul.ul-2>.td-sidebar-nav__section-title a { color: #616161 !important; font-weight: 400; + padding: .3rem .8rem !important; + border-radius: .3rem; + margin: .1rem !important; +} + +.td-sidebar-link.td-sidebar-link__section { + border-radius: .3rem; + padding: .3rem .8rem !important; + margin: .1rem !important; +} + +.td-sidebar-link.td-sidebar-link__section:hover { + color: $primary !important; + background-color: #7EB07F11; +} + +.td-sidebar-nav a.active { + color: $primary !important; + background-color: #7EB07F22; +} + +ul.ul-2 { + padding: 0; } ul.ul-2>.td-sidebar-nav__section-title a:hover { - color: $blue !important; + color: $primary !important; + background-color: #7EB07F11; } li:has(input[type="checkbox"]) { From 5fc5905bc3e639a248692b4a05daaaebd1cd8f27 Mon Sep 17 00:00:00 2001 From: nevfy Date: Sun, 4 Feb 2024 18:16:49 +0400 Subject: [PATCH 03/12] fix: hide another duplicate header --- assets/scss/_styles_project.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index 8be412e..6cded24 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -94,6 +94,10 @@ ul.ul-2>.td-sidebar-nav__section-title a:hover { background-color: #7EB07F11; } +ul.ul-0 li a.tree-root { + display: none; +} + li:has(input[type="checkbox"]) { list-style-type: none; } From 3e2c596d5aa36345031126ce27ef6e33ad7fcb42 Mon Sep 17 00:00:00 2001 From: nevfy Date: Sun, 4 Feb 2024 18:39:37 +0400 Subject: [PATCH 04/12] fix: hide categories title --- assets/scss/_styles_project.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index 6cded24..4290c0e 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -94,15 +94,16 @@ ul.ul-2>.td-sidebar-nav__section-title a:hover { background-color: #7EB07F11; } -ul.ul-0 li a.tree-root { - display: none; +ul.ul-0 li a.tree-root, +h5.taxonomy-title { + display: none !important; } li:has(input[type="checkbox"]) { list-style-type: none; } - .td-toc ul { +.td-toc ul { margin-top: 1rem; } From be1e35cef5983601d4684b6436af53e328d17179 Mon Sep 17 00:00:00 2001 From: nevfy Date: Sun, 4 Feb 2024 18:44:58 +0400 Subject: [PATCH 05/12] fix: header link hover --- assets/scss/_styles_project.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index 4290c0e..24d1d81 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -7,11 +7,15 @@ .nav-link { color: $secondary !important; font-weight: 600; + border-radius: 5px; } - .nav-link:hover, .nav-link.active{ + .nav-link:hover { + background-color: #61616177; + } + + .nav-link.active{ background-color: #616161; color: white; - border-radius: 5px; } } From b48564a58d73652e2c2549238eb793573945f03a Mon Sep 17 00:00:00 2001 From: nevfy Date: Sun, 4 Feb 2024 19:09:59 +0400 Subject: [PATCH 06/12] fix: footer hover --- assets/scss/_styles_project.scss | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index 24d1d81..ce1b7e2 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -10,7 +10,8 @@ border-radius: 5px; } .nav-link:hover { - background-color: #61616177; + background-color: #61616144; + transition: background-color 0.2s ease-in-out; } .nav-link.active{ @@ -32,6 +33,18 @@ padding: .5rem 1.5rem; } +.sp-footer h2, +.sp-footer h3, +.sp-footer a.nav-link { + padding: 0.3rem 1rem !important; +} + +.sp-footer a.nav-link:hover { + background-color: #61616144; + transition: background-color 0.2s ease-in-out; + border-radius: .3rem; +} + .sp-footer a.nav-link span { width: 2rem; display: inline-flex; From 041e682cd7bb67a9080f238689fa0c3c6a997e31 Mon Sep 17 00:00:00 2001 From: nevfy Date: Sun, 4 Feb 2024 19:24:20 +0400 Subject: [PATCH 07/12] fix: hover anim --- assets/scss/_styles_project.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index ce1b7e2..e1b18f0 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -95,6 +95,8 @@ ul.ul-2>.td-sidebar-nav__section-title a { .td-sidebar-link.td-sidebar-link__section:hover { color: $primary !important; background-color: #7EB07F11; + transition: background-color 0.2s ease-in-out; + transition: color 0.2s ease-in-out; } .td-sidebar-nav a.active { @@ -109,6 +111,8 @@ ul.ul-2 { ul.ul-2>.td-sidebar-nav__section-title a:hover { color: $primary !important; background-color: #7EB07F11; + transition: background-color 0.2s ease-in-out; + transition: color 0.2s ease-in-out; } ul.ul-0 li a.tree-root, From 664b2c88981bd169900cb996ff47f7a3cf5cc9ec Mon Sep 17 00:00:00 2001 From: nevfy Date: Sun, 4 Feb 2024 19:29:23 +0400 Subject: [PATCH 08/12] fix: sidebar link active state --- assets/scss/_styles_project.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index e1b18f0..4d419b0 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -77,6 +77,11 @@ border-radius: 0.25rem; } +.td-sidebar-nav-active-item { + color: $primary !important; + font-weight: 600; +} + .td-sidebar-nav .td-sidebar-link__page, ul.ul-2>.td-sidebar-nav__section-title a { color: #616161 !important; From 9c7746b2b0adf26941d277b82c2312d0437a14ef Mon Sep 17 00:00:00 2001 From: nevfy Date: Sun, 4 Feb 2024 21:31:22 +0400 Subject: [PATCH 09/12] fix: articles should only have one h1 --- content/en/docs/Contributing/_index.md | 5 +---- content/en/docs/FAQ/_index.md | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/content/en/docs/Contributing/_index.md b/content/en/docs/Contributing/_index.md index 9162108..edb29d7 100644 --- a/content/en/docs/Contributing/_index.md +++ b/content/en/docs/Contributing/_index.md @@ -7,9 +7,6 @@ description: > You can help with translations and programming --- -# How can you help the project? - - ## Help us translate We use our own [weblate instance](https://weblate.selfprivacy.org/projects/selfprivacy/selfprivacy-app/) to collaborate. @@ -47,6 +44,6 @@ If you want to improve [our site](https://selfprivacy.org): - [Main Site + Documentation](https://git.selfprivacy.org/SelfPrivacy/selfprivacy.org) -# For any help, please contact our chats: +## For any help, please contact our chats: - [Telegram: @selfprivacy_dev](https://t.me/selfprivacy_dev) - [Matrix: @dev:selfprivacy.org](https/matrix.to/#/%23dev:selfprivacy.org) \ No newline at end of file diff --git a/content/en/docs/FAQ/_index.md b/content/en/docs/FAQ/_index.md index 72e65c6..f3ad48f 100644 --- a/content/en/docs/FAQ/_index.md +++ b/content/en/docs/FAQ/_index.md @@ -7,8 +7,6 @@ description: > Frequently asked questions about our project. --- -# General questions - ## What are self-host services and what are their advantages? When we use centralised services, such as popular social networks, we trust the admins of the resource that stores our correspondence, our photos and even the most important secrets said in a chat with close people. We allow our interests and music preferences to be analysed, receive targeted advertising based on them, and most likely participate in unnamed audience analysis programs and all sorts of surveillance. From 7c1778778aa222f5a7871c77010da96539f3a12f Mon Sep 17 00:00:00 2001 From: nevfy Date: Tue, 6 Feb 2024 03:22:17 +0400 Subject: [PATCH 10/12] fix: remove categories from files --- content/en/docs/Getting started/_index.md | 2 -- content/en/docs/How To Guides/manual_cleanup.md | 1 - content/en/docs/How To Guides/root_ssh/_index.md | 1 - content/ru/docs/Getting started/_index.md | 2 -- content/ru/docs/How To Guides/change_dns_provider/_index.md | 1 - content/ru/docs/How To Guides/manual_cleanup.md | 1 - content/ru/docs/How To Guides/root_ssh/_index.md | 1 - 7 files changed, 9 deletions(-) diff --git a/content/en/docs/Getting started/_index.md b/content/en/docs/Getting started/_index.md index 47b2423..bad55c8 100644 --- a/content/en/docs/Getting started/_index.md +++ b/content/en/docs/Getting started/_index.md @@ -1,6 +1,4 @@ --- -categories: ["Tutorials"] -tags: [] title: "Getting Started" linkTitle: "Getting Started" weight: 1 diff --git a/content/en/docs/How To Guides/manual_cleanup.md b/content/en/docs/How To Guides/manual_cleanup.md index d5b99e4..8b3fd23 100644 --- a/content/en/docs/How To Guides/manual_cleanup.md +++ b/content/en/docs/How To Guides/manual_cleanup.md @@ -5,7 +5,6 @@ weight: 2 date: 2023-03-14 description: > Manual cleanup might be required if you need more space on system volume. -categories: ["How-To Guides"] --- diff --git a/content/en/docs/How To Guides/root_ssh/_index.md b/content/en/docs/How To Guides/root_ssh/_index.md index d16b2e0..f5e9a34 100644 --- a/content/en/docs/How To Guides/root_ssh/_index.md +++ b/content/en/docs/How To Guides/root_ssh/_index.md @@ -5,7 +5,6 @@ weight: 1 date: 2023-03-14 description: > If you need to manually perform some tasks, you can get root access via SSH. -categories: ["How-To Guides"] --- To access your server's root shell you will have to generate your SSH key and add it to your server's authorized keys. diff --git a/content/ru/docs/Getting started/_index.md b/content/ru/docs/Getting started/_index.md index 6159f87..277fe66 100644 --- a/content/ru/docs/Getting started/_index.md +++ b/content/ru/docs/Getting started/_index.md @@ -1,6 +1,4 @@ --- -categories: ["Tutorials"] -tags: [] title: "Начало работы" linkTitle: "Начало работы" weight: 1 diff --git a/content/ru/docs/How To Guides/change_dns_provider/_index.md b/content/ru/docs/How To Guides/change_dns_provider/_index.md index 5a69468..4b2de0b 100644 --- a/content/ru/docs/How To Guides/change_dns_provider/_index.md +++ b/content/ru/docs/How To Guides/change_dns_provider/_index.md @@ -5,7 +5,6 @@ weight: 2 date: 2023-10-21 description: > Для тех кто хочет сменить своего dns провайдера уже после установки сервера. -categories: ["How-To Guides"] --- diff --git a/content/ru/docs/How To Guides/manual_cleanup.md b/content/ru/docs/How To Guides/manual_cleanup.md index 5af34e8..ffa9d84 100644 --- a/content/ru/docs/How To Guides/manual_cleanup.md +++ b/content/ru/docs/How To Guides/manual_cleanup.md @@ -5,7 +5,6 @@ weight: 2 date: 2023-04-21 description: > Ручная очистка может потребоваться, если вам нужно больше свободного места на системном разделе. -categories: ["How-To Guides"] --- diff --git a/content/ru/docs/How To Guides/root_ssh/_index.md b/content/ru/docs/How To Guides/root_ssh/_index.md index 0d8b1ce..c3cb71b 100644 --- a/content/ru/docs/How To Guides/root_ssh/_index.md +++ b/content/ru/docs/How To Guides/root_ssh/_index.md @@ -5,7 +5,6 @@ weight: 1 date: 2023-04-22 description: > Если вам нужно вручную выполнить административные задачи, понадобится root-доступ через SSH. -categories: ["How-To Guides"] --- Чтобы получить доступ к корневой оболочке вашего сервера, вам необходимо сгенерировать SSH-ключ и добавить его в список авторизованных ключей вашего сервера. From 73bbf27bc43e7f7609d1b0d706394d337fa18775 Mon Sep 17 00:00:00 2001 From: nevfy Date: Tue, 6 Feb 2024 03:24:29 +0400 Subject: [PATCH 11/12] fix: remove taxonomies from site config --- config.toml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/config.toml b/config.toml index c8b1422..50ef071 100644 --- a/config.toml +++ b/config.toml @@ -16,22 +16,6 @@ enableGitInfo = true # Comment out to enable taxonomies in Docsy # disableKinds = ["taxonomy", "taxonomyTerm"] -# You can add your own taxonomies -[taxonomies] -tag = "tags" -category = "categories" - -[params.taxonomy] -# set taxonomyCloud = [] to hide taxonomy clouds -taxonomyCloud = ["tags", "categories"] - -# If used, must have same length as taxonomyCloud -taxonomyCloudTitle = ["Tag Cloud", "Categories"] - -# set taxonomyPageHeader = [] to hide taxonomies on the page headers -taxonomyPageHeader = ["tags", "categories"] - - # Highlighting config pygmentsCodeFences = true pygmentsUseClasses = false From e93cb64dbaf01c6c329cfe9f70b18291cdec6d97 Mon Sep 17 00:00:00 2001 From: def Date: Tue, 6 Feb 2024 15:48:11 +0200 Subject: [PATCH 12/12] docs: update screensots ru and eng (#112) Co-authored-by: dettlaff Co-authored-by: nevfy Reviewed-on: https://git.selfprivacy.org/SelfPrivacy/selfprivacy.org/pulls/112 Reviewed-by: Inex Code Co-authored-by: def Co-committed-by: def --- content/en/_index.html | 16 ++++++++++++---- content/ru/_index.html | 23 ++++++++++++++++------- static/images/screenshots/1-en.png | Bin 59136 -> 758542 bytes static/images/screenshots/1-ru.png | Bin 63254 -> 337842 bytes static/images/screenshots/2-en.png | Bin 87866 -> 367322 bytes static/images/screenshots/2-ru.png | Bin 90466 -> 211927 bytes static/images/screenshots/3-en.png | Bin 128513 -> 760979 bytes static/images/screenshots/3-ru.png | Bin 126321 -> 373417 bytes static/images/screenshots/4-en.png | Bin 85067 -> 307816 bytes static/images/screenshots/4-ru.png | Bin 84138 -> 155218 bytes static/images/screenshots/5-en.png | Bin 83111 -> 657325 bytes static/images/screenshots/5-ru.png | Bin 90857 -> 293614 bytes static/images/screenshots/6-en.png | Bin 0 -> 597114 bytes static/images/screenshots/6-ru.png | Bin 0 -> 347498 bytes static/images/screenshots/7-en.png | Bin 0 -> 267434 bytes static/images/screenshots/7-ru.png | Bin 0 -> 144097 bytes 16 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 static/images/screenshots/6-en.png create mode 100644 static/images/screenshots/6-ru.png create mode 100644 static/images/screenshots/7-en.png create mode 100644 static/images/screenshots/7-ru.png diff --git a/content/en/_index.html b/content/en/_index.html index f13cc2a..c88d2ed 100644 --- a/content/en/_index.html +++ b/content/en/_index.html @@ -10,11 +10,13 @@ linkTitle = "SelfPrivacy"