From 209eef081987eddec66eae0a764dc8de0af0f052 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Tue, 4 May 2021 23:39:02 +0200 Subject: [PATCH 1/6] WIP: Services --- content/services/_index.da.md | 195 ++++++++++++++++++++++++++++++++++ content/services/_index.en.md | 6 ++ 2 files changed, 201 insertions(+) create mode 100644 content/services/_index.da.md create mode 100644 content/services/_index.en.md diff --git a/content/services/_index.da.md b/content/services/_index.da.md new file mode 100644 index 0000000..e90c063 --- /dev/null +++ b/content/services/_index.da.md @@ -0,0 +1,195 @@ +--- +layout: page +title: Tjenester +--- + +Her er en oversigt over de tjenester vi tilbyder. Nogle er [kun for vores +medlemmer](#tjenester-der-kun-er-for-vores-medlemmer), andre er [åbne for +alle](#tjenester-der-er-åbne-for-alle). + +Alle tjenester er markeret med nogle badges, der deklarerer i hvor høj grad den +enkelte tjeneste lever op til [kerneprincipperne defineret i formålsparagraffen +i vores vedtægter](/_pages/vedtaegter.html#-2-form%C3%A5l). Vi har også skrevet +en uddybning af [hvad de forskellige badges dækker over](/tjenester/badges/). + +## Tjenester der kun er for vores medlemmer + +

Nextcloud – filer, kalender, adressebog

+ +
+

Gem dine filer, din kalender og dine kontakter i skyen og tilgå alt fra alle dine enheder.

+

Badges

+ + +

+ [1] Det kræver login at sende data til skyen. Men det er muligt at dele + dine data med andre (eller dig selv) uden at de skal logge ind. +

+ +
+ + + +## Tjenester der er åbne for alle + +

Gitea – hosting af git-versionsstyringssystem

+ +
+

Skriver du kode eller anden tekst som du gerne vil holde under versionsstyring, kan du gemme det her.

+

Badges

+ + +

+ [1] Offentligt tilgængelige repositories kan tilgås af alle, uden at være logget ind. +

+
+ + +

Passit – password manager

+ +
+

Hjælper dig med at huske stærke, unikke kodeord til alle de sites og apps du benytter dig af.

+

Badges

+ + +

+ [1] Al brugerdata (navne, websites, kodeord, noter osv.) er krypteret så det kun er brugerne selv der kan tilgå deres data. Der foretages dog stadig logning af brugen af tjenesten, så helt 100% ZN er det ikke. +

+
diff --git a/content/services/_index.en.md b/content/services/_index.en.md new file mode 100644 index 0000000..0314c89 --- /dev/null +++ b/content/services/_index.en.md @@ -0,0 +1,6 @@ +--- +layout: page +title: Tjenester +--- + +## Services of data.coop From 9a4b12de76e49d3b70a885508b2744cca8b6c243 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Wed, 5 May 2021 23:04:38 +0200 Subject: [PATCH 2/6] Adding more work on meta data and moving old badges descriptions in Danish --- content/badges.md | 116 ++++++++++++++++++ content/services/nextcloud.da.md | 14 +++ .../datacoop2020/layouts/services/list.html | 68 ++++++++++ .../datacoop2020/layouts/services/single.html | 14 +++ 4 files changed, 212 insertions(+) create mode 100644 content/badges.md create mode 100644 content/services/nextcloud.da.md create mode 100644 themes/datacoop2020/layouts/services/list.html create mode 100644 themes/datacoop2020/layouts/services/single.html diff --git a/content/badges.md b/content/badges.md new file mode 100644 index 0000000..7522980 --- /dev/null +++ b/content/badges.md @@ -0,0 +1,116 @@ +--- +layout: page +title: Badges +in_menu: false +permalink: /tjenester/badges/ +--- + +På [listen over vores tjenester](/services/) er hver enkelt tjeneste tildelt +en række badges, der deklarerer i hvor høj grad tjenesten lever op til +[kerneprincipperne defineret i formålsparagraffen i vores +vedtægter](/_pages/vedtaegter.html#-2-form%C3%A5l). Her følger en generel +uddybning af hvad de forskellige badges dækker over. Der kan være små +afvigelser fra den generelle definition af hvad et badge dækker over. I disse +tilfælde vil dette blive særdeklareret under listen af badges ved en tjeneste. + +## Badge-status + +Et badge kan have 3 forskellige statuser: + +

Positiv

+ +Tjenesten lever op til kravene til det badget dækker over. + +

Delvis

+ +Tjenesten lever delvist op til det badget dækker over. Dog i en sådan grad at +vi mener det er værd at fremhæve. + +

Negativ

+ +Tjenesten lever _ikke_ op til det badget dækker over. + + +## Detaljer om de forskellige badges + +

Stabilitet

+ +Det første badge er som sådan ikke relateret til hvorvidt tjenesten lever op +til vores formålsparagraf. Det angiver i stedet hvorvidt tjenesten er stabil +nok til at vi vil anbefale almindelige mennesker at bruge den. Vi tilbyder +løbende nye tjenester, og der vil være en periode i starten af en tjenestes +levetid hvor vi anser den som værende "ustabil", indtil den har vist sit værd +med en mindre skare af brugere der er med på at tjenesten kan være ustabil. +Alle er dog stadig velkomne til at benytte sig af tjenesten, så længe de er +indforstået med dette forbehold for stabiliteten. + +

Grafikken er Traffic Light af icon 54 fra the Noun Project.

+ + +

Sikker forbindelse

+ +Sikker forbindelse angiver at trafikken over internettet mellem dig og +tjenesten er krypteret. Du kender det som regel som en hængelås foran +adresselinjen i din browser. Det betyder at ingen andre end dig og tjenesten +kan se hvad der bliver sendt frem og tilbage mellem dig og tjenesten. + +

Grafikken er transfer af Gonzalo Bravo fra the Noun Project.

+ + +

Krypteret opbevaring af data

+ +Tjenestens data gemmes krypteret, og er dermed ikke umiddelbart læsbare for +andre end tjenesten selv og data.coops systemadministratorer. I tilfælde af at +data lækkes (fx ved virtuelt eller fysisk indbrud), kræver det en særlig +"hovednøgle" at læse data, som datatyven forhåbentligt ikke er i besiddelse af. + +

Grafikken er safe af Maxim Kulikov fra the Noun Project.

+ + +

Zero knowledge

+ +Data gemmes krypteret, og tjenesten er konstrueret på en måde, så selv ikke +data.coops systemadministratorer har mulighed for at tilgå og læse brugernes +data. Der findes simpelthen ingen "hovednøgle" som giver fuld datadgang, og det +er dermed kun brugerne selv der kan læse deres data. I tilfælde af at data +lækkes, er ingen større katastrofe sket, da der heller ikke er risiko for at +datatyven også har stjålet hovednøglen, da der ingen hovednøgle er. + +

Grafikken er Shrug af Andrew Doane fra the Noun Project.

+ + +

Backup

+ +Der tages løbende backup af tjenestens data, for at minimere skadens omfang i +tilfælde af tekniske nedbrud. + +**Bemærk**: Vi tager pt. slet ikke backup af noget, men det står selvfølgelig +højt på vores prioritetsliste. + +

Grafikken er backup af Adrien Coquet fra the Noun Project.

+ + +

Logning

+ +Dette badge er lidt omvendt: Det positive badge tildeles tjenester der _ikke_ +foretager logning. + +Logning fungerer på forskellig vis og foretages i større eller mindre grad. Som +regel giver logning data.coops systemadministratorer overordnet indsigt i +_hvordan_ tjenester bruges, men _ikke_ i det konkrete data tjenesten behandler +for brugerne. Fx vil logning afsløre overfor data.coops systemadministratorer, +at nogen overfører en fil, men ikke hvad selve filen indeholder eller hvem der +overfører filen. + +

Grafikken er Dog Paws af iejank fra the Noun Project.

+ + +

Anonym adgang

+ +Tjenester med anonym adgang kan benyttes helt uden at man skal være registreret +ved tjenesten. De fleste tjenester kræver en form for registrering af brugerne, +da de data tjenesten indeholder knyttes til de enkelte brugere. Nogle tjenester +tilbyder anonym læseadgang. Fx kan det kræve registrering at uploade en fil til +tjenesten, men andre kan downloade filen at være registreret. + +

Grafikken er anonymous af pidzemleyu fra the Noun Project.

diff --git a/content/services/nextcloud.da.md b/content/services/nextcloud.da.md new file mode 100644 index 0000000..0d1f3c2 --- /dev/null +++ b/content/services/nextcloud.da.md @@ -0,0 +1,14 @@ +--- +layout: page +title: Nextcloud +service_badges: + stability: negative + connection_security: positive + connection_anonymous: partial + storage_encrypted: negative + zero_knowledge: negative + storage_backup: negative + logging: negative +--- + +Nextcould blah blah \ No newline at end of file diff --git a/themes/datacoop2020/layouts/services/list.html b/themes/datacoop2020/layouts/services/list.html new file mode 100644 index 0000000..7d75869 --- /dev/null +++ b/themes/datacoop2020/layouts/services/list.html @@ -0,0 +1,68 @@ +{{- define "main" -}} + +

{{ .Title }}

+ +{{ $pages := .Pages }} +{{ range $pages.ByPublishDate.Reverse }} +

+ {{ .Title | markdownify }} + {{ $customDateFormat := "January 2, 2006" }} + {{ with .Site.Params.customDateFormat }}{{ $customDateFormat = . }}{{ end }} +
+ {{ .PublishDate.Format $customDateFormat }} + {{ partial "tags" . }} + {{ if eq .Site.Params.showPostSummary true }} +
+ {{ .Summary }} + {{ end }} +

+ +

Badges

+ +
+{{ end }} + +{{- end -}} diff --git a/themes/datacoop2020/layouts/services/single.html b/themes/datacoop2020/layouts/services/single.html new file mode 100644 index 0000000..9e34d6c --- /dev/null +++ b/themes/datacoop2020/layouts/services/single.html @@ -0,0 +1,14 @@ +{{- define "main" -}} + +

{{ .Title | markdownify }}

+

+ + {{ $customDateFormat := "January 2, 2006" }} + {{ with .Site.Params.customDateFormat }}{{ $customDateFormat = . }}{{ end }} + {{ .PublishDate.Format $customDateFormat }}{{ if gt .Lastmod .PublishDate }}, updated {{ .Lastmod.Format $customDateFormat }}{{ end }} + + {{ partial "tags" . }} +

+{{ .Content }} + +{{- end -}} \ No newline at end of file From efb448a8f9379917e1ff0ae3cf96b25acf62a953 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Tue, 28 Dec 2021 02:22:25 +0100 Subject: [PATCH 3/6] Display git log information on service pages, add partially finished table of different statuses --- config.yaml | 1 + content/services/nextcloud.da.md | 2 +- i18n/da.toml | 28 ++++++ i18n/en.toml | 3 + .../datacoop2020/assets/static/css/style.scss | 1 + .../assets/static/css/tables.scss | 8 ++ .../datacoop2020/layouts/_default/baseof.html | 2 +- .../datacoop2020/layouts/_default/single.html | 3 +- .../datacoop2020/layouts/services/single.html | 86 +++++++++++++++++-- 9 files changed, 125 insertions(+), 9 deletions(-) create mode 100644 themes/datacoop2020/assets/static/css/tables.scss diff --git a/config.yaml b/config.yaml index 74032e9..7a1368e 100644 --- a/config.yaml +++ b/config.yaml @@ -7,6 +7,7 @@ theme: datacoop2020 DefaultContentLanguage: da +enableGitInfo: true # See: https://gohugo.io/content-management/multilingual/ languages: diff --git a/content/services/nextcloud.da.md b/content/services/nextcloud.da.md index 0d1f3c2..6a57e82 100644 --- a/content/services/nextcloud.da.md +++ b/content/services/nextcloud.da.md @@ -11,4 +11,4 @@ service_badges: logging: negative --- -Nextcould blah blah \ No newline at end of file +Gem dine filer, din kalender og dine kontakter i skyen og tilgå alt fra alle dine enheder. diff --git a/i18n/da.toml b/i18n/da.toml index 7d2844a..1b0af0e 100644 --- a/i18n/da.toml +++ b/i18n/da.toml @@ -7,5 +7,33 @@ other = "Generateret med Hugo d. {{ . }}" [services_status] other = "Tjeneste Status" +[service_badges_status_positive] +other = "Positiv" +[service_badges_status_negative] +other = "Negativ" +[service_badges_status_partial] +other = "Delvis" + +[service_badge_stability] +other = "Stabilitet" + +[service_badge_connection_security] +other = "Sikker forbindelse" + +[service_badge_connection_anonymous] +other = "Anonym adgang" + +[service_badge_storage_encrypted] +other = "Krypteret opbevaring af data" + +[service_badge_zero_knowledge] +other = "Zero knowledge" + +[service_badge_storage_backup] +other = "Backup" + +[service_badge_logging] +other = "Logning" + [tagline] other = "vores data i vores hænder" diff --git a/i18n/en.toml b/i18n/en.toml index 2bfcee4..f54ab3f 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -7,5 +7,8 @@ other = "Generated by Hugo on {{ . }}" [services_status] other = "Services Status" +[service_badges_stability_negative] +other = "Negative" + [tagline] other = "our data in our hands" diff --git a/themes/datacoop2020/assets/static/css/style.scss b/themes/datacoop2020/assets/static/css/style.scss index e5e7f7b..f92d1f7 100644 --- a/themes/datacoop2020/assets/static/css/style.scss +++ b/themes/datacoop2020/assets/static/css/style.scss @@ -62,6 +62,7 @@ $body-color: $datacoop-purple; @import "bootstrap/bootstrap"; +@import "tables"; html { diff --git a/themes/datacoop2020/assets/static/css/tables.scss b/themes/datacoop2020/assets/static/css/tables.scss new file mode 100644 index 0000000..44550ac --- /dev/null +++ b/themes/datacoop2020/assets/static/css/tables.scss @@ -0,0 +1,8 @@ +table { + border-collapse: collapse; + td, th { + border: 2px solid $datacoop-purple; + padding: 5px; + } + +} diff --git a/themes/datacoop2020/layouts/_default/baseof.html b/themes/datacoop2020/layouts/_default/baseof.html index 443d40d..97cc289 100644 --- a/themes/datacoop2020/layouts/_default/baseof.html +++ b/themes/datacoop2020/layouts/_default/baseof.html @@ -15,7 +15,7 @@
- {{ with (now) | printf "%s" }} + {{ with now }} {{ i18n "generated_date" . }} {{ end }}
diff --git a/themes/datacoop2020/layouts/_default/single.html b/themes/datacoop2020/layouts/_default/single.html index e36e02d..48d24ce 100644 --- a/themes/datacoop2020/layouts/_default/single.html +++ b/themes/datacoop2020/layouts/_default/single.html @@ -3,4 +3,5 @@

{{ .Title | markdownify }}

{{ .Content }} -{{- end -}} \ No newline at end of file + +{{- end -}} diff --git a/themes/datacoop2020/layouts/services/single.html b/themes/datacoop2020/layouts/services/single.html index 9e34d6c..37860ea 100644 --- a/themes/datacoop2020/layouts/services/single.html +++ b/themes/datacoop2020/layouts/services/single.html @@ -1,14 +1,88 @@ {{- define "main" -}}

{{ .Title | markdownify }}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{ i18n "service_badge_stability" }} + + {{ with .Params.service_badges.stability | printf "service_badges_status_%s" }} + {{ i18n . }} + {{ end }} +
+ {{ i18n "service_badge_connection_security" }} + + {{ with .Params.service_badges.connection_security | printf "service_badges_status_%s" }} + {{ i18n . }} + {{ end }} +
+ {{ i18n "service_badge_connection_anonymous" }} + + {{ with .Params.service_badges.connection_anonymous | printf "service_badges_status_%s" }} + {{ i18n . }} + {{ end }} +
+ {{ i18n "service_badge_storage_encrypted" }} + + {{ with .Params.service_badges.storage_encrypted | printf "service_badges_status_%s" }} + {{ i18n . }} + {{ end }} +
+ {{ i18n "service_badge_zero_knowledge" }} + + {{ with .Params.service_badges.zero_knowledge | printf "service_badges_status_%s" }} + {{ i18n . }} + {{ end }} +
+ {{ i18n "service_badge_storage_backup" }} + + {{ with .Params.service_badges.storage_backup | printf "service_badges_status_%s" }} + {{ i18n . }} + {{ end }} +
+ {{ i18n "service_badge_logging" }} + + {{ with .Params.service_badges.logging | printf "service_badges_status_%s" }} + {{ i18n . }} + {{ end }} +
+ +{{ .Content }} +

