diff --git a/docker-compose.yaml b/docker-compose.yaml index af6f497b..83c446f0 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -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 diff --git a/website/dist/assets/css/main.css b/website/dist/assets/css/main.css index 4b40ac08..e5ba21f8 100644 --- a/website/dist/assets/css/main.css +++ b/website/dist/assets/css/main.css @@ -1,10 +1,8 @@ @import url(fontawesome-all.min.css); @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; diff --git a/website/dist/assets/js/main.js b/website/dist/assets/js/main.js index e84d4525..a5bccd5d 100644 --- a/website/dist/assets/js/main.js +++ b/website/dist/assets/js/main.js @@ -1,7 +1,5 @@ /* - Indivisible by Pixelarity - pixelarity.com | hello@pixelarity.com - License: pixelarity.com/license + (C) kabi.tk */ (function($) { diff --git a/website/dist/index.html b/website/dist/index.html index 5a75e247..2d0795a8 100644 --- a/website/dist/index.html +++ b/website/dist/index.html @@ -1,6 +1,6 @@ @@ -18,18 +18,21 @@ kabi.tk
- +

Kraut.World

-

Visit us virtually
- and have fun!

+

Workadventure Maps der Chaoszone
+ unter Initiative des Kraut.Space e.V. und KABI.tk

@@ -41,9 +44,9 @@ kabi.tk
-
+
- +
    @@ -51,330 +54,20 @@ kabi.tk
-

Work

-

Magna feugiat lorem ipsum dolor
- veroeros sed adipiscing

+

Was ist das?

+

rC3 Kraut.Space world map

-

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.

-

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.

+

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.

+

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.

+

Du möchtest Deine eigene Map mit verlinken bzw. über diese Plattform laden? Schau bitte im Mission Control vorbei!

+
  • Mission Control
    • - - -
    -
    - -
    -
    - -
    -
    -

    About

    -

    Magna feugiat lorem ipsum dolor
    - veroeros sed adipiscing

    -
    -

    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.

    -

    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.

    -
    -
    -
    - - -
    -
    - -
    -
    - -
    -
    -

    Contact

    -
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - -
    -
    -
    -
    - - -
    -
    - -
    -
    - -
    -
    -

    Elements

    -
    - -
    -

    Text

    -

    This is bold and this is strong. This is italic and this is emphasized. - This is superscript text and this is subscript text. - This is underlined and this is code: for (;;) { ... }. Finally, this is a link.

    -
    -

    Heading Level 2

    -

    Heading Level 3

    -

    Heading Level 4

    -
    Heading Level 5
    -
    Heading Level 6
    -
    -
    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.
    -
    Preformatted
    - 
    i = 0;
-
-while (!deck.isInOrder()) {
-    print 'Iteration ' + i;
-    deck.shuffle();
-    i++;
-}
-
-print 'It took ' + i + ' iterations to sort the deck.';
    -
    - -
    -

    Lists

    - -
    Unordered
    -
      -
    • Dolor pulvinar etiam.
      • -
    • Sagittis adipiscing.
      • -
    • Felis enim feugiat.
      • -
    - -
    Alternate
    -
      -
    • Dolor pulvinar etiam.
      • -
    • Sagittis adipiscing.
      • -
    • Felis enim feugiat.
      • -
    - -
    Ordered
    -
      -
    1. Dolor pulvinar etiam.
      2. -
    2. Etiam vel felis viverra.
      3. -
    3. Felis enim feugiat.
      4. -
    4. Dolor pulvinar etiam.
      5. -
    5. Etiam vel felis lorem.
      6. -
    6. Felis enim et feugiat.
      7. -
    -
    Icons
    - - -
    Actions
    - - -
    - -
    -

    Table

    -
    Default
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    NameDescriptionPrice
    Item OneAnte turpis integer aliquet porttitor.29.99
    Item TwoVis ac commodo adipiscing arcu aliquet.19.99
    Item Three Morbi faucibus arcu accumsan lorem.29.99
    Item FourVitae integer tempus condimentum.19.99
    Item FiveAnte turpis integer aliquet porttitor.29.99
    100.00
    -
    - -
    Alternate
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    NameDescriptionPrice
    Item OneAnte turpis integer aliquet porttitor.29.99
    Item TwoVis ac commodo adipiscing arcu aliquet.19.99
    Item Three Morbi faucibus arcu accumsan lorem.29.99
    Item FourVitae integer tempus condimentum.19.99
    Item FiveAnte turpis integer aliquet porttitor.29.99
    100.00
    -
    -
    - -
    -

    Buttons

    - - - -
      -
    • Disabled
      • -
    • Disabled
      • -
    -
    - -
    -

    Form

    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
      -
      • -
      • -
    -
    -
    - -
    -
    -
    -