Formatting

Update skills, page breaks and add profile picture
Fix translation ids
2024-10-24 13:20:19 +02:00 · 2024-10-24 13:15:06 +02:00 · 2024-10-21 14:52:24 +02:00 · 2024-10-21 14:22:40 +02:00 · 2024-10-21 11:37:59 +02:00 · 2024-10-21 11:19:42 +02:00
20 changed files with 524 additions and 378 deletions
@@ -27,8 +27,20 @@ steps:
  volumes:
    - name: deps
      path: /nix/store
+  environment:
+    DRONE_SSH_KEY:
+      from_secret: drone_ssh_key
+    GITEA_KNOWN_HOSTS:
+      from_secret: gitea_known_hosts
+    SSH_CONFIG:
+      from_secret: ssh_config
  commands:
-    - nix-build --argstr version ${DRONE_TAG} --argstr rev ${DRONE_COMMIT} --argstr repoUrl ${DRONE_REPO_LINK}
+    - mkdir /root/.ssh
+    - echo "$DRONE_SSH_KEY" > /root/.ssh/id_ed25519
+    - chmod 400 /root/.ssh/id_ed25519
+    - echo "$SSH_CONFIG" > /root/.ssh/config
+    - echo "$GITEA_KNOWN_HOSTS" > /root/.ssh/known_hosts
+    - nix --extra-experimental-features nix-command --extra-experimental-features flakes build .#image

 - name: publish
  image: docker:dind
@@ -46,7 +58,7 @@ steps:
    - sleep 5
    - ./result | docker load
    - echo $$REGISTRY_PASSWORD | docker login -u $$REGISTRY_USER --password-stdin dr.cechis.cz
-    - docker tag cv:${DRONE_TAG} dr.cechis.cz/c3c/cv:${DRONE_TAG}
+    - docker tag cv:current dr.cechis.cz/c3c/cv:${DRONE_TAG}
    - docker push dr.cechis.cz/c3c/cv:${DRONE_TAG}
  depends_on:
  - build
@@ -85,8 +97,20 @@ services:
  - name: dockersock
    path: /var/run

+---
+kind: secret
+name: drone_ssh_key
+data: 12kJDhu2Tb/25dBS+1HrXwn4tSuhD0S5F+z9WzIkNVl2MMbDmOlsV2XPhF1YgINsczyU7ceIWEp+tJI1X3+uMCDyuCU3zxVV4SOe3gc/2zdZ9fewz2uFxGDk6xHm/y1y9gmDfAt+//UjjjDgtGJKEKJX6r9D9diLyiF+P6m/zZCyRnTZv3SDvLv0PduOonEj/jWVVORjuBoKkshniygqqkfHL/v3TmIEvdZ0uQMCXEKKs0fEi+qOv2gpjt+tykHdlf57zSRUeDHIarKrlslGIae9HBq40CcVHLzbFMnCXpRA4wxxGbcsNnu0263fufZ169ef2Aqntgvqjxt7c0tppnI9GxMzCShBa3dHXh2mAs7irFaEAGJKtCXJ6ETMeS6/Li0Yyf1cNvW2dLVgtWGUggkW8Dbl0hD2ZqO26mu1lbxJ1v25JN0U6meNXhKFMxJDMSz+/kmPW6miMpJh3YSW7YIVZHcUrS4RoiJuYdOPD8OUcAJrHbCin3W78glqYSM1P5z0LowSlP12fNg0eYZ+5m1gML15j8DZ92PwKPKAM2WEVivfgs873cs3PVoeM8m9p3xd0qm0
+---
+kind: secret
+name: gitea_known_hosts
+data: r9Bi+OWiiOtFustCnv/oUn2ULPCHZwQKlhZ3IroztOaHsTy/RJiTsqm9Ntachs8by+skida+21YVry1oyabrbXcnClyejEuqgTKhB8fSm4Oy3GW35gZVoxRCOdYfteFgPAvX2iOpxzREwiOzhw9hcGSFNwZG5Iij+Ylp1/dD5fDc3SAczWE8M7A1mACwe2sBFv0EiG+SXOsHjH+n9P64EV52R4F7y+kSQmQ/Frjv1ZjtcbhVyP1LsLn3xhbotOI8ug0sxybRH2Mf48xC1wahdJJ54eoTDLFWBrOsopbZEVIC3wPHRSKjouSTPyzysb6QPnJdEYzQCwCNOJ4JNDrH5txVft7yLc6egyiIpiFE3IUfZHGWKeZiraqkUc3WjRIyX4+7v89HWmLlTPG08I3hBFR5aESu4NGPOp72fGjc3YKRze/nBuKDM5RXVH2AH3J9VLGD+6pfnllz9cgmHP3CEaS+8XC0rnOIpBKlNZWQJrApiWeBnLMdopy5E9ri1dPPmkvJjxaLyJ/23r35gz9RUUj/ws1AlGCIo3sM04XCXbLJbC1mgM1YDcRr6GMVztHMiMA4z0zCDzYHlQzTuSRPUl1Ygb/lyXBwVnvaajZDoyHju0D5Ie8kajcjlRxAMDcLZFlPTBJLuLp89WN9JEyKMss2L5kH0Ku7IDn3tZ7w4Ix9YJ4tN7WnjszZsks+lUbOwy5w4bKjiwwS7S9haiN2gMQ8TwCwzXIfynFS9c5xnOEzvDYTCjz04/1YbuSsYCM4HjR/ObpQWGo+1Zs5iUC9Lrhv9EaOO2q/8O7kpbqJURePN2F8f6lGRKe/aR8VGhrRrdd+YuKchL+BQaJK7q9d7m2ov3m+njNGO8/wzgUmB5GjALfYZ1nNVPta/+aMhVPrIc2iHMwlsGCx9pMClen0gtKic6MZhRWIZWxbxjoF4n9PNcBdcUW4/VvCLJRokAVHfxIH1/epH1hBrFRrDfI3hmFw8BXXIIEk4PDi1KydbJilbF3OvSOradcdzXlwIOOW2zqiq0tkeqjPrApdcCM6hkETkKgRfV9B9Ia9Ses3iy/v1bBN9Db8WjDu+KqoHfZrSkZGF2UlMjXQYLKoAPtH6ShlnaGHeeDZLk/+El6smOgeyUN6WJjKPPyBpSEZzbFfIZh7kkrqNmrkxh8ZdVlYloAuwzbCKzxCxHxDsGK5
+---
+kind: secret
+name: ssh_config
+data: 30Q8ofMygsDpqq4BcCtdv16/EWguc+mi2fYRszfZtmhe4PrIud4lxlOW5KJvyRVo7EZ2KzlZhHmGWGJKyA==
 ---
 kind: signature
