Update styles

update templates, adding robots
prepre publishing
2023-11-01 17:25:35 +01:00 · 2023-11-01 17:14:41 +01:00 · 2023-11-01 16:53:29 +01:00 · 2023-11-01 16:13:21 +01:00 · 2023-11-01 15:10:24 +01:00
19 changed files with 6139 additions and 26 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,11 +7,11 @@ package-lock.json
 package.json

 # scss
+assets/css/root_index*.css
 assets/css/default*.css
-assets/css/schedule-aula*.css
-assets/css/speaker-info-aula*.css
-assets/css/upcoming-talk-aula*.css
+assets/css/speaker*.css
+assets/css/upcoming*.css
 assets/css/fonts*.css
 assets/css/schedule*.css
-assets/css/talk-info-aula*.css
+assets/css/talk-info*.css

--- a/assets/js/custom/nodes/schedule-vortragsraum.js
+++ b/assets/js/custom/nodes/schedule-vortragsraum.js
@ -0,0 +1,49 @@
+'use strict';
+
+
+import * as fe from "../core/fetcher.js";
+
+import * as ti from "../core/time.js";
+
+import * as sc from "../core/screen.js";
+
+// Import services
+import * as serv from "../services/general.js";
+
+// Import views
+import * as dom from "../dom/schedule.js";
+import * as clk from "../dom/clock.js";
+
+
+// Empty JSON lists for data
+let storage = {
+    scheduleData: undefined
+};
+
+
+let do_fetch = fe.configure({}, serv);
+
+do_fetch(storage);
+
+
+
+// Main Loop
+let screen_update = sc.configure(serv, dom);
+let clock_update = sc.configure(serv, clk);
+
+
+let cfg = {
+    "roomName": "Vortragsraum",
+};
+
+
+// Just do it
+function main_loop() {
+    screen_update(storage, ti, cfg);
+    clock_update(storage, ti, cfg);
+    // update_screen();
+    // setTimeout(main_loop, 1 * 1000);
+    setTimeout(main_loop, 1 * 50);
+};
+
+main_loop();
--- a/assets/rendered_schedule-vortragsraum.js
+++ b/assets/rendered_schedule-vortragsraum.js
--- a/assets/robots.txt
+++ b/assets/robots.txt
@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
--- a/assets/scss/css/custom/nodes/schedule-aula.scss
+++ b/assets/scss/css/custom/nodes/schedule-aula.scss
@ -1,4 +0,0 @@
-@import "../styles/_base";
-
-@import "../styles/_schedule";
-@import "../styles/_clock";
--- a/assets/scss/css/custom/nodes/speaker-info-aula.scss
+++ b/assets/scss/css/custom/nodes/speaker-info-aula.scss
@ -1,3 +0,0 @@
-@import "../styles/_base";
-
-@import "../styles/_banner-speaker";
--- a/assets/scss/css/custom/nodes/talk-info-aula.scss
+++ b/assets/scss/css/custom/nodes/talk-info-aula.scss
@ -1,3 +0,0 @@
-@import "../styles/_base";
-
-@import "../styles/_banner-talk";
--- a/assets/scss/css/custom/nodes/upcoming-talk-aula.scss
+++ b/assets/scss/css/custom/nodes/upcoming-talk-aula.scss
@ -1,3 +0,0 @@
-@import "../styles/_base";
-
-@import "../styles/_upcoming-talk";
--- a/assets/scss/css/custom/styles/_base.scss
+++ b/assets/scss/css/custom/styles/_base.scss
@ -7,7 +7,7 @@

 body {
    color: rgb(255,255,255);
-    background: rgb(100,100,100);
+    background: $color-bg;
    margin: 0px;
    padding: 0px;
 }
--- a/assets/scss/css/custom/styles/_variables.scss
+++ b/assets/scss/css/custom/styles/_variables.scss
@ -2,7 +2,7 @@ $full-width: 1920px;
 $full-height: 1080px;


-$color-bg: rgb(0, 20, 10);
+$color-bg: rgb(0, 10, 23);
 // $color-bg: rgb(20, 29, 36);
 $color-bg-medium: rgb(7, 7, 74);

--- a/content/config.js/contents.lr
+++ b/content/config.js/contents.lr
@ -1,4 +1,5 @@
 _template: config.js
 ---
-_model: none
 _discoverable: no
+---
+_hidden: yes
--- a/content/schedule-vortragssaal/contents.lr
+++ b/content/schedule-vortragssaal/contents.lr
@ -0,0 +1,10 @@
+_model: html5infobeamer
+---
+title: Vortragsraum Schedule Aalen Geekend 23
+---
+body:
+
+This is a basic demo website that shows how to use Lektor for a basic
+website with some pages.
+---
+schedule: rendered_schedule-vortragsraum.js
--- a/content/schedule/contents.lr
+++ b/content/schedule/contents.lr
@ -1,6 +1,6 @@
 _model: html5infobeamer
 ---
-title: Overview Schedule Aalen
+title: Overview Schedule Aalen Geekend 23
 ---
 body:

