Extended intro page, removed trafik based redirect

This commit is contained in:
Ludwig Behm 2021-01-11 22:40:05 +01:00
parent 33aa153743
commit 5c87903a37
4 changed files with 42 additions and 368 deletions

View File

@ -51,21 +51,6 @@ services:
- "traefik.http.routers.front-ssl.service=front"
- "traefik.http.routers.front-ssl.tls.certresolver=le"
- "traefik.http.routers.front-ssl.tls.domains[0].main=play.kraut.world"
# kraut.world - redirects
- "traefik.http.middlewares.website-redirect.redirectregex.regex=^.*"
- "traefik.http.middlewares.website-redirect.redirectregex.replacement=https://play.kraut.world/_/global/raw.githubusercontent.com/HackspaceJena/krautspace-rc3-map/main/maps/kraut.space_e1.json"
# http
- "traefik.http.routers.website.rule=Host(`kraut.world`)"
- "traefik.http.routers.website.entryPoints=web"
- "traefik.http.routers.website.middlewares=website-redirect"
# https
- "traefik.http.routers.website-ssl.rule=Host(`kraut.world`)"
- "traefik.http.routers.website-ssl.entryPoints=websecure"
- "traefik.http.routers.website-ssl.tls=true"
- "traefik.http.routers.website-ssl.service=front"
- "traefik.http.routers.website-ssl.tls.certresolver=le"
- "traefik.http.routers.website-ssl.tls.domains[0].main=kraut.world"
- "traefik.http.routers.website-ssl.middlewares=website-redirect"
pusher:
image: thecodingmachine/nodejs:12
@ -165,26 +150,26 @@ services:
- "traefik.http.routers.uploader-ssl.tls.certresolver=le"
- "traefik.http.routers.uploader-ssl.tls.domains[0].main=uploader.kraut.world"
# website:
# image: thecodingmachine/nodejs:12-apache
# environment:
# STARTUP_COMMAND_1: npm install
# STARTUP_COMMAND_2: npm run watch &
# APACHE_DOCUMENT_ROOT: dist/
# volumes:
# - ./website:/var/www/html
# labels:
# - "traefik.http.middlewares.https-upgrade.redirectscheme.scheme=https"
# - "traefik.http.routers.website.rule=Host(`kraut.world`)"
# - "traefik.http.routers.website.entryPoints=web"
# - "traefik.http.routers.website.middlewares=https-upgrade@docker"
# - "traefik.http.services.website.loadbalancer.server.port=80"
# - "traefik.http.routers.website-ssl.rule=Host(`kraut.world`)"
# - "traefik.http.routers.website-ssl.entryPoints=websecure"
# - "traefik.http.routers.website-ssl.tls=true"
# - "traefik.http.routers.website-ssl.service=website"
# - "traefik.http.routers.website-ssl.tls.certresolver=le"
# - "traefik.http.routers.website-ssl.tls.domains[0].main=kraut.world"
website:
image: thecodingmachine/nodejs:12-apache
environment:
STARTUP_COMMAND_1: npm install
STARTUP_COMMAND_2: npm run watch &
APACHE_DOCUMENT_ROOT: dist/
volumes:
- ./website:/var/www/html
labels:
- "traefik.http.middlewares.https-upgrade.redirectscheme.scheme=https"
- "traefik.http.routers.website.rule=Host(`kraut.world`)"
- "traefik.http.routers.website.entryPoints=web"
- "traefik.http.routers.website.middlewares=https-upgrade@docker"
- "traefik.http.services.website.loadbalancer.server.port=80"
- "traefik.http.routers.website-ssl.rule=Host(`kraut.world`)"
- "traefik.http.routers.website-ssl.entryPoints=websecure"
- "traefik.http.routers.website-ssl.tls=true"
- "traefik.http.routers.website-ssl.service=website"
- "traefik.http.routers.website-ssl.tls.certresolver=le"
- "traefik.http.routers.website-ssl.tls.domains[0].main=kraut.world"
messages:
#image: thecodingmachine/nodejs:14

View File

