17.0 alpha 2

miermontoto · miermontoto · commit 9aa8c5e2b411 · 2023-11-09T03:14:55.000+01:00
webutils bundle page, fix imports, fix listeners, fix styles
diff --git a/.eleventy.js b/.eleventy.js
@@ -10,16 +10,24 @@ module.exports = function (eleventyConfig) {
         watch: ["_site/static/**"]
     });
 
+    eleventyConfig.addShortcode("addScript", function (filename) {
+        return `<script src="/static/js/app/${filename}.js"></script>`;
+    });
+
+    eleventyConfig.addShortcode("addStyle", function (filename) {
+        return `<link rel="stylesheet" href="/static/css/app/${filename}.css">`;
+    });
+
     eleventyConfig.addShortcode("version", function() {
         let json = require('./package.json');
-        let version = json.version || 'unknown';
-        let release = json.release && json.release !== 'RTW' ? ` (${json.release})` : '';
-        return `${version}${release}`;
+        let version = json.version;
+        let channel = json.channel && json.channel !== 'RTW' ? ` (${json.channel})` : '';
+        return `${version}${channel}`;
     });
 
     eleventyConfig.addShortcode("top", function() {
         return `
-        <span id="top" class="button">top ↑</span>
+        <span id="top" class="button topbtn">top ↑</span>
         `;
     });
 
diff --git a/package.json b/package.json
diff --git a/src/content/collections/projects/backup.md b/src/content/collections/projects/backup.md
@@ -6,10 +6,11 @@ permalink: /backup/
 demo: /backup
 keywords: backup, backup carrera, epi, epi gijón, asignaturas, giitin, informática, ingeniería informática, ingeniería, engineering, computer engineering, gijón
 icons: [fa-brands fa-markdown, fa-brands fa-github]
-project_css: /static/css/backup.css
 star: star
 ---
 
+{% addStyle 'backup' %}
+
 ## Resumen
 backup es una colección de repositorios de todas las asignaturas de la carrera de Ingeniería Informática en Tecnologías de la Información (GIITIN) en la Escuela Politécnica de Ingeniería de Gijón (EPI Gijón).
 
diff --git a/src/content/collections/projects/gti.njk b/src/content/collections/projects/gti.njk
@@ -3,11 +3,12 @@ title: gti quiz
 desc: homemade quiz made up of official questions of the course <i>Gestión de Tecnologías de la Información</i>
 icons: [devicon-eleventy-plain, devicon-javascript-plain]
 permalink: /gti/
-project_css: gti
-project_js: gti
 demo: /gti/
 ---
 
+{% addStyle 'gti' %}
+{% addScript 'gti' %}
+
 <div id="results">
 	<span id="correct">0</span> / <span id="total">?</span>
 	<span id="→">→</span>
diff --git a/src/content/collections/projects/webutils.njk b/src/content/collections/projects/webutils.njk
@@ -7,5 +7,10 @@ demo: /webutils/
 ---
 
 {% for util in collections.webutils %}
-
+	<div id="{{ util.fileSlug }}" class="util">
+		<h2><a href="/{{ util.fileSlug }}">{{ util.fileSlug }}</a></h2>
+		{% set name = './src/content/collections/webutils/' + util.fileSlug + '.njk' %}
+		{% renderFile name %}
+	</div>
+	<hr>
 {% endfor %}
diff --git a/src/content/collections/webutils/base64.njk b/src/content/collections/webutils/base64.njk
@@ -1,7 +1,5 @@
----
-title: base64
----
+{% addScript 'base64' %}
 
-<textarea id="decoded" rows="10" cols="50"></textarea>
+<textarea id="decoded"></textarea>
 <span><=></span>
-<textarea id="encoded" rows="10" cols="50"></textarea>
+<textarea id="encoded"></textarea>
diff --git a/src/content/collections/webutils/tiny.njk b/src/content/collections/webutils/tiny.njk
@@ -1,7 +1,5 @@
----
-title: tiny
-project_css: true
----
+{% addScript 'tiny' %}
+{% addStyle  'tiny' %}
 
 <input id="input">
 <br> <br>
diff --git a/src/content/collections/webutils/webutils.json b/src/content/collections/webutils/webutils.json
@@ -1,6 +1,5 @@
 {
     "tags": "webutils",
     "layout": "project.njk",
-	"permalink": "/{{ page.fileSlug }}/",
-    "project_js": true
+	"permalink": "/{{ page.fileSlug }}/"
 }
