Fix most errors

This commit is contained in:
Benjamin Bädorf 2022-10-02 21:38:38 +02:00
parent 42383743a9
commit 7cc662a83e
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C
19 changed files with 436 additions and 466 deletions

View file

@ -1,17 +1,18 @@
import Logo from './Logo.tsx'; import Logo from './Logo.tsx';
const x1312 = (new Array(400)).fill("0x1312").join(" "); const x1312 = (new Array(400)).fill("0x1312").join(" ");
export default () => <div export default () => <div
id="background" id="background"
className="ps-background ps-main--background" className="ps-background ps-main--background"
> >
<Logo className="ps-background--logo" />
<div <div
id="x1312" id="x1312"
className="ps-background--1312" className="ps-background--1312"
>{x1312}</div> >{x1312}</div>
<script <script
src="./scripts/background.js" src="/scripts/background.js"
async async
></script> ></script>
<Logo className="ps-background--logo" />
</div>; </div>;

View file

@ -0,0 +1 @@
export default ({ lang }) => <div id={`dates-list-${lang}`}></div>;

View file

@ -1,6 +1,12 @@
import { title as titleFilter } from '../filters.ts'; import { title as titleFilter } from '../filters.ts';
export default ({ title, theme, extraStylesheets }) => <head> export default ({
title,
theme,
extraStylesheets,
extraScripts,
cacheBust,
}) => <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>{ titleFilter(title) }</title> <title>{ titleFilter(title) }</title>
@ -11,10 +17,14 @@ export default ({ title, theme, extraStylesheets }) => <head>
<meta id="viewport" name="viewport" content="width=device-width, initial-scale=1.0" /> <meta id="viewport" name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" type="text/css" href="/style.css?1" media="all" /> <link rel="stylesheet" type="text/css" href={`/style.css${cacheBust}`} media="all" />
<> <>
{(extraStylesheets || []) {(extraStylesheets || [])
.map(extraStylesheet => <link rel="stylesheet" type="text/css" href="{{ extraStylesheet }}{{ cssCacheBust }}" media="all" />)} .map(extraStylesheet => <link rel="stylesheet" type="text/css" href={`${extraStylesheet}${cacheBust}`} media="all" />)}
</>
<>
{(extraScripts || [])
.map(extraScript => <script defer type="application/javascript" src={`${extraScript}${cacheBust}`}></script>)}
</> </>
</head>; </head>;

View file

