From 6fdcf4f10264c523d5cbb557e312830d96bdebb2 Mon Sep 17 00:00:00 2001 From: corentin Date: Tue, 12 Sep 2023 18:48:18 +0900 Subject: [PATCH] Add new entry blog: Web Infra 1 (#3) * Change blog entry style : titles font weight lighter->normal * Add tmpfs scripts for linux (dev only) Co-authored-by: Corentin Co-authored-by: Jimmy Vargo Reviewed-on: https://git.ayo.tokyo/ayo/website/pulls/3 --- .../Deep Learning Framework Benchmarks.md | 4 ++-- .../Self-Hosted Web Infrastructure.md | 3 +++ .../odroidn2plus.jpg | 3 +++ .../Web Infrastructure 2.md | 3 +++ package.json | 1 + scripts/tmpfs_dirs.sh | 17 +++++++++++++++++ src/blog_entry.jsx | 10 ++++------ src/blog_entry.scss | 6 +++--- src/test.js | 13 ------------- webpack.base.js | 18 +++++------------- 10 files changed, 41 insertions(+), 37 deletions(-) create mode 100644 assets/blog/2023-09-12_Self-Hosted Web Infrastructure/Self-Hosted Web Infrastructure.md create mode 100644 assets/blog/2023-09-12_Self-Hosted Web Infrastructure/odroidn2plus.jpg create mode 100644 assets/blog/draft_2023-09-XX-_Web_infrastructure_2/Web Infrastructure 2.md create mode 100755 scripts/tmpfs_dirs.sh delete mode 100644 src/test.js diff --git a/assets/blog/2021-10-07_Deep Learning Framework Benchmarks/Deep Learning Framework Benchmarks.md b/assets/blog/2021-10-07_Deep Learning Framework Benchmarks/Deep Learning Framework Benchmarks.md index 16b8d2f..9d94ceb 100644 --- a/assets/blog/2021-10-07_Deep Learning Framework Benchmarks/Deep Learning Framework Benchmarks.md +++ b/assets/blog/2021-10-07_Deep Learning Framework Benchmarks/Deep Learning Framework Benchmarks.md @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:275efef9888de714403821eea0fa50715428ac959053d460beeeb3f2af748201 -size 10025 +oid sha256:55ac55dc3dee1a9da272d51dbce19ea52d409f697ac05d50743b9684f28de6b5 +size 10047 diff --git a/assets/blog/2023-09-12_Self-Hosted Web Infrastructure/Self-Hosted Web Infrastructure.md b/assets/blog/2023-09-12_Self-Hosted Web Infrastructure/Self-Hosted Web Infrastructure.md new file mode 100644 index 0000000..2b02ad6 --- /dev/null +++ b/assets/blog/2023-09-12_Self-Hosted Web Infrastructure/Self-Hosted Web Infrastructure.md @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f85628fdd856be475fe43f9806f7e848ead4619d8e4016664e20344fc25c3eb +size 7957 diff --git a/assets/blog/2023-09-12_Self-Hosted Web Infrastructure/odroidn2plus.jpg b/assets/blog/2023-09-12_Self-Hosted Web Infrastructure/odroidn2plus.jpg new file mode 100644 index 0000000..b9ba012 --- /dev/null +++ b/assets/blog/2023-09-12_Self-Hosted Web Infrastructure/odroidn2plus.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cc9749199803b2c401a691109e6106becb436c173a1c58071bc4f51c5aebf57 +size 132981 diff --git a/assets/blog/draft_2023-09-XX-_Web_infrastructure_2/Web Infrastructure 2.md b/assets/blog/draft_2023-09-XX-_Web_infrastructure_2/Web Infrastructure 2.md new file mode 100644 index 0000000..dd577a2 --- /dev/null +++ b/assets/blog/draft_2023-09-XX-_Web_infrastructure_2/Web Infrastructure 2.md @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8baa7d66f3c605acc7c6a9e1208adc4313aac8a13766a51fe1ca34ca748bd893 +size 374 diff --git a/package.json b/package.json index bdf2728..919636c 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ }, "scripts": { "build": "webpack --config webpack.prod.js", + "predev": "./scripts/tmpfs_dirs.sh", "dev": "webpack --config webpack.dev.js", "server": "webpack --config webpack.server.js", "start": "node server.js", diff --git a/scripts/tmpfs_dirs.sh b/scripts/tmpfs_dirs.sh new file mode 100755 index 0000000..841eb72 --- /dev/null +++ b/scripts/tmpfs_dirs.sh @@ -0,0 +1,17 @@ +#! /bin/bash + +if [[ $(uname) != "Linux" ]]; then + echo "Not on Linux : no tmpfs" + exit +fi + +CWD=$(cd -P . && pwd) +readarray -t TMPFS_DIRS < <(df -lt tmpfs --output=target | tail -n +2) + + +if [[ " ${TMPFS_DIRS[*]} " =~ " ${CWD}/public " ]]; then + echo "public alread a tmpfs" +else + echo "Mounting public as tmpfs" + sudo mount -m -t tmpfs tmpfs public +fi \ No newline at end of file diff --git a/src/blog_entry.jsx b/src/blog_entry.jsx index 41f24f7..92232ac 100644 --- a/src/blog_entry.jsx +++ b/src/blog_entry.jsx @@ -38,18 +38,16 @@ class BlogEntryComponent extends Component , ] diff --git a/src/blog_entry.scss b/src/blog_entry.scss index 7fe98b4..58a36ea 100644 --- a/src/blog_entry.scss +++ b/src/blog_entry.scss @@ -8,7 +8,7 @@ h1, h2, h3 { - font-weight: lighter; + font-weight: normal; margin: 8px 0; color: var(--highlight-fg-color); } @@ -62,7 +62,7 @@ font-weight: normal; font-style: italic; } - + p { display: flex; @@ -70,7 +70,7 @@ justify-content: center; width: 100%; } - + img { display: block; diff --git a/src/test.js b/src/test.js deleted file mode 100644 index 106c6f2..0000000 --- a/src/test.js +++ /dev/null @@ -1,13 +0,0 @@ -const container = document.getElementById("image-container") -const image_view = document.getElementById("image-view") - -function view_image(src) -{ - image_view.src = src - container.style.display = 'flex' -} - -function close_image() -{ - container.style.display = 'none' -} \ No newline at end of file diff --git a/webpack.base.js b/webpack.base.js index 69f3d6d..be99526 100644 --- a/webpack.base.js +++ b/webpack.base.js @@ -66,8 +66,8 @@ class BlogListingPlugin }, (compilationAssets, callback) => { let content = [] - Object.keys(compilationAssets).forEach((file_path) => { - if(file_path.startsWith('blog') && file_path.endsWith('.md')) + Object.keys(compilationAssets).sort().reverse().forEach((file_path) => { + if(file_path.startsWith('blog') && file_path.endsWith('.md') && !file_path.endsWith('_draft.md')) { const file_name = path.basename(file_path).slice(0, -3) const blog_info = path.basename(path.dirname(file_path)).split('_') @@ -131,11 +131,7 @@ module.exports = { type: "asset/inline" }, { - test: /\.(png|jpg|jpeg|gif)$/, - type: "asset/resource" - }, - { - test: /\.(ttf|otf)$/, + test: /assets\/.*\.(png|jpg|jpeg|gif|ttf|otf)$/, type: "asset/resource" } ] @@ -147,18 +143,14 @@ module.exports = { {from: 'index.html'}, {from: 'robot.txt'}, {from: 'src/lang', to: 'lang'}, - {from: 'assets/blog', to: 'blog'}, - {from: 'assets/icons', to: 'assets/icons'}, - {from: 'assets/images', to: 'assets/images'}, - {from: 'assets/theme', to: 'assets/theme'}, - {from: 'assets/fonts', to: 'assets/fonts'} + {from: 'assets', to: 'assets', globOptions: {ignore: '**/blog/**'}}, + {from: 'assets/blog', to: 'blog', globOptions: {ignore: '**/blog/draft_*/**'}} ]}) ], output: { filename: 'bundle.js', path: path.resolve(__dirname, 'public'), - assetModuleFilename: 'assets/[query].[ext]', clean: true } };