diff --git a/portfolio/en/plamo.html b/portfolio/en/plamo.html index 899b992..d7e0ce7 100644 --- a/portfolio/en/plamo.html +++ b/portfolio/en/plamo.html @@ -1,6 +1,6 @@ --- title: Plamo -logosub: Plamoa +logosub: Plamo language: "en" --- diff --git a/portfolio/pages/en/plamo/model-kits/gundam/fm/gat-x370-raider-gundam.md b/portfolio/pages/en/plamo/model-kits/gundam/fm/gat-x370-raider-gundam.md index 298bf53..f665758 100644 --- a/portfolio/pages/en/plamo/model-kits/gundam/fm/gat-x370-raider-gundam.md +++ b/portfolio/pages/en/plamo/model-kits/gundam/fm/gat-x370-raider-gundam.md @@ -13,9 +13,6 @@ number: "5063349" release: "2022" manufacturer: "Bandai Spirits" purchase_date: "2024-08-14" -purchase_store: "" -purchase_venue: "" -purchase_location: "" --- The GAT-X370 Raider Gundam. diff --git a/portfolio/pages/en/plamo/model-kits/gundam/hg/ams-129m-zee-zulu.md b/portfolio/pages/en/plamo/model-kits/gundam/hg/ams-129m-zee-zulu.md index 96155c2..f9bd112 100644 --- a/portfolio/pages/en/plamo/model-kits/gundam/hg/ams-129m-zee-zulu.md +++ b/portfolio/pages/en/plamo/model-kits/gundam/hg/ams-129m-zee-zulu.md @@ -14,7 +14,6 @@ release: "2011" manufacturer: "Bandai" purchase_date: "??" purchase_store: "??" -purchase_venue: "" purchase_location: "Japan" --- diff --git a/portfolio/pages/en/plamo/model-kits/gundam/hg/amx-104-r-jarja.md b/portfolio/pages/en/plamo/model-kits/gundam/hg/amx-104-r-jarja.md index 9a3ca7e..0c3f7e3 100644 --- a/portfolio/pages/en/plamo/model-kits/gundam/hg/amx-104-r-jarja.md +++ b/portfolio/pages/en/plamo/model-kits/gundam/hg/amx-104-r-jarja.md @@ -15,7 +15,6 @@ manufacturer: "Bandai Spirits" purchase_date: "2025-03-10" purchase_store: "Geeks Heaven" purchase_venue: "Internet" -purchase_location: "" --- The AMX-104 R-Jarja. \ No newline at end of file diff --git a/portfolio/pages/en/plamo/model-kits/gundam/hg/nobell-gundam.md b/portfolio/pages/en/plamo/model-kits/gundam/hg/nobell-gundam.md index 96789f2..c0edddf 100644 --- a/portfolio/pages/en/plamo/model-kits/gundam/hg/nobell-gundam.md +++ b/portfolio/pages/en/plamo/model-kits/gundam/hg/nobell-gundam.md @@ -15,7 +15,6 @@ manufacturer: "Bandai Spirits" purchase_date: "2025-10-18" purchase_store: "Geeks Heaven" purchase_venue: "Internet" -purchase_location: "" --- The sassy Nobell Gundam. diff --git a/portfolio/pages/en/plamo/model-kits/gundam/hg/orx-005-gaplant.md b/portfolio/pages/en/plamo/model-kits/gundam/hg/orx-005-gaplant.md index db61693..8980645 100644 --- a/portfolio/pages/en/plamo/model-kits/gundam/hg/orx-005-gaplant.md +++ b/portfolio/pages/en/plamo/model-kits/gundam/hg/orx-005-gaplant.md @@ -15,7 +15,6 @@ manufacturer: "Bandai Spirits" purchase_date: "2025-03-10" purchase_store: "Geeks Heaven" purchase_venue: "Internet" -purchase_location: "" --- The ORX-005 Gaplant. \ No newline at end of file diff --git a/portfolio/pages/en/plamo/model-kits/gundam/hg/zeta-gundam-gundam-base.md b/portfolio/pages/en/plamo/model-kits/gundam/hg/zeta-gundam-gundam-base.md index 4c7d394..a8739f3 100644 --- a/portfolio/pages/en/plamo/model-kits/gundam/hg/zeta-gundam-gundam-base.md +++ b/portfolio/pages/en/plamo/model-kits/gundam/hg/zeta-gundam-gundam-base.md @@ -14,7 +14,6 @@ release: "2020" manufacturer: "Bandai Spirits" purchase_date: "2025-05-12" purchase_store: "The Gundam Base" -purchase_venue: "" purchase_location: "Tokyo, Japan" --- diff --git a/portfolio/pages/en/plamo/model-kits/gundam/mg/ms-06s-zaku-ii.md b/portfolio/pages/en/plamo/model-kits/gundam/mg/ms-06s-zaku-ii.md index 24bde55..d8f4176 100644 --- a/portfolio/pages/en/plamo/model-kits/gundam/mg/ms-06s-zaku-ii.md +++ b/portfolio/pages/en/plamo/model-kits/gundam/mg/ms-06s-zaku-ii.md @@ -2,7 +2,7 @@ logosub: "Plamo" language: "en" title: "MS-06S Zaku II" -page: "model-kits/gundam/mg/zaku-ii" +page: "model-kits/gundam/mg/zaku-2" model_name: "MS-06S Zaku II" date: "1990-01-01" status: "Messing it up with putty" @@ -15,7 +15,7 @@ manufacturer: "Bandai Spirits" purchase_date: "2025-02-07" purchase_store: "Modelbouw krikke" purchase_venue: "Internet" -purchase_location: "" --- -The MS-06S Zaku II. \ No newline at end of file +The MS-06S Zaku II. + diff --git a/portfolio/pages/en/plamo/model-kits/gundam/mg/rgm-96x-jesta.md b/portfolio/pages/en/plamo/model-kits/gundam/mg/rgm-96x-jesta.md index cc49f38..b5b61ec 100644 --- a/portfolio/pages/en/plamo/model-kits/gundam/mg/rgm-96x-jesta.md +++ b/portfolio/pages/en/plamo/model-kits/gundam/mg/rgm-96x-jesta.md @@ -15,7 +15,7 @@ manufacturer: "Bandai Spirits" purchase_date: "2025-11-02" purchase_store: "Mecha Universe" purchase_venue: "Internet" -purchase_location: "" +purchase_location: "Barcelona, Spain" --- The MG RGM-96X JESTA. \ No newline at end of file diff --git a/portfolio/pages/en/plamo/model-kits/gundam/mg/rgz-95-rezel.md b/portfolio/pages/en/plamo/model-kits/gundam/mg/rgz-95-rezel.md index 22f35ed..a005eaf 100644 --- a/portfolio/pages/en/plamo/model-kits/gundam/mg/rgz-95-rezel.md +++ b/portfolio/pages/en/plamo/model-kits/gundam/mg/rgz-95-rezel.md @@ -15,7 +15,6 @@ manufacturer: "Bandai Spirits" purchase_date: "2025-03-10" purchase_store: "Geeks Heaven" purchase_venue: "Internet" -purchase_location: "" --- The RGZ-95 ReZEL. \ No newline at end of file diff --git a/portfolio/pages/en/plamo/model-kits/gundam/mg/rx-78-2-gundam-base.md b/portfolio/pages/en/plamo/model-kits/gundam/mg/rx-78-2-gundam-base.md index b236edc..1e27671 100644 --- a/portfolio/pages/en/plamo/model-kits/gundam/mg/rx-78-2-gundam-base.md +++ b/portfolio/pages/en/plamo/model-kits/gundam/mg/rx-78-2-gundam-base.md @@ -14,7 +14,6 @@ release: "2020" manufacturer: "Bandai Spirits" purchase_date: "2025-05-12" purchase_store: "The Gundam Base" -purchase_venue: "" purchase_location: "Tokyo, Japan" --- diff --git a/portfolio/pages/en/plamo/model-kits/gundam/mg/rx-78-2-ver-ka.md b/portfolio/pages/en/plamo/model-kits/gundam/mg/rx-78-2-ver-ka.md index 32aa9bc..f00426a 100644 --- a/portfolio/pages/en/plamo/model-kits/gundam/mg/rx-78-2-ver-ka.md +++ b/portfolio/pages/en/plamo/model-kits/gundam/mg/rx-78-2-ver-ka.md @@ -14,7 +14,6 @@ release: "2002" manufacturer: "Bandai" purchase_date: "2018-10-28" purchase_store: "Joshin Store" -purchase_venue: "" purchase_location: "Sakae, Nagoya, Japan" --- diff --git a/portfolio/pages/en/plamo/model-kits/maschinen-krieger/raccoon.md b/portfolio/pages/en/plamo/model-kits/maschinen-krieger/raccoon.md index a7faa2d..c911ca5 100644 --- a/portfolio/pages/en/plamo/model-kits/maschinen-krieger/raccoon.md +++ b/portfolio/pages/en/plamo/model-kits/maschinen-krieger/raccoon.md @@ -14,7 +14,6 @@ release: "2021" manufacturer: "Wave Corporation" purchase_date: "2025-05-24" purchase_store: "Mandarake" -purchase_venue: "" purchase_location: "Sakae, Nagoya, Japan" --- diff --git a/portfolio/pages/en/plamo/model-kits/other-mecha/30-minute-missions/acerby-type-d.md b/portfolio/pages/en/plamo/model-kits/other-mecha/30-minute-missions/acerby-type-d.md index 087654e..5dfa550 100644 --- a/portfolio/pages/en/plamo/model-kits/other-mecha/30-minute-missions/acerby-type-d.md +++ b/portfolio/pages/en/plamo/model-kits/other-mecha/30-minute-missions/acerby-type-d.md @@ -15,7 +15,6 @@ manufacturer: "Bandai Spirits" purchase_date: "2025-03-10" purchase_store: "Geeks Heaven" purchase_venue: "Internet" -purchase_location: "" --- The Acerby Type-D. \ No newline at end of file diff --git a/portfolio/pages/en/plamo/model-kits/spacecraft/ginkei.md b/portfolio/pages/en/plamo/model-kits/spacecraft/ginkei.md index fdc3b46..e97067d 100644 --- a/portfolio/pages/en/plamo/model-kits/spacecraft/ginkei.md +++ b/portfolio/pages/en/plamo/model-kits/spacecraft/ginkei.md @@ -15,7 +15,6 @@ manufacturer: "Kotobukiya" purchase_date: "2025-11-13" purchase_store: "Archonia" purchase_venue: "Internet" -purchase_location: "" --- The player 2 ship from the game Ikaruga. \ No newline at end of file diff --git a/portfolio/pages/en/plamo/model-kits/spacecraft/yamato/mc-01-space-battleship-yamato.md b/portfolio/pages/en/plamo/model-kits/spacecraft/yamato/mc-01-space-battleship-yamato.md index 744f112..85a9c26 100644 --- a/portfolio/pages/en/plamo/model-kits/spacecraft/yamato/mc-01-space-battleship-yamato.md +++ b/portfolio/pages/en/plamo/model-kits/spacecraft/yamato/mc-01-space-battleship-yamato.md @@ -14,7 +14,6 @@ release: "1979" manufacturer: "Bandai" purchase_date: "2025-05-24" purchase_store: "Mandarake" -purchase_venue: "" purchase_location: "Sakae, Nagoya, Japan" --- diff --git a/portfolio/pages/en/plamo/model-kits/spacecraft/yamato/mc-29-deslers-gunship.md b/portfolio/pages/en/plamo/model-kits/spacecraft/yamato/mc-29-deslers-gunship.md index 7c22084..44450e3 100644 --- a/portfolio/pages/en/plamo/model-kits/spacecraft/yamato/mc-29-deslers-gunship.md +++ b/portfolio/pages/en/plamo/model-kits/spacecraft/yamato/mc-29-deslers-gunship.md @@ -14,7 +14,6 @@ release: "2012" manufacturer: "Bandai" purchase_date: "" purchase_store: "Hard off" -purchase_venue: "" purchase_location: "Gifu, Japan" --- diff --git a/portfolio/pages/en/plamo/model-kits/vehicles/cars/daihatsu-move.md b/portfolio/pages/en/plamo/model-kits/vehicles/cars/daihatsu-move.md index 10805b0..46b0da0 100644 --- a/portfolio/pages/en/plamo/model-kits/vehicles/cars/daihatsu-move.md +++ b/portfolio/pages/en/plamo/model-kits/vehicles/cars/daihatsu-move.md @@ -7,7 +7,6 @@ model_name: "Daihatsu Move CX '95/SR Turbo" date: "1990-01-01" status: "Still in box" price: "€18,99" -series: "" scale: "1/24" number: "039077" release: "2014" diff --git a/portfolio/pages/en/plamo/model-kits/vehicles/cars/nissan-march-ak11-99.md b/portfolio/pages/en/plamo/model-kits/vehicles/cars/nissan-march-ak11-99.md index 9407e46..f0f2015 100644 --- a/portfolio/pages/en/plamo/model-kits/vehicles/cars/nissan-march-ak11-99.md +++ b/portfolio/pages/en/plamo/model-kits/vehicles/cars/nissan-march-ak11-99.md @@ -7,7 +7,6 @@ model_name: "Nissan March AK11 3 Door G# '99" date: "1990-01-01" status: "Still in box" price: "€15,39" -series: "" scale: "1/24" number: "03546" release: "2003" diff --git a/portfolio/pages/en/plamo/model-kits/vehicles/cars/nissan-march-k11-93.md b/portfolio/pages/en/plamo/model-kits/vehicles/cars/nissan-march-k11-93.md index 46bbc11..7db8c9a 100644 --- a/portfolio/pages/en/plamo/model-kits/vehicles/cars/nissan-march-k11-93.md +++ b/portfolio/pages/en/plamo/model-kits/vehicles/cars/nissan-march-k11-93.md @@ -7,7 +7,6 @@ model_name: "Nissan March izf '93" date: "1990-01-01" status: "Still in box" price: "€57,00" -series: "" scale: "1/24" number: "03546" release: "2003" diff --git a/portfolio/pages/en/plamo/model-kits/vehicles/military/armoured-cars/fennek.md b/portfolio/pages/en/plamo/model-kits/vehicles/military/armoured-cars/fennek.md index 42163b4..9ff4cda 100644 --- a/portfolio/pages/en/plamo/model-kits/vehicles/military/armoured-cars/fennek.md +++ b/portfolio/pages/en/plamo/model-kits/vehicles/military/armoured-cars/fennek.md @@ -7,7 +7,6 @@ model_name: "Spähwagen Fennek" date: "1990-01-01" status: "Still in box" price: "€17,28" -series: "" scale: "1/72" number: "03356" release: "2024" diff --git a/portfolio/pages/en/plamo/model-kits/vehicles/military/armoured-cars/sd-kfz-222.md b/portfolio/pages/en/plamo/model-kits/vehicles/military/armoured-cars/sd-kfz-222.md index 8f70f8c..fbaf5cb 100644 --- a/portfolio/pages/en/plamo/model-kits/vehicles/military/armoured-cars/sd-kfz-222.md +++ b/portfolio/pages/en/plamo/model-kits/vehicles/military/armoured-cars/sd-kfz-222.md @@ -7,7 +7,6 @@ model_name: "Sd.Kfz 222 Leichter Panzerspähwagen 4x4" date: "1990-01-01" status: "Building" price: "€26,00" -series: "World War 2" scale: "1/35" number: "35270" release: "2003" diff --git a/portfolio/pages/en/plamo/model-kits/vehicles/motorcycles/honda-cx500.md b/portfolio/pages/en/plamo/model-kits/vehicles/motorcycles/honda-cx500.md index 1017f92..91d3315 100644 --- a/portfolio/pages/en/plamo/model-kits/vehicles/motorcycles/honda-cx500.md +++ b/portfolio/pages/en/plamo/model-kits/vehicles/motorcycles/honda-cx500.md @@ -7,14 +7,12 @@ model_name: "Honda CX500 Turbo" date: "1990-01-01" status: "Still in box" price: "¥2080" -series: "" scale: "1/12" number: "14016" release: "2010" manufacturer: "Tamiya" purchase_date: "2025-05-17" purchase_store: "Surugaya flagship store" -purchase_venue: "" purchase_location: "Shizuoka, Japan" --- diff --git a/portfolio/pages/en/plamo/model-kits/vehicles/motorcycles/honda-dax.md b/portfolio/pages/en/plamo/model-kits/vehicles/motorcycles/honda-dax.md index acd55e7..0a21e4a 100644 --- a/portfolio/pages/en/plamo/model-kits/vehicles/motorcycles/honda-dax.md +++ b/portfolio/pages/en/plamo/model-kits/vehicles/motorcycles/honda-dax.md @@ -7,7 +7,6 @@ model_name: "Honda Dax 125" date: "1990-01-01" status: "Still in box" price: "¥3146" -series: "" scale: "1/12" number: "14142" release: "2024" diff --git a/portfolio/pages/en/plamo/model-kits/vehicles/tractors/lanz-bulldog.md b/portfolio/pages/en/plamo/model-kits/vehicles/tractors/lanz-bulldog.md index 2ab90f9..f762e82 100644 --- a/portfolio/pages/en/plamo/model-kits/vehicles/tractors/lanz-bulldog.md +++ b/portfolio/pages/en/plamo/model-kits/vehicles/tractors/lanz-bulldog.md @@ -7,7 +7,6 @@ model_name: "Lanz Bulldog D8500 mod.1938" date: "1990-01-01" status: "Still in box" price: "€26,50" -series: "" scale: "1/35" number: "38024" release: "2020" diff --git a/portfolio/pages/en/plamo/model-kits/vehicles/tractors/us-army-tractor.md b/portfolio/pages/en/plamo/model-kits/vehicles/tractors/us-army-tractor.md index 6cd466f..ed5a84f 100644 --- a/portfolio/pages/en/plamo/model-kits/vehicles/tractors/us-army-tractor.md +++ b/portfolio/pages/en/plamo/model-kits/vehicles/tractors/us-army-tractor.md @@ -7,7 +7,6 @@ model_name: "US army Tractor VAI with Field compaction roller" date: "1990-01-01" status: "Still in box" price: "€10,00*" -series: "" scale: "1/72" number: "5391532331355" release: "2024" diff --git a/portfolio/site.hs b/portfolio/site.hs index 12b54ae..9b974e1 100644 --- a/portfolio/site.hs +++ b/portfolio/site.hs @@ -4,6 +4,7 @@ import Control.Monad (filterM) import Data.Maybe (fromMaybe) import Data.Monoid (mappend) import Data.Time +import Data.Time.Format (parseTimeM, defaultTimeLocale, formatTime) import Hakyll @@ -52,7 +53,7 @@ main = hakyll $ do >>= loadAndApplyTemplate "templates/default.html" (postCtx language) >>= relativizeUrls - match "pages/en/plamo/**" $ do + match "pages/*/plamo/**" $ do route $ setExtension "html" compile $ do identifier <- getUnderlying @@ -60,14 +61,18 @@ main = hakyll $ do let language = lookupString "language" metadata let dateValue = lookupString "date" metadata + purchaseDateValue = lookupString "purchase_date" metadata + formattedPurchaseDate = maybe "" formatDate purchaseDateValue modelKitTemplate = if dateValue == Just "1990-01-01" then "templates/model-kit-not-ready.html" else "templates/model-kit.html" + extendedCtx = constField "formatted_purchase_date" formattedPurchaseDate <> (postCtx language) + pandocCompiler - >>= loadAndApplyTemplate modelKitTemplate (postCtx language) - >>= loadAndApplyTemplate "templates/default.html" (postCtx language) + >>= loadAndApplyTemplate modelKitTemplate extendedCtx + >>= loadAndApplyTemplate "templates/default.html" extendedCtx >>= relativizeUrls create ["archive.html"] $ do @@ -98,17 +103,20 @@ main = hakyll $ do ]) $ do route idRoute compile $ do - ident <- getUnderlying - kits <- recentFirst =<< loadAll "pages/en/plamo/**" - + -- ident <- getUnderlying -- language <- getMetadataField' ident "language" + identifier <- getUnderlying metadata <- getMetadata identifier let language = lookupString "language" metadata let lang = fromMaybe "en" language + let urla = "pages/" ++ lang ++ "/plamo/**" + -- TODO: other language do not seem to load any kits. + kits <- recentFirst =<< loadAll (fromGlob (urla)) + let plamoCtx = - listField "kits" (postCtx language) (return kits) <> + listField "kits" kitCtx (return kits) <> langDict lang <> defaultContext @@ -164,6 +172,12 @@ staticPageContext = langDict "en" <> defaultContext +formatDate :: String -> String +formatDate s = + case parseTimeM True defaultTimeLocale "%Y-%m-%d" s :: Maybe Day of + Just day -> formatTime defaultTimeLocale "%e %B %Y" day + Nothing -> s + postCtx :: Maybe String -> Context String postCtx language = let lang = fromMaybe "en" language @@ -173,6 +187,15 @@ postCtx language = langDict lang <> defaultContext +kitCtx :: Context String +kitCtx = + (field "formatted_purchase_date" $ \item -> do + metadata <- getMetadata (itemIdentifier item) + let purchaseDateValue = lookupString "purchase_date" metadata + return $ maybe "" formatDate purchaseDateValue + ) + <> postCtx Nothing + isUpcoming :: UTCTime -> Item a -> Compiler Bool isUpcoming cutoff item = do metadata <- getMetadata (itemIdentifier item) diff --git a/portfolio/templates/model-kit.html b/portfolio/templates/model-kit.html index 0f12e80..71047d8 100644 --- a/portfolio/templates/model-kit.html +++ b/portfolio/templates/model-kit.html @@ -6,43 +6,45 @@
Model information - - - - - - - - - - - - - - - + $if(model_name)$ + + $endif$ + $if(scale)$ + + $endif$ + $if(series)$ + + $endif$ + $if(manufacturer)$ + + $endif$ + $if(release)$ + + $endif$ + $if(number)$ + $endif$
Model$model_name$
Scale$scale$
Series$series$
Manufacturer$manufacturer$
Release year$release$
Model$model_name$
Scale$scale$
Series$series$
Manufacturer$manufacturer$
Release year$release$
Kit number$number$
Purchase information - - - - - - - - - - - - - - - + $if(purchase_date)$ + + $endif$ + $if(price)$ + + $endif$ + $if(purchase_store)$ + + $endif$ + $if(purchase_venue)$ + + $endif$ + $if(purchase_location)$ + + $endif$
Date$purchase_date$
Price$price$
Store$purchase_store$
Venue$purchase_venue$
Location$purchase_location$
Date$formatted_purchase_date$
Price$price$
Store$purchase_store$
Venue$purchase_venue$
Location$purchase_location$
diff --git a/portfolio/templates/model-kits.html b/portfolio/templates/model-kits.html index f060ffc..34e0bd3 100644 --- a/portfolio/templates/model-kits.html +++ b/portfolio/templates/model-kits.html @@ -6,13 +6,21 @@
$title$
 +

$date$

$model_name$ $scale$
- Series: $series$
+ $if(series)$ + Series: $series$
+ $endif$ $manufacturer$, $release$ - $number$
- Bought at $purchase_store$ for $price$ ($purchase_date$)
+ $if(purchase_store)$ + $if(price)$ + $if(purchase_date)$ + Bought at $purchase_store$ for $price$
($formatted_purchase_date$)
+ $endif$ + $endif$ + $endif$

-

$date$