@ -2,9 +2,7 @@
@import url("https://fonts.googleapis.com/css?family=Raleway|Montserrat:700");
/*
Indivisible by Pixelarity
pixelarity.com | hello@pixelarity.com
License: pixelarity.com/license
(C) KABI.tk
*/
html, body, div, span, applet, object,
@ -309,7 +307,7 @@ input, select, textarea {
}
header p {
font-size: 0.9em;
font-size: 1.0em;
letter-spacing: 0.25em;
margin-bottom: 0;
text-transform: uppercase;

View File

@ -1,7 +1,5 @@
/*
Indivisible by Pixelarity
pixelarity.com | hello@pixelarity.com
License: pixelarity.com/license
(C) kabi.tk
*/
(function($) {

View File

@ -1,6 +1,6 @@
<!DOCTYPE HTML>
<!--
kabi.tk
(c) KABI.tk
-->
<html>
<head>
@ -18,18 +18,21 @@ kabi.tk
<!-- Home -->
<article id="home" class="panel special">
<div class="image">
<img src="images/pic01.png" alt="" data-position="center center" />
<img src="images/pic03.png" alt="" data-position="center center" />
</div>
<div class="content">
<div class="inner">
<header>
<h1>Kraut.World</h1>
<p>Visit us virtually<br />
and have fun!</p>
<p>Workadventure Maps der Chaoszone<br />
unter Initiative des Kraut.Space e.V. und KABI.tk</p>
</header>
<nav id="nav">
<ul class="actions stacked special animated spinY">
<li><a href="https://play.kraut.world/_/global/raw.githubusercontent.com/HackspaceJena/krautspace-rc3-map/main/maps/kraut.space_e1.json#entry_krautspace_e1" class="button">Start the World</a></li>
<li><a href="https://play.kraut.world/_/global/play.kraut.world/rawmaps/2D-Welt-thueringen/main.json" class="button primary"><b></b>Chaoszone</b></a></li>
<li><a href="https://play.kraut.world/_/global/play.kraut.world/rawmaps/lounge/main.json" class="button"><b>Lounge</b></a></li>
<li><a href="https://missioncontrol.kraut.world" class="button">Mission Control</a></li>
<li><a href="#learnmore" class="button small">Was ist das?</a></li>
<!--<li><a href="#elements" class="button">Elements</a></li>-->
</ul>
</nav>
@ -41,9 +44,9 @@ kabi.tk
</article>
<!-- Work -->
<article id="work" class="panel secondary">
<article id="learnmore" class="panel secondary">
<div class="image">
<img src="images/pic01.png" alt="" data-position="center center" />
<img src="images/pic02.png" alt="" data-position="center center" />
</div>
<div class="content">
<ul class="actions animated spinX">
@ -51,330 +54,20 @@ kabi.tk
</ul>
<div class="inner">
<header>
<h2>Work</h2>
<p>Magna feugiat lorem ipsum dolor<br />
veroeros sed adipiscing</p>
<h2>Was ist das?</h2>
<p>rC3 Kraut.Space world map</p>
</header>
<p>Lorem ipsum dolor sit amet, magna etiam adipiscing elit. Vivamus in quam eu turpis venenatis euismod eget ac velit. Magna pharetra eleifend urna quis laoreet. Nullam quis urna iaculis metus ornare accumsan. Sed nunc lacus, lobortis nec ante sit amet.</p>
<p>Vitae quis magna. Sed condimentum dui sed nunc dapibus dignissim. Sed at arcu gravida, vehicula massa ut, consectetur urna. Morbi eu venenatis turpis. In tincidunt pharetra etiam veroeros.</p>
<p>Ziel ist es, die beim rc3 verwendete World-Maps aller Hackspaces der Chaoszone zurück zu bringen und perspektivisch zu dezentralisieren. Die aktuellen Maps sowie technische Implementation ist noch "work in progress", daher kann es durchaus zu Fehlern oder Abstürzen kommen. In dem Fall ladet die Seite einfach neu.</p>
<p>Später wird es nur einen Eingangsbereich geben, von dem aus man die in die verschiedenen Maps kommen kann. Um aktuell einen schnellen Einstieg zu erhalten und sich besser orientieren zu können, sind einige Haupt-Maps auf der Startseite direkt verlinkt.</p>
<p>Du möchtest Deine eigene Map mit verlinken bzw. über diese Plattform laden? Schau bitte im Mission Control vorbei!</p>
<li><a href="https://missioncontrol.kraut.world" class="button">Mission Control</a></li>
</div>
</div>
</article>
<!-- About -->
<article id="about" class="panel secondary">
<div class="image">
<img src="images/pic01.png" alt="" data-position="center center" />
</div>
<div class="content">
<ul class="actions animated spinX">
<li><a href="#" class="button small back">Back</a></li>
</ul>
<div class="inner">
<header>
<h2>About</h2>
<p>Magna feugiat lorem ipsum dolor<br />
veroeros sed adipiscing</p>
</header>
<p>Lorem ipsum dolor sit amet, magna etiam adipiscing elit. Vivamus in quam eu turpis venenatis euismod eget ac velit. Magna pharetra eleifend urna quis laoreet. Nullam quis urna iaculis metus ornare accumsan. Sed nunc lacus, lobortis nec ante sit amet.</p>
<p>Vitae quis magna. Sed condimentum dui sed nunc dapibus dignissim. Sed at arcu gravida, vehicula massa ut, consectetur urna. Morbi eu venenatis turpis. In tincidunt pharetra etiam veroeros.</p>
</div>
</div>
</article>
<!-- Contact -->
<article id="contact" class="panel secondary">
<div class="image">
<img src="images/pic04.jpg" alt="" data-position="bottom center" />
</div>
<div class="content">
<ul class="actions animated spinX">
<li><a href="#" class="button small back">Back</a></li>
</ul>
<div class="inner">
<header>
<h2>Contact</h2>
</header>
<form method="post" action="#">
<div class="fields">
<div class="field half">
<label for="name">Name</label>
<input type="text" name="name" id="name" />
</div>
<div class="field half">
<label for="email">Email</label>
<input type="text" name="email" id="email" />
</div>
<div class="field">
<label for="message">Message</label>
<textarea name="message" id="message" rows="5"></textarea>
</div>
</div>
<ul class="actions">
<li><a href="" class="button submit">Send Message</a></li>
</ul>
</form>
</div>
</div>
</article>
<!-- Elements -->
<article id="elements" class="panel secondary">
<div class="image">
<img src="images/pic03.jpg" alt="" data-position="center center" />
</div>
<div class="content">
<ul class="actions animated spinX">
<li><a href="#" class="button small back">Back</a></li>
</ul>
<div class="inner">
<header>
<h2>Elements</h2>
</header>
<section>
<h4>Text</h4>
<p>This is <b>bold</b> and this is <strong>strong</strong>. This is <i>italic</i> and this is <em>emphasized</em>.
This is <sup>superscript</sup> text and this is <sub>subscript</sub> text.
This is <u>underlined</u> and this is code: <code>for (;;) { ... }</code>. Finally, <a href="#">this is a link</a>.</p>
<hr />
<h2>Heading Level 2</h2>
<h3>Heading Level 3</h3>
<h4>Heading Level 4</h4>
<h5>Heading Level 5</h5>
<h6>Heading Level 6</h6>
<hr />
<h5>Blockquote</h5>
<blockquote>Fringilla nisl. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan faucibus. Vestibulum ante ipsum primis in faucibus lorem ipsum dolor sit amet nullam adipiscing eu felis.</blockquote>
<h5>Preformatted</h5>
<pre><code>i = 0;
while (!deck.isInOrder()) {
print 'Iteration ' + i;
deck.shuffle();
i++;
}
print 'It took ' + i + ' iterations to sort the deck.';</code></pre>
</section>
<section>
<h4>Lists</h4>
<h5>Unordered</h5>
<ul>
<li>Dolor pulvinar etiam.</li>
<li>Sagittis adipiscing.</li>
<li>Felis enim feugiat.</li>
</ul>
<h5>Alternate</h5>
<ul class="alt">
<li>Dolor pulvinar etiam.</li>
<li>Sagittis adipiscing.</li>
<li>Felis enim feugiat.</li>
</ul>
<h5>Ordered</h5>
<ol>
<li>Dolor pulvinar etiam.</li>
<li>Etiam vel felis viverra.</li>
<li>Felis enim feugiat.</li>
<li>Dolor pulvinar etiam.</li>
<li>Etiam vel felis lorem.</li>
<li>Felis enim et feugiat.</li>
</ol>
<h5>Icons</h5>
<ul class="icons">
<li><a href="#" class="icon brands fa-twitter"><span class="label">Twitter</span></a></li>
<li><a href="#" class="icon brands fa-facebook-f"><span class="label">Facebook</span></a></li>
<li><a href="#" class="icon brands fa-instagram"><span class="label">Instagram</span></a></li>
<li><a href="#" class="icon brands fa-github"><span class="label">Github</span></a></li>
</ul>
<h5>Actions</h5>
<ul class="actions">
<li><a href="#" class="button primary">Default</a></li>
<li><a href="#" class="button">Default</a></li>
</ul>
<ul class="actions stacked">
<li><a href="#" class="button primary">Default</a></li>
<li><a href="#" class="button">Default</a></li>
</ul>
</section>
<section>
<h4>Table</h4>
<h5>Default</h5>
<div class="table-wrapper">
<table>
<thead>
<tr>
<th>Name</th>
<th>Description</th>
<th>Price</th>
</tr>
</thead>
<tbody>
<tr>
<td>Item One</td>
<td>Ante turpis integer aliquet porttitor.</td>
<td>29.99</td>
</tr>
<tr>
<td>Item Two</td>
<td>Vis ac commodo adipiscing arcu aliquet.</td>
<td>19.99</td>
</tr>
<tr>
<td>Item Three</td>
<td> Morbi faucibus arcu accumsan lorem.</td>
<td>29.99</td>
</tr>
<tr>
<td>Item Four</td>
<td>Vitae integer tempus condimentum.</td>
<td>19.99</td>
</tr>
<tr>
<td>Item Five</td>
<td>Ante turpis integer aliquet porttitor.</td>
<td>29.99</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="2"></td>
<td>100.00</td>
</tr>
</tfoot>
</table>
</div>
<h5>Alternate</h5>
<div class="table-wrapper">
<table class="alt">
<thead>
<tr>
<th>Name</th>
<th>Description</th>
<th>Price</th>
</tr>
</thead>
<tbody>
<tr>
<td>Item One</td>
<td>Ante turpis integer aliquet porttitor.</td>
<td>29.99</td>
</tr>
<tr>
<td>Item Two</td>
<td>Vis ac commodo adipiscing arcu aliquet.</td>
<td>19.99</td>
</tr>
<tr>
<td>Item Three</td>
<td> Morbi faucibus arcu accumsan lorem.</td>
<td>29.99</td>
</tr>
<tr>
<td>Item Four</td>
<td>Vitae integer tempus condimentum.</td>
<td>19.99</td>
</tr>
<tr>
<td>Item Five</td>
<td>Ante turpis integer aliquet porttitor.</td>
<td>29.99</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="2"></td>
<td>100.00</td>
</tr>
</tfoot>
</table>
</div>
</section>
<section>
<h4>Buttons</h4>
<ul class="actions">
<li><a href="#" class="button primary">Primary</a></li>
<li><a href="#" class="button">Default</a></li>
</ul>
<ul class="actions">
<li><a href="#" class="button">Default</a></li>
<li><a href="#" class="button small">Small</a></li>
</ul>
<ul class="actions">
<li><a href="#" class="button primary icon solid fa-download">Icon</a></li>
<li><a href="#" class="button icon solid fa-download">Icon</a></li>
</ul>
<ul class="actions">
<li><span class="button primary disabled">Disabled</span></li>
<li><span class="button disabled">Disabled</span></li>
</ul>
</section>
<section>
<h4>Form</h4>
<form method="post" action="#">
<div class="fields">
<div class="field half">
<label for="demo-name">Name</label>
<input type="text" name="demo-name" id="demo-name" value="" placeholder="Jane Doe" />
</div>
<div class="field half">
<label for="demo-email">Email</label>
<input type="email" name="demo-email" id="demo-email" value="" placeholder="jane@untitled.tld" />
</div>
<div class="field">
<label for="demo-category">Category</label>
<select name="demo-category" id="demo-category">
<option value="">-</option>
<option value="1">Manufacturing</option>
<option value="1">Shipping</option>
<option value="1">Administration</option>
<option value="1">Human Resources</option>
</select>
</div>
<div class="field half">
<input type="radio" id="demo-priority-low" name="demo-priority" checked>
<label for="demo-priority-low">Low</label>
</div>
<div class="field half">
<input type="radio" id="demo-priority-high" name="demo-priority">
<label for="demo-priority-high">High</label>
</div>
<div class="field half">
<input type="checkbox" id="demo-copy" name="demo-copy">
<label for="demo-copy">Email me a copy</label>
</div>
<div class="field half">
<input type="checkbox" id="demo-human" name="demo-human" checked>
<label for="demo-human">Not a robot</label>
</div>
<div class="field">
<label for="demo-message">Message</label>
<textarea name="demo-message" id="demo-message" placeholder="Enter your message" rows="6"></textarea>
</div>
</div>
<ul class="actions">
<li><input type="submit" value="Send Message" class="primary" /></li>
<li><input type="reset" value="Reset" /></li>
</ul>
</form>
</section>
</div>
</div>
</article>
<!-- Footer -->
<footer id="footer">
<p class="copyright">&copy; kraut.space</p>
<p class="copyright">This project is hosted by KABI.tk in association with Kraut.Space Jena e.V.</p>
<a href="https://kabi.tk/imprint-gdpr.html" class="copyright">Impressum / Datenschutz</a>
</footer>
</div>