Skip to content

Commit 1aa7284

Browse files
ligiligi
authored
Merge pull request #33 from department-of-decentralization/q9f/copy/edit
update website copy
2 parents 92a0887 + 252962b commit 1aa7284

21 files changed

+311
-76
lines changed

‎app/impressum/NextStammtisch.tsx renamed to ‎app/NextStammtisch.tsx

File renamed without changes.

‎app/contact/page.tsx

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
import PageTitle from '@/components/PageTitle'
2+
import { genPageMetadata } from 'app/seo'
3+
import NextStammtisch from '../NextStammtisch'
4+
5+
export const metadata = genPageMetadata({ title: 'Contact' })
6+
7+
export default function Contact() {
8+
return (
9+
<>
10+
<PageTitle>Contact</PageTitle>
11+
<div className="prose max-w-none pb-8 pt-8 dark:prose-invert">
12+
<h2>Away from Keyboard</h2>
13+
<p>
14+
Our public, in-person <span className="font-medium">Stammtisch</span> happens every 3rd
15+
Wednesday at the{' '}
16+
<a href="https://c-base.org/" target="_blank" rel="noreferrer">
17+
c-base
18+
</a>{' '}
19+
in Berlin. Drop in and say hi!
20+
</p>
21+
<div>
22+
<p>
23+
Next Stammtisch: <NextStammtisch /> at 19:00 Berlin time.
24+
<br />
25+
Please check the <span className="font-medium">c-base calendar</span> or our [Matrix]
26+
space if the meetup is happening!
27+
</p>
28+
</div>
29+
<h2>On the Internet</h2>
30+
<p>
31+
We are coordinating on [Matrix]:
32+
<a
33+
href="https://matrix.to/#/%23stammtisch:dod.ngo"
34+
target="_blank"
35+
rel="noopener noreferrer"
36+
>
37+
#stammtisch:dod.ngo
38+
</a>
39+
,{' '}
40+
<a
41+
href="https://matrix.to/#/%23ethberlin:dod.ngo"
42+
target="_blank"
43+
rel="noopener noreferrer"
44+
>
45+
#ethberlin:dod.ngo
46+
</a>
47+
,{' '}
48+
<a
49+
href="https://matrix.to/#/%23protocol:dod.ngo"
50+
target="_blank"
51+
rel="noopener noreferrer"
52+
>
53+
#protocol:dod.ngo
54+
</a>
55+
</p>
56+
<p>
57+
Follow us on Bluesky:
58+
<a href="https://bsky.app/profile/dod.ngo" target="_blank" rel="noopener noreferrer">
59+
@dod.ngo
60+
</a>
61+
,{' '}
62+
<a
63+
href="https://bsky.app/profile/ethberlin.org"
64+
target="_blank"
65+
rel="noopener noreferrer"
66+
>
67+
@ethberlin.org
68+
</a>
69+
,{' '}
70+
<a
71+
href="https://bsky.app/profile/protocol.berlin"
72+
target="_blank"
73+
rel="noopener noreferrer"
74+
>
75+
@protocol.berlin
76+
</a>
77+
</p>
78+
<p>
79+
Follow us on Twitter:
80+
<a href="https://twitter.com/dod_berlin" target="_blank" rel="noopener noreferrer">
81+
@dod_berlin
82+
</a>
83+
,{' '}
84+
<a href="https://twitter.com/ETHBerlin" target="_blank" rel="noopener noreferrer">
85+
@ETHBerlin
86+
</a>
87+
,{' '}
88+
<a href="https://twitter.com/protocol_berg" target="_blank" rel="noopener noreferrer">
89+
@protocol_berg
90+
</a>
91+
</p>
92+
<p>
93+
All event recordings are available on Youtube:
94+
<a
95+
href="https://www.youtube.com/@departmentofdecentralization/playlists"
96+
target="_blank"
97+
rel="noopener noreferrer"
98+
>
99+
@departmentofdecentralization
100+
</a>
101+
</p>
102+
<p>
103+
Email us at{' '}
104+
<a href="mailto:[email protected]" target="_blank" rel="noreferrer">
105+
[email protected]
106+
</a>
107+
.
108+
</p>
109+
</div>
110+
</>
111+
)
112+
}

