Compare commits
No commits in common. "a11ca73d1afc6702c5b83e74da3266f860fd7b20" and "00d087fb7060a7da9780a870073865b1b0e53999" have entirely different histories.
a11ca73d1a
...
00d087fb70
|
|
@ -28,13 +28,12 @@ steps:
|
||||||
image: appleboy/drone-scp
|
image: appleboy/drone-scp
|
||||||
settings: &deploy-settings
|
settings: &deploy-settings
|
||||||
host: dragon.luj0ga.de
|
host: dragon.luj0ga.de
|
||||||
port: 4222
|
username: www
|
||||||
username: www-data
|
|
||||||
key:
|
key:
|
||||||
from_secret: ssh_key
|
from_secret: ssh_key
|
||||||
passphrase:
|
passphrase:
|
||||||
from_secret: ssh_passphrase
|
from_secret: ssh_passphrase
|
||||||
target: /var/www/staging.www.franconian.net/
|
target: /srv/www/sites/staging.www.franconian.net/
|
||||||
source: public/*
|
source: public/*
|
||||||
strip_components: 1
|
strip_components: 1
|
||||||
rm: yes
|
rm: yes
|
||||||
|
|
@ -48,7 +47,7 @@ steps:
|
||||||
image: appleboy/drone-scp
|
image: appleboy/drone-scp
|
||||||
settings:
|
settings:
|
||||||
<<: *deploy-settings
|
<<: *deploy-settings
|
||||||
target: /var/www/www.franconian.net/
|
target: /srv/www/sites/www.franconian.net/
|
||||||
when:
|
when:
|
||||||
event:
|
event:
|
||||||
- push
|
- push
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
(() => {
|
(() => {
|
||||||
const scheduleUrl = 'https://static.rc3.world/schedule/everything.json';
|
const scheduleUrl = 'https://schedule2.broken.equipment/everything.schedule.json';
|
||||||
|
|
||||||
let isFirstRun = true;
|
let isFirstRun = true;
|
||||||
let autoIntro = false;
|
let autoIntro = false;
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,7 @@ fi
|
||||||
|
|
||||||
DIR="$(dirname "$(which "$0")")"
|
DIR="$(dirname "$(which "$0")")"
|
||||||
|
|
||||||
export LOGO_URL="file://$DIR/$1.svg"
|
export LOGO_URL="file://$DIR/logoGen/$1.svg"
|
||||||
echo "Generating from $LOGO_URL ..."
|
|
||||||
envsubst < "$DIR/overlay.svg" > overlay.tmp.svg
|
envsubst < "$DIR/overlay.svg" > overlay.tmp.svg
|
||||||
|
|
||||||
inkscape -o overlay.png overlay.tmp.svg
|
inkscape -o overlay.png overlay.tmp.svg
|
||||||
|
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
<!doctype html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<style>
|
|
||||||
* {
|
|
||||||
border: 0;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
.fgrid {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(4, 25vw);
|
|
||||||
grid-template-rows: repeat(4, 25vh);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<script>
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
<body class="content">
|
|
||||||
<div class="fgrid">
|
|
||||||
<div style="margin: 4vh 4vw; background: cyan; grid-column: 1 / span 4; grid-row: 1 / span 4;">01</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
<!doctype html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<style>
|
|
||||||
* {
|
|
||||||
border: 0;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
.fgrid {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(4, 25vw);
|
|
||||||
grid-template-rows: repeat(4, 25vh);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<script>
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
<body class="content">
|
|
||||||
<div class="fgrid">
|
|
||||||
<div style="margin: 0 1em; background: cyan; grid-column: 1 / span 2; grid-row: 2 / span 2;">02</div>
|
|
||||||
<div style="margin-right: 1em; background: cyan; grid-column: 3 / span 2; grid-row: 2 / span 2;">02</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
<!doctype html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<style>
|
|
||||||
* {
|
|
||||||
border: 0;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
.fgrid {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(4, 25vw);
|
|
||||||
grid-template-rows: repeat(4, 25vh);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<script>
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
<body class="content">
|
|
||||||
<div class="fgrid">
|
|
||||||
<div style="margin: 1em; background: cyan; grid-column: 1 / span 2; grid-row: 1 / span 2;">02</div>
|
|
||||||
<div style="margin: 1em; margin-top: 0; background: cyan; grid-column: 1 / span 2; grid-row: 3 / span 2;">02</div>
|
|
||||||
<div style="margin: 1em; margin-left: 0; background: cyan; grid-column: 3 / span 2; grid-row: 2 / span 2;">02</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
<!doctype html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<style>
|
|
||||||
* {
|
|
||||||
border: 0;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
.fgrid {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(4, 25vw);
|
|
||||||
grid-template-rows: repeat(4, 25vh);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<script>
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
<body class="content">
|
|
||||||
<div class="fgrid">
|
|
||||||
<div style="margin: 1em; background: cyan; grid-column: 1 / span 2; grid-row: 1 / span 2;">01</div>
|
|
||||||
<div style="margin: 1em; margin-top: 0; background: cyan; grid-column: 1 / span 2; grid-row: 3 / span 2;">02</div>
|
|
||||||
<div style="margin: 1em; margin-left: 0; background: cyan; grid-column: 3 / span 2; grid-row: 1 / span 2;">03</div>
|
|
||||||
<div style="margin: 1em; margin-top: 0; margin-left: 0; background: cyan; grid-column: 3 / span 2; grid-row: 3 / span 2;">04</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
<!doctype html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<style>
|
|
||||||
* {
|
|
||||||
border: 0;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
.fgrid {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(4, 25vw);
|
|
||||||
grid-template-rows: repeat(4, 25vh);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<script>
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
<body class="content">
|
|
||||||
<div class="fgrid">
|
|
||||||
<div style="margin: 1em 1em; background: cyan; grid-column: 1 / span 3; grid-row: 1 / span 3;">02</div>
|
|
||||||
<div style="margin: -5vh 1em 1em -5vw; background: cyan; grid-column: 4 / span 1; grid-row: 4 / span 1;">02</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
<!doctype html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<style>
|
|
||||||
* {
|
|
||||||
border: 0;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
.fgrid {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(8, 12.5vw);
|
|
||||||
grid-template-rows: repeat(8, 12.5vh);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<script>
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
<body class="content">
|
|
||||||
<div class="fgrid">
|
|
||||||
<div style="border: 1px solid black; margin: 1em 1em; background: cyan; grid-column: 1 / span 6; grid-row: 1 / span 6;">02</div>
|
|
||||||
<div style="border: 1px solid black; margin: -4vh 1vw 3vh -2vw; background: green; grid-column: 7 / span 2; grid-row: 5 / span 2;">02</div>
|
|
||||||
<div style="border: 1px solid black; margin: -2vh 1vw 1vh -2vw; background: green; grid-column: 7 / span 2; grid-row: 7 / span 2;">02</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
<!doctype html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<style>
|
|
||||||
* {
|
|
||||||
border: 0;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
.fgrid {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(8, 12.5vw);
|
|
||||||
grid-template-rows: repeat(8, 12.5vh);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<script>
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
<body class="content">
|
|
||||||
<div class="fgrid">
|
|
||||||
<div style="border: 1px solid black; margin: 1em 1em; background: cyan; grid-column: 1 / span 6; grid-row: 1 / span 6;">02</div>
|
|
||||||
<div style="border: 1px solid black; margin: -6vh 1vw 5vh -2vw; background: green; grid-column: 7 / span 2; grid-row: 3 / span 2;">02</div>
|
|
||||||
<div style="border: 1px solid black; margin: -4vh 1vw 3vh -2vw; background: green; grid-column: 7 / span 2; grid-row: 5 / span 2;">02</div>
|
|
||||||
<div style="border: 1px solid black; margin: -2vh 1vw 1vh -2vw; background: green; grid-column: 7 / span 2; grid-row: 7 / span 2;">02</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 21 KiB |
|
|
@ -1,39 +0,0 @@
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width,initial-scale=1.0">
|
|
||||||
<title>
|
|
||||||
Infobeamer
|
|
||||||
</title>
|
|
||||||
<link rel="stylesheet" href="https://www.franconian.net/style.css">
|
|
||||||
</head>
|
|
||||||
<body class="">
|
|
||||||
<header style="max-width: 1700px;">
|
|
||||||
</header>
|
|
||||||
<main style="max-width: 1700px;">
|
|
||||||
<h1 style="font-size: 4em;">
|
|
||||||
Tox CryptoParty
|
|
||||||
<span style="font-size: .5em; display: block;">Install a Tox Client and have some fun with it</span>
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<div class="box">
|
|
||||||
<h2 class="box-header" style="font-size: 2em; padding: 0.2em;">workshop in the rC3 world</h2>
|
|
||||||
<div class="box-content clamp-height" style="font-size: 2em; text-align: center;">
|
|
||||||
<p>
|
|
||||||
This talk is a workshop, taking place in the rC3 world. A ticket is required.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
Dieser Talk ist ein Workshop und wird in der rC3-Welt stattfinden. Es wird ein Ticket benötigt.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
https://rc3.world/2021/room/workshop-4ccf/
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
<img src="./tox-qr.png">
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB |
|
|
@ -1,39 +0,0 @@
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width,initial-scale=1.0">
|
|
||||||
<title>
|
|
||||||
Infobeamer
|
|
||||||
</title>
|
|
||||||
<link rel="stylesheet" href="https://www.franconian.net/style.css">
|
|
||||||
</head>
|
|
||||||
<body class="">
|
|
||||||
<header style="max-width: 1700px;">
|
|
||||||
</header>
|
|
||||||
<main style="max-width: 1700px;">
|
|
||||||
<h1 style="font-size: 4em;">
|
|
||||||
Teaching programming to your loved ones
|
|
||||||
<span style="font-size: .5em; display: block;">Hands on!</span>
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<div class="box">
|
|
||||||
<h2 class="box-header" style="font-size: 2em; padding: 0.2em;">workshop in the rC3 world</h2>
|
|
||||||
<div class="box-content clamp-height" style="font-size: 2em; text-align: center;">
|
|
||||||
<p>
|
|
||||||
This talk is a workshop, taking place in the rC3 world. A ticket is required.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
Dieser Talk ist ein Workshop und wird in der rC3-Welt stattfinden. Es wird ein Ticket benötigt.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
https://rc3.world/2021/room/workshop-ii/
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
<img src="./tpl-qr.png">
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
Loading…
Reference in New Issue