21.8

[general]
- move building scripts

[changelog]
- minor enhancements

[about]
- okticket situation update
- small changes

Author: miermontoto

.eleventy.js

@@ -3,10 +3,10 @@ const { EleventyRenderPlugin } = require("@11ty/eleventy");
 const eleventyNavigationPlugin = require("@11ty/eleventy-navigation");
 const Nunjucks = require("nunjucks");
 
-const buildBreadcrumbs = require('./src/building/breadcrumbs.js');
-const buildChangelog = require('./src/building/changelog.js');
-const addAsset = require('./src/building/linking.js');
-const { qka, quizButtons, quizQuestions } = require('./src/building/quizzing.js');
+const buildBreadcrumbs = require('./src/static/js/building/breadcrumbs.js');
+const buildChangelog = require('./src/static/js/building/changelog.js');
+const addAsset = require('./src/static/js/building/linking.js');
+const { qka, quizButtons, quizQuestions } = require('./src/static/js/building/quizzing.js');
 
 module.exports = function (eleventyConfig) {
     eleventyConfig.addPlugin(EleventyRenderPlugin);

assets/icons/tech/typescript.svg

@@ -7,5 +7,5 @@
 	<li>i like 🧗 climbing, 🚲 cycling and playing 🎸 bass.</li>
 	<li>{{ macros.renderIcon('ruby') }} ruby, {{ macros.renderIcon('python') }} python, {{ macros.renderIcon('java') }} java and a little bit of everything else (c/c++/c#, shell, web, sql, ...)</li>
 	<li>i take 📒 <a href="https://github.com/miermontoto/notes">notes</a> in {{ macros.renderIcon('markdown') }}  markdown using {{ macros.renderIcon('obsidian') }} <a href="https://obsidian.md">obsidian</a>.
-	<li><a href="/this/">this 🌐 webpage</a> was hand built by me using {{ macros.renderIcon('eleventy') }} <a href="https://11ty.dev" target="_blank">eleventy</a>.</li>
+	<li><a href="/this/">this 🌐 webpage</a> was hand built using {{ macros.renderIcon('eleventy') }} <a href="https://11ty.dev" target="_blank">eleventy</a>.</li>
 </ul>

package.json

@@ -2,7 +2,7 @@
 name: okticket
 role: software engineer
 period: 2023-
-icons: [ruby, laravel, docker, php, aws]
+icons: [ruby, laravel, docker, php, aws, typescript]
 class: okticket work
 ---
 
@@ -12,9 +12,10 @@ class: okticket work
 
 - **2024-now: developer**
   - backend serverless services using aws lambdas in nestjs.
-  - new pdf generator service using puppeteer.
-  - devops tasks: postmortem analysis, cloudwatch monitoring and others.
-  - further system migration (PHPUnit 10, PHP 8.3) and maintenance.
+  - backend deployment and validation manager.
+  - devops tasks in AWS: postmortem analysis, cloudwatch monitoring, infrastructure deployment.
+  - further system migration (PHPUnit 11, PHP 8.3, Laravel 11) and maintenance.
+  - sonarqube and locust integration for code quality and performance testing.
 - **2023: developer (intership)**
   - back-end system migration (laravel 10, PHP 8.2, composer 2).
   - local deploy automation with Docker and Ruby.

src/building/changelog.js

@@ -0,0 +1,50 @@
+const checkCurrent = (data) => {
+	let currentJson = require('../../../../package.json')
+	let currentVersion = currentJson.version.split('.')
+	let currentChannel = currentJson.channel ? ` ${currentJson.channel}` : ''
+
+	// if the current version is already in the changelog, return
+	if (data.find(d => d.version.major == currentVersion[1] && d.version.minor == currentVersion[2])) return
+
+	data.unshift({
+		"version": {
+			"major": currentVersion[1],
+			"minor": currentVersion[2]
+		},
+		"title": `${currentVersion[1]}.${currentVersion[2]}${currentChannel}`,
+		"date": "ongoing",
+		"message": "<span class='warning'>this version hasn't been published yet.</span>",
+		"hash": "main"
+	})
+}
+
+const buildChangelog = (data) => {
+	let content = '<div id="changelog">'
+
+	// sort commits by version
+	data.sort((a, b) => { return a.version.major > b.version.major ? -1 : 1 })
+
+	// if the current version isn't in the changelog,
+	// add it manually to the data array
+	checkCurrent(data)
+
+	let prevMajor = null
+	data.forEach((d) => {
+		// if the major version has changed, add a new header
+		if (prevMajor != d.version.major) {
+			if (prevMajor) content += '</div><hr>'
+			content += `<div id="version-${d.version.major}"><h1>v${d.version.major}</h1>`
+		}
+		prevMajor = d.version.major
+
+		// add the commit entry
+		content += `<div class="entry hoverborder"><span class="title">${d.title}</span>`
+		if (d.message) content += `<br><span class="message">${d.message.replace(/\n/g, '<br>')}</span>`
+		content += `<a class="date" href="https://github.com/miermontoto/mier.info/commit/${d.hash}" target="_blank">${d.date}</a></div>`
+	})
+	content += '</div>'
+
+	return content
+}
+
+module.exports = buildChangelog;

src/content/about.njk

@@ -27,7 +27,7 @@ const addAsset = (type, filename) => {
 
 
 const addStyle = (filename) => {
-	let filepath = findAsset(path.resolve(__dirname, '../static/css'), `${filename}.sass`)
+	let filepath = findAsset(path.resolve(__dirname, '../../css'), `${filename}.sass`)
 
 	if (!filepath) {
 		console.error(`style file ${filename}.sass not found`)
@@ -39,7 +39,7 @@ const addStyle = (filename) => {
 
 
 const addScript = (filename) => {
-	let filepath = findAsset(path.resolve(__dirname, '../static/js'), `${filename}.js`)
+	let filepath = findAsset(path.resolve(__dirname, '..'), `${filename}.js`)
 
 	if (!filepath) {
 		console.error(`script file ${filename}.js not found`)