- {{ $customDateFormat := "January 2, 2006" }} - {{ with .Site.Params.customDateFormat }}{{ $customDateFormat = . }}{{ end }} - {{ .PublishDate.Format $customDateFormat }}{{ if gt .Lastmod .PublishDate }}, updated {{ .Lastmod.Format $customDateFormat }}{{ end }} + "{{ .Title }}" was last updated on {{ .Lastmod.Format "January 2, 2006" }}: {{ .GitInfo.Subject }} ({{ .GitInfo.AbbreviatedHash }}) {{ partial "tags" . }}

-{{ .Content }} - -{{- end -}} \ No newline at end of file +{{- end -}} From 20a7bee06895b2425ff41b04d0050a46f0ecc96e Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Tue, 28 Dec 2021 02:56:03 +0100 Subject: [PATCH 4/6] Try to add "git" to installed image (no git executable in PATH) --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 22a8f59..486e0d5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,7 +6,7 @@ steps: image: debian:buster-slim commands: - apt-get update; apt-get upgrade -y - - apt-get install -y wget + - apt-get install -y wget git - wget https://github.com/gohugoio/hugo/releases/download/v0.80.0/hugo_extended_0.80.0_Linux-64bit.deb -O hugo.deb - dpkg -i hugo.deb - hugo --destination _site/ From d40a9556ab79ef9727975c5ad191328f4f3b9a0b Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Tue, 28 Dec 2021 23:56:33 +0100 Subject: [PATCH 5/6] Adds Gitea and Passit from old site --- content/services/gitea.da.md | 14 ++++++++++++++ content/services/passit.da.md | 14 ++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 content/services/gitea.da.md create mode 100644 content/services/passit.da.md diff --git a/content/services/gitea.da.md b/content/services/gitea.da.md new file mode 100644 index 0000000..b254531 --- /dev/null +++ b/content/services/gitea.da.md @@ -0,0 +1,14 @@ +--- +layout: page +title: Gitea +service_badges: + stability: negative + connection_security: positive + connection_anonymous: partial + storage_encrypted: negative + zero_knowledge: negative + storage_backup: negative + logging: negative +--- + +Skriver du kode eller anden tekst som du gerne vil holde under versionsstyring, kan du gemme det her. diff --git a/content/services/passit.da.md b/content/services/passit.da.md new file mode 100644 index 0000000..9165988 --- /dev/null +++ b/content/services/passit.da.md @@ -0,0 +1,14 @@ +--- +layout: page +title: Passit +service_badges: + stability: negative + connection_security: positive + connection_anonymous: negative + storage_encrypted: positive + zero_knowledge: partial + storage_backup: negative + logging: negative +--- + +Hjælper dig med at huske stærke, unikke kodeord til alle de sites og apps du benytter dig af. From f6196411ab106c558b8fcfec0503d2cad3a93094 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Sat, 8 Jan 2022 01:45:05 +0100 Subject: [PATCH 6/6] English title translations, updates section --- config.yaml | 19 ++++--- content/services/_index.en.md | 2 +- content/updates/_index.da.md | 6 ++ content/updates/_index.en.md | 6 ++ .../newsite.en.md} | 0 themes/datacoop2020/layouts/index.html | 56 +++++++++---------- 6 files changed, 50 insertions(+), 39 deletions(-) create mode 100644 content/updates/_index.da.md create mode 100644 content/updates/_index.en.md rename content/{post/creating-a-new-theme.en.md => updates/newsite.en.md} (100%) diff --git a/config.yaml b/config.yaml index 7a1368e..048349f 100644 --- a/config.yaml +++ b/config.yaml @@ -27,20 +27,20 @@ languages: LanguageName: English menu: nav: - - name: "Bliv Medlem" + - name: "Mebership" url: "/membership/" weight: 1 - - name: "Om os" + - name: "About us" url: "/about/" weight: 2 - - name: "Tjenester" + - name: "Services" url: "/services/" weight: 3 - - name: "Vedtægter" + - name: "Statutes" url: "/rights/" weight: 4 - - name: "Nyheder" - url: "/news/" + - name: "Updates" + url: "/updates/" weight: 5 taxonomies: @@ -53,6 +53,9 @@ params: description: "Et datakollektiv, der passer på dine data." includeBootstrapJs: true +# Sections displayed on front page +mainSections: ['updates'] + menu: nav: - name: "Bliv Medlem" @@ -67,7 +70,7 @@ menu: - name: "Vedtægter" url: "/rights/" weight: 4 - - name: "Nyheder" - url: "/news/" + - name: "Opdateringer" + url: "/updates/" weight: 5 diff --git a/content/services/_index.en.md b/content/services/_index.en.md index 0314c89..5be455c 100644 --- a/content/services/_index.en.md +++ b/content/services/_index.en.md @@ -1,6 +1,6 @@ --- layout: page -title: Tjenester +title: Services --- ## Services of data.coop diff --git a/content/updates/_index.da.md b/content/updates/_index.da.md new file mode 100644 index 0000000..be84ee7 --- /dev/null +++ b/content/updates/_index.da.md @@ -0,0 +1,6 @@ +--- +layout: page +title: Opdateringer +--- + +## Opdateringer og nyheder diff --git a/content/updates/_index.en.md b/content/updates/_index.en.md new file mode 100644 index 0000000..f4f877c --- /dev/null +++ b/content/updates/_index.en.md @@ -0,0 +1,6 @@ +--- +layout: page +title: Updates +--- + +## Updates and news diff --git a/content/post/creating-a-new-theme.en.md b/content/updates/newsite.en.md similarity index 100% rename from content/post/creating-a-new-theme.en.md rename to content/updates/newsite.en.md diff --git a/themes/datacoop2020/layouts/index.html b/themes/datacoop2020/layouts/index.html index 3147e52..aa53918 100644 --- a/themes/datacoop2020/layouts/index.html +++ b/themes/datacoop2020/layouts/index.html @@ -2,38 +2,34 @@ {{ define "main" }}
-
-

