diff --git a/Dockerfile b/Dockerfile index 84904e2..cb8d052 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,8 @@ RUN npm run build FROM nginx:alpine +HEALTHCHECK --interval=1m --timeout=10s CMD curl --fail http://localhost/ || exit 1 + WORKDIR /usr/share/nginx/html RUN rm -rf * diff --git a/docker-compose.yml b/docker-compose.yml index 64e5961..db57a85 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.8" +version: '3.8' services: timeline: @@ -13,7 +13,7 @@ services: # no cpu limit memory: 16M reservations: - cpus: "0.2" + cpus: '0.2' memory: 16M placement: max_replicas_per_node: 1 diff --git a/nginx-config/nginx.conf b/nginx-config/nginx.conf index c9cb38d..902ca30 100644 --- a/nginx-config/nginx.conf +++ b/nginx-config/nginx.conf @@ -11,6 +11,7 @@ events { http { server_tokens off; + include /etc/nginx/mime.types; default_type application/octet-stream; diff --git a/src/framework/primitives/implementations/image.ts b/src/framework/primitives/implementations/image.ts index a737058..f098344 100644 --- a/src/framework/primitives/implementations/image.ts +++ b/src/framework/primitives/implementations/image.ts @@ -9,16 +9,16 @@ export class Image implements Primitive { private readonly alt: string ) {} - public toHTML(noContainer = false): html { + public toHTML(container = false): html { return ` - ${!noContainer ? `
` : ''} + ${container ? `
` : ''} ${this.alt} - ${!noContainer ? `
` : ''} + ${container ? `
` : ''} `; } diff --git a/src/framework/primitives/implementations/video.ts b/src/framework/primitives/implementations/video.ts index b867924..f4a83cd 100644 --- a/src/framework/primitives/implementations/video.ts +++ b/src/framework/primitives/implementations/video.ts @@ -8,16 +8,16 @@ export class Video implements Primitive { private readonly webm: url, private readonly options?: string ) {} - public toHTML(noContainer = false): string { + public toHTML(container = false): string { return ` - ${!noContainer ? `
` : ''} + ${container ? `
` : ''} - ${!noContainer ? `
` : ''} + ${container ? `
` : ''} `; } } diff --git a/src/page/about/about.html.ts b/src/page/about/about.html.ts index bba1e7c..8117d86 100644 --- a/src/page/about/about.html.ts +++ b/src/page/about/about.html.ts @@ -5,7 +5,7 @@ import './about.scss'; export const generate = ({ name, picture }: Header): html => `
- ${picture.toHTML(true)} + ${picture.toHTML()}

${name}

diff --git a/src/page/about/about.scss b/src/page/about/about.scss index a181e57..da7d681 100644 --- a/src/page/about/about.scss +++ b/src/page/about/about.scss @@ -16,6 +16,7 @@ section#about { @include square($img-size); border-radius: 100%; cursor: pointer; + box-shadow: var(--shadow); } p { diff --git a/src/page/theme-switcher/theme-switcher.ts b/src/page/theme-switcher/theme-switcher.ts index 76bacb6..40e6389 100644 --- a/src/page/theme-switcher/theme-switcher.ts +++ b/src/page/theme-switcher/theme-switcher.ts @@ -21,7 +21,8 @@ export class PageThemeSwitcher extends PageElement { super(createElement(generate())); const storedIsDark = PageThemeSwitcher.loadFromLocalStorage(); - const isDark = storedIsDark ? storedIsDark : isSystemLevelDarkModeEnabled(); + const isDark = + storedIsDark !== null ? storedIsDark : isSystemLevelDarkModeEnabled(); if (isDark) { (this.element as HTMLInputElement).checked = true; diff --git a/src/page/timeline/timeline-element/timeline-element.html.ts b/src/page/timeline/timeline-element/timeline-element.html.ts index 50f5f99..92ed294 100644 --- a/src/page/timeline/timeline-element/timeline-element.html.ts +++ b/src/page/timeline/timeline-element/timeline-element.html.ts @@ -15,7 +15,7 @@ export const generate = (

${title}

- ${figure.toHTML()} + ${figure.toHTML(true)} ${description.toHTML()} ${ more diff --git a/src/portfolio.ts b/src/portfolio.ts index 7ce16dd..e8a67fe 100644 --- a/src/portfolio.ts +++ b/src/portfolio.ts @@ -290,7 +290,7 @@ export const create = () => { curiumVitaes: [{ name: `Curriculum vitae`, url: cvEnglish }], email: `andras@schmelczer.dev`, lastEditText: `Last modified on `, - lastEdit: new Date(2020, 8 + 1, 30), // months are 0 indexed + lastEdit: new Date(2020, 9 - 1, 10), // months are 0 indexed }), }; diff --git a/src/static/media/me.jpg b/src/static/media/me.jpg index cd26439..7d4d2a2 100644 Binary files a/src/static/media/me.jpg and b/src/static/media/me.jpg differ diff --git a/src/style/a.scss b/src/style/a.scss index 7d708f5..18da81c 100644 --- a/src/style/a.scss +++ b/src/style/a.scss @@ -12,7 +12,7 @@ a { display: inline-block; overflow: hidden; - padding-bottom: $line-width; + padding: 0 3px $line-width 0; &:before, &:after { diff --git a/src/style/vars.scss b/src/style/vars.scss index a7bf8b4..0de06a1 100644 --- a/src/style/vars.scss +++ b/src/style/vars.scss @@ -22,7 +22,7 @@ --large-margin: 70px; --normal-margin: 45px; --small-margin: 25px; - --shadow: 0 0 10px 2px rgba(0, 0, 0, 0.075), 0 0 1px rgba(0, 0, 0, 0.2); + --shadow: 0 0 10px 2px rgba(0, 0, 0, 0.1), 0 0 1px rgba(0, 0, 0, 0.2); --inset-shadow: inset 0 0 10px 2px rgba(0, 0, 0, 0.075), inset 0 0 1px rgba(0, 0, 0, 0.2); --icon-size: 35px; @@ -36,7 +36,7 @@ --large-margin: 60px; --normal-margin: 30px; --small-margin: 15px; - --shadow: 0 0 10px 2px rgba(0, 0, 0, 0.05), 0 0 1px rgba(0, 0, 0, 0.125); + --shadow: 0 0 10px 2px rgba(0, 0, 0, 0.75), 0 0 1px rgba(0, 0, 0, 0.125); --inset-shadow: inset 0 0 10px 2px rgba(0, 0, 0, 0.05), inset 0 0 1px rgba(0, 0, 0, 0.125); --icon-size: 25px;