From f9540abdeffd76a7f9431b5c89c73cf823536e16 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Wed, 21 Sep 2022 13:16:03 +0200 Subject: [PATCH] Move files --- src/{static => data}/media/ad_astra.jpg | Bin src/{static => data}/media/avoid.jpg | Bin src/{static => data}/media/color.jpg | Bin .../media/cv-andras-schmelczer.pdf | Bin src/{static => data}/media/decla-red.png | Bin src/{static => data}/media/forex.jpg | Bin src/{static => data}/media/led.jpg | Bin src/{static => data}/media/me.jpg | Bin src/{static => data}/media/mp4/ad_astra.mp4 | Bin src/{static => data}/media/mp4/forex.mp4 | Bin src/{static => data}/media/mp4/led.mp4 | Bin src/{static => data}/media/mp4/platform.mp4 | Bin src/{static => data}/media/mp4/simulation.mp4 | Bin src/{static => data}/media/my-notes.png | Bin src/{static => data}/media/photos.jpg | Bin src/{static => data}/media/platform.png | Bin .../media/process-simulator-input.jpg | Bin .../media/process-simulator.jpg | Bin src/{static => data}/media/sdf2d.png | Bin src/{static => data}/media/simulation.jpg | Bin .../media/thesis-andras-schmelczer.pdf | Bin src/{static => data}/media/towers.png | Bin src/{static => data}/media/webm/ad_astra.webm | Bin src/{static => data}/media/webm/forex.webm | Bin src/{static => data}/media/webm/led.webm | Bin src/{static => data}/media/webm/platform.webm | Bin .../media/webm/simulation.webm | Bin src/{ => data}/portfolio.ts | 51 +++++++++--------- src/data/{ => projects}/ad-astra.ts | 15 +++--- src/data/{ => projects}/city-simulation.ts | 13 ++--- src/data/{ => projects}/colors.ts | 10 ++-- src/data/{ => projects}/declared.ts | 13 ++--- src/data/{ => projects}/forex.ts | 13 ++--- src/data/{ => projects}/leds.ts | 13 ++--- src/data/{ => projects}/my-notes.ts | 11 ++-- src/data/{ => projects}/nuclear-editor.ts | 9 ++-- src/data/{ => projects}/nuclear.ts | 9 ++-- src/data/{ => projects}/photos.ts | 11 ++-- src/data/{ => projects}/platform-game.ts | 13 ++--- src/data/{ => projects}/sdf2d.ts | 11 ++-- src/data/{ => projects}/towers.ts | 11 ++-- src/data/shared.ts | 10 ++-- src/index.ts | 22 ++++---- src/page/basics/preview/preview.html.ts | 4 +- src/page/basics/video/video.html.ts | 4 +- src/page/footer/footer.html.ts | 6 +-- src/page/image-viewer/image-viewer.html.ts | 2 +- .../timeline-element/timeline-element.html.ts | 2 +- {src/static => static}/icons/cancel.svg | 0 {src/static => static}/icons/cv.svg | 0 {src/static => static}/icons/email.svg | 0 {src/static => static}/icons/fullscreen.svg | 0 {src/static => static}/icons/github.svg | 0 {src/static => static}/icons/info.svg | 0 {src/static => static}/icons/linkedin.svg | 0 {src/static => static}/icons/loading.svg | 0 {src/static => static}/icons/open.svg | 0 {src/static => static}/icons/package.svg | 0 {src/static => static}/icons/play-button.svg | 0 {src/static => static}/icons/youtube.svg | 0 {src/static => static}/no-change/404.html | 0 .../favicons/android-chrome-192x192.png | Bin .../favicons/android-chrome-512x512.png | Bin .../no-change/favicons/apple-touch-icon.png | Bin .../no-change/favicons/favicon-16x16.png | Bin .../no-change/favicons/favicon-32x32.png | Bin .../no-change/favicons/favicon.ico | Bin .../no-change/favicons/site.webmanifest | 0 {src/static => static}/no-change/og-image.jpg | Bin {src/static => static}/no-change/robots.txt | 0 70 files changed, 134 insertions(+), 119 deletions(-) rename src/{static => data}/media/ad_astra.jpg (100%) rename src/{static => data}/media/avoid.jpg (100%) rename src/{static => data}/media/color.jpg (100%) rename src/{static => data}/media/cv-andras-schmelczer.pdf (100%) rename src/{static => data}/media/decla-red.png (100%) rename src/{static => data}/media/forex.jpg (100%) rename src/{static => data}/media/led.jpg (100%) rename src/{static => data}/media/me.jpg (100%) rename src/{static => data}/media/mp4/ad_astra.mp4 (100%) rename src/{static => data}/media/mp4/forex.mp4 (100%) rename src/{static => data}/media/mp4/led.mp4 (100%) rename src/{static => data}/media/mp4/platform.mp4 (100%) rename src/{static => data}/media/mp4/simulation.mp4 (100%) rename src/{static => data}/media/my-notes.png (100%) rename src/{static => data}/media/photos.jpg (100%) rename src/{static => data}/media/platform.png (100%) rename src/{static => data}/media/process-simulator-input.jpg (100%) rename src/{static => data}/media/process-simulator.jpg (100%) rename src/{static => data}/media/sdf2d.png (100%) rename src/{static => data}/media/simulation.jpg (100%) rename src/{static => data}/media/thesis-andras-schmelczer.pdf (100%) rename src/{static => data}/media/towers.png (100%) rename src/{static => data}/media/webm/ad_astra.webm (100%) rename src/{static => data}/media/webm/forex.webm (100%) rename src/{static => data}/media/webm/led.webm (100%) rename src/{static => data}/media/webm/platform.webm (100%) rename src/{static => data}/media/webm/simulation.webm (100%) rename src/{ => data}/portfolio.ts (55%) rename src/data/{ => projects}/ad-astra.ts (77%) rename src/data/{ => projects}/city-simulation.ts (70%) rename src/data/{ => projects}/colors.ts (70%) rename src/data/{ => projects}/declared.ts (69%) rename src/data/{ => projects}/forex.ts (70%) rename src/data/{ => projects}/leds.ts (66%) rename src/data/{ => projects}/my-notes.ts (63%) rename src/data/{ => projects}/nuclear-editor.ts (60%) rename src/data/{ => projects}/nuclear.ts (78%) rename src/data/{ => projects}/photos.ts (65%) rename src/data/{ => projects}/platform-game.ts (55%) rename src/data/{ => projects}/sdf2d.ts (76%) rename src/data/{ => projects}/towers.ts (73%) rename {src/static => static}/icons/cancel.svg (100%) rename {src/static => static}/icons/cv.svg (100%) rename {src/static => static}/icons/email.svg (100%) rename {src/static => static}/icons/fullscreen.svg (100%) rename {src/static => static}/icons/github.svg (100%) rename {src/static => static}/icons/info.svg (100%) rename {src/static => static}/icons/linkedin.svg (100%) rename {src/static => static}/icons/loading.svg (100%) rename {src/static => static}/icons/open.svg (100%) rename {src/static => static}/icons/package.svg (100%) rename {src/static => static}/icons/play-button.svg (100%) rename {src/static => static}/icons/youtube.svg (100%) rename {src/static => static}/no-change/404.html (100%) rename {src/static => static}/no-change/favicons/android-chrome-192x192.png (100%) rename {src/static => static}/no-change/favicons/android-chrome-512x512.png (100%) rename {src/static => static}/no-change/favicons/apple-touch-icon.png (100%) rename {src/static => static}/no-change/favicons/favicon-16x16.png (100%) rename {src/static => static}/no-change/favicons/favicon-32x32.png (100%) rename {src/static => static}/no-change/favicons/favicon.ico (100%) rename {src/static => static}/no-change/favicons/site.webmanifest (100%) rename {src/static => static}/no-change/og-image.jpg (100%) rename {src/static => static}/no-change/robots.txt (100%) diff --git a/src/static/media/ad_astra.jpg b/src/data/media/ad_astra.jpg similarity index 100% rename from src/static/media/ad_astra.jpg rename to src/data/media/ad_astra.jpg diff --git a/src/static/media/avoid.jpg b/src/data/media/avoid.jpg similarity index 100% rename from src/static/media/avoid.jpg rename to src/data/media/avoid.jpg diff --git a/src/static/media/color.jpg b/src/data/media/color.jpg similarity index 100% rename from src/static/media/color.jpg rename to src/data/media/color.jpg diff --git a/src/static/media/cv-andras-schmelczer.pdf b/src/data/media/cv-andras-schmelczer.pdf similarity index 100% rename from src/static/media/cv-andras-schmelczer.pdf rename to src/data/media/cv-andras-schmelczer.pdf diff --git a/src/static/media/decla-red.png b/src/data/media/decla-red.png similarity index 100% rename from src/static/media/decla-red.png rename to src/data/media/decla-red.png diff --git a/src/static/media/forex.jpg b/src/data/media/forex.jpg similarity index 100% rename from src/static/media/forex.jpg rename to src/data/media/forex.jpg diff --git a/src/static/media/led.jpg b/src/data/media/led.jpg similarity index 100% rename from src/static/media/led.jpg rename to src/data/media/led.jpg diff --git a/src/static/media/me.jpg b/src/data/media/me.jpg similarity index 100% rename from src/static/media/me.jpg rename to src/data/media/me.jpg diff --git a/src/static/media/mp4/ad_astra.mp4 b/src/data/media/mp4/ad_astra.mp4 similarity index 100% rename from src/static/media/mp4/ad_astra.mp4 rename to src/data/media/mp4/ad_astra.mp4 diff --git a/src/static/media/mp4/forex.mp4 b/src/data/media/mp4/forex.mp4 similarity index 100% rename from src/static/media/mp4/forex.mp4 rename to src/data/media/mp4/forex.mp4 diff --git a/src/static/media/mp4/led.mp4 b/src/data/media/mp4/led.mp4 similarity index 100% rename from src/static/media/mp4/led.mp4 rename to src/data/media/mp4/led.mp4 diff --git a/src/static/media/mp4/platform.mp4 b/src/data/media/mp4/platform.mp4 similarity index 100% rename from src/static/media/mp4/platform.mp4 rename to src/data/media/mp4/platform.mp4 diff --git a/src/static/media/mp4/simulation.mp4 b/src/data/media/mp4/simulation.mp4 similarity index 100% rename from src/static/media/mp4/simulation.mp4 rename to src/data/media/mp4/simulation.mp4 diff --git a/src/static/media/my-notes.png b/src/data/media/my-notes.png similarity index 100% rename from src/static/media/my-notes.png rename to src/data/media/my-notes.png diff --git a/src/static/media/photos.jpg b/src/data/media/photos.jpg similarity index 100% rename from src/static/media/photos.jpg rename to src/data/media/photos.jpg diff --git a/src/static/media/platform.png b/src/data/media/platform.png similarity index 100% rename from src/static/media/platform.png rename to src/data/media/platform.png diff --git a/src/static/media/process-simulator-input.jpg b/src/data/media/process-simulator-input.jpg similarity index 100% rename from src/static/media/process-simulator-input.jpg rename to src/data/media/process-simulator-input.jpg diff --git a/src/static/media/process-simulator.jpg b/src/data/media/process-simulator.jpg similarity index 100% rename from src/static/media/process-simulator.jpg rename to src/data/media/process-simulator.jpg diff --git a/src/static/media/sdf2d.png b/src/data/media/sdf2d.png similarity index 100% rename from src/static/media/sdf2d.png rename to src/data/media/sdf2d.png diff --git a/src/static/media/simulation.jpg b/src/data/media/simulation.jpg similarity index 100% rename from src/static/media/simulation.jpg rename to src/data/media/simulation.jpg diff --git a/src/static/media/thesis-andras-schmelczer.pdf b/src/data/media/thesis-andras-schmelczer.pdf similarity index 100% rename from src/static/media/thesis-andras-schmelczer.pdf rename to src/data/media/thesis-andras-schmelczer.pdf diff --git a/src/static/media/towers.png b/src/data/media/towers.png similarity index 100% rename from src/static/media/towers.png rename to src/data/media/towers.png diff --git a/src/static/media/webm/ad_astra.webm b/src/data/media/webm/ad_astra.webm similarity index 100% rename from src/static/media/webm/ad_astra.webm rename to src/data/media/webm/ad_astra.webm diff --git a/src/static/media/webm/forex.webm b/src/data/media/webm/forex.webm similarity index 100% rename from src/static/media/webm/forex.webm rename to src/data/media/webm/forex.webm diff --git a/src/static/media/webm/led.webm b/src/data/media/webm/led.webm similarity index 100% rename from src/static/media/webm/led.webm rename to src/data/media/webm/led.webm diff --git a/src/static/media/webm/platform.webm b/src/data/media/webm/platform.webm similarity index 100% rename from src/static/media/webm/platform.webm rename to src/data/media/webm/platform.webm diff --git a/src/static/media/webm/simulation.webm b/src/data/media/webm/simulation.webm similarity index 100% rename from src/static/media/webm/simulation.webm rename to src/data/media/webm/simulation.webm diff --git a/src/portfolio.ts b/src/data/portfolio.ts similarity index 55% rename from src/portfolio.ts rename to src/data/portfolio.ts index 28b37aa..8d9a509 100644 --- a/src/portfolio.ts +++ b/src/data/portfolio.ts @@ -1,29 +1,30 @@ -import meJpeg from './static/media/me.jpg?format=jpg'; -import meWebP from './static/media/me.jpg?format=webp'; -import cvEnglish from './static/media/cv-andras-schmelczer.pdf'; +import meJpeg from './media/me.jpg?format=jpg'; +import meWebP from './media/me.jpg?format=webp'; +import cvEnglish from './media/cv-andras-schmelczer.pdf'; -import { PageFooter } from './page/footer/footer'; -import { Image } from './page/basics/image/image'; -import { PageHeader } from './page/header/header'; -import { PageTimeline } from './page/timeline/timeline'; -import { PageImageViewer } from './page/image-viewer/image-viewer'; -import { PageBackground } from './page/background/background'; -import { Main } from './page/main/main'; -import { Body } from './page/body/body'; -import { declaredTimelineElement } from './data/declared'; -import { sdf2dTimelineElement } from './data/sdf2d'; -import { adAstraTimelineElement } from './data/ad-astra'; -import { forexTimelineElement } from './data/forex'; -import { myNotesTimelineElement } from './data/my-notes'; -import { nuclearTimelineElement } from './data/nuclear'; -import { nuclearEditorTimelineElement } from './data/nuclear-editor'; -import { citySimulationTimelineElement } from './data/city-simulation'; -import { platformGameTimelineElement } from './data/platform-game'; -import { photosTimelineElement } from './data/photos'; -import { ledsTimelineElement } from './data/leds'; -import { towersTimelineElement } from './data/towers'; +import { PageFooter } from '../page/footer/footer'; +import { Image } from '../page/basics/image/image'; +import { PageHeader } from '../page/header/header'; +import { PageTimeline } from '../page/timeline/timeline'; +import { PageImageViewer } from '../page/image-viewer/image-viewer'; +import { PageBackground } from '../page/background/background'; +import { Main } from '../page/main/main'; +import { Body } from '../page/body/body'; +import { declaredTimelineElement } from './projects/declared'; +import { sdf2dTimelineElement } from './projects/sdf2d'; +import { adAstraTimelineElement } from './projects/ad-astra'; +import { forexTimelineElement } from './projects/forex'; +import { myNotesTimelineElement } from './projects/my-notes'; +import { nuclearTimelineElement } from './projects/nuclear'; +import { nuclearEditorTimelineElement } from './projects/nuclear-editor'; +import { citySimulationTimelineElement } from './projects/city-simulation'; +import { platformGameTimelineElement } from './projects/platform-game'; +import { photosTimelineElement } from './projects/photos'; +import { ledsTimelineElement } from './projects/leds'; +import { towersTimelineElement } from './projects/towers'; +import { greatAiTimelineElement } from './projects/great-ai'; -export const create = () => { +export const create = () => new Body( new Main( new PageBackground(1, 1), @@ -48,6 +49,7 @@ export const create = () => { showMoreText: `Show details`, showLessText: `Show less`, elements: [ + greatAiTimelineElement, declaredTimelineElement, sdf2dTimelineElement, adAstraTimelineElement, @@ -74,4 +76,3 @@ export const create = () => { ), new PageImageViewer() ); -}; diff --git a/src/data/ad-astra.ts b/src/data/projects/ad-astra.ts similarity index 77% rename from src/data/ad-astra.ts rename to src/data/projects/ad-astra.ts index 337f8fd..c502cca 100644 --- a/src/data/ad-astra.ts +++ b/src/data/projects/ad-astra.ts @@ -1,12 +1,13 @@ -import adAstraWebP from '../static/media/ad_astra.jpg?format=webp'; -import adAstraJpeg from '../static/media/ad_astra.jpg?format=jpg'; -import adAstraMp4 from '../static/media/mp4/ad_astra.mp4'; -import adAstraWebM from '../static/media/webm/ad_astra.webm'; +import adAstraWebP from '../media/ad_astra.jpg?format=webp'; +import adAstraJpeg from '../media/ad_astra.jpg?format=jpg'; +import adAstraMp4 from '../media/mp4/ad_astra.mp4'; +import adAstraWebM from '../media/webm/ad_astra.webm'; -import { GitHub } from './shared'; -import { Video } from '../page/basics/video/video'; +import { GitHub } from '../shared'; +import { Video } from '../../page/basics/video/video'; +import { TimelineElementParameters } from '../../page/timeline/timeline-element/timeline-element'; -export const adAstraTimelineElement = { +export const adAstraTimelineElement: TimelineElementParameters = { title: `Gaming on an ATtiny85`, date: `2020 spring`, figure: new Video({ diff --git a/src/data/city-simulation.ts b/src/data/projects/city-simulation.ts similarity index 70% rename from src/data/city-simulation.ts rename to src/data/projects/city-simulation.ts index 462ad36..603e7aa 100644 --- a/src/data/city-simulation.ts +++ b/src/data/projects/city-simulation.ts @@ -1,11 +1,12 @@ -import citySimulationPosterWebP from '../static/media/simulation.jpg?format=webp'; -import citySimulationPosterJpeg from '../static/media/simulation.jpg?format=jpg'; -import citySimulationMp4 from '../static/media/mp4/simulation.mp4'; -import citySimulationWebM from '../static/media/webm/simulation.webm'; +import citySimulationPosterWebP from '../media/simulation.jpg?format=webp'; +import citySimulationPosterJpeg from '../media/simulation.jpg?format=jpg'; +import citySimulationMp4 from '../media/mp4/simulation.mp4'; +import citySimulationWebM from '../media/webm/simulation.webm'; -import { Video } from '../page/basics/video/video'; +import { Video } from '../../page/basics/video/video'; +import { TimelineElementParameters } from '../../page/timeline/timeline-element/timeline-element'; -export const citySimulationTimelineElement = { +export const citySimulationTimelineElement: TimelineElementParameters = { title: `City simulation`, date: `2018 July - August`, figure: new Video({ diff --git a/src/data/colors.ts b/src/data/projects/colors.ts similarity index 70% rename from src/data/colors.ts rename to src/data/projects/colors.ts index d19953f..7a3ea92 100644 --- a/src/data/colors.ts +++ b/src/data/projects/colors.ts @@ -1,9 +1,10 @@ -import colourJpeg from '../static/media/color.jpg?format=jpg'; -import colourWebP from '../static/media/color.jpg?format=webp'; +import colourJpeg from '../media/color.jpg?format=jpg'; +import colourWebP from '../media/color.jpg?format=webp'; -import { Image } from '../page/basics/image/image'; +import { Image } from '../../page/basics/image/image'; +import { TimelineElementParameters } from '../../page/timeline/timeline-element/timeline-element'; -export const colorsTimelineElement = { +export const colorsTimelineElement: TimelineElementParameters = { title: `Photo colour grader`, date: `2018 June`, figure: new Image(colourWebP, colourJpeg, `a picture of the app`), @@ -24,4 +25,5 @@ export const colorsTimelineElement = { (and they can also be moved by drag & drop). `, ], + links: [], }; diff --git a/src/data/declared.ts b/src/data/projects/declared.ts similarity index 69% rename from src/data/declared.ts rename to src/data/projects/declared.ts index 757b890..5fd124b 100644 --- a/src/data/declared.ts +++ b/src/data/projects/declared.ts @@ -1,11 +1,12 @@ -import declaredJpeg from '../static/media/decla-red.png?format=jpg'; -import declaredWebP from '../static/media/decla-red.png?format=webp'; -import thesis from '../static/media/thesis-andras-schmelczer.pdf'; +import declaredJpeg from '../media/decla-red.png?format=jpg'; +import declaredWebP from '../media/decla-red.png?format=webp'; +import thesis from '../media/thesis-andras-schmelczer.pdf'; -import { Preview } from '../page/basics/preview/preview'; -import { GitHub, Thesis, Open } from './shared'; +import { Preview } from '../../page/basics/preview/preview'; +import { GitHub, Thesis, Open } from '../shared'; +import { TimelineElementParameters } from '../../page/timeline/timeline-element/timeline-element'; -export const declaredTimelineElement = { +export const declaredTimelineElement: TimelineElementParameters = { title: `Multiplayer game`, date: `2020 autumn`, figure: new Preview( diff --git a/src/data/forex.ts b/src/data/projects/forex.ts similarity index 70% rename from src/data/forex.ts rename to src/data/projects/forex.ts index 264ba1f..ebb9df2 100644 --- a/src/data/forex.ts +++ b/src/data/projects/forex.ts @@ -1,11 +1,12 @@ -import forexPosterWebP from '../static/media/forex.jpg?format=webp'; -import forexPosterJpeg from '../static/media/forex.jpg?format=jpg'; -import forexMp4 from '../static/media/mp4/forex.mp4'; -import forexWebM from '../static/media/webm/forex.webm'; +import forexPosterWebP from '../media/forex.jpg?format=webp'; +import forexPosterJpeg from '../media/forex.jpg?format=jpg'; +import forexMp4 from '../media/mp4/forex.mp4'; +import forexWebM from '../media/webm/forex.webm'; -import { Video } from '../page/basics/video/video'; +import { Video } from '../../page/basics/video/video'; +import { TimelineElementParameters } from '../../page/timeline/timeline-element/timeline-element'; -export const forexTimelineElement = { +export const forexTimelineElement: TimelineElementParameters = { title: `Predicting foreign exchange rates`, date: `2019 autumn`, figure: new Video({ diff --git a/src/data/leds.ts b/src/data/projects/leds.ts similarity index 66% rename from src/data/leds.ts rename to src/data/projects/leds.ts index 7643ac8..89cc29a 100644 --- a/src/data/leds.ts +++ b/src/data/projects/leds.ts @@ -1,11 +1,12 @@ -import ledPosterWebP from '../static/media/led.jpg?format=webp'; -import ledPosterJpeg from '../static/media/led.jpg?format=jpg'; -import ledMp4 from '../static/media/mp4/led.mp4'; -import ledWebM from '../static/media/webm/led.webm'; +import ledPosterWebP from '../media/led.jpg?format=webp'; +import ledPosterJpeg from '../media/led.jpg?format=jpg'; +import ledMp4 from '../media/mp4/led.mp4'; +import ledWebM from '../media/webm/led.webm'; -import { Video } from '../page/basics/video/video'; +import { Video } from '../../page/basics/video/video'; +import { TimelineElementParameters } from '../../page/timeline/timeline-element/timeline-element'; -export const ledsTimelineElement = { +export const ledsTimelineElement: TimelineElementParameters = { title: `Lights synchronised to music`, date: `2016 spring`, figure: new Video({ diff --git a/src/data/my-notes.ts b/src/data/projects/my-notes.ts similarity index 63% rename from src/data/my-notes.ts rename to src/data/projects/my-notes.ts index 349dc76..7cbe2c3 100644 --- a/src/data/my-notes.ts +++ b/src/data/projects/my-notes.ts @@ -1,10 +1,11 @@ -import myNotesJpeg from '../static/media/my-notes.png?format=jpg'; -import myNotesWebP from '../static/media/my-notes.png?format=webp'; +import myNotesJpeg from '../media/my-notes.png?format=jpg'; +import myNotesWebP from '../media/my-notes.png?format=webp'; -import { Image } from '../page/basics/image/image'; -import { GitHub } from './shared'; +import { Image } from '../../page/basics/image/image'; +import { GitHub } from '../shared'; +import { TimelineElementParameters } from '../../page/timeline/timeline-element/timeline-element'; -export const myNotesTimelineElement = { +export const myNotesTimelineElement: TimelineElementParameters = { title: `My Notes`, date: `2019 November`, figure: new Image(myNotesWebP, myNotesJpeg, `two screenshots of the application`), diff --git a/src/data/nuclear-editor.ts b/src/data/projects/nuclear-editor.ts similarity index 60% rename from src/data/nuclear-editor.ts rename to src/data/projects/nuclear-editor.ts index a833122..4dd7cc3 100644 --- a/src/data/nuclear-editor.ts +++ b/src/data/projects/nuclear-editor.ts @@ -1,9 +1,10 @@ -import processSimulatorInputJpeg from '../static/media/process-simulator-input.jpg?format=jpg'; -import processSimulatorInputWebP from '../static/media/process-simulator-input.jpg?format=webp'; +import processSimulatorInputJpeg from '../media/process-simulator-input.jpg?format=jpg'; +import processSimulatorInputWebP from '../media/process-simulator-input.jpg?format=webp'; -import { Image } from '../page/basics/image/image'; +import { Image } from '../../page/basics/image/image'; +import { TimelineElementParameters } from '../../page/timeline/timeline-element/timeline-element'; -export const nuclearEditorTimelineElement = { +export const nuclearEditorTimelineElement: TimelineElementParameters = { title: `Graph editing application`, date: `2018 October - November`, figure: new Image( diff --git a/src/data/nuclear.ts b/src/data/projects/nuclear.ts similarity index 78% rename from src/data/nuclear.ts rename to src/data/projects/nuclear.ts index 757e79d..69eebbf 100644 --- a/src/data/nuclear.ts +++ b/src/data/projects/nuclear.ts @@ -1,9 +1,10 @@ -import processSimulatorJpeg from '../static/media/process-simulator.jpg?format=jpg'; -import processSimulatorWebP from '../static/media/process-simulator.jpg?format=webp'; +import processSimulatorJpeg from '../media/process-simulator.jpg?format=jpg'; +import processSimulatorWebP from '../media/process-simulator.jpg?format=webp'; -import { Image } from '../page/basics/image/image'; +import { Image } from '../../page/basics/image/image'; +import { TimelineElementParameters } from '../../page/timeline/timeline-element/timeline-element'; -export const nuclearTimelineElement = { +export const nuclearTimelineElement: TimelineElementParameters = { title: `Simulating the cooling system of a nuclear facility`, date: `2018 October - November`, figure: new Image( diff --git a/src/data/photos.ts b/src/data/projects/photos.ts similarity index 65% rename from src/data/photos.ts rename to src/data/projects/photos.ts index a61f070..4258043 100644 --- a/src/data/photos.ts +++ b/src/data/projects/photos.ts @@ -1,10 +1,11 @@ -import photosJpeg from '../static/media/photos.jpg?format=jpg'; -import photosWebP from '../static/media/photos.jpg?format=webp'; +import photosJpeg from '../media/photos.jpg?format=jpg'; +import photosWebP from '../media/photos.jpg?format=webp'; -import { Image } from '../page/basics/image/image'; -import { Open } from './shared'; +import { Image } from '../../page/basics/image/image'; +import { Open } from '../shared'; +import { TimelineElementParameters } from '../../page/timeline/timeline-element/timeline-element'; -export const photosTimelineElement = { +export const photosTimelineElement: TimelineElementParameters = { title: `Photos`, date: `2016 summer`, figure: new Image(photosWebP, photosJpeg, `a picture of the website`), diff --git a/src/data/platform-game.ts b/src/data/projects/platform-game.ts similarity index 55% rename from src/data/platform-game.ts rename to src/data/projects/platform-game.ts index 98cd8e9..b3c7ea8 100644 --- a/src/data/platform-game.ts +++ b/src/data/projects/platform-game.ts @@ -1,11 +1,12 @@ -import platformPosterWebP from '../static/media/platform.png?format=webp'; -import platformPosterJpeg from '../static/media/platform.png?format=jpg'; -import platformMp4 from '../static/media/mp4/platform.mp4'; -import platformWebM from '../static/media/webm/platform.webm'; +import platformPosterWebP from '../media/platform.png?format=webp'; +import platformPosterJpeg from '../media/platform.png?format=jpg'; +import platformMp4 from '../media/mp4/platform.mp4'; +import platformWebM from '../media/webm/platform.webm'; -import { Video } from '../page/basics/video/video'; +import { Video } from '../../page/basics/video/video'; +import { TimelineElementParameters } from '../../page/timeline/timeline-element/timeline-element'; -export const platformGameTimelineElement = { +export const platformGameTimelineElement: TimelineElementParameters = { title: `Platform game`, date: `2017 autumn`, figure: new Video({ diff --git a/src/data/sdf2d.ts b/src/data/projects/sdf2d.ts similarity index 76% rename from src/data/sdf2d.ts rename to src/data/projects/sdf2d.ts index 752956f..c8f72e0 100644 --- a/src/data/sdf2d.ts +++ b/src/data/projects/sdf2d.ts @@ -1,10 +1,11 @@ -import sdf2dJpeg from '../static/media/sdf2d.png?format=jpg'; -import sdf2dWebP from '../static/media/sdf2d.png?format=webp'; +import sdf2dJpeg from '../media/sdf2d.png?format=jpg'; +import sdf2dWebP from '../media/sdf2d.png?format=webp'; -import { Preview } from '../page/basics/preview/preview'; -import { Open, NPM, Youtube } from './shared'; +import { Preview } from '../../page/basics/preview/preview'; +import { Open, NPM, Youtube } from '../shared'; +import { TimelineElementParameters } from '../../page/timeline/timeline-element/timeline-element'; -export const sdf2dTimelineElement = { +export const sdf2dTimelineElement: TimelineElementParameters = { title: `2D ray tracing`, date: `2020 autumn`, figure: new Preview( diff --git a/src/data/towers.ts b/src/data/projects/towers.ts similarity index 73% rename from src/data/towers.ts rename to src/data/projects/towers.ts index 0193603..909c659 100644 --- a/src/data/towers.ts +++ b/src/data/projects/towers.ts @@ -1,10 +1,11 @@ -import towersJpeg from '../static/media/towers.png?format=jpg'; -import towersWebP from '../static/media/towers.png?format=webp'; +import towersJpeg from '../media/towers.png?format=jpg'; +import towersWebP from '../media/towers.png?format=webp'; -import { Image } from '../page/basics/image/image'; -import { Open, GitHub } from './shared'; +import { Image } from '../../page/basics/image/image'; +import { Open, GitHub } from '../shared'; +import { TimelineElementParameters } from '../../page/timeline/timeline-element/timeline-element'; -export const towersTimelineElement = { +export const towersTimelineElement: TimelineElementParameters = { title: `Towers tracking app`, date: `2019 August - September`, figure: new Image(towersWebP, towersJpeg, `a picture of the website`), diff --git a/src/data/shared.ts b/src/data/shared.ts index c4db347..d82995e 100644 --- a/src/data/shared.ts +++ b/src/data/shared.ts @@ -1,10 +1,10 @@ import { ImageAnchorFactory } from '../page/basics/image-anchor/image-anchor'; -import githubIcon from '../static/icons/github.svg'; -import openIcon from '../static/icons/open.svg'; -import cvIcon from '../static/icons/cv.svg'; -import packageIcon from '../static/icons/package.svg'; -import youtubeIcon from '../static/icons/youtube.svg'; +import githubIcon from '../../static/icons/github.svg'; +import openIcon from '../../static/icons/open.svg'; +import cvIcon from '../../static/icons/cv.svg'; +import packageIcon from '../../static/icons/package.svg'; +import youtubeIcon from '../../static/icons/youtube.svg'; export const GitHub = ImageAnchorFactory(githubIcon, 'Open on GitHub'); export const NPM = ImageAnchorFactory(packageIcon, 'Open on npm'); diff --git a/src/index.ts b/src/index.ts index 64d4bad..79f9adc 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,15 +1,15 @@ -import './static/no-change/og-image.jpg'; -import './static/no-change/robots.txt'; -import './static/no-change/404.html'; -import './static/no-change/favicons/android-chrome-192x192.png'; -import './static/no-change/favicons/android-chrome-512x512.png'; -import './static/no-change/favicons/apple-touch-icon.png'; -import './static/no-change/favicons/favicon-16x16.png'; -import './static/no-change/favicons/favicon-32x32.png'; -import './static/no-change/favicons/favicon.ico'; -import './static/no-change/favicons/site.webmanifest'; +import '../static/no-change/og-image.jpg'; +import '../static/no-change/robots.txt'; +import '../static/no-change/404.html'; +import '../static/no-change/favicons/android-chrome-192x192.png'; +import '../static/no-change/favicons/android-chrome-512x512.png'; +import '../static/no-change/favicons/apple-touch-icon.png'; +import '../static/no-change/favicons/favicon-16x16.png'; +import '../static/no-change/favicons/favicon-32x32.png'; +import '../static/no-change/favicons/favicon.ico'; +import '../static/no-change/favicons/site.webmanifest'; import './styles.scss'; -import { create } from './portfolio'; +import { create } from './data/portfolio'; const addSupportForTabNavigation = () => document.addEventListener('keydown', (e) => { diff --git a/src/page/basics/preview/preview.html.ts b/src/page/basics/preview/preview.html.ts index 770483f..12bb48a 100644 --- a/src/page/basics/preview/preview.html.ts +++ b/src/page/basics/preview/preview.html.ts @@ -1,6 +1,6 @@ import './preview.scss'; -import play from '../../../static/icons/play-button.svg'; -import loading from '../../../static/icons/loading.svg'; +import play from '../../../../static/icons/play-button.svg'; +import loading from '../../../../static/icons/loading.svg'; import { html } from '../../../types/html'; export const generate = ({ alt }: { alt: string }): html => ` diff --git a/src/page/basics/video/video.html.ts b/src/page/basics/video/video.html.ts index 1079732..74a155e 100644 --- a/src/page/basics/video/video.html.ts +++ b/src/page/basics/video/video.html.ts @@ -1,9 +1,9 @@ import './video.scss'; -import loading from '../../../static/icons/loading.svg'; +import loading from '../../../../static/icons/loading.svg'; import { html } from '../../../types/html'; -import play from '../../../static/icons/play-button.svg'; +import play from '../../../../static/icons/play-button.svg'; import { VideoParameters } from './video'; export const generate = ({ diff --git a/src/page/footer/footer.html.ts b/src/page/footer/footer.html.ts index 66ad0d8..e50e658 100644 --- a/src/page/footer/footer.html.ts +++ b/src/page/footer/footer.html.ts @@ -1,7 +1,7 @@ import './footer.scss'; -import cvIcon from '../../static/icons/cv.svg'; -import emailIcon from '../../static/icons/email.svg'; -import linkedinIcon from '../../static/icons/linkedin.svg'; +import cvIcon from '../../../static/icons/cv.svg'; +import emailIcon from '../../../static/icons/email.svg'; +import linkedinIcon from '../../../static/icons/linkedin.svg'; import { html } from '../../types/html'; import { FooterParameters } from './footer'; diff --git a/src/page/image-viewer/image-viewer.html.ts b/src/page/image-viewer/image-viewer.html.ts index 8be8eb2..7cb4adc 100644 --- a/src/page/image-viewer/image-viewer.html.ts +++ b/src/page/image-viewer/image-viewer.html.ts @@ -1,4 +1,4 @@ -import cancel from '../../static/icons/cancel.svg'; +import cancel from '../../../static/icons/cancel.svg'; import './image-viewer.scss'; import { html } from '../../types/html'; diff --git a/src/page/timeline/timeline-element/timeline-element.html.ts b/src/page/timeline/timeline-element/timeline-element.html.ts index f080ca8..29d7908 100644 --- a/src/page/timeline/timeline-element/timeline-element.html.ts +++ b/src/page/timeline/timeline-element/timeline-element.html.ts @@ -1,4 +1,4 @@ -import info from '../../../static/icons/info.svg'; +import info from '../../../../static/icons/info.svg'; import './timeline-element.scss'; import { html } from '../../../types/html'; import { TimelineElementParameters } from './timeline-element'; diff --git a/src/static/icons/cancel.svg b/static/icons/cancel.svg similarity index 100% rename from src/static/icons/cancel.svg rename to static/icons/cancel.svg diff --git a/src/static/icons/cv.svg b/static/icons/cv.svg similarity index 100% rename from src/static/icons/cv.svg rename to static/icons/cv.svg diff --git a/src/static/icons/email.svg b/static/icons/email.svg similarity index 100% rename from src/static/icons/email.svg rename to static/icons/email.svg diff --git a/src/static/icons/fullscreen.svg b/static/icons/fullscreen.svg similarity index 100% rename from src/static/icons/fullscreen.svg rename to static/icons/fullscreen.svg diff --git a/src/static/icons/github.svg b/static/icons/github.svg similarity index 100% rename from src/static/icons/github.svg rename to static/icons/github.svg diff --git a/src/static/icons/info.svg b/static/icons/info.svg similarity index 100% rename from src/static/icons/info.svg rename to static/icons/info.svg diff --git a/src/static/icons/linkedin.svg b/static/icons/linkedin.svg similarity index 100% rename from src/static/icons/linkedin.svg rename to static/icons/linkedin.svg diff --git a/src/static/icons/loading.svg b/static/icons/loading.svg similarity index 100% rename from src/static/icons/loading.svg rename to static/icons/loading.svg diff --git a/src/static/icons/open.svg b/static/icons/open.svg similarity index 100% rename from src/static/icons/open.svg rename to static/icons/open.svg diff --git a/src/static/icons/package.svg b/static/icons/package.svg similarity index 100% rename from src/static/icons/package.svg rename to static/icons/package.svg diff --git a/src/static/icons/play-button.svg b/static/icons/play-button.svg similarity index 100% rename from src/static/icons/play-button.svg rename to static/icons/play-button.svg diff --git a/src/static/icons/youtube.svg b/static/icons/youtube.svg similarity index 100% rename from src/static/icons/youtube.svg rename to static/icons/youtube.svg diff --git a/src/static/no-change/404.html b/static/no-change/404.html similarity index 100% rename from src/static/no-change/404.html rename to static/no-change/404.html diff --git a/src/static/no-change/favicons/android-chrome-192x192.png b/static/no-change/favicons/android-chrome-192x192.png similarity index 100% rename from src/static/no-change/favicons/android-chrome-192x192.png rename to static/no-change/favicons/android-chrome-192x192.png diff --git a/src/static/no-change/favicons/android-chrome-512x512.png b/static/no-change/favicons/android-chrome-512x512.png similarity index 100% rename from src/static/no-change/favicons/android-chrome-512x512.png rename to static/no-change/favicons/android-chrome-512x512.png diff --git a/src/static/no-change/favicons/apple-touch-icon.png b/static/no-change/favicons/apple-touch-icon.png similarity index 100% rename from src/static/no-change/favicons/apple-touch-icon.png rename to static/no-change/favicons/apple-touch-icon.png diff --git a/src/static/no-change/favicons/favicon-16x16.png b/static/no-change/favicons/favicon-16x16.png similarity index 100% rename from src/static/no-change/favicons/favicon-16x16.png rename to static/no-change/favicons/favicon-16x16.png diff --git a/src/static/no-change/favicons/favicon-32x32.png b/static/no-change/favicons/favicon-32x32.png similarity index 100% rename from src/static/no-change/favicons/favicon-32x32.png rename to static/no-change/favicons/favicon-32x32.png diff --git a/src/static/no-change/favicons/favicon.ico b/static/no-change/favicons/favicon.ico similarity index 100% rename from src/static/no-change/favicons/favicon.ico rename to static/no-change/favicons/favicon.ico diff --git a/src/static/no-change/favicons/site.webmanifest b/static/no-change/favicons/site.webmanifest similarity index 100% rename from src/static/no-change/favicons/site.webmanifest rename to static/no-change/favicons/site.webmanifest diff --git a/src/static/no-change/og-image.jpg b/static/no-change/og-image.jpg similarity index 100% rename from src/static/no-change/og-image.jpg rename to static/no-change/og-image.jpg diff --git a/src/static/no-change/robots.txt b/static/no-change/robots.txt similarity index 100% rename from src/static/no-change/robots.txt rename to static/no-change/robots.txt