From 17fc7b78913c7f3a28c0dabca3d6ff72ba1f094a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Fri, 22 Oct 2021 23:42:44 +0200 Subject: [PATCH] Add imprint and privacy policy --- _config.ts | 6 +++++ _data/people.yml | 43 ---------------------------------- _data/people/avd.yml | 13 ++++++++++ _data/people/byb.yml | 17 ++++++++++++++ _data/people/cmp.yml | 7 ++++++ _data/people/hmd.yml | 7 ++++++ _data/people/hsg.yml | 7 ++++++ _data/people/jfw.yml | 12 ++++++++++ _data/people/jjg.yml | 7 ++++++ _includes/footer.njk | 3 +-- _includes/layouts/default.njk | 27 +++++++++++---------- _includes/layouts/homepage.njk | 20 ++++++++++++++++ _includes/people.njk | 19 ++++++++++----- imprint.yml | 16 +++++++++++++ index.yml | 15 +++++++++--- privacy-policy.yml | 7 ++++++ styles.css | 11 ++++++--- 17 files changed, 168 insertions(+), 69 deletions(-) delete mode 100644 _data/people.yml create mode 100644 _data/people/avd.yml create mode 100644 _data/people/byb.yml create mode 100644 _data/people/cmp.yml create mode 100644 _data/people/hmd.yml create mode 100644 _data/people/hsg.yml create mode 100644 _data/people/jfw.yml create mode 100644 _data/people/jjg.yml create mode 100644 _includes/layouts/homepage.njk create mode 100644 imprint.yml create mode 100644 privacy-policy.yml diff --git a/_config.ts b/_config.ts index 2a7edae..a0247b2 100644 --- a/_config.ts +++ b/_config.ts @@ -21,4 +21,10 @@ site.loadAssets([ site.filter("title", (value = '') => value + (value ? " | " : "") + "MiOM"); +site.filter("objectToArray", (value = {}) => Object.keys(value) + .sort() + .map(key => value[key]) + .filter(val => !!val) +); + export default site; diff --git a/_data/people.yml b/_data/people.yml deleted file mode 100644 index 587e8b3..0000000 --- a/_data/people.yml +++ /dev/null @@ -1,43 +0,0 @@ -- name: Alexander von Dombois - pronouns: he/him - role: Product Design - contactOptions: - - name: MAIL - value: avd@miom.space - - name: INSTA - value: '@alexandervondombois' - - name: WEB - value: alexandervondombois.de - -- name: Helena Geisler - pronouns: she/her - role: Visual artist - contactOptions: - - name: MAIL - value: hsg@miom.space - -- name: Benjamin Bädorf - pronouns: he/him - role: Software Engineer - contactOptions: - - name: MAIL - value: byb@miom.space - - name: GIT - value: git.b12f.io/b12f - - name: GPG - value: 4332 E0D0 2B21 4D31 376C 366E 4406 E80E 13CD 656C - - name: MATRIX - value: '@b12f:pub.solar' - - name: WEB - value: benjaminbaedorf.eu - -- name: Jhonas Wernery - pronouns: he/him - role: System Engineer - contactOptions: - - name: MAIL - value: jfw@miom.space - - name: GIT - value: git.b12f.io/teutat3s - - name: MATRIX - value: '@teutat3s:pub.solar' diff --git a/_data/people/avd.yml b/_data/people/avd.yml new file mode 100644 index 0000000..a1a2caa --- /dev/null +++ b/_data/people/avd.yml @@ -0,0 +1,13 @@ +name: Alexander von Dombois +pronouns: he/him +role: Product Design +contactOptions: + - name: mail + value: avd@miom.space + link: 'mailto:avd@miom.space' + - name: insta + value: '@alexandervondombois' + - name: web + value: alexandervondombois.de + link: 'https://alexandervondombois.de' + diff --git a/_data/people/byb.yml b/_data/people/byb.yml new file mode 100644 index 0000000..1e0ea00 --- /dev/null +++ b/_data/people/byb.yml @@ -0,0 +1,17 @@ +name: Benjamin Bädorf +pronouns: he/him +role: Software Engineer +contactOptions: + - name: mail + value: byb@miom.space + link: 'mailto:byb@miom.space' + - name: git + value: '@b12f' + link: 'git.b12f.io/b12f' + - name: gpg + value: 4332 E0D0 2B21 4D31 376C 366E 4406 E80E 13CD 656C + - name: matrix + value: '@b12f:pub.solar' + - name: web + value: benjaminbaedorf.eu + link: 'https://benjaminbaedorf.eu' diff --git a/_data/people/cmp.yml b/_data/people/cmp.yml new file mode 100644 index 0000000..4575eae --- /dev/null +++ b/_data/people/cmp.yml @@ -0,0 +1,7 @@ +name: Constantin Pannwitz +pronouns: he/him +role: Product Designer +contactOptions: + - name: mail + value: cmp@miom.space + link: 'mailto:cmp@miom.space' diff --git a/_data/people/hmd.yml b/_data/people/hmd.yml new file mode 100644 index 0000000..3886fc9 --- /dev/null +++ b/_data/people/hmd.yml @@ -0,0 +1,7 @@ +name: Hannah Deuss +pronouns: she/her +role: Visual artist +contactOptions: + - name: mail + value: hmd@miom.space + link: 'mailto:hmd@miom.space' diff --git a/_data/people/hsg.yml b/_data/people/hsg.yml new file mode 100644 index 0000000..e92ba3b --- /dev/null +++ b/_data/people/hsg.yml @@ -0,0 +1,7 @@ +name: Helena Geisler +pronouns: she/her +role: Visual artist +contactOptions: + - name: mail + value: hsg@miom.space + link: 'mailto:hsg@miom.space' diff --git a/_data/people/jfw.yml b/_data/people/jfw.yml new file mode 100644 index 0000000..19e2cab --- /dev/null +++ b/_data/people/jfw.yml @@ -0,0 +1,12 @@ +name: Jhonas Wernery +pronouns: he/him +role: System Engineer +contactOptions: + - name: mail + value: jfw@miom.space + link: 'mailto:jfw@miom.space' + - name: git + value: '@teutat3s' + link: 'https://git.b12f.io/teutat3s' + - name: matrix + value: '@teutat3s:pub.solar' diff --git a/_data/people/jjg.yml b/_data/people/jjg.yml new file mode 100644 index 0000000..7bc962c --- /dev/null +++ b/_data/people/jjg.yml @@ -0,0 +1,7 @@ +name: Julian Gerullis +pronouns: he/him +role: Product Designer +contactOptions: + - name: mail + value: jjg@miom.space + link: 'mailto:jjg@miom.space' diff --git a/_includes/footer.njk b/_includes/footer.njk index d37bb5b..154be39 100644 --- a/_includes/footer.njk +++ b/_includes/footer.njk @@ -2,8 +2,7 @@ diff --git a/_includes/layouts/default.njk b/_includes/layouts/default.njk index 9a46413..ef1d06e 100644 --- a/_includes/layouts/default.njk +++ b/_includes/layouts/default.njk @@ -20,22 +20,25 @@ {% endif %} -

is

-

- {% for thingWeAre in thingsWeAre %} - - {{ thingWeAre }}space - - {% endfor %} -

+ {% block header %} +
+ +
+
+ Back home +
+ +
+

{{ title }}

+
+ {% endblock %}
- {% if article %} + {% block main %} {{ article | md | safe }} - {% endif %} - - {% include "people.njk" %} + {% endblock %}
+ {% include "footer.njk" %} diff --git a/_includes/layouts/homepage.njk b/_includes/layouts/homepage.njk new file mode 100644 index 0000000..7348a5a --- /dev/null +++ b/_includes/layouts/homepage.njk @@ -0,0 +1,20 @@ +{% extends 'layouts/default.njk' %} + +{% block header %} +
is
+

+ {% for thingWeAre in thingsWeAre %} + + {{ thingWeAre }}space + + {% endfor %} +

+{% endblock %} + +{% block main %} + {{ introduction | md | safe }} + + {% include "people.njk" %} + + {{ cta | md | safe }} +{% endblock %} diff --git a/_includes/people.njk b/_includes/people.njk index 50daa34..13e860e 100644 --- a/_includes/people.njk +++ b/_includes/people.njk @@ -1,5 +1,5 @@