{{.Title}}

- {{ with .Params.subtitle }} - {{.}} - {{ end }} -
-
- - {{.Content}} -
-
- {{ range first 10 .Site.RegularPages }} - {{ .Render "summary"}} - {{ end }} -
+
+

{{.Title}}

+ {{ with .Params.subtitle }} + {{.}} + {{ end }} +
+
+ + {{.Content}} +
-{{ $pages := where site.RegularPages "Type" "in" site.Params.mainSections }} -{{ range $pages.ByPublishDate.Reverse }} -

- {{ .Title | markdownify }} - {{ $customDateFormat := "January 2, 2006" }} - {{ with .Site.Params.customDateFormat }}{{ $customDateFormat = . }}{{ end }} -
- {{ .PublishDate.Format $customDateFormat }} - {{ partial "tags" . }} - {{ if eq .Site.Params.showPostSummary true }} -
- {{ .Summary }} - {{ end }} -

-{{ end }} + {{ .Site.Params.mainSections }} + {{ $pages := where site.RegularPages "Type" "in" ("") }} + {{ range $pages.ByPublishDate.Reverse }} +

+ {{ .Title | markdownify }} + {{ $customDateFormat := "January 2, 2006" }} + {{ with .Site.Params.customDateFormat }}{{ $customDateFormat = . }}{{ end }} +
+ {{ .PublishDate.Format $customDateFormat }} + {{ partial "tags" . }} + {{ if eq .Site.Params.showPostSummary true }} +
+ {{ .Summary }} + {{ end }} +

+ {{ end }} {{ end }}