From 5248dae506c5a88b54bb3be636311a86e509afe7 Mon Sep 17 00:00:00 2001 From: Kevin Matsubara Date: Sat, 26 Oct 2024 12:30:34 +0200 Subject: [PATCH] Add Scale model section. --- src/App.js | 8 +++++- src/Language/LanguageStrings.js | 4 +++ src/Pages/ScaleModel/BlogPage.js | 16 ++++++++++++ src/Pages/ScaleModel/ScaleModelMain.js | 15 +++++++++++ .../blog/en/smc-2025-rx-178-mk-2.md | 16 ++++++++++++ src/Pages/ScaleModel/en/main.md | 11 ++++++++ .../ScaleModel/equipment/en/fiskars-knife.md | 1 + src/Pages/ScaleModel/wishlist.md | 26 +++++++++++++++++++ src/Pages/home-en.md | 2 +- src/Pages/home-nl.md | 2 +- src/Routers.js | 11 ++++++++ src/UI/Navigation.js | 1 + src/overrides.scss | 4 +++ 13 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 src/Pages/ScaleModel/BlogPage.js create mode 100644 src/Pages/ScaleModel/ScaleModelMain.js create mode 100644 src/Pages/ScaleModel/blog/en/smc-2025-rx-178-mk-2.md create mode 100644 src/Pages/ScaleModel/en/main.md create mode 100644 src/Pages/ScaleModel/equipment/en/fiskars-knife.md create mode 100644 src/Pages/ScaleModel/wishlist.md diff --git a/src/App.js b/src/App.js index 26a70c6..8ba8db8 100644 --- a/src/App.js +++ b/src/App.js @@ -43,8 +43,10 @@ import JapanesePage from './Pages/Japan/JapanesePage'; import EquipmentPage from './Pages/Radio/equipmentPage'; +import ScaleModelMain from './Pages/ScaleModel/ScaleModelMain' + import { languages, getLanguage } from './Language/Language'; -import { japaneseRoutes, programmingLanguageRoutes } from './Routers'; +import { japaneseRoutes, scaleModelBlogRoutes, programmingLanguageRoutes } from './Routers'; function App() { const language = getLanguage(); @@ -54,6 +56,7 @@ function App() { 'japan/japanese': , // Needs an md_path 'japanMap': , 'radio': , + 'scalemodel': , 'software': , }; @@ -125,6 +128,9 @@ function App() { {equipmentRoutes} {generatedRoutes} + {/* Scale model */} + {scaleModelBlogRoutes} + {/* Software */} {programmingLanguageRoutes} diff --git a/src/Language/LanguageStrings.js b/src/Language/LanguageStrings.js index b7a964d..a7860b9 100644 --- a/src/Language/LanguageStrings.js +++ b/src/Language/LanguageStrings.js @@ -33,6 +33,8 @@ const languageStrings = { fielddays: 'Field days', nvisAntenna: 'NVIS Antenna', totalUniqueQSO: 'total unique QSO', + // Scale Model + scalemodel: 'Scale model', // Software code_pages: 'Code sections', code_pages_intro: 'Some notes and examples of code.', @@ -72,6 +74,8 @@ const languageStrings = { fielddays: 'Velddagen', nvisAntenna: 'NVIS antenne', totalUniqueQSO: 'totaal unieke QSO', + // Scale Model + scalemodel: 'Schaalmodel', // Software code_pages: 'Code secties', code_pages_intro: 'Notities en voorbeelden van code.', diff --git a/src/Pages/ScaleModel/BlogPage.js b/src/Pages/ScaleModel/BlogPage.js new file mode 100644 index 0000000..c3fbb0a --- /dev/null +++ b/src/Pages/ScaleModel/BlogPage.js @@ -0,0 +1,16 @@ +import React from 'react'; +import Breadcrumbs from '../../UI/Breadcrumbs'; +import MarkdownPage from '../markdownPage'; + +const BlogPage = ({ mdPath }) => { + return ( +
+ + {['Scale model']} + + +
+ ) +} + +export default BlogPage; \ No newline at end of file diff --git a/src/Pages/ScaleModel/ScaleModelMain.js b/src/Pages/ScaleModel/ScaleModelMain.js new file mode 100644 index 0000000..b923220 --- /dev/null +++ b/src/Pages/ScaleModel/ScaleModelMain.js @@ -0,0 +1,15 @@ +import React from 'react'; +import MarkdownPage from '../markdownPage'; +import { getLanguage } from '../../Language/Language'; + +const ScaleModelMain = () => { + const language = getLanguage(); + + return ( +
+ +
+ ) +} + +export default ScaleModelMain; \ No newline at end of file diff --git a/src/Pages/ScaleModel/blog/en/smc-2025-rx-178-mk-2.md b/src/Pages/ScaleModel/blog/en/smc-2025-rx-178-mk-2.md new file mode 100644 index 0000000..92536c2 --- /dev/null +++ b/src/Pages/ScaleModel/blog/en/smc-2025-rx-178-mk-2.md @@ -0,0 +1,16 @@ + # Scale Model Challenge 2025 + +For years I have been painting miniatures as a hobby. I did so as a solitary activity, with only a few miniatures completed. When a colleague of mine, now a friend, discovered we shared many interests like Gundam and other things related to Japan, (both of us are married with a Japanese woman as well), he introduced me to the SIG Plamo (Special Interests Group Plamo). A group of friends from university that share similar interests. This group regularly comes together to paint historic models, Warhammer, Gunpla, airbrushing, build Lego and other fun stuff. They also promote the Gunpla hobby at Animecon. Every year, some members participate in the Scale Model Challenge, the SMC in Veldhoven, Netherlands. This sparked new enthusiasm in me for this hobby again! + +They created a special tradition, where they pick a model kit, preferably they can buy directly at the SMC. Then everyone needs to prepare this miniature for next year's SMC, where they present the model. During that year, they do not check each other's progress, so it is a surprise to see what everyone has created after one year. They have created a ship, a tank, an airplane and in 2023, a Velorex from Eduard. + +This year will be my first entry, we bought 4 kits of the **HGUC RX-178 Mark II Gundam**, 10 Euro each. Here I will describe my progress. + +### 2024 +#### October + +Cut all parts from the sprue, removed the nubs and sanded the parts. I put each part into a little bag with a tag of the sprue number, so that I can track them later during assembly. +equipment used: + * Tamiya sanding sponges 400, 600 & 1000 + * Cutter + * [Fiskars knife](./equipment/fiskars-knife) diff --git a/src/Pages/ScaleModel/en/main.md b/src/Pages/ScaleModel/en/main.md new file mode 100644 index 0000000..033e2e7 --- /dev/null +++ b/src/Pages/ScaleModel/en/main.md @@ -0,0 +1,11 @@ +# Scale modelling + +Building and painting scale models is one of my hobbies. Here is a collection of the things I made and use. + +--- + +## Blog + +### Scale Model Challenge + +* [SMC 2025 - RX-178 Mk. II](./blog/smc-2025-rx-178-mk-2) diff --git a/src/Pages/ScaleModel/equipment/en/fiskars-knife.md b/src/Pages/ScaleModel/equipment/en/fiskars-knife.md new file mode 100644 index 0000000..fcbbf09 --- /dev/null +++ b/src/Pages/ScaleModel/equipment/en/fiskars-knife.md @@ -0,0 +1 @@ +# Fiskars knife \ No newline at end of file diff --git a/src/Pages/ScaleModel/wishlist.md b/src/Pages/ScaleModel/wishlist.md new file mode 100644 index 0000000..b234122 --- /dev/null +++ b/src/Pages/ScaleModel/wishlist.md @@ -0,0 +1,26 @@ + +### Gundam wishlist: + +* MG – MSM-07 Z’gok +* HG – AGX-04 Gerbera Tetra +* HG – MSJ-06II-A Tieren Ground Type + +* Bandai - BPHD-38 ms hand 02 (Zeon) + +--- + +### Equipment wishlist: + +* Dremel +* Bluetack +* Kruidvat nagellak verwijderaar (met of zonder aceton) +* UV light for curing + +--- + +### Diorama wishlist: + +* XPS insulation foam +* Hot wire cutter +* LED filament lines +* UV resin \ No newline at end of file diff --git a/src/Pages/home-en.md b/src/Pages/home-en.md index b91d062..cd719e9 100644 --- a/src/Pages/home-en.md +++ b/src/Pages/home-en.md @@ -11,10 +11,10 @@ My interests are: * Software development * Japanese language * Amateur radio +* Scale modelling * Linux * Electronics * Woodworking * Yoga -* Synthesize music I am based in Helmond, the Netherlands. \ No newline at end of file diff --git a/src/Pages/home-nl.md b/src/Pages/home-nl.md index bf12b78..fe5991d 100644 --- a/src/Pages/home-nl.md +++ b/src/Pages/home-nl.md @@ -11,10 +11,10 @@ Mijn andere interesses: * Software ontwikkeling * Japanse taal * Radiozendamateurisme +* Schaalmodellen * Linux * Electronica * Houtbewerking * Yoga -* Synthesizer muziek Ik woon in Helmond. \ No newline at end of file diff --git a/src/Routers.js b/src/Routers.js index d4f1e01..b3dff67 100644 --- a/src/Routers.js +++ b/src/Routers.js @@ -2,6 +2,7 @@ import React from 'react'; import { Route } from 'react-router-dom'; import { languages } from './Language/Language'; import JapanesePage from './Pages/Japan/JapanesePage'; +import BlogPage from './Pages/ScaleModel/BlogPage'; import CSharpPage from './Pages/Software/csharp/CSharpPage'; import ElmPage from './Pages/Software/elm/ElmPage'; @@ -16,6 +17,16 @@ export const japaneseRoutes = languages.map(lang => { }); }).flat(); +// Scale model +export const scaleModelBlogRoutes = languages.map(lang => { + const pages = ['smc-2025-rx-178-mk-2']; + return pages.map(page => { + const path = `/${lang}/scalemodel/blog/${page}`; + const mdPath = `ScaleModel/blog/${lang}/${page}.md`; + return } />; + }); +}).flat(); + // Software export const programmingLanguageRoutes = languages.map(lang => { // Main page. diff --git a/src/UI/Navigation.js b/src/UI/Navigation.js index df1673c..c2d6cfd 100644 --- a/src/UI/Navigation.js +++ b/src/UI/Navigation.js @@ -37,6 +37,7 @@ const Navigation = () => {
  • {getString('japan')}
  • {getString('radio_amateur')}
    • +
  • {getString('scalemodel')}
  • {getString('software')}
    • diff --git a/src/overrides.scss b/src/overrides.scss index 8e37639..004f9af 100644 --- a/src/overrides.scss +++ b/src/overrides.scss @@ -213,6 +213,10 @@ body.light { } +li.hidden { + display: none; +} + // Core variables and mixins // @import "variables"; // @import "mixins"; \ No newline at end of file