diff --git a/astro.config.ts b/astro.config.ts index 8f04608..1ac5c56 100644 --- a/astro.config.ts +++ b/astro.config.ts @@ -4,8 +4,7 @@ import remarkMath from 'remark-math'; import remarkEmoji from 'remark-emoji'; import svelte from "@astrojs/svelte"; import mdx from '@astrojs/mdx'; -import yaml from '@rollup/plugin-yaml'; -import ruby from './src/assets/ruby'; +import remarkRuby from './src/assets/ruby'; // https://astro.build/config @@ -16,7 +15,7 @@ export default defineConfig({ remarkPlugins: [ [(remarkEmoji as any), {accessible: true}], remarkMath, - ruby, + remarkRuby, ], rehypePlugins: [ [rehypeKatex, {output: 'mathml'}] @@ -29,7 +28,4 @@ export default defineConfig({ svelte(), mdx(), ], - vite: { - plugins: [yaml()] - } }); diff --git a/package.json b/package.json index 8cf174a..7310bc1 100644 --- a/package.json +++ b/package.json @@ -25,19 +25,18 @@ "remark-math": "^5.1.1", "remark-parse": "^10.0.1", "remark-rehype": "^10.1.0", - "reveal.js": "^4.4.0", - "sass": "^1.62.0", + "reveal.js": "^4.5.0", "svelte": "^3.58.0", "unified": "^10.1.2", "unist-util-visit": "^4.1.2" }, "devDependencies": { - "@rollup/plugin-yaml": "^4.0.1", "@types/leaflet": "^1.9.3", "@types/leaflet.markercluster": "^1.5.1", "@types/lunr": "^2.3.4", "@types/marked": "^4.0.8", "@types/reveal.js": "^4.4.2", - "@types/unist": "^2.0.6" + "@types/unist": "^2.0.6", + "sass": "^1.62.0" } } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c17fcb5..6891305 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -47,11 +47,8 @@ dependencies: specifier: ^10.1.0 version: 10.1.0 reveal.js: - specifier: ^4.4.0 - version: 4.4.0 - sass: - specifier: ^1.62.0 - version: 1.62.0 + specifier: ^4.5.0 + version: 4.5.0 svelte: specifier: ^3.58.0 version: 3.58.0 @@ -63,9 +60,6 @@ dependencies: version: 4.1.2 devDependencies: - '@rollup/plugin-yaml': - specifier: ^4.0.1 - version: 4.0.1(rollup@3.20.2) '@types/leaflet': specifier: ^1.9.3 version: 1.9.3 @@ -84,6 +78,9 @@ devDependencies: '@types/unist': specifier: ^2.0.6 version: 2.0.6 + sass: + specifier: ^1.62.0 + version: 1.62.0 packages: @@ -772,21 +769,6 @@ packages: tslib: 2.5.0 dev: false - /@rollup/plugin-yaml@4.0.1(rollup@3.20.2): - resolution: {integrity: sha512-eyftkLWrwaGhgad+gXmisPYXeW3hP1s+lz63mgbur+F/8aKZhPG1Bf8RFNnz0Vhnf3uBimFebZBDwwz6X4KqUQ==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.20.2) - js-yaml: 4.1.0 - rollup: 3.20.2 - tosource: 2.0.0-alpha.3 - dev: true - /@rollup/pluginutils@5.0.2(rollup@3.20.2): resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==} engines: {node: '>=14.0.0'} @@ -800,6 +782,7 @@ packages: estree-walker: 2.0.2 picomatch: 2.3.1 rollup: 3.20.2 + dev: false /@sveltejs/vite-plugin-svelte@2.0.4(svelte@3.58.0)(vite@4.2.1): resolution: {integrity: sha512-pjqhW00KwK2uzDGEr+yJBwut+D+4XfJO/+bHHdHzPRXn9+1Jeq5JcFHyrUiYaXgHtyhX0RsllCTm4ssAx4ZY7Q==} @@ -869,6 +852,7 @@ packages: /@types/estree@1.0.0: resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==} + dev: false /@types/geojson@7946.0.10: resolution: {integrity: sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==} @@ -1020,7 +1004,6 @@ packages: dependencies: normalize-path: 3.0.0 picomatch: 2.3.1 - dev: false /argparse@1.0.10: resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} @@ -1028,10 +1011,6 @@ packages: sprintf-js: 1.0.3 dev: false - /argparse@2.0.1: - resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} - dev: true - /array-iterate@2.0.1: resolution: {integrity: sha512-I1jXZMjAgCMmxT4qxXfPXa6SthSoE8h6gkSI9BGGNv8mP8G/v0blc+qFnZu6K42vTOiuME596QaLO0TP3Lk0xg==} dev: false @@ -1125,7 +1104,6 @@ packages: /binary-extensions@2.2.0: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} engines: {node: '>=8'} - dev: false /bl@5.1.0: resolution: {integrity: sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==} @@ -1154,7 +1132,6 @@ packages: engines: {node: '>=8'} dependencies: fill-range: 7.0.1 - dev: false /browserslist@4.21.5: resolution: {integrity: sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==} @@ -1162,7 +1139,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001478 - electron-to-chromium: 1.4.359 + electron-to-chromium: 1.4.361 node-releases: 2.0.10 update-browserslist-db: 1.0.10(browserslist@4.21.5) dev: false @@ -1245,7 +1222,6 @@ packages: readdirp: 3.6.0 optionalDependencies: fsevents: 2.3.2 - dev: false /ci-info@3.8.0: resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==} @@ -1400,8 +1376,8 @@ packages: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} dev: false - /electron-to-chromium@1.4.359: - resolution: {integrity: sha512-OoVcngKCIuNXtZnsYoqlCvr0Cf3NIPzDIgwUfI9bdTFjXCrr79lI0kwQstLPZ7WhCezLlGksZk/BFAzoXC7GDw==} + /electron-to-chromium@1.4.361: + resolution: {integrity: sha512-VocVwjPp05HUXzf3xmL0boRn5b0iyqC7amtDww84Jb1QJNPBc7F69gJyEeXRoriLBC4a5pSyckdllrXAg4mmRA==} dev: false /emmet@2.4.2: @@ -1513,6 +1489,7 @@ packages: /estree-walker@2.0.2: resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} + dev: false /estree-walker@3.0.3: resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} @@ -1579,7 +1556,6 @@ packages: engines: {node: '>=8'} dependencies: to-regex-range: 5.0.1 - dev: false /find-up@4.1.0: resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} @@ -1643,7 +1619,6 @@ packages: engines: {node: '>= 6'} dependencies: is-glob: 4.0.3 - dev: false /globals@11.12.0: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} @@ -1827,7 +1802,6 @@ packages: /immutable@4.3.0: resolution: {integrity: sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==} - dev: false /import-meta-resolve@2.2.2: resolution: {integrity: sha512-f8KcQ1D80V7RnqVm+/lirO9zkOxjGxhaTC1IPrBGd3MEfNgmNG67tSUO9gTi2F3Blr2Az6g1vocaxzkVnWl9MA==} @@ -1857,7 +1831,6 @@ packages: engines: {node: '>=8'} dependencies: binary-extensions: 2.2.0 - dev: false /is-buffer@2.0.5: resolution: {integrity: sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==} @@ -1894,7 +1867,6 @@ packages: /is-extglob@2.1.1: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} - dev: false /is-fullwidth-code-point@3.0.0: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} @@ -1906,7 +1878,6 @@ packages: engines: {node: '>=0.10.0'} dependencies: is-extglob: 2.1.1 - dev: false /is-hexadecimal@2.0.1: resolution: {integrity: sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==} @@ -1920,7 +1891,6 @@ packages: /is-number@7.0.0: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} - dev: false /is-plain-obj@4.1.0: resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==} @@ -1966,13 +1936,6 @@ packages: esprima: 4.0.1 dev: false - /js-yaml@4.1.0: - resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} - hasBin: true - dependencies: - argparse: 2.0.1 - dev: true - /jsesc@2.5.2: resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} engines: {node: '>=4'} @@ -2749,7 +2712,6 @@ packages: /normalize-path@3.0.0: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} - dev: false /npm-run-path@5.1.0: resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==} @@ -2982,7 +2944,6 @@ packages: engines: {node: '>=8.10.0'} dependencies: picomatch: 2.3.1 - dev: false /rehype-katex@6.0.2: resolution: {integrity: sha512-C4gDAlS1+l0hJqctyiU64f9CvT00S03qV1T6HiMzbSuLBgWUtcqydWHY9OpKrm0SpkK16FNd62CDKyWLwV2ppg==} @@ -3163,8 +3124,8 @@ packages: engines: {iojs: '>=1.0.0', node: '>=0.10.0'} dev: false - /reveal.js@4.4.0: - resolution: {integrity: sha512-jIV6C9V2NEUjGzU8L6dUFGpk1KJmq7/EzP2fOW67ggc2c0Cp/PdprWxZ9Qgp46F0T2ZWDCjQ1p3Ytzy5jA6a2w==} + /reveal.js@4.5.0: + resolution: {integrity: sha512-Lx1hUWhJR7Y7ScQNyGt7TFzxeviDAswK2B0cn9RwbPZogTMRgS8+FTr+/12KNHOegjvWKH0H0EGwBARNDPTgWQ==} engines: {node: '>=10.0.0'} dev: false @@ -3174,6 +3135,7 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.2 + dev: false /run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -3210,7 +3172,6 @@ packages: chokidar: 3.5.3 immutable: 4.3.0 source-map-js: 1.0.2 - dev: false /section-matter@1.0.0: resolution: {integrity: sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==} @@ -3273,7 +3234,6 @@ packages: /source-map-js@1.0.2: resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} engines: {node: '>=0.10.0'} - dev: false /source-map@0.7.4: resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==} @@ -3453,12 +3413,6 @@ packages: engines: {node: '>=8.0'} dependencies: is-number: 7.0.0 - dev: false - - /tosource@2.0.0-alpha.3: - resolution: {integrity: sha512-KAB2lrSS48y91MzFPFuDg4hLbvDiyTjOVgaK7Erw+5AmZXNq4sFRVn8r6yxSLuNs15PaokrDRpS61ERY9uZOug==} - engines: {node: '>=10'} - dev: true /trim-lines@3.0.1: resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==} diff --git a/src/assets/timeline.json b/src/assets/timeline.json new file mode 100644 index 0000000..843621d --- /dev/null +++ b/src/assets/timeline.json @@ -0,0 +1,122 @@ +[ + { + "year": 2015, + "events": [ + "Learned HTML, CSS, SQL, PHP and Lua" + ] + }, + { + "year": 2016, + "months": [ + { + "month": "May", + "events": [ + "Started learning Japanese language" + ] + } + ] + }, + { + "year": 2017, + "events": [ + "Learned JavaScript" + ] + }, + { + "year": 2018, + "events": [ + "Learned Java" + ] + }, + { + "year": 2019, + "events": [ + "Learned Scala and OCaml, got interested in the functional paradigm and functional languages." + ] + }, + { + "year": 2020, + "events": [ + "Learned Python, Bash and *nix" + ] + }, + { + "year": 2021, + "months": [ + { + "month": "January", + "events": [ + "Learned C# and ASP.NET" + ] + }, + { + "month": "May", + "events": [ + "Learned Vue.js" + ] + }, + { + "month": "July", + "events": [ + "Learned TypeScript and Angular", + "Idea for a personal website is conceived. The first idea is to use Angular for the website.", + "28th - First [basic layout](/static/first-layout.png) in plain HTML and CSS is created by hand." + ] + }, + { + "month": "August", + "events": [ + "Started thinking about using a static website generator, Jekyll and Hugo are under consideration.", + "26th - Migrating already created content to Hugo." + ] + }, + { + "month": "September", + "events": [ + "Learned Hugo" + ] + }, + { + "month": "December", + "events": [ + "Started using GNU/Linux" + ] + } + ] + }, + { + "year": 2022, + "months": [ + { + "month": "February", + "events": [ + "Completed bachelor's degree in Computer Science at Wrocław University of Science and Technology" + ] + }, + { + "month": "April", + "events": [ + "Learned Svelte" + ] + }, + { + "month": "December", + "events": [ + "Learned DevOps - vagrant, docker, ansible, kubernetes, etc.", + "Learned Rust" + ] + } + ] + }, + { + "year": 2023, + "months": [ + { + "month": "April", + "events": [ + "Learned Astro" + ] + } + ] + } +] \ No newline at end of file diff --git a/src/assets/timeline.yml b/src/assets/timeline.yml deleted file mode 100644 index 2d921ef..0000000 --- a/src/assets/timeline.yml +++ /dev/null @@ -1,60 +0,0 @@ -- year: 2015 - events: - - Learned HTML, CSS, SQL, PHP and Lua -- year: 2016 - months: - - month: May - events: - - Started learning Japanese language -- year: 2017 - events: - - Learned JavaScript -- year: 2018 - events: - - Learned Java -- year: 2019 - events: - - Learned Scala and OCaml, got interested in the functional paradigm and functional languages. -- year: 2020 - events: - - Learned Python, Bash and *nix -- year: 2021 - months: - - month: January - events: - - Learned C# and ASP.NET - - month: May - events: - - Learned Vue.js - - month: July - events: - - Learned TypeScript and Angular - - Idea for a personal website is conceived. The first idea is to use Angular for the website. - - 28th - First [basic layout](/static/first-layout.png) in plain HTML and CSS is created by hand. - - month: August - events: - - Started thinking about using a static website generator, Jekyll and Hugo are under consideration. - - 26th - Migrating already created content to Hugo. - - month: September - events: - - Learned Hugo - - month: December - events: - - Started using GNU/Linux -- year: 2022 - months: - - month: February - events: - - "Completed bachelor's degree in Computer Science at Wrocław University of Science and Technology" - - month: April - events: - - Learned Svelte - - month: December - events: - - Learned DevOps - vagrant, docker, ansible, kubernetes, etc. - - Learned Rust -- year: 2023 - months: - - month: April - events: - - "Learned Astro" diff --git a/src/components/Timeline.astro b/src/components/Timeline.astro index 104c7c1..170308c 100644 --- a/src/components/Timeline.astro +++ b/src/components/Timeline.astro @@ -1,5 +1,5 @@ --- -import timeline from '../assets/timeline.yml'; +import timeline from '../assets/timeline.json'; ---
diff --git a/src/pages/slides/[...slug].astro b/src/pages/slides/[...slug].astro index b4a97c8..e0b7bab 100644 --- a/src/pages/slides/[...slug].astro +++ b/src/pages/slides/[...slug].astro @@ -13,11 +13,12 @@ export async function getStaticPaths () { } const { entry } = Astro.props; +const slides = compile(entry.body); ---
-
+