franconian
/
www.franconian.net
13
0
Fork 0
Code Pull Requests Releases Activity

Compare commits

base: franconian:00d087fb7060a7da9780a870073865b1b0e53999
Branches Tags
franconian:main
franconian:staging
...
compare: franconian:a11ca73d1afc6702c5b83e74da3266f860fd7b20
Branches Tags
franconian:main
franconian:staging

9 Commits
00d087fb70 ... a11ca73d1a

Author SHA1 Message Date
Luca a11ca73d1a Update drone config
continuous-integration/drone/push Build is passing Details
2022-11-05 20:08:15 +01:00
Stefan Schwarz e8e422b2d6 add second workshop
continuous-integration/drone/push Build is passing Details
2021-12-29 15:58:10 +01:00
Stefan Schwarz b0463a5039 add masks
continuous-integration/drone/push Build is passing Details
2021-12-27 23:31:40 +01:00
Stefan Schwarz d8c2ef6276 workshops: remove logo
continuous-integration/drone/push Build is passing Details
2021-12-27 17:52:24 +01:00
Stefan Schwarz 667857ae04 workshop: fix alignment and fix into screen size
continuous-integration/drone/push Build is passing Details
2021-12-27 17:48:54 +01:00
Stefan Schwarz 711b2e674f add workshop obs pages
continuous-integration/drone/push Build is passing Details
2021-12-27 17:43:28 +01:00
Luca a00e0e9c67 Fix schedule url
continuous-integration/drone/push Build is passing Details
2021-12-27 13:09:30 +01:00
Luca 1bad7b7abd Fix overlay generator and overlay
continuous-integration/drone/push Build is passing Details
2021-12-27 12:44:29 +01:00
Luca c951617fb2 Generate updated stream overlay
continuous-integration/drone/push Build is passing Details
2021-12-27 12:39:37 +01:00
15 changed files with 279 additions and 5 deletions
Show Stats Expand all files Collapse all files

7
.drone.yml
View File

@ -28,12 +28,13 @@ steps:
image: appleboy/drone-scp
settings: &deploy-settings
host: dragon.luj0ga.de
username: www
port: 4222
username: www-data
key:
from_secret: ssh_key
passphrase:
from_secret: ssh_passphrase
target: /srv/www/sites/staging.www.franconian.net/
target: /var/www/staging.www.franconian.net/
source: public/*
strip_components: 1
rm: yes
@ -47,7 +48,7 @@ steps:
image: appleboy/drone-scp
settings:
<<: *deploy-settings
target: /srv/www/sites/www.franconian.net/
target: /var/www/www.franconian.net/
when:
event:
- push

2
static/bauchbinde/assets/script.js
View File

@ -1,5 +1,5 @@
(() => {
const scheduleUrl = 'https://schedule2.broken.equipment/everything.schedule.json';
const scheduleUrl = 'https://static.rc3.world/schedule/everything.json';
let isFirstRun = true;
let autoIntro = false;

3
static/gen-overlay.sh
View File

@ -10,7 +10,8 @@ fi
DIR="$(dirname "$(which "$0")")"
export LOGO_URL="file://$DIR/logoGen/$1.svg"
export LOGO_URL="file://$DIR/$1.svg"
echo "Generating from $LOGO_URL ..."
envsubst < "$DIR/overlay.svg" > overlay.tmp.svg
inkscape -o overlay.png overlay.tmp.svg

26
static/mask/1-speaker.html Normal file
View File

@ -0,0 +1,26 @@
<!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>

27
static/mask/2-speaker.html Normal file
View File

@ -0,0 +1,27 @@
<!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>

28
static/mask/3-speaker.html Normal file
View File

@ -0,0 +1,28 @@
<!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>

29
static/mask/4-speaker.html Normal file
View File

@ -0,0 +1,29 @@
<!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>

27
static/mask/slide-1-speaker.html Normal file
View File

@ -0,0 +1,27 @@
<!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>

28
static/mask/slide-2-speaker.html Normal file
View File

@ -0,0 +1,28 @@
<!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>

29
static/mask/slide-3-speaker.html Normal file
View File

@ -0,0 +1,29 @@
<!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>

BIN
static/overlay.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
static/workshops/tox-qr.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

39
static/workshops/tox.html Normal file
View File

@ -0,0 +1,39 @@
<!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>

BIN
static/workshops/tpl-qr.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

39
static/workshops/tpl.html Normal file
View File

@ -0,0 +1,39 @@
<!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>