‎app/donate/page.tsx

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
import PageTitle from '@/components/PageTitle'
2+
import { genPageMetadata } from 'app/seo'
3+
4+
export const metadata = genPageMetadata({ title: 'Donate' })
5+
6+
export default function Donate() {
7+
return (
8+
<>
9+
<PageTitle>Donate</PageTitle>
10+
<div className="prose max-w-none pb-8 pt-8 dark:prose-invert">
11+
<p>
12+
The Department of Decentralization is a non-profit organization accepting donations either
13+
via cryptographic transactions or traditional wire transfers.
14+
</p>
15+
<h3>Crypto</h3>
16+
<p>
17+
Donations on Ethereum mainnet: <code>ethberlin.eth</code>; on other EVM chains:{' '}
18+
<code>0xd22dC63e2388AE8226b5CAA0341fc0c1294b6B40</code>
19+
</p>
20+
<p>
21+
Our old, secondary account is: <code>dezent.eth</code>; on other EVM chains:{' '}
22+
<code>0x59cc3Fc56B8B2988F259EC1E6f3446907130f728</code>; do not use if possible.
23+
</p>
24+
<h3>Fiat</h3>
25+
<p>
26+
Wire (SEPA) donations:
27+
<br />
28+
Beneficiary: <code>Goerli Dezentral gGmbH</code>
29+
<br />
30+
International Bank Account Number: <code>DE16 1005 0000 0190 8447 44</code>
31+
<br />
32+
Bank Identifier Code: <code>BELADEBEXXX</code>
33+
<br />
34+
Subject: <code>Spende Department of Decentralization</code>
35+
</p>
36+
<p>
37+
To donate on other platforms or to get a donation receipt, please message us at{' '}
38+
<a href="mailto:[email protected]">[email protected]</a>.
39+
</p>
40+
</div>
41+
</>
42+
)
43+
}

‎app/events/EventsList.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use client'
22

33
import { events } from '@/data/dodEvents'
4+
import NextStammtisch from 'app/NextStammtisch'
45