diff --git a/src/static/css/app/backup.sass b/src/static/css/app/backup.sass
diff --git a/src/static/css/app/gti.sass b/src/static/css/app/gti.sass
diff --git a/src/static/css/app/tiny.sass b/src/static/css/app/tiny.sass
diff --git a/src/static/css/index.sass b/src/static/css/index.sass
@@ -40,7 +40,7 @@ ul
     max-height: 9999em
 
 .model
-    border-radius: $radius
+    border-radius: base.$radius
     border: 2px solid base.$light
     background-color: base.$secondary
     margin: 1em
@@ -144,7 +144,7 @@ table#projects
     table-layout: auto
     margin: 1em 0
     border: 3px solid base.$light
-    border-radius: $radius
+    border-radius: base.$radius
     padding: 1em
 
     .project.star > .project-title
diff --git a/src/static/js/app/base64.js b/src/static/js/app/base64.js
@@ -1,4 +1,4 @@
-window.onload = function () {
+window.addEventListener("load", function(event) {
 	const decoded = document.querySelector('#decoded');
 	const encoded = document.querySelector('#encoded');
 
@@ -20,7 +20,7 @@ window.onload = function () {
 
 	decoded.addEventListener('input', encode);
 	encoded.addEventListener('input', decode);
-}
+});
 
 function a2b(str) {
 	return decodeURIComponent(atob(str).split('').map(function(c) {
diff --git a/src/static/js/app/gti.js b/src/static/js/app/gti.js
diff --git a/src/static/js/app/tiny.js b/src/static/js/app/tiny.js
@@ -1,15 +1,15 @@
-window.onload = function () {
+window.addEventListener("load", function(event) {
 	const input = document.querySelector('#input');
 	const output = document.querySelector('#output');
 
 	clear(input);
 
-	const event = () => {
+	const update = () => {
 		output.innerHTML = tinify(input.value);
 	}
 
-	input.addEventListener('input', event);
-};
+	input.addEventListener('input', update);
+});
 
 const superscript = { 'a': 'ᵃ', 'b': 'ᵇ', 'c': 'ᶜ', 'd': 'ᵈ', 'e': 'ᵉ', 'f': 'ᶠ', 'g': 'ᵍ', 'h': 'ʰ', 'i': 'ⁱ', 'j': 'ʲ', 'k': 'ᵏ', 'l': 'ˡ', 'm': 'ᵐ', 'n': 'ⁿ', 'o': 'ᵒ', 'p': 'ᵖ', 'q': '𐞥', 'r': 'ʳ', 's': 'ˢ', 't': 'ᵗ', 'u': 'ᵘ', 'v': 'ᵛ', 'w': 'ʷ', 'x': 'ˣ', 'y': 'ʸ', 'z': 'ᶻ',
 					  'A': 'ᴬ', 'B': 'ᴮ', 'C': 'ꟲ', 'D': 'ᴰ', 'E': 'ᴱ', 'F': 'ꟳ', 'G': 'ᴳ', 'H': 'ᴴ', 'I': 'ᴵ', 'J': 'ᴶ', 'K': 'ᴷ', 'L': 'ᴸ', 'M': 'ᴹ', 'N': 'ᴺ', 'O': 'ᴼ', 'P': 'ᴾ', 'Q': 'ꟴ', 'R': 'ᴿ', 'S': 'ˢ', 'T': 'ᵀ', 'U': 'ᵁ', 'V': 'ⱽ', 'W': 'ᵂ', 'X': 'ˣ', 'Y': 'ʸ', 'Z': 'ᶻ',
diff --git a/src/templates/project.njk b/src/templates/project.njk
@@ -3,18 +3,6 @@ layout: base.njk
 css: /static/css/project.css
 ---
 
-{% if project_css %}
-    {% set temp = title if project_css === true else project_css %}
-    {% set target = '/static/css/project/' + temp + '.css' %}
-    <link rel="stylesheet" href="{{ target }}">
-{% endif %}
-
-{% if project_js %}
-    {% set temp = title if project_js === true else project_js %}
-    {% set target = '/static/js/project/' + temp + '.js' %}
-    <script src="{{ target }}"></script>
-{% endif %}
-
 <a href="/" id="back">< go back</a>
 {% if source %}
     <span id="sep"> | </span>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"tags": "webutils",`
`3`	`3`	`"layout": "project.njk",`
`4`		`- "permalink": "/{{ page.fileSlug }}/",`
`5`		`- "project_js": true`
	`4`	`+ "permalink": "/{{ page.fileSlug }}/"`
`6`	`5`	`}`