@ -1,28 +1,31 @@
import { import { md } from '../../filters.ts';
title as titleFilter,
en,
de,
md,
} from '../../filters.ts';
import Head from '../Head.tsx'; import Head from '../Head.tsx';
import Background from '../Background.tsx'; import Background from '../Background.tsx';
import HakkenDates from '../HakkenDates.tsx';
export default ({ export default ({
title, title,
content,
theme, theme,
extraStylesheets, extraStylesheets,
content, extraScripts,
cssCacheBust, cacheBust,
showHakkenDates,
}) => <> }) => <>
<html> <html>
<Head <Head
title={title} title={title}
theme={theme} theme={theme}
extraStylesheets={extraStylesheets} extraStylesheets={extraStylesheets}
cssCacheBust={cssCacheBust} cacheBust={cacheBust}
extraScripts={extraScripts}
/> />
<body className="ps-main"> <body className="ps-main">
<Background /> <Background />
<main className="ps-main--page ps-page"> <main className="ps-main--page ps-page">
<section <section
lang="en" lang="en"
@ -38,6 +41,8 @@ export default ({
dangerouslySetInnerHTML={{ __html: md(content.en) }} dangerouslySetInnerHTML={{ __html: md(content.en) }}
className="ps-page--section-contents" className="ps-page--section-contents"
></div> ></div>
{showHakkenDates ? <HakkenDates lang="en" /> : null}
</section> </section>
<section <section
@ -54,6 +59,8 @@ export default ({
dangerouslySetInnerHTML={{ __html: md(content.de) }} dangerouslySetInnerHTML={{ __html: md(content.de) }}
className="ps-page--section-contents" className="ps-page--section-contents"
></div> ></div>
{showHakkenDates ? <HakkenDates lang="de" /> : null}
</section> </section>
</main> </main>
</body> </body>

View file

@ -1,31 +1,31 @@
import {
title as titleFilter,
en,
de,
md,
} from '../../filters.ts';
import Head from '../Head.tsx'; import Head from '../Head.tsx';
import Background from '../Background.tsx'; import Background from '../Background.tsx';
export default ({ export default ({
title, title,
content,
links,
theme, theme,
extraStylesheets, extraStylesheets,
links, extraScripts,
cssCacheBust, cacheBust,
showHakkenDates,
}) => <> }) => <>
<html> <html>
<Head <Head
title={title} title={title}
theme={theme} theme={theme}
extraStylesheets={extraStylesheets} extraStylesheets={extraStylesheets}
cssCacheBust={cssCacheBust} cacheBust={cacheBust}
extraScripts={extraScripts}
/> />
<body className="ps-main"> <body className="ps-main">
<Background /> <Background />
<main className="ps-main--page ps-page ps-page_home"> <main className="ps-main--page ps-page ps-page_home">
{links.map(({ href, title }) => {links.map(({ href, title, openInNewTab }) =>
<a href={href} target="_blank" className="ps-page--link">{title}</a> <a href={href} target={openInNewTab ? '_blank' : '_self'} className="ps-page--link">{title}</a>
)} )}
<footer className="ps-footer"> <footer className="ps-footer">
<a <a

File diff suppressed because one or more lines are too long

View file

@ -1,5 +1,7 @@
layout: layouts/default.tsx layout: layouts/default.tsx
title: About & Imprint
content: content:
en: | en: |
# Hi! We're pub.solar # Hi! We're pub.solar

View file

@ -29,12 +29,3 @@ const mdIt = new MarkdownIt({
export const md = (string) => mdIt.render(string); export const md = (string) => mdIt.render(string);
export const title = (value = '') => value + (value ? " | " : "") + "pub.solar"; export const title = (value = '') => value + (value ? " | " : "") + "pub.solar";
export const i18n = (value) => value.en;
export const de = (value) => value.de;
export const objectToArray = (value = {}) => Object.keys(value)
.sort()
.map(key => value[key])
.filter(val => !!val);

View file

@ -1,107 +1,109 @@
const skippedMonths = [ (() => {
{ m: 8, y: 2022 }, const skippedMonths = [
{ m: 12, y: 2022 }, { m: 8, y: 2022 },
]; { m: 12, y: 2022 },
];
const i18n = { const i18n = {
en: { en: {
comingDates: 'The following dates are scheduled:', comingDates: 'The following dates are scheduled:',
friday: 'friday', friday: 'friday',
sunday: 'sunday', sunday: 'sunday',
until: 'until', until: 'until',
months: [ months: [
'Jan.', 'Jan.',
'Feb.', 'Feb.',
'Mar.', 'Mar.',
'Apr.', 'Apr.',
'May', 'May',
'Jun.', 'Jun.',
'Jul.', 'Jul.',
'Aug.', 'Aug.',
'Sep.', 'Sep.',
'Oct.', 'Oct.',
'Nov.', 'Nov.',
'Dec.', 'Dec.',
], ],
}, },
de: { de: {
comingDates: 'Folgende Termine stehen an:', comingDates: 'Folgende Termine stehen an:',
friday: 'Freitag', friday: 'Freitag',
sunday: 'Sonntag', sunday: 'Sonntag',
until: 'bis', until: 'bis',
months: [ months: [
'Jan.', 'Jan.',
'Feb.', 'Feb.',
'Mär.', 'Mär.',
'Apr.', 'Apr.',
'Mai', 'Mai',
'Jun.', 'Jun.',
'Jul.', 'Jul.',
'Aug.', 'Aug.',
'Sep.', 'Sep.',
'Okt.', 'Okt.',
'Nov.', 'Nov.',
'Dez.', 'Dez.',
], ],
}, },
}; };
const datesLists = { const datesLists = {
en: document.getElementById('dates-list-en'), en: document.getElementById('dates-list-en'),
de: document.getElementById('dates-list-de'), de: document.getElementById('dates-list-de'),
}; };
const day = 24 * 60 * 60 * 1000; const day = 24 * 60 * 60 * 1000;
const week = 7 * day; const week = 7 * day;
const endOfWeekend = 2 * day; const endOfWeekend = 2 * day;
const start = new Date(); const start = new Date();
const hakkens = []; const hakkens = [];
// We'll be looking about half a year into the future // We'll be looking about half a year into the future
for (let i = 0; i < 185; i++) { for (let i = 0; i < 185; i++) {
const dateToTry = new Date(start.valueOf() + (i * day)); const dateToTry = new Date(start.valueOf() + (i * day));
if (dateToTry.getDay() !== 5) { if (dateToTry.getDay() !== 5) {
continue; continue;
}
const oneWeekLater = new Date(dateToTry.valueOf() + week);
if (dateToTry.getMonth() === oneWeekLater.getMonth()) {
continue;
}
const m = dateToTry.getMonth() + 1;
const y = dateToTry.getFullYear();
if (skippedMonths.find((s) => s.m === m && s.y === y)) {
continue;
}
hakkens.push(dateToTry);
} }
const oneWeekLater = new Date(dateToTry.valueOf() + week); // Helper function to add leading zeros to dates
if (dateToTry.getMonth() === oneWeekLater.getMonth()) { const d = (num) => ('0' + num).slice(-2);
continue;
const writeText = (lang) => {
const p = document.createElement('p');
p.innerHTML = i18n[lang].comingDates;
datesLists[lang].appendChild(p);
} }
const m = dateToTry.getMonth() + 1; const writeDateList = (lang) => {
const y = dateToTry.getFullYear(); const ul = document.createElement('ul');
if (skippedMonths.find((s) => s.m === m && s.y === y)) { hakkens.forEach(hakken => {
continue; hakkend = new Date(hakken.valueOf() + endOfWeekend);
const showFirstMonth = hakken.getMonth() !== hakkend.getMonth();
const li = document.createElement('li');
li.innerHTML = `
${i18n[lang].friday} ${d(hakken.getDate())}. ${showFirstMonth ? i18n[lang].months[hakken.getMonth()] : ''}
${i18n[lang].until}
${d(hakkend.getDate())}. ${i18n[lang].months[hakkend.getMonth()]}
`;
ul.appendChild(li);
});
datesLists[lang].appendChild(ul);
} }
hakkens.push(dateToTry);
}
// Helper function to add leading zeros to dates writeText('de');
const d = (num) => ('0' + num).slice(-2); writeText('en');
writeDateList('de');
const writeText = (lang) => { writeDateList('en');
const p = document.createElement('p'); })();
p.innerHTML = i18n[lang].comingDates;
datesLists[lang].appendChild(p);
}
const writeDateList = (lang) => {
const ul = document.createElement('ul');
hakkens.forEach(hakken => {
hakkend = new Date(hakken.valueOf() + endOfWeekend);
const showFirstMonth = hakken.getMonth() !== hakkend.getMonth();
const li = document.createElement('li');
li.innerHTML = `
${i18n[lang].friday} ${d(hakken.getDate())}. ${showFirstMonth ? i18n[lang].months[hakken.getMonth()] : ''}
${i18n[lang].until}
${d(hakkend.getDate())}. ${i18n[lang].months[hakkend.getMonth()]}
`;
ul.appendChild(li);
});
datesLists[lang].appendChild(ul);
}
writeText('de');
writeText('en');
writeDateList('de');
writeDateList('en');

File diff suppressed because one or more lines are too long

92
hakken.yml Normal file
View file

@ -0,0 +1,92 @@
layout: layouts/default.tsx
title: hakken.irl
showHakkenDates: true
extraScripts:
- /scripts/hakken-dates.js
content:
en: |
# hakken.irl
You're invited!
We meet (almost) every month in Cologne for hakken.irl, a small three-day (friday to sunday) hackathon that's just about having fun and nerding around.
## What will we be doing?
There is only one set agenda point: riding with Critical Mass. In general, we'll be hakking on pub.solar related stuff like [PubSolarOS](https://git.b12f.io/pub-solar/os "PubSolarOS git repo") or [our Infra](https://git.b12f.io/pub-solar/infra "pub.solar infra repo").
Stuff we've done so far:
* [configured Matrix monitoring with Prometheus](https://git.b12f.io/pub-solar/infra/commit/c682a97746770121b419a9ad2c8c94688e5fa0f8),
* [refactored the core module of PubSolarOS](https://git.b12f.io/pub-solar/os/pulls/115),
* [started sway as a systemd service](https://git.b12f.io/pub-solar/os/commit/159ae86722bc706ff42d4d3e4b0f49ede2f253de),
* [added a "paranoid" option that always uses encrypted hibernation instead of sleep](https://git.b12f.io/pub-solar/os/pulls/74),
* [removed nonfree software from PubSolarOS](https://git.b12f.io/pub-solar/os/pulls/113),
* played Wizard, cards and board games,
* cooked, ordered, and ate together,
* and made fun of neoliberals.
## So is it just for über-nerds?
It's pretty nerdy over all, and you should definitely bring your laptop. However we don't really care what you do while you're with us. It's good if you can also entertain yourself with a project. We use the space to work together and connect, but if we vibe you can also just sit with us and play games all day.
## What do I have to pay?
It's free, but if we order food or get some stuff at a kiosk it'd be cool if you chip in. A small donation to the association is also always welcome.
## Where do I sleep?
If you cannot find an (affordable, cool, safe) place to stay in Cologne, then talk to us. We'll surely be able to set you up with a place to stay somewhere.
## Where do I sign up?
Write us a short message. You can reach us via [Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) and [Mastodon](https://mastodon.pub.solar/@crew), or send a mail to[crew@pub.solar](mailto:crew@pub.solar).
## When will this happen?
hakken.irl always starts on the last friday of the month.
de: |
# hakken.irl
Du bist eingeladen!
Wir treffen uns (fast) monatlich in Köln zum hakken.irl, ein kleiner 3-Tägiger (Freitag bis Sonntag) Hackathon bei dem es nur darum geht Spaß zu haben und ab zu nerden.
## Was machen wir denn so?
Es gibt nur einen festen Programmpunkt: bei der Critical Mass mitradeln. Tendenziell hakken wir danach an pub.solar relatierten sachen wie z.B. [PubSolarOS](https://git.b12f.io/pub-solar/os "PubSolarOS git repo") oder [unsere Infra](https://git.b12f.io/pub-solar/infra "pub.solar infra repo").
Was wir bisher so gemacht haben:
* [Matrix monitoring per Prometheus konfiguriert](https://git.b12f.io/pub-solar/infra/commit/c682a97746770121b419a9ad2c8c94688e5fa0f8),
* [das core module in PubSolarOS gerefactored](https://git.b12f.io/pub-solar/os/pulls/115),
* [sway als systemd service starten](https://git.b12f.io/pub-solar/os/commit/159ae86722bc706ff42d4d3e4b0f49ede2f253de),
* [eine "paranoid" Option für PubSolarOS hinzugefügt, bei dem der PC immer in encrypted hibernation locked](https://git.b12f.io/pub-solar/os/pulls/74),
* [nonfree software aus PubSolarOS entfernt](https://git.b12f.io/pub-solar/os/pulls/113),
* Wizard, Karten und Brettspiele gespielt,
* zusammen gekocht, bestellt, und gegessen,
* und über die FDP her gezogen.
## Ist das also nur für über-nerds?
Es geht schon ziemlich nerdy zu, und du solltest auf jeden Fall deinen Laptop dabei haben. Allerdings ist es uns eigentlich egal, wie du deine Zeit vertreibst. Im besten Falle kannst du dich auch allein an einem eigenen Projekt vergnügen. Wir benutzen den Raum zum gemeinsamen Arbeiten und Austauschen, aber wenn der vibe passt kannst du dich auch dazu setzen und nur Zocken.
## Was kostet das?
Es kostet nichts, aber wenn wir mal Essen bestellen oder beim Kiosk was holen wärs cool wenn du was rein gibst. Auch ist ne kleine Spende an den Verein immer gerne gesehen.
## Wo schlafe ich?
Falls du keine (bezahlbare, coole, sichere) Übernachtungsmöglichkeit in Köln finden kannst, dann rede mit uns. Wir kriegen garantiert einen Schlafplatz organisiert.
## Wo melde ich mich an?
Schreib uns kurz ne Nachricht. Du kannst uns via [Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) und [Mastodon](https://mastodon.pub.solar/@crew) erreichen, oder eine Mail an [crew@pub.solar](mailto:crew@pub.solar) schicken.
## Und wann soll das sein?
hakken.irl startet immer am letzten Freitag des Monats

File diff suppressed because one or more lines are too long

View file

@ -3,6 +3,7 @@ layout: layouts/homepage.tsx
links: links:
- href: https://en.wikipedia.org/wiki/Free_software - href: https://en.wikipedia.org/wiki/Free_software
title: Fucking Free title: Fucking Free
openInNewTab: true
- href: https://pub.solar/os/ - href: https://pub.solar/os/
title: PubSolarOS title: PubSolarOS
- href: https://chat.pub.solar/ - href: https://chat.pub.solar/

File diff suppressed because one or more lines are too long

70
privacy.yml Normal file
View file

@ -0,0 +1,70 @@
layout: layouts/default.tsx
title: Privacy Policy
content:
en: |
# Privacy Policy
Information on data privacy and protection for the Matrix service operated by pub.solar n.e.V. as required by article 13 DSGVO
*Explanation: Our Matrix service consists of the "Homeserver"; `https://matrix.pub.solar`, as well as the web-based Element-Messenger ([chat.pub.solar](https://chat.pub.solar/)).*
## Responsible for operating the service
**pub.solar n.e.V.**
Benjamin Bädorf, Jhonas Wernery, Hendrik Sokolowki
c/o MiOM 202
Wilhelm-Mauser-Straße 47 Halle 5,
D-50827 Köln
[crew@pub.solar](mailto:crew@pub.solar)
## Contact for data protection issues
If you have any questions regarding data protection, please contact us at [crew@pub.solar](mailto:crew@pub.solar) or at the postal address given above.
## What is the purpose of the data processing?
"Matrix" is an open, decentralized communication service for real-time communication. It enables members of pub.solar n.e.V., as well as other interested parties, to communicate with other users of this server as well as other Matrix users of federated Matrix servers via chat and audio/video telephony by means of a Matrix account.
## What personal data is processed?
The processing includes the following personal data:
* Access control: matrix ID, display name, e-mail address (optional), phone number (optional)
* Authentication: username and password
* User content: all data that the user enters into the system (end-to-end encryption is enabled by default in 1:1 rooms)
* Device identification: IP addresses with time stamp and device name; type of end device used (mobile / desktop), operating system
* Server log: IP addresses with timestamp
* Audio/video chat: IP addresses, audio/video data
* Notifications (e-mail)
## How long will the personal data be stored?
The personal data will be deleted from our server after 15 months of inactivity. The deletion requests are forwarded to the federated servers. However, we have no influence on their execution.
## Where is the personal data stored?
We run our Matrix service on servers of the company [Greenbaum Cloud](https://greenbaum.cloud/).
## Data subject rights
When we process personal data about you, you have the following rights:
* right of access to the data processed and right to obtain a copy of it,
* right of rectification if we process incorrect data about you,
* right to deletion, unless exceptions apply as to why we are still storing the data, for example, retention obligations or limitation periods
* right to restriction of processing,
* right to withdraw consent to data processing at any time,
* right to object to processing in the public or legitimate interest,
* right to data portability,
* right to lodge a complaint with a data protection supervisory authority if you believe that we are not processing your data properly. The State Commissioner for Data Protection and Freedom of Information in Nordrhein-Westfalen is responsible in our case. However, if you are in another federal state or not in Germany, you can also contact the data protection authority there.
## References/License
We have created the basic structure of this data protection information with the help of [DS-GVO.clever-Tools](https://www.baden-wuerttemberg.datenschutz.de/ds-gvo.clever/) and adapted it to our needs. We have also used parts of [Datenschutzerklärung der TU-Dresden](https://doc.matrix.tu-dresden.de/privacy/) and adjusted them accordingly. Text is licensed [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/deed.de).
de: |
Es gibt momentan leider keine Deutsche Version unserer Datenschutzerklärung.
Falls Du unbedingt eine sehen willst, dann kontaktiere die Crew damit wir das Thema höher priorisieren können.

View file

@ -1,9 +1,11 @@
const background = document.getElementById("background"); (() => {
const logo = document.getElementById("logo").cloneNode(true); const background = document.getElementById("background");
logo.id = ""; const logo = document.getElementById("logo").cloneNode(true);
(new Array(Math.ceil(window.innerWidth / 100) * Math.ceil(window.innerHeight / 100))) logo.id = "";
.fill(null) (new Array(Math.ceil(window.innerWidth / 100) * Math.ceil(window.innerHeight / 100)))
.map(_ => logo.cloneNode(true)) .fill(null)
.forEach(l => { .map(_ => logo.cloneNode(true))
background.appendChild(l); .forEach(l => {
}); background.appendChild(l);
});
})();

107
scripts/hakken-dates.js Normal file
View file

@ -0,0 +1,107 @@
const skippedMonths = [
{ m: 8, y: 2022 },
{ m: 12, y: 2022 },
];
const i18n = {
en: {
comingDates: 'The following dates are scheduled:',
friday: 'friday',
sunday: 'sunday',
until: 'until',
months: [
'Jan.',
'Feb.',
'Mar.',
'Apr.',
'May',
'Jun.',
'Jul.',
'Aug.',
'Sep.',
'Oct.',
'Nov.',
'Dec.',
],
},
de: {
comingDates: 'Folgende Termine stehen an:',
friday: 'Freitag',
sunday: 'Sonntag',
until: 'bis',
months: [
'Jan.',
'Feb.',
'Mär.',
'Apr.',
'Mai',
'Jun.',
'Jul.',
'Aug.',
'Sep.',
'Okt.',
'Nov.',
'Dez.',
],
},
};
const datesLists = {
en: document.getElementById('dates-list-en'),
de: document.getElementById('dates-list-de'),
};
const day = 24 * 60 * 60 * 1000;
const week = 7 * day;
const endOfWeekend = 2 * day;
const start = new Date();
const hakkens = [];
// We'll be looking about half a year into the future
for (let i = 0; i < 185; i++) {
const dateToTry = new Date(start.valueOf() + (i * day));
if (dateToTry.getDay() !== 5) {
continue;
}
const oneWeekLater = new Date(dateToTry.valueOf() + week);
if (dateToTry.getMonth() === oneWeekLater.getMonth()) {
continue;
}
const m = dateToTry.getMonth() + 1;
const y = dateToTry.getFullYear();
if (skippedMonths.find((s) => s.m === m && s.y === y)) {
continue;
}
hakkens.push(dateToTry);
}
// Helper function to add leading zeros to dates
const d = (num) => ('0' + num).slice(-2);
const writeText = (lang) => {
const p = document.createElement('p');
p.innerHTML = i18n[lang].comingDates;
datesLists[lang].appendChild(p);
}
const writeDateList = (lang) => {
const ul = document.createElement('ul');
hakkens.forEach(hakken => {
hakkend = new Date(hakken.valueOf() + endOfWeekend);
const showFirstMonth = hakken.getMonth() !== hakkend.getMonth();
const li = document.createElement('li');
li.innerHTML = `
${i18n[lang].friday} ${d(hakken.getDate())}. ${showFirstMonth ? i18n[lang].months[hakken.getMonth()] : ''}
${i18n[lang].until}
${d(hakkend.getDate())}. ${i18n[lang].months[hakkend.getMonth()]}
`;
ul.appendChild(li);
});
datesLists[lang].appendChild(ul);
}
writeText('de');
writeText('en');
writeDateList('de');
writeDateList('en');

View file

@ -197,8 +197,16 @@ html {
} }
} }
.ps-page--section-link {
position: sticky;
top: 0;
background-color: var(--background);
padding: 1rem;
display: flex;
}
@media screen and (min-width: 1200px) { @media screen and (min-width: 1200px) {
.mobile-only { .ps-page--section-link {
display: none; display: none;
} }
} }