diff --git a/.github/workflows/deploy_site.yaml b/.github/workflows/deploy_site.yaml index a85da91..8514502 100644 --- a/.github/workflows/deploy_site.yaml +++ b/.github/workflows/deploy_site.yaml @@ -15,21 +15,18 @@ jobs: name: Build site runs-on: ubuntu-latest container: - image: docker://hugomods/hugo:ci + image: docker://git.korhonen.cc/functionalhacker/hugo-asciidoc-docker-ci:latest steps: - name: Checkout uses: actions/checkout@v4 - - name: Add extra dependencies - run: apk add ruby-rouge tar + - name: Fix git ownership + run: git config --global --add safe.directory /__w/korhonen.cc/korhonen.cc - name: Install NPM packages run: npm install - - name: Fix git ownership - run: chown -R $(id -u):$(id -g) $PWD - - name: Run Hugo run: hugo --gc --minify -d /public diff --git a/assets/images/marko.jpeg b/assets/images/marko.jpeg index b87efc5..4737a45 100644 Binary files a/assets/images/marko.jpeg and b/assets/images/marko.jpeg differ diff --git a/assets/jsconfig.json b/assets/jsconfig.json index e1ea500..63bb894 100644 --- a/assets/jsconfig.json +++ b/assets/jsconfig.json @@ -3,7 +3,7 @@ "baseUrl": ".", "paths": { "*": [ - "../../../.cache/hugo_cache/modules/filecache/modules/pkg/mod/github.com/hugo-toha/toha/v4@v4.8.0/assets/*" + "../../../.cache/hugo_cache/modules/filecache/modules/pkg/mod/github.com/hugo-toha/toha/v4@v4.5.0/assets/*" ] } } diff --git a/content/korhonen_aur/index.adoc b/content/korhonen_aur/index.adoc index 37e8180..5250001 100644 --- a/content/korhonen_aur/index.adoc +++ b/content/korhonen_aur/index.adoc @@ -2,7 +2,6 @@ title: Korhonen AUR date: 2022-03-25 featured_image: hero.jpg -draft: true --- = Korhonen AUR diff --git a/content/korhonen_aur/index.fi.adoc b/content/korhonen_aur/index.fi.adoc index 4e6616b..1d9a610 100644 --- a/content/korhonen_aur/index.fi.adoc +++ b/content/korhonen_aur/index.fi.adoc @@ -2,7 +2,6 @@ title: Korhonen AUR date: 2022-03-25 featured_image: hero.jpg -draft: true --- = Korhonen AUR diff --git a/data/en/author.toml b/data/en/author.toml index 5fd40ba..875aa03 100644 --- a/data/en/author.toml +++ b/data/en/author.toml @@ -10,6 +10,5 @@ summary = [ ] [contactInfo] -"FI" = "+358 40 765 8800" -"US" = "+1 (469) 349-2503" email = "marko@korhonen.cc" +phone = "+358407658800" diff --git a/data/en/sections/about.toml b/data/en/sections/about.toml index ec1ff88..8bd44cd 100644 --- a/data/en/sections/about.toml +++ b/data/en/sections/about.toml @@ -1,6 +1,6 @@ designation = "Software developer" -resume = "https://codeberg.org/FunctionalHacker/cv/releases/download/v1.2.0/marko_korhonen_cv_en.pdf" -summary = "I am a Finnish software developer currently based in the USA with $workingExperienceYears years of experience in software development. I specialize in Java and React.js and have a strong passion for open-source projects, Linux, and server management." +resume = "https://codeberg.org/FunctionalHacker/cv/releases/download/v1.0.0/marko_korhonen_cv_en.pdf" +summary = "I am a passionate software engineer with $workingExperienceYears years of working experience. I also have a passion for open source, Linux, and servers." [section] name = "About" @@ -10,9 +10,9 @@ weight = 1 showOnNavbar = true template = "sections/about.html" -#[company] -#name = "Rossum Oy" -#url = "https://rossum.fi/etusivu_rossum-copy_en/" +[company] +name = "Rossum Oy" +url = "https://rossum.fi/etusivu_rossum-copy_en/" [[socialLinks]] name = "Email" @@ -22,7 +22,7 @@ url = "marko@korhonen.cc" [[socialLinks]] name = "Phone" icon = "fas fa-phone" -url = "+14693492503" +url = "+358407658800" [[socialLinks]] name = "GitHub" diff --git a/data/en/sections/experience.toml b/data/en/sections/experience.toml index 8a0e839..6c3d762 100644 --- a/data/en/sections/experience.toml +++ b/data/en/sections/experience.toml @@ -16,7 +16,6 @@ overview = "Rossum is a well-established Finnish software company" [[experiences.positions]] designation = "Software Developer" start = "May 2020" -end = "January 2025" responsibilities = [ "Full-stack software development (Java, React.js)", "Linux server and infrastructure maintenance", diff --git a/data/en/site.toml b/data/en/site.toml index 1beac28..340d844 100644 --- a/data/en/site.toml +++ b/data/en/site.toml @@ -12,17 +12,17 @@ showOnFooter = true [[customMenus]] name = "Repo" url = "/korhonen_aur" -hideFromNavbar = true -showOnFooter = false - -[[customMenus]] -name = "Website source code" -url = "https://github.com/FunctionalHacker/korhonen.cc" -hideFromNavbar = true +hideFromNavbar = false showOnFooter = true [[customMenus]] -name = "Website analytics" -url = "https://umami.korhonen.cc/share/GRslDxJt/korhonen.cc" +name = "Website source code" +url = "https://codeberg.org/FunctionalHacker/korhonen.cc" hideFromNavbar = true -showOnFooter = false +showOnFooter = true + +# [[customMenus]] +# name = "Website analytics" +# url = "https://umami.korhonen.cc/share/GRslDxJt/korhonen.cc" +# hideFromNavbar = true +# showOnFooter = true diff --git a/data/fi/author.toml b/data/fi/author.toml index dbf97d6..86c3088 100644 --- a/data/fi/author.toml +++ b/data/fi/author.toml @@ -10,6 +10,5 @@ summary = [ ] [contactInfo] -"FI" = "+358 40 765 8800" -"US" = "+1 (469) 349-2503" email = "marko@korhonen.cc" +phone = "+358407658800" diff --git a/data/fi/sections/about.toml b/data/fi/sections/about.toml index 53a0955..aafa797 100644 --- a/data/fi/sections/about.toml +++ b/data/fi/sections/about.toml @@ -1,6 +1,6 @@ designation = "Ohjelmistokehittäjä" -resume = "https://codeberg.org/FunctionalHacker/cv/releases/download/v1.2.0/marko_korhonen_cv_fi.pdf" -summary = "Olen suomalainen ohjelmistokehittäjä, joka asuu tällä hetkellä Yhdysvalloissa ja minulla on $workingExperienceYears vuoden kokemus ohjelmistokehityksestä. Erikoistun Javaan ja React.js:ään, ja minulla on vahva intohimo avoimen lähdekoodin projekteihin, Linuxiin ja palvelinten hallintaan." +resume = "https://codeberg.org/FunctionalHacker/cv/releases/download/v1.0.0/marko_korhonen_cv_fi.pdf" +summary = "Olen innokas ohjelmistokehittäjä $workingExperienceYears vuoden työkokemuksella. Tykkään paljon myös avoimesta lähdekoodista, Linuxista ja servereistä." [section] name = "Yleistä" @@ -10,9 +10,9 @@ weight = 1 showOnNavbar = true template = "sections/about.html" -#[company] -#name = "Rossum Oy" -#url = "https://rossum.fi" +[company] +name = "Rossum Oy" +url = "https://rossum.fi" [[socialLinks]] name = "Sähköposti" diff --git a/data/fi/sections/experience.toml b/data/fi/sections/experience.toml index 31d68e7..f2b3040 100644 --- a/data/fi/sections/experience.toml +++ b/data/fi/sections/experience.toml @@ -16,7 +16,6 @@ overview = "Rossum Oy on vakiintunut suomalainen ohjelmistoyritys." [[experiences.positions]] designation = "Ohjelmistokehittäjä" start = "Touko 2020" -end = "Tammi 2025" responsibilities = [ "Full-stack ohjelmistokehitys (Java, React.js)", "Linux serverien ja infrastruktuurin ylläpitoa", diff --git a/data/fi/site.toml b/data/fi/site.toml index 171ce2e..d6df7a9 100644 --- a/data/fi/site.toml +++ b/data/fi/site.toml @@ -12,17 +12,17 @@ showOnFooter = true [[customMenus]] name = "Repo" url = "/fi/korhonen_aur" -hideFromNavbar = true -showOnFooter = false - -[[customMenus]] -name = "Nettisivun lähdekoodi" -url = "https://github.com/FunctionalHacker/korhonen.cc" -hideFromNavbar = true +hideFromNavbar = false showOnFooter = true [[customMenus]] -name = "Nettisivun analytiikka" -url = "https://umami.korhonen.cc/share/GRslDxJt/korhonen.cc" +name = "Nettisivun lähdekoodi" +url = "https://codeberg.org/FunctionalHacker/korhonen.cc" hideFromNavbar = true -showOnFooter = false +showOnFooter = true + +# [[customMenus]] +# name = "Nettisivun analytiikka" +# url = "https://umami.korhonen.cc/share/GRslDxJt/korhonen.cc" +# hideFromNavbar = true +# showOnFooter = true diff --git a/go.mod b/go.mod index bafd824..826d721 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module git.korhonen.cc/FunctionalHacker/korhonen.cc go 1.21.6 -require github.com/hugo-toha/toha/v4 v4.8.0 // indirect +require github.com/hugo-toha/toha/v4 v4.6.0 // indirect diff --git a/go.sum b/go.sum index dfaf668..4accedd 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,2 @@ github.com/hugo-toha/toha/v4 v4.6.0 h1:u+9KiGyTsC54sHld8HEvLEJBnKjkuuasHwair1wJM2Y= github.com/hugo-toha/toha/v4 v4.6.0/go.mod h1:TU/6WXz7fJ3BSrTS+K/sVctzUMF4pB4ZwKWzFBFra8g= -github.com/hugo-toha/toha/v4 v4.7.0 h1:XmMLJRXoYKd8UmM3RTh0Kwe6+7l9/JnUi51c86h+GzU= -github.com/hugo-toha/toha/v4 v4.7.0/go.mod h1:TU/6WXz7fJ3BSrTS+K/sVctzUMF4pB4ZwKWzFBFra8g= -github.com/hugo-toha/toha/v4 v4.8.0 h1:TYNqOsr01q73R5Sgz7lonXoX39dIl22lZhQy/V421so= -github.com/hugo-toha/toha/v4 v4.8.0/go.mod h1:TU/6WXz7fJ3BSrTS+K/sVctzUMF4pB4ZwKWzFBFra8g= diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index c9713e7..9c0eb20 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -77,7 +77,7 @@