diff --git a/.github/workflows/deploy_site.yaml b/.github/workflows/deploy_site.yaml index 8514502..a85da91 100644 --- a/.github/workflows/deploy_site.yaml +++ b/.github/workflows/deploy_site.yaml @@ -15,18 +15,21 @@ jobs: name: Build site runs-on: ubuntu-latest container: - image: docker://git.korhonen.cc/functionalhacker/hugo-asciidoc-docker-ci:latest + image: docker://hugomods/hugo:ci steps: - name: Checkout uses: actions/checkout@v4 - - name: Fix git ownership - run: git config --global --add safe.directory /__w/korhonen.cc/korhonen.cc + - name: Add extra dependencies + run: apk add ruby-rouge tar - 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 4737a45..b87efc5 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 63bb894..e1ea500 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.5.0/assets/*" + "../../../.cache/hugo_cache/modules/filecache/modules/pkg/mod/github.com/hugo-toha/toha/v4@v4.8.0/assets/*" ] } } diff --git a/content/korhonen_aur/index.adoc b/content/korhonen_aur/index.adoc index 5250001..37e8180 100644 --- a/content/korhonen_aur/index.adoc +++ b/content/korhonen_aur/index.adoc @@ -2,6 +2,7 @@ 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 1d9a610..4e6616b 100644 --- a/content/korhonen_aur/index.fi.adoc +++ b/content/korhonen_aur/index.fi.adoc @@ -2,6 +2,7 @@ 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 875aa03..5fd40ba 100644 --- a/data/en/author.toml +++ b/data/en/author.toml @@ -10,5 +10,6 @@ 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 8bd44cd..ec1ff88 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.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." +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." [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 = "+358407658800" +url = "+14693492503" [[socialLinks]] name = "GitHub" diff --git a/data/en/sections/experience.toml b/data/en/sections/experience.toml index 6c3d762..8a0e839 100644 --- a/data/en/sections/experience.toml +++ b/data/en/sections/experience.toml @@ -16,6 +16,7 @@ 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 340d844..1beac28 100644 --- a/data/en/site.toml +++ b/data/en/site.toml @@ -12,17 +12,17 @@ showOnFooter = true [[customMenus]] name = "Repo" url = "/korhonen_aur" -hideFromNavbar = false -showOnFooter = true +hideFromNavbar = true +showOnFooter = false [[customMenus]] name = "Website source code" -url = "https://codeberg.org/FunctionalHacker/korhonen.cc" +url = "https://github.com/FunctionalHacker/korhonen.cc" hideFromNavbar = true showOnFooter = true -# [[customMenus]] -# name = "Website analytics" -# url = "https://umami.korhonen.cc/share/GRslDxJt/korhonen.cc" -# hideFromNavbar = true -# showOnFooter = true +[[customMenus]] +name = "Website analytics" +url = "https://umami.korhonen.cc/share/GRslDxJt/korhonen.cc" +hideFromNavbar = true +showOnFooter = false diff --git a/data/fi/author.toml b/data/fi/author.toml index 86c3088..dbf97d6 100644 --- a/data/fi/author.toml +++ b/data/fi/author.toml @@ -10,5 +10,6 @@ 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 aafa797..53a0955 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.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ä." +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." [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 f2b3040..31d68e7 100644 --- a/data/fi/sections/experience.toml +++ b/data/fi/sections/experience.toml @@ -16,6 +16,7 @@ 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 d6df7a9..171ce2e 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 = false -showOnFooter = true +hideFromNavbar = true +showOnFooter = false [[customMenus]] name = "Nettisivun lähdekoodi" -url = "https://codeberg.org/FunctionalHacker/korhonen.cc" +url = "https://github.com/FunctionalHacker/korhonen.cc" hideFromNavbar = true showOnFooter = true -# [[customMenus]] -# name = "Nettisivun analytiikka" -# url = "https://umami.korhonen.cc/share/GRslDxJt/korhonen.cc" -# hideFromNavbar = true -# showOnFooter = true +[[customMenus]] +name = "Nettisivun analytiikka" +url = "https://umami.korhonen.cc/share/GRslDxJt/korhonen.cc" +hideFromNavbar = true +showOnFooter = false diff --git a/go.mod b/go.mod index 826d721..bafd824 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.6.0 // indirect +require github.com/hugo-toha/toha/v4 v4.8.0 // indirect diff --git a/go.sum b/go.sum index 4accedd..dfaf668 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,6 @@ 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 9c0eb20..c9713e7 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -77,7 +77,7 @@