Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
uses: actions/checkout@v2

- name: Install Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 20.x

- name: Install NPM packages
run: npm ci
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: PR Build

on:
pull_request:
branches:
- main

jobs:
build:
name: Build
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20.x
cache: npm

- name: Install NPM packages
run: npm ci

- name: Build project
run: npm run build
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# ETHBerlin³ (2022) Website

> - https://ethberlin.ooo
> - https://2022.ethberlin.org

Join the ETHBerlin³ Matrix space to contribute: https://matrix.to/#/#ethberlin:matrix.org
Join the ETHBerlin³ Matrix space to contribute: https://matrix.to/#/%23ethberlin:dod.ngo

# Run

Expand Down
4 changes: 2 additions & 2 deletions gatsby-config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module.exports = {
siteMetadata: {
title: "ETHBerlin³ 2022",
siteUrl: `https://ethberlin.ooo`,
url: `https://ethberlin.ooo`,
siteUrl: `https://2022.ethberlin.org`,
url: `https://2022.ethberlin.org`,
description:
"ETHBerlin 3: three-day hackathon extravaganza, September 16-18, 2022",
twitterUsername: "@ETHBerlin",
Expand Down
3 changes: 3 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package-old.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"test": "react-scripts test",
"eject": "react-scripts eject",
"predeploy": "npm run build",
"deploy": "echo 'https://ethberlin.ooo' > ./build/CNAME && gh-pages -d build"
"deploy": "echo 'https://2022.ethberlin.org' > ./build/CNAME && gh-pages -d build"
},
"eslintConfig": {
"extends": [
Expand All @@ -44,5 +44,5 @@
"postcss": "^8.4.14",
"tailwindcss": "^3.0.24"
},
"homepage": "https://ethberlin.ooo"
"homepage": "https://2022.ethberlin.org"
}
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@
"keywords": [
"gatsby"
],
"engines": {
"node": "20.x"
},
"scripts": {
"develop": "gatsby develop",
"start": "gatsby develop",
"build": "gatsby build",
"serve": "gatsby serve",
"clean": "gatsby clean",
"deploy": "echo 'https://ethberlin.ooo' > ./build/CNAME && gh-pages -d build"
"deploy": "echo 'https://2022.ethberlin.org' > ./build/CNAME && gh-pages -d build"
},
"dependencies": {
"@mdx-js/mdx": "^1.6.22",
Expand Down Expand Up @@ -42,5 +45,5 @@
"postcss": "^8.4.14",
"tailwindcss": "^3.1.6"
},
"homepage": "https://ethberlin.ooo"
"homepage": "https://2022.ethberlin.org"
}
6 changes: 3 additions & 3 deletions src/components/Layout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const Layout = ({ children, showEthDiamond }) => {
join our{" "}
<a
className="underline"
href="https://matrix.to/#/%23ethberlin:matrix.org"
href="https://matrix.to/#/%23ethberlin:dod.ngo"
target="_blank"
rel="noreferrer"
>
Expand Down Expand Up @@ -163,13 +163,13 @@ const Layout = ({ children, showEthDiamond }) => {
>
<a
className="mx-4 my-2 sm:ml-8 text-berlin-yellow"
href="https://blog.ethberlin.ooo"
href="https://dod.ngo/blog"
>
(b)log
</a>
<a
className="mx-4 my-2 sm:ml-8 text-berlin-yellow"
href="/decentralization"
href="https://dod.ngo"
>
department of (d)ecentralization
</a>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Sidebar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const Sidebar = ({ className, hideLogo }) => {
join our{" "}
<a
className="underline"
href="https://matrix.to/#/%23ethberlin:matrix.org"
href="https://matrix.to/#/%23ethberlin:dod.ngo"
target="_blank"
rel="noreferrer"
>
Expand Down
4 changes: 2 additions & 2 deletions src/html.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ export default function HTML(props) {
window.location.href= "/contact";
}
else if (e.key == 'd' || e.key == 'D') {
window.location.href= "/decentralization";
window.location.href= "https://dod.ngo";
}
else if (e.key == 'o' || e.key == 'O') {
window.location.href= "/code-of-conduct";
}
else if (e.key == 'b' || e.key == 'B') {
window.location.href= "https://blog.ethberlin.ooo";
window.location.href= "https://dod.ngo/blog";
}
else if (e.key == 'v' || e.key == 'V') {
window.location.href= "/venue";
Expand Down
2 changes: 1 addition & 1 deletion src/pages/about.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const About = () => (
<p>
After successful events in 2018 and 2019, ETHBerlin decided to reaffirm
its commitment with the ecosystem and founded the{" "}
<a href="/decentralization">Department of Decentralization</a>. The DoD is
<a href="https://dod.ngo">Department of Decentralization</a>. The DoD is
responsible for initiatives that go beyond organizing hackathons and
seek to also support the projects coming from our events and community.
ETHBerlin 2018 and ETHBerlinZwei 2019 sought to marry the culture and
Expand Down
2 changes: 1 addition & 1 deletion src/pages/contact.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const Impressum = () => {
</li>
<li>
join our{" "}
<a href="https://matrix.to/#/%23ethberlin:matrix.org">
<a href="https://matrix.to/#/%23ethberlin:dod.ngo">
matrix space
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/contribute.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const Contribute = () => (
</p>
<p>
The sponsorship deck is available{" "}
<a href="https://ethberlin.ooo/sponsor.pdf" target="_blank">here.</a>
<a href="https://2022.ethberlin.org/sponsor.pdf" target="_blank">here.</a>
</p>
<p>
As an acknowledged German non-profit entity we are entitled to issue
Expand Down
17 changes: 9 additions & 8 deletions src/pages/decentralization.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,16 @@ const decentralization = () => (
<span className="fake-bold">ETHBerlin (2018):</span> Hackathon,
conference, and the first event that ran almost entirely using
decentralized applications:{" "}
<a href="https://ethberlin.com" target="_blank">
ethberlin.com
<a href="https://2018.ethberlin.org" target="_blank">
2018.ethberlin.org
</a>
</li>
<li>
<span className="fake-bold">GoerliCon 0 (2019): </span>The Ethereum
testnet and infrastructure conference where the Goerli Testnet was
launched live on stage: <a href="https://goerli.net/" target="_blank">
goerli.net
launched live on stage:{" "}
<a href="https://goerli.dod.ngo/" target="_blank">
goerli.dod.ngo
</a>
</li>
<li>
Expand All @@ -57,8 +58,8 @@ const decentralization = () => (
<li>
<span className="fake-bold">ETHBerlin ZWEI (2019): </span>hackathon,
conference, and cultural festival, second edition:{" "}
<a href="https://ethberlinzwei.com" target="_blank">
ethberlinzwei.com
<a href="https://2019.ethberlin.org" target="_blank">
2019.ethberlin.org
</a>
</li>
<li>
Expand Down Expand Up @@ -93,8 +94,8 @@ const decentralization = () => (
<li>
<span className="fake-bold">ETHBerlin³ (2022): </span>hackathon,
conference, and cultural festival, third edition:{" "}
<a href="https://ethberlin.ooo" target="_blank">
ethberlin.ooo
<a href="https://2022.ethberlin.org" target="_blank">
2022.ethberlin.org
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/hack.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const Hack = () => (
redeem it before it expires
</a>! Once, you redeemed your ticket,
{" "}
<a href="https://matrix.to/#/%23ethberlin:matrix.org" target="_blank">
<a href="https://matrix.to/#/%23ethberlin:dod.ngo" target="_blank">
join the official matrix space
</a>, and read on!
</p>
Expand Down
16 changes: 8 additions & 8 deletions src/pages/hacker-manual.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ const HackerManual = () => {
<li>
Join the conversation on Matrix:{" "}
<a
href="https://matrix.to/#/%23ethberlin:matrix.org"
href="https://matrix.to/#/%23ethberlin:dod.ngo"
target="_blank"
>
#ethberlin:matrix.org
#ethberlin:dod.ngo
</a>
</li>
<li>
Expand All @@ -143,8 +143,8 @@ const HackerManual = () => {
</li>
<li>
Bookmark the Mentor Helpdesk:{" "}
<a href="https://ask.ethberlin.ooo" target="_blank">
ask.ethberlin.ooo
<a href="https://ask.2022.ethberlin.org" target="_blank">
ask.2022.ethberlin.org
</a>
</li>
</ul>
Expand Down Expand Up @@ -289,8 +289,8 @@ const HackerManual = () => {
The only official communication channel is the ETHBerlin Matrix
space. Use it to connect with hackers and mentors, and to get
updates from the organizers throughout the hackathon:{" "}
<a href="https://matrix.to/#/%23ethberlin:matrix.org">
#ethberlin:matrix.org
<a href="https://matrix.to/#/%23ethberlin:dod.ngo">
#ethberlin:dod.ngo
</a>
</p>
</div>
Expand Down Expand Up @@ -493,8 +493,8 @@ const HackerManual = () => {
<ul>
<li>
Reach all of our mentors via the simple ticket system, HELPq:{" "}
<a href="https://ask.ethberlin.ooo" target="_blank">
ask.ethberlin.ooo
<a href="https://ask.2022.ethberlin.org" target="_blank">
ask.2022.ethberlin.org
</a>
</li>
<li>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ const Home = () => {
join our{" "}
<a
className="underline"
href="https://matrix.to/#/%23ethberlin:matrix.org"
href="https://matrix.to/#/%23ethberlin:dod.ngo"
target="_blank"
rel="noreferrer"
>
Expand Down Expand Up @@ -289,13 +289,13 @@ const Home = () => {
>
<a
className="mx-4 my-2 sm:ml-8 text-berlin-yellow"
href="https://blog.ethberlin.ooo"
href="https://dod.ngo/blog"
>
(b)log
</a>
<a
className="mx-4 my-2 sm:ml-8 text-berlin-yellow"
href="/decentralization"
href="https://dod.ngo"
>
department of (d)ecentralization
</a>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/manifesto.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ const Manifesto = () => {
<p>
In fact, the world seems to have changed drastically since we last
met in Berlin in{" "}
<a href="https://ethberlin.com/about/" target="_blank">
<a href="https://2018.ethberlin.org/about/" target="_blank">
2018 for ETHBerlin
</a>{" "}
and in{" "}
<a href="https://ethberlinzwei.com/about.html" target="_blank">
<a href="https://2019.ethberlin.org/about.html" target="_blank">
2019 for ETHBerlin ZWEI
</a>
.
Expand Down Expand Up @@ -152,7 +152,7 @@ const Manifesto = () => {
IPFS Pinata
</a>{" "}
or the{" "}
<a href="https://goerli.net/" target="_blank">
<a href="https://goerli.dod.ngo/" target="_blank">
Goerli Testnet
</a>
. And legend has it that even the Dune Analytics founders{" "}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/sponsor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ const Sponsor = () => (
className="h-12 md:h-14 sm:mx-8 sm:grayscale hover:grayscale-0 my-4"
/>
</a>
<a href="https://goerli.net/" target="_blank" rel="noreferrer">
<a href="https://goerli.dod.ngo/" target="_blank" rel="noreferrer">
<img
src={goerli}
className="h-24 md:h-28 sm:mx-8 sm:grayscale hover:grayscale-0 my-4"
Expand Down