-hmac: 8db89c3a13466a543ec8edb72923c4985aae191b0b6de8c324bb24116a7684e9
+hmac: 3d73eb044fd8a4fa566e7c19e0302b6db2e888f29784353de22a3937f49bdfec

 ...
@@ -12,6 +12,7 @@

 # Frontend
 /app/frontend/node_modules
+/app/frontend/dist
 /app/frontend/.pnp
 /app/frontend/.pnp.js
 /app/frontend/.dependency-graph
@@ -1,24 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-ssr
-*.local
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
@@ -3,7 +3,7 @@ import { defineMessages, useIntl } from "react-intl";

 import { Content } from "../common/Content";
 import { Headline, SubHeadline } from "../common/Headline";
-import { Spacer } from "../common/Spacer";
+import PageBreakAvoid from "../common/PageBreakAvoid";
 import { Paragraph } from "../common/Text";

 const messages = defineMessages({
@@ -11,67 +11,83 @@ const messages = defineMessages({
    defaultMessage: "Skills",
    id: "Experience.skills",
  },
-  yourpass: {
-    defaultMessage: "July 2021 - Present ({count} years)",
-    id: "Experience.yourpass",
-  },
-  yoursystem: {
-    defaultMessage: "February 2016 - December 2021 (5 years)",
-    id: "Experience.yoursystem",
-  },
-  past: {
-    defaultMessage: "Birth - February 2016",
-    id: "Experience.past",
-  },
-  pastDescription: {
-    defaultMessage:
-      "Working on smaller projects such as chats, forum based websites, web based presentations, most notably a system for handling the driver training center and driving school agenda... Tinkering...",
-    id: "Experience.pastDescription",
-  },
 });

-const approxCurrentYears = Math.round(
-  (Date.now() - new Date("2021-06-01").getTime()) / 1000 / 60 / 60 / 24 / 365
-);
+const approxCurrentYears = {
+  InvestBay: Math.round(
+    (Date.now() - new Date("2024-02-01").getTime()) / 1000 / 60 / 60 / 24 / 365
+  ),
+  YourPass: Math.round(
+    (Date.now() - new Date("2021-06-01").getTime()) / 1000 / 60 / 60 / 24 / 365
+  ),
+  YourSystemSysOps: Math.round(
+    (Date.now() - new Date("2022-01-01").getTime()) / 1000 / 60 / 60 / 24 / 365
+  ),
+};

-const yourpassSkills = [
+const investbaySkills = [
  "DevOps",
-  "Front-End Development",
-  "Back-end Operations",
-  "Software Development",
-  "Kubernetes",
-  "TypeScript",
-  "Go",
-  "Linux",
-  "Linux Server",
+  "Google Cloud Platform (GCP)",
+  "Amazon Web Services (AWS)",
+  "Gitlab",
+  "Terraform",
+  "Cloud infrastructure",
+  "Cloud Applications",
+  "Software Development Life Cycle (SDLC)",
  "Linux System Administration",
-  "Back-End Web Development",
-  "Git",
+  "Go",
+  "TypeScript",
+  "Nix",
+  "GraphQL",
+  "gRPC",
  "PostgreSQL",
  "Node.js",
  "React.js",
+];
+
+const yourpassSkills = [
+  "DevOps",
+  "Software as a Service (SaaS)",
+  "Cloud Infrastructure",
+  "Kubernetes",
+  "Back-end Operations",
+  "Linux System Administration",
  "Amazon Web Services (AWS)",
-  "Amazon EKS",
+  "Terraform",
+  "Go (Programming Language)",
+  "gRPC",
+  "Front-End Development",
+  "React.js",
+  "Node.js",
+  "TypeScript",
+  "Nix",
+  "Software Development Life Cycle (SDLC)",
+  "Software Development",
+  "Git",
+  "PostgreSQL",
 ];

 const yoursystemSkills = [
  "DevOps",
-  "Front-End Development",
+  "Docker Swarm",
+  "Linux System Administration",
  "Back-end Operations",
+  "Front-End Development",
+  "Amazon Web Services (AWS)",
+  "Bash",
+  "Linux Server",
+  "Terraform",
+  "Cloud Infrastructure",
+  "Cloud Applications",
+  "Go (Programming Language)",
+  "TypeScript",
+  "Node.js",
+  "Software Development Life Cycle (SDLC)",
  "Software Development",
  "Kubernetes",
-  "TypeScript",
-  "Linux",
-  "Linux Server",
-  "Linux System Administration",
  "Back-End Web Development",
+  "GraphQL",
  "Git",
-  "Node.js",
-  "Vue.js",
-  "PHP",
-  "Bash",
-  "Amazon Web Services (AWS)",
-  "Amazon EKS",
 ];

 const Experience: React.FC = () => {
@@ -79,40 +95,109 @@ const Experience: React.FC = () => {

  return (
    <>
-      <Headline level={3}>YOUR PASS s.r.o.</Headline>
-      <SubHeadline level={4}>DevOps Engineer</SubHeadline>
-      <Content>
-        <Paragraph>
-          {intl.formatMessage(messages.yourpass, {
-            count: approxCurrentYears,
-          })}
-        </Paragraph>
-        <Paragraph>
-          <strong>{intl.formatMessage(messages.skills)}:</strong>{" "}
-          {yourpassSkills.join(" · ")}
-        </Paragraph>
-      </Content>
+      <PageBreakAvoid>
+        <Headline level={3}>INVESTBAY s.r.o.</Headline>
+        <SubHeadline level={4}>DevOps Architect</SubHeadline>
+        <Content>
+          <Paragraph>
+            {intl.formatMessage(
+              {
+                defaultMessage: "February 2024 - Present",
+                id: "Experience.investbay",
+              },
+              {
+                // not used atm
+                count: approxCurrentYears.InvestBay,
+              }
+            )}
+          </Paragraph>
+          <Paragraph>
+            <strong>{intl.formatMessage(messages.skills)}:</strong>{" "}
+            {investbaySkills.join(" · ")}
+          </Paragraph>
+        </Content>
+      </PageBreakAvoid>

-      <Spacer />
+      <PageBreakAvoid>
+        <Headline level={3}>YOUR PASS s.r.o.</Headline>
+        <SubHeadline level={4}>DevOps Engineer</SubHeadline>
+        <Content>
+          <Paragraph>
+            {intl.formatMessage(
+              {
+                defaultMessage: "July 2021 - Present ({count} years)",
+                id: "Experience.yourpass",
+              },
+              {
+                count: approxCurrentYears.YourPass,
+              }
+            )}
+          </Paragraph>
+          <Paragraph>
+            <strong>{intl.formatMessage(messages.skills)}:</strong>{" "}
+            {yourpassSkills.join(" · ")}
+          </Paragraph>
+        </Content>
+      </PageBreakAvoid>

-      <Headline level={3}>YOUR SYSTEM s.r.o.</Headline>
-      <SubHeadline level={4}>Lead Developer/Architect</SubHeadline>
+      <PageBreakAvoid>
+        <Headline level={3}>YOUR SYSTEM s.r.o.</Headline>
+        <SubHeadline level={4}>SysOps</SubHeadline>

-      <Content>
-        <Paragraph>{intl.formatMessage(messages.yoursystem)}</Paragraph>
-        <Paragraph>
-          <strong>{intl.formatMessage(messages.skills)}:</strong>{" "}
-          {yoursystemSkills.join(" · ")}
-        </Paragraph>
-      </Content>
+        <Content>
+          <Paragraph>
+            {intl.formatMessage(
+              {
+                defaultMessage: "January 2022 - Present ({count} years)",
+                id: "Experience.yoursystem",
+              },
+              {
+                count: approxCurrentYears.YourSystemSysOps,
+              }
+            )}
+          </Paragraph>
+          <Paragraph>
+            <strong>{intl.formatMessage(messages.skills)}:</strong>{" "}
+            {yoursystemSkills.join(" · ")}
+          </Paragraph>
+        </Content>

-      <Headline level={3}>Past experience</Headline>
-      <SubHeadline level={4}>Developer</SubHeadline>
+        <SubHeadline level={4}>Lead Developer/Architect</SubHeadline>

-      <Content>
-        <Paragraph>{intl.formatMessage(messages.past)}</Paragraph>
-        <Paragraph>{intl.formatMessage(messages.pastDescription)}</Paragraph>
-      </Content>
+        <Content>
+          <Paragraph>
+            {intl.formatMessage({
+              defaultMessage: "February 2016 - December 2021 (5 years)",
+              id: "Experience.yoursystem",
+            })}
+          </Paragraph>
+          <Paragraph>
+            <strong>{intl.formatMessage(messages.skills)}:</strong>{" "}
+            {yoursystemSkills.join(" · ")}
+          </Paragraph>
+        </Content>
+      </PageBreakAvoid>
+
+      <PageBreakAvoid>
+        <Headline level={3}>Past experience</Headline>
+        <SubHeadline level={4}>Developer</SubHeadline>
+
+        <Content>
+          <Paragraph>
+            {intl.formatMessage({
+              defaultMessage: "Birth - February 2016",
+              id: "Experience.past",
+            })}
+          </Paragraph>
+          <Paragraph>
+            {intl.formatMessage({
+              defaultMessage:
+                "Working on smaller projects such as chats, forum based websites, web based presentations, most notably a system for handling the driver training center and driving school agenda... Tinkering...",
+              id: "Experience.pastDescription",
+            })}
+          </Paragraph>
+        </Content>
+      </PageBreakAvoid>
    </>
  );
 };
@@ -1,5 +1,6 @@
 import React from "react";

+import PageBreakAvoid from "../common/PageBreakAvoid";
 import { Spacer } from "../common/Spacer";
 import { Paragraph } from "../common/Text";

@@ -11,13 +12,13 @@ const Skill: React.FC<React.PropsWithChildren<SkillProps>> = (props) => {
  const { children, title } = props;

  return (
-    <div>
+    <PageBreakAvoid>
      <strong>{title}</strong>
      <Spacer />
      {React.Children.map(children, (c) => (
        <Paragraph>{c}</Paragraph>
      ))}
-    </div>
+    </PageBreakAvoid>
  );
 };

@@ -1,49 +1,13 @@
 import React from "react";
-import { defineMessages, useIntl } from "react-intl";
+import { useIntl } from "react-intl";

 import { SubHeadline } from "../common/Headline";
 import { List, ListItem } from "../common/List";
+import PageBreakAvoid from "../common/PageBreakAvoid";
 import { Spacer } from "../common/Spacer";
 import { Paragraph } from "../common/Text";
 import Skill from "./Skill";

-const messages = defineMessages({
-  backendDevelopment: {
-    defaultMessage:
-      "Deep knowledge of backend operations, mostly supporting web based applications using various technologies, programming languages and frameworks.",
-    id: "Skills.backendDevelopment",
-  },
-  backendDevelopmentAdditional: {
-    defaultMessage:
-      "In recent years, the main focus was on Go to write tooling and backend services.",
-    id: "Skills.backendDevelopment",
-  },
-  devops: {
-    defaultMessage:
-      "Several years of experience developing, maintaining and adhering to the DevOps practices to streamline organization's processes across both backend and frontend development.",
-    id: "Skills.devops",
-  },
-  frontendDevelopment: {
-    defaultMessage:
-      "Extensive experience in frontend development spanning back to the early 2000s.",
-    id: "Skills.frontendDevelopment",
-  },
-  infrastructureOperations: {
-    defaultMessage:
-      "Throughout my career, I have gained valuable experience in developing and maintaining high-load infrastructures over several years.",
-    id: "Skills.infrastructureOperations",
-  },
-  infrastructureOperationsAdditional: {
-    defaultMessage:
-      "Following the OCI (Open Container Initiative) and leveraging Docker and Kubernetes to create highly available deployments, primarily on the AWS platform, was a challenging and enjoyable experience, that has greatly enhanced my skills in this area.",
-    id: "Skills.infrastructureOperationsAdditional",
-  },
-  otherNotableSkills: {
-    defaultMessage: "Other notable skills",
-    id: "Skills.otherNotableSkills",
-  },
-});
-
 type OtherSkill = {
  title: string;
  description?: string;
@@ -51,13 +15,13 @@ type OtherSkill = {

 const otherSkills: OtherSkill[] = [
  {
-    title: "Primary languages",
-    description: "Go, Typescript (and Javascript)",
+    title: "Strong proficiency in",
+    description: "Go, Typescript (and Javascript), Bash, IaaC tools",
  },
  {
-    title: "Infrastructure based skills",
+    title: "Infrastructure related skills",
    description:
-      "Kubernetes and AWS EKS, Containerized applications, Linux system administration, Amazon Web Services - good understanding of Networking, RDS, Queues",
+      "Kubernetes and AWS EKS, Containerized applications, Linux system administration, Amazon Web Services - good understanding of Networking, RDS, Queues. Notable experience with GCP/Azure.",
  },
  {
    title: "Databases",
@@ -88,27 +52,58 @@ const Skills: React.FC = () => {

  return (
    <>
-      <Skill title="DevOps">{intl.formatMessage(messages.devops)}</Skill>
+      <Skill title="DevOps">
+        {intl.formatMessage({
+          defaultMessage:
+            "Several years of experience developing, maintaining and adhering to the DevOps practices to streamline organization's processes across both backend and frontend development.",
+          id: "Skills.devops",
+        })}
+      </Skill>
      <Skill title="Front-End Development">
-        {intl.formatMessage(messages.frontendDevelopment)}
+        {intl.formatMessage({
+          defaultMessage:
+            "Extensive experience in frontend development spanning back to the early 2000s.",
+          id: "Skills.frontendDevelopment",
+        })}
      </Skill>
      <Skill title="Back-End Development">
-        {intl.formatMessage(messages.backendDevelopment)}
-        {intl.formatMessage(messages.backendDevelopmentAdditional)}
+        {intl.formatMessage({
+          defaultMessage:
+            "Deep knowledge of backend operations, mostly supporting web based applications using various technologies, programming languages and frameworks.",
+          id: "Skills.backendDevelopmentSum1",
+        })}
+        {intl.formatMessage({
+          defaultMessage:
+            "In recent years, the main focus was on Go to write tooling and backend services.",
+          id: "Skills.backendDevelopmentSum2",
+        })}
      </Skill>
      <Skill title="Infrastructure operations">
-        {intl.formatMessage(messages.infrastructureOperations)}
-        {intl.formatMessage(messages.infrastructureOperationsAdditional)}
+        {intl.formatMessage({
+          defaultMessage:
+            "Throughout my career, I have gained valuable experience in developing and maintaining high-load infrastructures over several years.",
+          id: "Skills.infrastructureOperations",
+        })}
+        {intl.formatMessage({
+          defaultMessage:
+            "Following the OCI (Open Container Initiative) and leveraging Docker and Kubernetes to create highly available deployments, primarily on the AWS platform, was a challenging and enjoyable experience, that has greatly enhanced my skills in this area.",
+          id: "Skills.infrastructureOperationsAdditional",
+        })}
      </Skill>
      <Spacer withDivider />
      <SubHeadline level={4}>
-        {intl.formatMessage(messages.otherNotableSkills)}
+        {intl.formatMessage({
+          defaultMessage: "Other notable skills",
+          id: "Skills.otherNotableSkills",
+        })}
      </SubHeadline>
      <List>
        {otherSkills.map((s) => (
          <ListItem key={s.title}>
-            <strong>{s.title}</strong>
-            {s.description && `: ${s.description}`}
+            <PageBreakAvoid>
+              <strong>{s.title}</strong>
+              {s.description && `: ${s.description}`}
+            </PageBreakAvoid>
          </ListItem>
        ))}
      </List>
@@ -38,8 +38,7 @@ const Summary: React.FC = () => {
        knowledge of KNX systems.
      </Paragraph>
      <Caption>
-        -- This summary was graciously generated by an AI and then rewritten and
-        adjusted by a human
+        -- Summary graciously generated by an AI and curated by human
      </Caption>
    </>
  );
@@ -23,7 +23,7 @@ const Nav = styled("nav")({
  flex: "0 0 280px",
  width: 280,
  minHeight: "100%",
-  padding: "3rem 2rem 2rem",
+  padding: "2rem 2rem 2rem",

  [hideNavigationMQ]: {
    display: "none",
@@ -1,33 +1,21 @@
+import styled from "@emotion/styled";
 import React, { useEffect, useRef } from "react";
-import { defineMessages, useIntl } from "react-intl";
+import { useIntl } from "react-intl";

+import profile from "../../assets/profile.jpg";
 import { CONTACT_EMAIL, CONTACT_PHONE } from "../../config/environment";
 import { Contact } from "../common/Contact";
 import { List, ListItem } from "../common/List";
 import { Spacer } from "../common/Spacer";
 import NavigationHeadline from "./NavigationHeadline";

-const messages = defineMessages({
-  certifications: {
-    defaultMessage: "Certifications",
-    id: "Navigation.certifications",
-  },
-  contact: {
-    defaultMessage: "Contact",
-    id: "Navigation.contact",
-  },
-  experience: {
-    defaultMessage: "Experience",
-    id: "Navigation.experience",
-  },
-  objective: {
-    defaultMessage: "Objective",
-    id: "Navigation.objective",
-  },
-  topSkills: {
-    defaultMessage: "Top Skills",
-    id: "Navigation.topSkills",
-  },
+const ProfileImg = styled("img")({
+  borderRadius: "50%",
+  border: "2px solid white",
+  display: "block",
+  margin: "0 auto",
+  maxWidth: "100%",
+  width: 150,
 });

 const getTopOffset = (input: HTMLElement) => {
@@ -74,6 +62,13 @@ const MainNavigation: React.FC = () => {
      scrollPrev = window.scrollY;
      const top = getTopOffset(d);

+      console.log({
+        "window.innerHeight": window.innerHeight,
+        height,
+        top,
+        down,
+      });
+
      if (window.innerHeight > height) {
        d.style.marginTop = `${Math.max(window.scrollY, 0)}px`;
        return;
@@ -84,16 +79,24 @@ const MainNavigation: React.FC = () => {
        const wDelta = window.scrollY + window.innerHeight;

        const diff = wDelta - delta;
+        console.log({ delta, wDelta, "window.scrollY": window.scrollY, diff });
+
        if (diff > 0) {
          const sizeDelta = Math.min(window.innerHeight - height, 0);
          d.style.marginTop = `${Math.max(top + diff + sizeDelta, 0)}px`;
+          console.log({
+            sizeDelta,
+            marginTop: Math.max(top + diff + sizeDelta, 0),
+          });
        }
      } else {
        const delta = top;
        const wDelta = window.scrollY;

        const diff = wDelta - delta;
+        console.log({ delta, wDelta, "window.scrollY": window.scrollY, diff });
        if (diff < 0) {
+          console.log({ marginTop: Math.max(top + diff, 0) });
          d.style.marginTop = `${Math.max(top + diff, 0)}px`;
        }
      }
@@ -109,8 +112,13 @@ const MainNavigation: React.FC = () => {

  return (
    <div ref={ref}>
+      <ProfileImg src={profile} alt="profile picture" />
+
      <NavigationHeadline>
-        {intl.formatMessage(messages.contact)}
+        {intl.formatMessage({
+          defaultMessage: "Contact",
+          id: "Navigation.contact",
+        })}
      </NavigationHeadline>

      <Spacer />
@@ -118,28 +126,40 @@ const MainNavigation: React.FC = () => {
      <Contact email={CONTACT_EMAIL} phoneNumber={CONTACT_PHONE} />

      <NavigationHeadline href="#objective">
-        {intl.formatMessage(messages.objective)}
+        {intl.formatMessage({
+          defaultMessage: "Objective",
+          id: "Navigation.objective",
+        })}
      </NavigationHeadline>

      <NavigationHeadline href="#skills">
-        {intl.formatMessage(messages.topSkills)}
+        {intl.formatMessage({
+          defaultMessage: "Top Skills",
+          id: "Navigation.topSkills",
+        })}
      </NavigationHeadline>

      <Spacer />

      <List>
        <ListItem>DevOps</ListItem>
-        <ListItem>Front-End Development</ListItem>
-        <ListItem>Back-End Development</ListItem>
        <ListItem>Kubernetes</ListItem>
-        <ListItem>Typescript</ListItem>
+        <ListItem>Linux</ListItem>
        <ListItem>Go</ListItem>
+        <ListItem>Typescript</ListItem>
+        <ListItem>Back-End Development</ListItem>
+        <ListItem>Front-End Development</ListItem>
+        <ListItem>Scripting:</ListItem>
+        <ListItem>Bash, Python, Lua</ListItem>
      </List>

      <Spacer spacing={0} withDivider />

      <NavigationHeadline>
-        {intl.formatMessage(messages.certifications)}
+        {intl.formatMessage({
+          defaultMessage: "Certifications",
+          id: "Navigation.certifications",
+        })}
      </NavigationHeadline>

      <Spacer />
@@ -152,7 +172,10 @@ const MainNavigation: React.FC = () => {
      <Spacer spacing={0} withDivider />

      <NavigationHeadline href="#experience">
-        {intl.formatMessage(messages.experience)}
+        {intl.formatMessage({
+          defaultMessage: "Experience",
+          id: "Navigation.experience",
+        })}
      </NavigationHeadline>
    </div>
  );
@@ -0,0 +1,7 @@
+import styled from "@emotion/styled";
+
+const PageBreakAvoid = styled("div")({
+  pageBreakInside: "avoid",
+});
+
+export default PageBreakAvoid;
@@ -1,6 +1,6 @@
 import styled from "@emotion/styled";
 import React from "react";
-import { defineMessages, useIntl } from "react-intl";
+import { useIntl } from "react-intl";

 import { Experience, Skills, Summary } from "../components/CV";
 import MainLayout from "../components/Layout/MainLayout";
@@ -11,21 +11,6 @@ import { Headline, SubHeadline } from "../components/common/Headline";
 import { Spacer } from "../components/common/Spacer";
 import { CONTACT_EMAIL, CONTACT_PHONE, POSITION } from "../config/environment";

-const messages = defineMessages({
-  experienceTitle: {
-    defaultMessage: "Experience",
-    id: "Dashboard.experienceTitle",
-  },
-  location: {
-    defaultMessage: "Central Bohemia, Czechia",
-    id: "Dashboard.location",
-  },
-  skillsTitle: {
-    defaultMessage: "Skills",
-    id: "Dashboard.skillsTitle",
-  },
-});
-
 const HiddenWithNav = styled("div")({
  display: "none",
  [hideNavigationMQ]: {
@@ -41,7 +26,10 @@ const Dashboard: React.FC = () => {
      <Headline level={1}>Lukáš Čech</Headline>
      <SubHeadline level={2}>{POSITION}</SubHeadline>
      <SubHeadline level={4}>
-        {intl.formatMessage(messages.location)}
+        {intl.formatMessage({
+          defaultMessage: "Central Bohemia, Czechia",
+          id: "Dashboard.location",
+        })}
      </SubHeadline>

      <HiddenWithNav>
@@ -58,7 +46,12 @@ const Dashboard: React.FC = () => {
      <div id="skills" />
      <Spacer withDivider />

-      <Headline level={2}>{intl.formatMessage(messages.skillsTitle)}</Headline>
+      <Headline level={2}>
+        {intl.formatMessage({
+          defaultMessage: "Skills",
+          id: "Dashboard.skillsTitle",
+        })}
+      </Headline>
      <Spacer />
      <Content>
        <Skills />
@@ -68,7 +61,10 @@ const Dashboard: React.FC = () => {
      <Spacer withDivider />

      <Headline level={2}>
-        {intl.formatMessage(messages.experienceTitle)}
+        {intl.formatMessage({
+          defaultMessage: "Experience",
+          id: "Dashboard.experienceTitle",
+        })}
      </Headline>
      <Spacer />
      <Content>
@@ -1,16 +1,9 @@
 import styled from "@emotion/styled";
 import React from "react";
-import { defineMessages, useIntl } from "react-intl";
+import { useIntl } from "react-intl";

 import { Link } from "../components/common/Link";

-const messages = defineMessages({
-  notFound: {
-    defaultMessage: "Nothing to see here",
-    id: "Router.NotFound",
-  },
-});
-
 const Root = styled("div")({
  display: "flex",
  flexDirection: "column",
@@ -25,7 +18,12 @@ const NotFound = () => {

  return (
    <Root>
-      <p>{intl.formatMessage(messages.notFound)}</p>
+      <p>
+        {intl.formatMessage({
+          defaultMessage: "Nothing to see here",
+          id: "Router.NotFound",
+        })}
+      </p>
      <Link to="/">Go home</Link>
    </Root>
  );
@@ -7,10 +7,9 @@ import (
 	"os"
 	"time"

+	"go.c3c.cz/cv/app/server/internal/version"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-
-	"go.c3c.cz/cv/app/server/internal/version"
 )

 type FrontendConfigDef struct {
@@ -14,10 +14,9 @@ import (
 	"strings"
 	"time"

-	"go.uber.org/zap"
-
 	"go.c3c.cz/cv/app/server/internal/files"
 	"go.c3c.cz/cv/app/server/internal/version"
+	"go.uber.org/zap"
 )

 type handler struct {
@@ -67,7 +66,6 @@ func (h *handler) serveFile(w http.ResponseWriter, r *http.Request, modtime time
 			gw.Reset(io.Discard)
 		}
 		err = gw.Close()
-
 		if err != nil {
 			h.logger.Warn("Could not close gzip writer", zap.Error(err))
 			return
@@ -10,9 +10,8 @@ import (
 	"net/http"
 	"time"

-	"go.uber.org/zap"
-
 	"go.c3c.cz/cv/app/server/internal/files"
+	"go.uber.org/zap"
 )

 func init() {
@@ -8,12 +8,11 @@ import (
 	"os/signal"
 	"syscall"

-	"go.uber.org/zap"
-
 	"go.c3c.cz/cv/app/server/internal/config"
 	"go.c3c.cz/cv/app/server/internal/httpserver"
 	"go.c3c.cz/cv/app/server/internal/pprofserver"
 	"go.c3c.cz/cv/app/server/internal/version"
+	"go.uber.org/zap"
 )

 func main() {
@@ -33,7 +32,6 @@ func main() {
 	var err error

 	logger, err = config.LoggerConfig.Build()
-
 	if err != nil {
 		fmt.Println(notice)
 		fmt.Println(version.CommitTime.Format("Committed at 2006/01/02 15:04:05 MST"))
@@ -1,154 +0,0 @@
-{ system ? builtins.currentSystem
-, version ? "latest"
-, rev ? ""
-, commitTime ? "1970-01-01T00:00:00+00:00"
-, repoUrl ? ""
-}:
-
-let
-  nixpkgs = builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/4ecab3273592f27479a583fb6d975d4aba3486fe.tar.gz";
-    sha256 = "10wn0l08j9lgqcw8177nh2ljrnxdrpri7bp0g7nvrsn9rkawvlbf";
-  };
-  pkgs = import nixpkgs { inherit system; };
-
-  devshell = import
-    (pkgs.fetchFromGitHub {
-      owner = "numtide";
-      repo = "devshell";
-      rev = "5143ea68647c4cf5227e4ad2100db6671fc4c369";
-      sha256 = "sha256-9goJTd05yOyD/McaMqZ4BUB8JW+mZMnZQJZ7VQ6C/Lw=";
-    })
-    { nixpkgs = pkgs; };
-
-  nodejs = pkgs.nodejs_20;
-
-  go = pkgs.go_1_20;
-
-  dream2nix = pkgs.dream2nix;
-
-  buildGoModule = pkgs.buildGoModule.override { inherit go; };
-  golangci-lint = pkgs.golangci-lint.override { inherit buildGoModule; };
-
-  src = pkgs.lib.cleanSource ./.;
-  uiSrc = pkgs.lib.cleanSource ./app/frontend;
-
-  package = pkgs.buildNpmPackage {
-    name = "ui";
-    buildInputs = [
-      nodejs
-    ];
-    pname = "ui";
-    src = uiSrc;
-    buildPhase = ''
-      npm run check
-      npm run build
-      mkdir $out
-      cp -a dist $out
-    '';
-    npmInstallFlags = "--no-audit --no-progress --no-fund";
-    npmDepsHash = "sha256-p4rTpy0t8aajbubvtF1TA83/FFqvfKEOPBb5T0ZRfQY=";
-    npmPackFlags = [ "--ignore-scripts" ];
-  };
-
-  server = buildGoModule {
-    inherit src version;
-    pname = "cv";
-    postPatch = ''
-      rm -rf app/server/internal/files/data/public
-      mkdir -p app/server/internal/files/data/public
-      touch app/server/internal/files/data/public/.gitkeep
-      cp -Tr ${package}/dist/ app/server/internal/files/data/public/
-      chmod +w -R app/server/internal/files/data/public
-      sed -i 's#<script#<script nonce="{{ .CspNonce }}"#g' app/server/internal/files/data/public/index.html
-    '';
-    CGO_ENABLED = 0;
-    ldflags = "-s -w -X gopkg.c3c.cz/cv/app/server/internal/version.Tag=${version} -X gopkg.c3c.cz/cv/app/server/internal/version.Commit=${rev} -X gopkg.c3c.cz/cv/app/server/internal/version.commitTime=${commitTime} -X gopkg.c3c.cz/cv/app/server/internal/version.repoUrl=${repoUrl}";
-    subPackages = [ "app/server" ];
-    vendorSha256 = "sha256-44xcyVk5KcurQLkVJv1MeAj+Pfcu53664pvVgHdyv3E=";
-    overrideModAttrs = (_: {
-      impureEnvVars = pkgs.lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" "GOPROXY" ];
-    });
-  };
-
-in
-{
-  image = pkgs.dockerTools.streamLayeredImage {
-    name = "cv";
-    tag = version;
-
-    config = {
-      Env = [ "SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ];
-      Entrypoint = [ "${server}/bin/server" ];
-    };
-  };
-
-  shell = devshell.mkShell {
-    devshell = {
-      name = "c3c-cv";
-      packages = [
-        go
-        golangci-lint
-        pkgs.prefetch-npm-deps
-
-        nodejs
-
-        # keep pinned nixpkgs so they are not garbage collected
-        pkgs.path
-      ];
-    };
-
-    commands = [
-      {
-        name = "lint";
-        help = "run golangci-lint and npm run check";
-        command = ''
-          cd ''$PRJ_ROOT
-          golangci-lint run --sort-results --out-format tab
-          npm --prefix app/frontend run check
-        '';
-      }
-      {
-        name = "fmt";
-        help = "Format and fix found issues";
-        command = ''
-          cd ''$PRJ_ROOT
-          golangci-lint run --sort-results --out-format tab --fix
-          npm --prefix app/frontend run fix
-        '';
-      }
-      {
-        name = "update-npm-deps-hash";
-        help = "Calculates and updates the npmDepsHash in default.nix";
-        command = ''
-          echo "Calculating npm deps"
-          # STDERR is poluted by the installed nodules, silencing
-          HASH=''$(prefetch-npm-deps ''$PRJ_ROOT/app/frontend/package-lock.json 2> /dev/null)
-          [[ ''$HASH = sha256* ]] && echo "Hash is ''$HASH"
-          [[ ''$HASH != sha256* ]] && echo "Failed" && exit 137
-
-          # Replace the first occurence of npmDepsHash with the new calculated hash in this file
-          sed -i "0,/npmDepsHash =/{s@npmDepsHash = .*@npmDepsHash = \"''$HASH\";@}" ''$PRJ_ROOT/default.nix
-        '';
-      }
-      {
-        name = "pre-commit";
-        help = "Format and fix found issues";
-        command = ''
-          cd ''$PRJ_ROOT
-          golangci-lint run --sort-results --out-format tab --fix
-          npm --prefix ''$PRJ_ROOT/app/frontend run fix
-
-          update-npm-deps-hash
-        '';
-      }
-      {
-        name = "dev";
-        help = "Starts the javascript project in dev";
-        command = ''
-          npm --prefix ''$PRJ_ROOT/app/frontend run dev
-        '';
-      }
-    ];
-  };
-}
@@ -0,0 +1,67 @@
+{
+  "nodes": {
+    "devshell": {
+      "inputs": {
+        "nixpkgs": [
+          "nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1728330715,
+        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "nix": {
+      "inputs": {
+        "devshell": "devshell",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1729027123,
+        "narHash": "sha256-LjD40ya8efdhxQ26Zy/LkLDOriZIHJZqutAorvPIka8=",
+        "ref": "refs/heads/main",
+        "rev": "d3596fc7e933c171a284771f7f72342d33ad6508",
+        "revCount": 5,
+        "type": "git",
+        "url": "ssh://git@git.c3c.cz/C3C/nix"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://git@git.c3c.cz/C3C/nix"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1728538411,
+        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nix": "nix"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
@@ -0,0 +1,134 @@
+{
+  inputs = {
+    nix.url = "git+ssh://git@git.c3c.cz/C3C/nix";
+  };
+
+  outputs =
+    { self, nix }:
+    {
+      formatter = nix.formatter;
+
+      packages = nix.lib.forAllSystems (
+        pkgs:
+        let
+          version = "rev-${self.shortRev or self.dirtyShortRev}";
+          package = builtins.fromJSON (builtins.readFile ./app/frontend/package.json);
+        in
+        rec {
+          ui = pkgs.buildNpmPackage {
+            inherit version;
+            pname = "cv";
+            src = ./app/frontend;
+            npmInstallFlags = "--no-audit --no-progress --no-fund";
+            npmDepsHash = "sha256-p4rTpy0t8aajbubvtF1TA83/FFqvfKEOPBb5T0ZRfQY=";
+            npmPackFlags = [ "--ignore-scripts" ];
+          };
+
+          server = pkgs.buildGoModule {
+            inherit version;
+            pname = "cv";
+            CGO_ENABLED = 0;
+            src = ./.;
+            subPackages = [ "app/server" ];
+            postPatch = ''
+              rm -rf app/server/internal/files/data/public
+              mkdir -p app/server/internal/files/data/public
+              touch app/server/internal/files/data/public/.gitkeep
+              cp -Tr ${ui}/lib/node_modules/${package.name}/dist app/server/internal/files/data/public/
+              chmod +w -R app/server/internal/files/data/public
+              sed -i 's#<script#<script nonce="{{ .CspNonce }}"#g' app/server/internal/files/data/public/index.html
+            '';
+            ldflags = [
+              "-s"
+              "-w"
+              "-X gopkg.c3c.cz/cv/app/server/internal/version.Tag=${version}"
+              "-X gopkg.c3c.cz/cv/app/server/internal/version.Commit=${self.rev or self.dirtyRev}"
+              "-X gopkg.c3c.cz/cv/app/server/internal/version.commitTime=${
+                builtins.toString (self.lastModified or 0)
+              }"
+            ];
+            vendorHash = "sha256-44xcyVk5KcurQLkVJv1MeAj+Pfcu53664pvVgHdyv3E=";
+          };
+
+          image = pkgs.dockerTools.streamLayeredImage {
+            name = "cv";
+            tag = "current";
+
+            config = {
+              Env = [ "SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ];
+              Entrypoint = [ "${server}/bin/server" ];
+            };
+          };
+
+        }
+      );
+
+      devShells = nix.lib.forAllSystems (pkgs: {
+        default = pkgs.devshell.mkShell {
+          name = "c3c-cv";
+
+          packages = [
+            pkgs.go
+            pkgs.nodejs_22
+          ];
+
+          commands = [
+            {
+              # Override golangci-lint for vscode, because the extension incorrectly assumes usage of global binaries is preferred
+              name = "golangci-lint";
+              command = ''
+                CMD=''${1:-}
+                if [[ "$CMD" == "run" ]]; then
+                  shift
+                  ${pkgs.golangci-lint}/bin/golangci-lint run --config ${nix.lib.golangci-config-file} $@
+                else
+                  ${pkgs.golangci-lint}/bin/golangci-lint $@
+                fi
+              '';
+            }
+            {
+              name = "lint";
+              help = "run linters";
+              command = ''
+                ${nix.lib.cd_root}
+                ${pkgs.golangci-lint}/bin/golangci-lint run --sort-results --out-format tab --config ${nix.lib.golangci-config-file} ./...
+                npm --prefix app/frontend run check
+              '';
+            }
+            {
+              name = "fix";
+              help = "format & fix found issues";
+              command = ''
+                ${nix.lib.cd_root}
+                nix fmt ./*.nix
+                ${pkgs.golangci-lint}/bin/golangci-lint run --sort-results --out-format tab --config ${nix.lib.golangci-config-file} --fix --issues-exit-code 0 ./...
+                npm --prefix app/frontend run fix
+              '';
+            }
+            {
+              name = "update-npm-deps-hash";
+              help = "Calculates and updates the npmDepsHash in default.nix";
+              command = ''
+                ${nix.lib.cd_root}
+                echo "Calculating npm deps"
+                # STDERR is poluted by the installed nodules, silencing
+                HASH=''$(${pkgs.prefetch-npm-deps}/bin/prefetch-npm-deps ''$PRJ_ROOT/app/frontend/package-lock.json 2> /dev/null)
+                [[ ''$HASH = sha256* ]] && echo "Hash is ''$HASH"
+                [[ ''$HASH != sha256* ]] && echo "Failed" && exit 137
+
+                # Replace the first occurence of npmDepsHash with the new calculated hash in this file
+                sed -i "0,/npmDepsHash =/{s@npmDepsHash = .*@npmDepsHash = \"''$HASH\";@}" ./flake.nix
+              '';
+            }
+            {
+              name = "dev";
+              help = "Starts the javascript project in dev";
+              command = ''
+                npm --prefix ''$PRJ_ROOT/app/frontend run dev
+              '';
+            }
+          ];
+        };
+      });
+    };
+}
Author	SHA1	Message	Date
Arnie	ea5fed1bf9	Formatting continuous-integration/drone/tag Build is passing Details	2024-10-24 13:20:19 +02:00
Arnie	373f01c9c2	Update skills, page breaks and add profile picture continuous-integration/drone/tag Build is failing Details	2024-10-24 13:15:06 +02:00
Arnie	df24388d95	Fix translation ids	2024-10-21 14:52:24 +02:00
Arnie	f71449985d	Use new cmd for nix builds continuous-integration/drone/tag Build is passing Details	2024-10-21 14:22:40 +02:00
Arnie	438f83e217	Update CV continuous-integration/drone/tag Build is failing Details	2024-10-21 11:37:59 +02:00
Arnie	1d67745c69	Flakeify	2024-10-21 11:19:42 +02:00