--- a/content/sitemap.xml/contents.lr
+++ b/content/sitemap.xml/contents.lr
@ -0,0 +1,4 @@
+_template: sitemap.xml
+---
+_model: none
+_discoverable: no
--- a/models/html5infobeamer.ini
+++ b/models/html5infobeamer.ini
@ -9,3 +9,8 @@ type = string
 [fields.body]
 label = Body
 type = markdown
+
+[fields.schedule]
+label = Schedule Javascript Address
+type = string
+default = rendered_schedule.js
--- a/templates/html5infobeamer.html
+++ b/templates/html5infobeamer.html
@ -4,9 +4,13 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>{{ this.title }}</title>
+    <meta name="description" content="{{ this.description }}">
+    <meta name="robots" content="noindex">
+    <link rel="sitemap" type="application/xml" title="Sitemap" href="/sitemap.xml">
+    <meta name="author" content="L3D">
    <link href="{{ '/static/fork-awesome/css/fork-awesome.min.css'|asseturl }}" rel="stylesheet" type="text/css">
    <link rel="stylesheet" href="{{ '/css/schedule.css'|asseturl }}" rel="stylesheet" type="text/css">
-    <script href="/config.js"></script>
+    <script src="/config.js"></script>
  </head>
  <body>
    <img class="header" src="https://files.chvoc.ch/sps22/info//header.png" />
@ -17,6 +21,6 @@
    <script src="{{ '/js/luxon/luxon.min.js' | asseturl }}"></script>
    <script src="{{ '/js/preact/preact.min.js' | asseturl }}"></script>
    <script src="{{ '/js/htm/htm.js' | asseturl }}"></script>
-    <script src="{{ '/rendered_schedule.js' | asseturl }}"></script>
+    <script src="{{ this.schedule | asseturl }}"></script>
  </body>
 </html>
--- a/templates/root.html
+++ b/templates/root.html
@ -5,8 +5,9 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>{{ this.title }}</title>
    <link href="{{ '/static/fork-awesome/css/fork-awesome.min.css'|asseturl }}" rel="stylesheet" type="text/css">
+    <meta name="robots" content="noindex">
    <link rel="stylesheet" href="{{ '/css/root_index.css'|asseturl }}" rel="stylesheet" type="text/css">
-    <script href="/config.js"></script>
+    <script src="/config.js"></script>
  </head>
  <body>
    <h1 class="header">{{ this.title }}</h1>
@ -14,7 +15,10 @@
      {{ this.body }}
      <ul>
        <li class="infopointitem">
-          <span class="fa fa-hand-o-right bullet"></span><b>InfoBeamer General:</b><a class="infopoint" href="/schedule/">/schedule/</a>
+          <span class="fa fa-hand-o-right bullet"></span><b>HTML5 InfoBeamer:</b><a class="infopoint" href="/schedule/">/schedule/</a>
+        </li>
+        <li>
+          <span class="fa fa-hand-o-right bullet"></span><b>iHTML5 InfoBeamer "Vortragssaal":</b><a class="infopoint" href="/schedule/">/schedule-vortragssaal/</a>
        </li>
      </ul>
    </div>
--- a/templates/sitemap.xml
+++ b/templates/sitemap.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+{%- if '/css/sitemap.min.css'|asseturl is defined -%}
+  <?xml-stylesheet href="{{ '/css/sitemap.min.css'|asseturl }}" type="text/css" ?>
+{%- endif %}
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  {%- for page in [site.root] if page != this recursive %}
+    {%- if not page.hide_from_global_index %}
+  <url><loc>{{ page|url(external=true) }}</loc></url>
+  {{- loop(page.children) }}
+    {%- endif %}
+  {%- endfor %}
+</urlset>
--- a/voc-info.lektorproject
+++ b/voc-info.lektorproject
@ -1,7 +1,16 @@
 [project]
 name = voc-info
-url = https://info.winkekatze.tv/
+url = https://aalen-geekend-23.winkekatze.tv/
 excluded_assets = *.scss
+url_style = absolute
+
+[servers.winekaktze]
+url = https://aalen-geekend-23.winkekatze.tv/
+name = winekaktze
+enabled = yes
+default = yes
+locale = en_EN
+target = rsync://winkekatze@aalen-geekend-23.winkekatze.tv/srv/www/aalen-geekend-23.winkekatze.tv/

 [packages]
 lektor-scss = 1.4.2
Author	SHA1	Message	Date
L3D	6339806cfc	Update styles	2023-11-01 17:25:35 +01:00
L3D	43ebdf2881	update templates, adding robots	2023-11-01 17:14:41 +01:00
L3D	839d63b687	prepre publishing	2023-11-01 16:53:29 +01:00
L3D	31ca1248fd	Merge branch 'main' of https://git.l3d.ch/voc/html5-infobeamer-aalen-geekend-23	2023-11-01 16:13:21 +01:00
L3D	4e04731ebd	Adding Vortragsraum	2023-11-01 15:10:24 +01:00