56
export default function EventsList() {
67
const now = new Date()
@@ -37,7 +38,16 @@ export default function EventsList() {
3738
<div className="prose max-w-none pb-8 pt-8 dark:prose-invert">
3839
<h3>Upcoming events:</h3>
3940
<div>
40-
<ul>{upcomingEvents.map(renderEvent)}</ul>
41+
<ul>
42+
{upcomingEvents.map(renderEvent)}
43+
<li>
44+
Next Stammtisch (informal meetup) at{' '}
45+
<a href="https://c-base.org" target="_blank" rel="noopener noreferrer">
46+
c-base
47+
</a>
48+
: <NextStammtisch /> at 19:00 Berlin time.
49+
</li>
50+
</ul>
4151
</div>
4252
<h3>Past events:</h3>
4353
<div>

‎app/impressum/page.tsx

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import PageTitle from '@/components/PageTitle'
22
import { genPageMetadata } from 'app/seo'
3-
import NextStammtisch from './NextStammtisch'
43

54
export const metadata = genPageMetadata({ title: 'Impressum' })
65

@@ -9,61 +8,6 @@ export default function Impressum() {
98
<>
109
<PageTitle>Impressum</PageTitle>
1110
<div className="prose max-w-none pb-8 pt-8 dark:prose-invert">
12-
<h2>Contact</h2>
13-
<p>
14-
Our public, in-person Stammtisch happens every 3rd Wednesday at the{' '}
15-
<a href="https://c-base.org/" target="_blank" rel="noreferrer">
16-
c-base
17-
</a>{' '}
18-
in Berlin. Drop in and say hi!
19-
</p>
20-
<div>
21-
<p>
22-
Next Stammtisch: <NextStammtisch />
23-
</p>
24-
</div>
25-
<p>
26-
We are coordinating on Matrix:
27-
<a
28-
href="https://matrix.to/#/%23stammtisch:dod.ngo"
29-
target="_blank"
30-
rel="noopener noreferrer"
31-
>
32-
#stammtisch:dod.ngo
33-
</a>
34-
</p>
35-
<p>
36-
Email us at{' '}
37-
<a href="mailto:[email protected]" target="_blank" rel="noreferrer">
38-
[email protected]
39-
</a>
40-
.
41-
</p>
42-
<h3>Donations</h3>
43-
<p>
44-
The Department of Decentralization is a non-profit organization accepting donations either
45-
via cryptographic transactions or traditional wire transfers.
46-
</p>
47-
<p>
48-
Donations on Ethereum mainnet: <code>ethberlin.eth</code>; on other EVM chains:{' '}
49-
<code>0xd22dC63e2388AE8226b5CAA0341fc0c1294b6B40</code>
50-
</p>
51-
<p>
52-
Wire (SEPA) donations:
53-
<br />
54-
Beneficiary: <code>Goerli Dezentral gGmbH</code>
55-
<br />
56-
International Bank Account Number: <code>DE16 1005 0000 0190 8447 44</code>
57-
<br />
58-
Bank Identifier Code: <code>BELADEBEXXX</code>
59-
<br />
60-
Subject: <code>Spende Department of Decentralization</code>
61-
</p>
62-
<p>
63-
To donate on other platforms or to get a donation receipt, please message us at{' '}
64-
<a href="mailto:[email protected]">[email protected]</a>.
65-
</p>
66-
<h3>Impressum</h3>
6711
<p>
6812
Angaben gem&auml;&szlig; &sect; 5 TMG: Goerli Dezentral gGmbH, Mariannenstra&szlig;e 9-10,
6913
10999 Berlin

‎app/page.tsx

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,38 @@ export default function Page() {
99
<PageTitle>Department of Decentralization</PageTitle>
1010
<div className="prose max-w-none pb-8 pt-8 dark:prose-invert">
1111
<div>
12-
The Department of Decentralization is a collective of people from various crypto,
13-
decentralization and peer-to-peer communities in and around Berlin. The group assembled in
14-
2018 to organize ETHBerlin and has been active since.
12+
The Department of Decentralization is a collective of people from Berlin. The group
13+
assembled in 2018 to organize the{' '}
14+
<a href="https://ethberlin.com" target="_blank" rel="noopener noreferrer">
15+
ETHBerlin
16+
</a>{' '}
17+
hackathon and has been active since.
1518
</div>
1619
<div>
1720
We aim to be an agnostic vehicle to drive adoption, educate newcomers, and raise awareness
1821
of the challenges and benefits of decentralization and open-source software.
1922
</div>
23+
<div>
24+
All our events are free to attend and we try, whenever possible, to deliver a
25+
distraction-free experience by not hosting sponsors, paid talks, or any other commercial
26+
components. Our collective entirely runs on donations.
27+
</div>
28+
<div>
29+
<img
30+
alt="The DoD team at Protocol Berg v1 in 2023"
31+
src="/static/images/team.jpg"
32+
style={{ marginBottom: 0 }}
33+
/>
34+
<div style={{ textAlign: 'center' }}>
35+
<em>
36+
The DoD team at{' '}
37+
<a href="https://v1.protocol.berlin" target="_blank" rel="noopener noreferrer">
38+
Protocol Berg v1
39+
</a>{' '}
40+
in 2023.
41+
</em>
42+
</div>
43+
</div>
2044
</div>
2145
</>
2246
)

‎app/people/images/alex.jpg

11.6 KB
Loading

‎app/people/images/carl.jpg

85.8 KB
Loading

‎app/people/images/caspar.jpg

19.7 KB
Loading

‎app/people/images/jommi.jpg

32.9 KB
Loading

‎app/people/images/lili.jpg

5.71 KB
Loading

‎app/people/images/nich.jpg

29.6 KB
Loading

‎app/people/images/noPhoto.jpg

384 KB
Loading

‎app/people/page.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,14 @@ function PersonCard({ person }: { person: PersonData }) {
3333
}
3434

3535
export default function PeoplePage() {
36-
const currentMembers = peopleData.filter((person) => !person.isAlumni)
37-
const alumni = peopleData.filter((person) => person.isAlumni)
36+
const currentMembers = peopleData
37+
.filter((person) => !person.isAlumni)
38+
.sort(() => Math.random() - 0.5)
39+
const alumni = peopleData.filter((person) => person.isAlumni).sort(() => Math.random() - 0.5)
3840

3941
return (
4042
<div className="container mx-auto px-4 py-12">
41-
<h1 className="mb-12 text-center text-4xl font-bold">Department Members</h1>
43+
<h1 className="mb-12 text-center text-4xl font-bold">Collective Members</h1>
4244

4345
<section className="mb-16">
4446
<h2 className="mb-8 text-2xl font-semibold">Office</h2>

0 commit comments

Comments
 (0)