From 485c57a28d465eacce2eb70f77195a136d00b729 Mon Sep 17 00:00:00 2001 From: Reed Nelson Date: Tue, 5 Dec 2023 09:26:12 -0600 Subject: [PATCH 1/5] revise drinks --- src/content/config.ts | 1 + src/content/drinks/_drink.md | 2 +- src/content/drinks/amaretto-sour.md | 1 - src/content/drinks/appler.md | 1 - src/content/drinks/aviation.md | 1 - src/content/drinks/basilica.md | 1 - src/content/drinks/berlin.md | 1 - src/content/drinks/berry-smoothie.md | 1 - src/content/drinks/boulevardier.md | 1 - src/content/drinks/bourbon-bash.md | 1 - src/content/drinks/clark-old-fashioned.md | 1 - src/content/drinks/cosmopolitan.md | 1 - src/content/drinks/cucumber-martini.md | 1 - src/content/drinks/elderflower-martini.md | 1 - src/content/drinks/floradora.md | 1 - src/content/drinks/gin-buck.md | 1 - src/content/drinks/gin-gin-mule.md | 1 - src/content/drinks/hotel-georgia.md | 1 - .../drinks/improved-japanese-cocktail.md | 1 - .../drinks/improved-whiskey-cocktail.md | 1 - src/content/drinks/irish-maid.md | 1 - src/content/drinks/kentucky-maid.md | 1 - src/content/drinks/la-louisiane.md | 1 - src/content/drinks/lemon-drop-martini.md | 1 - src/content/drinks/london-gypsy.md | 1 - src/content/drinks/lucien-gaudin.md | 1 - src/content/drinks/manhattan.md | 1 - src/content/drinks/martinez.md | 1 - src/content/drinks/martini.md | 1 - src/content/drinks/mojito.md | 1 - src/content/drinks/negroni.md | 1 - src/content/drinks/new-york-sour.md | 1 - src/content/drinks/old-fashioned.md | 1 - src/content/drinks/orange-bite.md | 1 - src/content/drinks/perfect-manhattan.md | 1 - src/content/drinks/pike-bay-special.md | 1 - src/content/drinks/raspberry-martini.md | 1 - src/content/drinks/raspberryy-cocktail.md | 1 - src/content/drinks/rosemary-gin-fizz.md | 1 - src/content/drinks/rosemary-sour.md | 1 - src/content/drinks/sazerac.md | 1 - src/content/drinks/stormy-morning.md | 1 - src/content/drinks/tom-collins.md | 1 - src/content/drinks/trinidad-sour.md | 1 - src/content/drinks/vieux-carre.md | 1 - src/content/drinks/watermelon-martini.md | 1 - src/content/drinks/whiskey-daisy.md | 1 - src/content/drinks/whiskey-smash.md | 1 - src/content/drinks/whiskey-sour.md | 1 - src/content/drinks/wisconsin-old-fashioned.md | 1 - src/content/food/punch-salad.md | 2 +- src/layouts/DrinkSingle.astro | 139 ++++++++++-------- src/layouts/FoodSingle.astro | 44 +++--- src/lib/utils/similarItems.ts | 7 +- 54 files changed, 111 insertions(+), 132 deletions(-) diff --git a/src/content/config.ts b/src/content/config.ts index c32eef3..2ec11f7 100755 --- a/src/content/config.ts +++ b/src/content/config.ts @@ -33,6 +33,7 @@ const drinkCollection = defineCollection({ qty: z.array(z.string()).optional(), }).optional(), instructions: z.array(z.string()).optional(), + notes: z.array(z.string()).optional(), }), }); diff --git a/src/content/drinks/_drink.md b/src/content/drinks/_drink.md index 4540515..a07b7f4 100644 --- a/src/content/drinks/_drink.md +++ b/src/content/drinks/_drink.md @@ -3,9 +3,9 @@ title: Drink meta_title: Drink author: Reed Nelson draft: true -description: recipe. cover: "@assets/drinks/.jpg" +description: recipe. spirits: [spirit] bottles: [bottle] tags: [tag] diff --git a/src/content/drinks/amaretto-sour.md b/src/content/drinks/amaretto-sour.md index d257263..8e71510 100644 --- a/src/content/drinks/amaretto-sour.md +++ b/src/content/drinks/amaretto-sour.md @@ -3,7 +3,6 @@ title: Amaretto Sour meta_title: Amaretto Sour author: Reed Nelson draft: false -description: Amaretto Sour recipe. cover: "@assets/drinks/amaretto-sour.jpg" spirits: [whiskey] diff --git a/src/content/drinks/appler.md b/src/content/drinks/appler.md index 07d224a..6172ff4 100644 --- a/src/content/drinks/appler.md +++ b/src/content/drinks/appler.md @@ -3,7 +3,6 @@ title: Appler? I hardly know her! meta_title: Appler? I hardly know her! author: Reed Nelson draft: false -description: Appler? I hardly know her! recipe. cover: "@assets/drinks/appler.jpg" spirits: [whiskey] diff --git a/src/content/drinks/aviation.md b/src/content/drinks/aviation.md index 6cab5d9..86b3090 100644 --- a/src/content/drinks/aviation.md +++ b/src/content/drinks/aviation.md @@ -3,7 +3,6 @@ title: Aviation meta_title: Aviation author: Reed Nelson draft: false -description: Aviation recipe. cover: "@assets/drinks/aviation.jpg" spirits: [gin] diff --git a/src/content/drinks/basilica.md b/src/content/drinks/basilica.md index d1e3589..93cf525 100644 --- a/src/content/drinks/basilica.md +++ b/src/content/drinks/basilica.md @@ -3,7 +3,6 @@ title: Basilica meta_title: Basilica author: Reed Nelson draft: false -description: Basilica recipe. cover: "@assets/drinks/basilica.jpg" spirits: [gin] diff --git a/src/content/drinks/berlin.md b/src/content/drinks/berlin.md index b279bda..8abcbed 100644 --- a/src/content/drinks/berlin.md +++ b/src/content/drinks/berlin.md @@ -3,7 +3,6 @@ title: Berlin meta_title: Berlin author: Reed Nelson draft: false -description: Berlin recipe. cover: "@assets/drinks/berlin.jpg" spirits: [whiskey] diff --git a/src/content/drinks/berry-smoothie.md b/src/content/drinks/berry-smoothie.md index ac1da5e..0362236 100644 --- a/src/content/drinks/berry-smoothie.md +++ b/src/content/drinks/berry-smoothie.md @@ -3,7 +3,6 @@ title: Berry Smoothie meta_title: Berry Smoothie author: Reed Nelson draft: false -description: Berry Smoothie recipe. cover: "@assets/drinks/berry-smoothie.jpg" spirits: [] diff --git a/src/content/drinks/boulevardier.md b/src/content/drinks/boulevardier.md index e3f1601..90aa948 100644 --- a/src/content/drinks/boulevardier.md +++ b/src/content/drinks/boulevardier.md @@ -3,7 +3,6 @@ title: Boulevardier meta_title: Boulevardier author: Reed Nelson draft: false -description: Boulevardier recipe. cover: "@assets/drinks/boulevardier.jpg" spirits: [whiskey] diff --git a/src/content/drinks/bourbon-bash.md b/src/content/drinks/bourbon-bash.md index c68da6e..fb8c55e 100644 --- a/src/content/drinks/bourbon-bash.md +++ b/src/content/drinks/bourbon-bash.md @@ -3,7 +3,6 @@ title: Bourbon Bash meta_title: Bourbon Bash author: Reed Nelson draft: false -description: Bourbon Bash recipe. cover: "@assets/drinks/bourbon-bash.jpg" spirits: [whiskey] diff --git a/src/content/drinks/clark-old-fashioned.md b/src/content/drinks/clark-old-fashioned.md index 1ba3702..f06453f 100644 --- a/src/content/drinks/clark-old-fashioned.md +++ b/src/content/drinks/clark-old-fashioned.md @@ -3,7 +3,6 @@ title: Clark Old Fashioned meta_title: Clark Old Fashioned author: Reed Nelson draft: false -description: Clark Old Fashioned recipe. cover: "@assets/drinks/clark-old-fashioned.jpg" spirits: [brandy] diff --git a/src/content/drinks/cosmopolitan.md b/src/content/drinks/cosmopolitan.md index b87700d..5193a8b 100644 --- a/src/content/drinks/cosmopolitan.md +++ b/src/content/drinks/cosmopolitan.md @@ -3,7 +3,6 @@ title: Cosmopolitan meta_title: Cosmopolitan author: Reed Nelson draft: false -description: Cosmopolitan recipe. cover: "@assets/drinks/cosmopolitan.jpg" spirits: [vodka] diff --git a/src/content/drinks/cucumber-martini.md b/src/content/drinks/cucumber-martini.md index dde98f3..906a234 100644 --- a/src/content/drinks/cucumber-martini.md +++ b/src/content/drinks/cucumber-martini.md @@ -3,7 +3,6 @@ title: Cucumber Martini meta_title: Cucumber Martini author: Reed Nelson draft: false -description: Cucumber Martini recipe. cover: "@assets/drinks/cucumber-martini.jpg" spirits: [vodka] diff --git a/src/content/drinks/elderflower-martini.md b/src/content/drinks/elderflower-martini.md index f587d23..0cb0460 100644 --- a/src/content/drinks/elderflower-martini.md +++ b/src/content/drinks/elderflower-martini.md @@ -3,7 +3,6 @@ title: Elderflower Martini meta_title: Elderflower Martini author: Reed Nelson draft: false -description: Elderflower Martini recipe. cover: "@assets/drinks/elderflower-martini.jpg" spirits: [vodka] diff --git a/src/content/drinks/floradora.md b/src/content/drinks/floradora.md index 6fce936..5d2f280 100644 --- a/src/content/drinks/floradora.md +++ b/src/content/drinks/floradora.md @@ -3,7 +3,6 @@ title: Floradora meta_title: Floradora author: Reed Nelson draft: false -description: Floradora recipe. cover: "@assets/drinks/floradora.jpg" spirits: [gin] diff --git a/src/content/drinks/gin-buck.md b/src/content/drinks/gin-buck.md index fabec9b..70a70c2 100644 --- a/src/content/drinks/gin-buck.md +++ b/src/content/drinks/gin-buck.md @@ -3,7 +3,6 @@ title: Gin Buck meta_title: Gin Buck author: Reed Nelson draft: false -description: Gin Buck recipe. cover: "@assets/drinks/gin-buck.jpg" spirits: [Gin] diff --git a/src/content/drinks/gin-gin-mule.md b/src/content/drinks/gin-gin-mule.md index bf5fa69..32e3df1 100644 --- a/src/content/drinks/gin-gin-mule.md +++ b/src/content/drinks/gin-gin-mule.md @@ -3,7 +3,6 @@ title: Gin Gin Mule meta_title: Gin Gin Mule author: Reed Nelson draft: false -description: Gin Gin Mule recipe. cover: "@assets/drinks/gin-gin-mule.jpg" spirits: [Gin] diff --git a/src/content/drinks/hotel-georgia.md b/src/content/drinks/hotel-georgia.md index 5fdd784..82ede06 100644 --- a/src/content/drinks/hotel-georgia.md +++ b/src/content/drinks/hotel-georgia.md @@ -3,7 +3,6 @@ title: Hotel Georgia meta_title: Hotel Georgia author: Reed Nelson draft: false -description: Hotel Georgia recipe. cover: "@assets/drinks/hotel-georgia.jpg" spirits: [gin] diff --git a/src/content/drinks/improved-japanese-cocktail.md b/src/content/drinks/improved-japanese-cocktail.md index 5714edf..24857e1 100644 --- a/src/content/drinks/improved-japanese-cocktail.md +++ b/src/content/drinks/improved-japanese-cocktail.md @@ -3,7 +3,6 @@ title: Improved Japanese Cocktail meta_title: Improved Japanese Cocktail author: Reed Nelson draft: false -description: Improved Japanese Cocktail recipe. cover: "@assets/drinks/improved-japanese-cocktail.jpg" spirits: [brandy] diff --git a/src/content/drinks/improved-whiskey-cocktail.md b/src/content/drinks/improved-whiskey-cocktail.md index 050cffa..2cdf2d7 100644 --- a/src/content/drinks/improved-whiskey-cocktail.md +++ b/src/content/drinks/improved-whiskey-cocktail.md @@ -3,7 +3,6 @@ title: Improved Whiskey Cocktail meta_title: Improved Whiskey Cocktail author: Reed Nelson draft: false -description: Improved Whiskey Cocktail recipe. cover: "@assets/drinks/improved-whiskey-cocktail.jpg" spirits: [whiskey] diff --git a/src/content/drinks/irish-maid.md b/src/content/drinks/irish-maid.md index 6f2ad9f..2ecbce4 100644 --- a/src/content/drinks/irish-maid.md +++ b/src/content/drinks/irish-maid.md @@ -3,7 +3,6 @@ title: Irish Maid meta_title: Irish Maid author: Reed Nelson draft: false -description: Irish Maid recipe. cover: "@assets/drinks/irish-maid.jpg" spirits: [whiskey] diff --git a/src/content/drinks/kentucky-maid.md b/src/content/drinks/kentucky-maid.md index d3c757d..32b2462 100644 --- a/src/content/drinks/kentucky-maid.md +++ b/src/content/drinks/kentucky-maid.md @@ -3,7 +3,6 @@ title: Kentucky Maid meta_title: Kentucky Maid author: Reed Nelson draft: false -description: Kentucky Maid recipe. cover: "@assets/drinks/kentucky-maid.jpg" spirits: [whiskey] diff --git a/src/content/drinks/la-louisiane.md b/src/content/drinks/la-louisiane.md index bad883e..20cd4e7 100644 --- a/src/content/drinks/la-louisiane.md +++ b/src/content/drinks/la-louisiane.md @@ -3,7 +3,6 @@ title: La Louisiane meta_title: La Louisiane author: Reed Nelson draft: false -description: La Louisiane recipe. cover: "@assets/drinks/la-louisiane.jpg" spirits: [whiskey] diff --git a/src/content/drinks/lemon-drop-martini.md b/src/content/drinks/lemon-drop-martini.md index fe079dd..a4da23c 100644 --- a/src/content/drinks/lemon-drop-martini.md +++ b/src/content/drinks/lemon-drop-martini.md @@ -3,7 +3,6 @@ title: Lemon Drop Martini meta_title: Lemon Drop Martini author: Reed Nelson draft: false -description: Lemon Drop Martini recipe. cover: "@assets/drinks/lemon-drop-martini.jpg" spirits: [vodka] diff --git a/src/content/drinks/london-gypsy.md b/src/content/drinks/london-gypsy.md index fe6434c..45f077f 100644 --- a/src/content/drinks/london-gypsy.md +++ b/src/content/drinks/london-gypsy.md @@ -3,7 +3,6 @@ title: London Gypsy meta_title: London Gypsy author: Reed Nelson draft: false -description: London Gypsy recipe. cover: "@assets/drinks/london-gypsy.jpg" spirits: [gin] diff --git a/src/content/drinks/lucien-gaudin.md b/src/content/drinks/lucien-gaudin.md index 7808514..26933e3 100644 --- a/src/content/drinks/lucien-gaudin.md +++ b/src/content/drinks/lucien-gaudin.md @@ -3,7 +3,6 @@ title: Lucien Gaudin meta_title: Lucien Gaudin author: Reed Nelson draft: false -description: Lucien Gaudin recipe. cover: "@assets/drinks/lucien-gaudin.jpg" spirits: [gin] diff --git a/src/content/drinks/manhattan.md b/src/content/drinks/manhattan.md index 84b7fdf..9dad3e4 100644 --- a/src/content/drinks/manhattan.md +++ b/src/content/drinks/manhattan.md @@ -1,7 +1,6 @@ --- title: Manhattan meta_title: Manhattan -description: Manhattan recipe. cover: "@assets/drinks/manhattan.jpg" author: Reed Nelson draft: false diff --git a/src/content/drinks/martinez.md b/src/content/drinks/martinez.md index 9d0f78b..1792ecd 100644 --- a/src/content/drinks/martinez.md +++ b/src/content/drinks/martinez.md @@ -3,7 +3,6 @@ title: Martinez meta_title: Martinez author: Reed Nelson draft: false -description: Martinez recipe. cover: "@assets/drinks/martinez.jpg" spirits: [gin] diff --git a/src/content/drinks/martini.md b/src/content/drinks/martini.md index 21f9752..9fa6de3 100644 --- a/src/content/drinks/martini.md +++ b/src/content/drinks/martini.md @@ -3,7 +3,6 @@ title: Martini meta_title: Martini author: Reed Nelson draft: false -description: Martini recipe. cover: "@assets/drinks/martini.jpg" spirits: [gin] diff --git a/src/content/drinks/mojito.md b/src/content/drinks/mojito.md index e03bb81..2bc77ce 100644 --- a/src/content/drinks/mojito.md +++ b/src/content/drinks/mojito.md @@ -3,7 +3,6 @@ title: Mojito meta_title: Mojito author: Reed Nelson draft: false -description: Mojito recipe. cover: "@assets/drinks/mojito.jpg" spirits: [rum] diff --git a/src/content/drinks/negroni.md b/src/content/drinks/negroni.md index 3840c58..794d448 100644 --- a/src/content/drinks/negroni.md +++ b/src/content/drinks/negroni.md @@ -3,7 +3,6 @@ title: Negroni meta_title: Negroni author: Reed Nelson draft: false -description: Negroni recipe. cover: "@assets/drinks/negroni.jpg" spirits: [gin] diff --git a/src/content/drinks/new-york-sour.md b/src/content/drinks/new-york-sour.md index 717054a..5ad3e51 100644 --- a/src/content/drinks/new-york-sour.md +++ b/src/content/drinks/new-york-sour.md @@ -3,7 +3,6 @@ title: New York Sour meta_title: New York Sour author: Reed Nelson draft: false -description: New York Sour recipe. cover: "@assets/drinks/new-york-sour.jpg" spirits: [whiskey] diff --git a/src/content/drinks/old-fashioned.md b/src/content/drinks/old-fashioned.md index 4b195be..13221fd 100644 --- a/src/content/drinks/old-fashioned.md +++ b/src/content/drinks/old-fashioned.md @@ -3,7 +3,6 @@ title: Old Fashioned meta_title: Old Fashioned author: Reed Nelson draft: false -description: Old Fashioned recipe. cover: "@assets/drinks/old-fashioned.jpg" spirits: [whiskey] diff --git a/src/content/drinks/orange-bite.md b/src/content/drinks/orange-bite.md index 433a224..7053f5e 100644 --- a/src/content/drinks/orange-bite.md +++ b/src/content/drinks/orange-bite.md @@ -3,7 +3,6 @@ title: Orange Bite meta_title: Orange Bite author: Reed Nelson draft: false -description: Orange Bite recipe. cover: "@assets/drinks/orange-bite.jpg" spirits: [gin] diff --git a/src/content/drinks/perfect-manhattan.md b/src/content/drinks/perfect-manhattan.md index 56447e7..ec632d9 100644 --- a/src/content/drinks/perfect-manhattan.md +++ b/src/content/drinks/perfect-manhattan.md @@ -1,7 +1,6 @@ --- title: Perfect Manhattan meta_title: Perfect Manhattan -description: Perfect Manhattan recipe. cover: "@assets/drinks/perfect-manhattan.jpg" author: Reed Nelson draft: false diff --git a/src/content/drinks/pike-bay-special.md b/src/content/drinks/pike-bay-special.md index 26fe5a9..7fa9ba8 100644 --- a/src/content/drinks/pike-bay-special.md +++ b/src/content/drinks/pike-bay-special.md @@ -3,7 +3,6 @@ title: Pike Bay Special meta_title: Pike Bay Special author: Reed Nelson draft: false -description: Pike Bay Special recipe. cover: "@assets/drinks/pike-bay-special.jpg" spirits: [vodka] diff --git a/src/content/drinks/raspberry-martini.md b/src/content/drinks/raspberry-martini.md index 0162de8..6695c91 100644 --- a/src/content/drinks/raspberry-martini.md +++ b/src/content/drinks/raspberry-martini.md @@ -3,7 +3,6 @@ title: Raspberry Martini meta_title: Raspberry Martini author: Reed Nelson draft: false -description: Raspberry Martini recipe. cover: "@assets/drinks/raspberry-martini.jpg" spirits: [vodka] diff --git a/src/content/drinks/raspberryy-cocktail.md b/src/content/drinks/raspberryy-cocktail.md index f3a41da..e8da2e9 100644 --- a/src/content/drinks/raspberryy-cocktail.md +++ b/src/content/drinks/raspberryy-cocktail.md @@ -3,7 +3,6 @@ title: Raspberryy Cocktail meta_title: Raspberryy Cocktail author: Reed Nelson draft: false -description: Raspberryy Cocktail recipe. cover: "@assets/drinks/raspberryy-cocktail.jpg" spirits: [whiskey] diff --git a/src/content/drinks/rosemary-gin-fizz.md b/src/content/drinks/rosemary-gin-fizz.md index bd2989e..26d96ab 100644 --- a/src/content/drinks/rosemary-gin-fizz.md +++ b/src/content/drinks/rosemary-gin-fizz.md @@ -3,7 +3,6 @@ title: Rosemary Gin Fizz meta_title: Rosemary Gin Fizz author: Reed Nelson draft: false -description: Rosemary Gin Fizz recipe. cover: "@assets/drinks/rosemary-gin-fizz.jpg" spirits: [gin] diff --git a/src/content/drinks/rosemary-sour.md b/src/content/drinks/rosemary-sour.md index c59b35f..d686b2f 100644 --- a/src/content/drinks/rosemary-sour.md +++ b/src/content/drinks/rosemary-sour.md @@ -3,7 +3,6 @@ title: Rosemary Sour meta_title: Rosemary Sour author: Reed Nelson draft: false -description: Rosemary Sour recipe. cover: "@assets/drinks/rosemary-sour.jpg" spirits: [whiskey] diff --git a/src/content/drinks/sazerac.md b/src/content/drinks/sazerac.md index 1a38a53..d256629 100644 --- a/src/content/drinks/sazerac.md +++ b/src/content/drinks/sazerac.md @@ -3,7 +3,6 @@ title: Sazerac meta_title: Sazerac author: Reed Nelson draft: false -description: Sazerac recipe. cover: "@assets/drinks/sazerac.jpg" spirits: [whiskey, cognac] diff --git a/src/content/drinks/stormy-morning.md b/src/content/drinks/stormy-morning.md index eb0abc2..75d545d 100644 --- a/src/content/drinks/stormy-morning.md +++ b/src/content/drinks/stormy-morning.md @@ -3,7 +3,6 @@ title: Stormy Morning meta_title: Stormy Morning author: Reed Nelson draft: false -description: Stormy Morning recipe. cover: "@assets/drinks/stormy-morning.jpg" spirits: [] diff --git a/src/content/drinks/tom-collins.md b/src/content/drinks/tom-collins.md index 091a23f..ff16edb 100644 --- a/src/content/drinks/tom-collins.md +++ b/src/content/drinks/tom-collins.md @@ -3,7 +3,6 @@ title: Tom Collins meta_title: Tom Collins author: Reed Nelson draft: false -description: Tom Collins recipe. cover: "@assets/drinks/tom-collins.jpg" spirits: [gin] diff --git a/src/content/drinks/trinidad-sour.md b/src/content/drinks/trinidad-sour.md index 8076e77..751ddb1 100644 --- a/src/content/drinks/trinidad-sour.md +++ b/src/content/drinks/trinidad-sour.md @@ -3,7 +3,6 @@ title: Trinidad Sour meta_title: Trinidad Sour author: Reed Nelson draft: false -description: Trinidad Sour recipe. cover: "@assets/drinks/trinidad-sour.jpg" spirits: [whiskey] diff --git a/src/content/drinks/vieux-carre.md b/src/content/drinks/vieux-carre.md index 3ee60d7..05997bf 100644 --- a/src/content/drinks/vieux-carre.md +++ b/src/content/drinks/vieux-carre.md @@ -3,7 +3,6 @@ title: Vieux Carré meta_title: Vieux Carré author: Reed Nelson draft: false -description: Carré recipe. cover: "@assets/drinks/vieux-carre.jpg" spirits: [whiskey, cognac] diff --git a/src/content/drinks/watermelon-martini.md b/src/content/drinks/watermelon-martini.md index 839d12a..b0199f4 100644 --- a/src/content/drinks/watermelon-martini.md +++ b/src/content/drinks/watermelon-martini.md @@ -3,7 +3,6 @@ title: Watermelon Martini meta_title: Watermelon Martini author: Reed Nelson draft: false -description: Watermelon Martini recipe. cover: "@assets/drinks/watermelon-martini.jpg" spirits: [vodka] diff --git a/src/content/drinks/whiskey-daisy.md b/src/content/drinks/whiskey-daisy.md index 84d5a33..89772bf 100644 --- a/src/content/drinks/whiskey-daisy.md +++ b/src/content/drinks/whiskey-daisy.md @@ -3,7 +3,6 @@ title: Whiskey Daisy meta_title: Whiskey Daisy author: Reed Nelson draft: false -description: Whiskey Daisy recipe. cover: "@assets/drinks/whiskey-daisy.jpg" spirits: [whiskey] diff --git a/src/content/drinks/whiskey-smash.md b/src/content/drinks/whiskey-smash.md index 6fff151..0ba2c42 100644 --- a/src/content/drinks/whiskey-smash.md +++ b/src/content/drinks/whiskey-smash.md @@ -3,7 +3,6 @@ title: Whiskey Smash meta_title: Whiskey Smash author: Reed Nelson draft: false -description: Whiskey Smash recipe. cover: "@assets/drinks/whiskey-smash.jpg" spirits: [whiskey] diff --git a/src/content/drinks/whiskey-sour.md b/src/content/drinks/whiskey-sour.md index 133251b..7320abf 100644 --- a/src/content/drinks/whiskey-sour.md +++ b/src/content/drinks/whiskey-sour.md @@ -3,7 +3,6 @@ title: Whiskey Sour meta_title: Whiskey Sour author: Reed Nelson draft: false -description: Whiskey Sour recipe. cover: "@assets/drinks/whiskey-sour.jpg" spirits: [Whiskey] diff --git a/src/content/drinks/wisconsin-old-fashioned.md b/src/content/drinks/wisconsin-old-fashioned.md index d3d589c..8ec02c7 100644 --- a/src/content/drinks/wisconsin-old-fashioned.md +++ b/src/content/drinks/wisconsin-old-fashioned.md @@ -3,7 +3,6 @@ title: Wisconsin Old Fashioned meta_title: Wisconsin Old Fashioned author: Reed Nelson draft: false -description: Wisconsin Old Fashioned recipe. cover: "@assets/drinks/wisconsin-old-fashioned.jpg" spirits: [brandy] diff --git a/src/content/food/punch-salad.md b/src/content/food/punch-salad.md index a3ce781..0f70d8b 100644 --- a/src/content/food/punch-salad.md +++ b/src/content/food/punch-salad.md @@ -8,7 +8,7 @@ cover: "@assets/food/punch-salad.jpg" author: Reed Nelson prep_time: 15 servings: 2 -diet: Vegetarian +diet: Vegetarian, GF ingredients: list: diff --git a/src/layouts/DrinkSingle.astro b/src/layouts/DrinkSingle.astro index ace835d..97cc7a2 100644 --- a/src/layouts/DrinkSingle.astro +++ b/src/layouts/DrinkSingle.astro @@ -4,6 +4,7 @@ import Share from "@/components/Share.astro"; import config from "@/config/config.json"; import { getSinglePage } from "@/lib/contentParser.astro"; import similerItems from "@/lib/utils/similarItems"; +import { markdownify } from "@/lib/utils/textConverter"; import { Image } from "astro:assets"; interface Recipe { @@ -12,6 +13,7 @@ interface Recipe { qty: string[]; }; instructions: string[]; + notes: string[]; } const { drink_folder } = config.settings; @@ -19,12 +21,12 @@ const posts = await getSinglePage(drink_folder); const { post } = Astro.props; const similarPosts = similerItems(post, posts, post.slug); const { title, description, cover, spirits, bottles, tags } = post.data; -const { ingredients, instructions }: Recipe = post.data; +const { ingredients, instructions, notes }: Recipe = post.data; // alphabetize -spirits.sort((a: string, b: string) => a.localeCompare(b)); -bottles.sort((a: string, b: string) => a.localeCompare(b)); -tags.sort((a: string, b: string) => a.localeCompare(b)); +{ spirits && spirits.sort((a: string, b: string) => a.localeCompare(b)) } +{ bottles && bottles.sort((a: string, b: string) => a.localeCompare(b)) } +{ tags && tags.sort((a: string, b: string) => a.localeCompare(b)) } ---
@@ -48,74 +50,68 @@ tags.sort((a: string, b: string) => a.localeCompare(b)); ) } - +
-

+

    - { - spirits.length > 0 && ( -
    -
  • - { - spirits.map((spirit: string, index: number) => ( - - {spirit} - - )) - } -
    • - {bottles.length > 0 || tags.length > 0 ?
    : null} -
    - ) - } + { spirits && ( +
    +
  • + { spirits.map((spirit: string, index: number) => ( + + {spirit} + + ))} +
    • +
    + )}
    - { - bottles.length > 0 && ( -
    -
  • - { - bottles.map((bottle: string, index: number) => ( - - {bottle} - - )) - } -
    • - {tags.length > 0 ?
    : null} -
    - ) - } + { bottles && ( +
    +
  • + { bottles.map((bottle: string, index: number) => ( + + {bottle} + + ))} +
    • +
    + )}
    - { - tags.length > 0 && ( -
  • - { - tags.map((tag: string, index: number) => ( - - {tag} - - )) - } -
    • - ) - } + { tags && ( +
  • + { tags.map((tag: string, index: number) => ( + + {tag} + + ))} +
    • + )}
+ { description && ( +
+ {spirits || bottles || tags ?
: null} +
+
+
+
+ )}

@@ -162,6 +158,29 @@ tags.sort((a: string, b: string) => a.localeCompare(b));
+ + { notes && notes.length > 0 && ( +
+
+
+
+

+
+ {notes.map((it: string, index: number) => ( +
+
+ {it} +
+
+
+ ))} +
+

+
+
+
+ )} +
-
- - {humanize(author)} -
+ { author && ( +
+ + {humanize(author)} +
+ )} - {prep_time && ( + { prep_time && (
{prep_time + " minutes"}
)} - {servings && ( + { servings && (
{servings === 1 ? "1 serving" : servings + " servings"}
)} - {diet && ( + { diet && (
{diet}
)} -
-
-
-
+ { description && ( +
+ {author || prep_time || servings || diet ?
: null} +
+
+
+
+ )}
@@ -95,15 +101,13 @@ const { ingredients, instructions, notes }: Recipe = post.data;

- { - ingredients.list.map((it: string, index: number) => ( -
-
-
-
-
- )) - } + { ingredients.list.map((it: string, index: number) => ( +
+
+
+
+
+ ))}
diff --git a/src/lib/utils/similarItems.ts b/src/lib/utils/similarItems.ts index 0134853..8a42b5f 100644 --- a/src/lib/utils/similarItems.ts +++ b/src/lib/utils/similarItems.ts @@ -67,9 +67,12 @@ const similerItems = (currentItem: any, allItems: any, slug: string) => { // sort items by number of instances const sortedItems = filterBySlug.sort((a: any, b: any) => itemCount[b.slug] - itemCount[a.slug]); + // remove items with fewer than 2 instances + const filteredItems = sortedItems.filter((item: any) => itemCount[item.slug] > 1); + // remove duplicates - const uniqueItems = [...new Set(sortedItems.map((item: any) => item.slug))].map((slug: string) => { - return sortedItems.find((item: any) => item.slug === slug); + const uniqueItems = [...new Set(filteredItems.map((item: any) => item.slug))].map((slug: string) => { + return filteredItems.find((item: any) => item.slug === slug); }); return uniqueItems; From aea7dbe76a1ea3d953f125b57ee6fa3707679b79 Mon Sep 17 00:00:00 2001 From: Reed Nelson Date: Tue, 5 Dec 2023 13:02:14 -0600 Subject: [PATCH 2/5] rescheme metatitle and draft --- src/content/about/-index.md | 2 -- src/content/blog/-index.md | 1 - src/content/blog/crypto.md | 1 - src/content/blog/debruijn.md | 1 - src/content/blog/dh.md | 1 - src/content/blog/dharma.md | 1 - src/content/blog/drinks.md | 1 - src/content/blog/huffman.md | 1 - src/content/blog/language.md | 1 - src/content/blog/love.md | 1 - src/content/blog/microbiome.md | 1 - src/content/blog/phenomenology.md | 1 - src/content/blog/power.md | 1 - src/content/blog/rsa.md | 1 - src/content/config.ts | 12 ++++-------- src/content/conversation/-index.md | 2 -- src/content/drinks/-index.md | 1 - src/content/drinks/_drink.md | 9 +++++---- src/content/drinks/amaretto-sour.md | 4 ---- src/content/drinks/appler.md | 4 ---- src/content/drinks/aviation.md | 4 ---- src/content/drinks/basilica.md | 4 ---- src/content/drinks/berlin.md | 4 ---- src/content/drinks/berry-smoothie.md | 4 ---- src/content/drinks/boulevardier.md | 4 ---- src/content/drinks/bourbon-bash.md | 4 ---- src/content/drinks/clark-old-fashioned.md | 4 ---- src/content/drinks/cosmopolitan.md | 4 ---- src/content/drinks/cucumber-martini.md | 4 ---- src/content/drinks/elderflower-martini.md | 4 ---- src/content/drinks/floradora.md | 4 ---- src/content/drinks/gin-buck.md | 4 ---- src/content/drinks/gin-gin-mule.md | 4 ---- src/content/drinks/hotel-georgia.md | 4 ---- src/content/drinks/improved-japanese-cocktail.md | 4 ---- src/content/drinks/improved-whiskey-cocktail.md | 4 ---- src/content/drinks/irish-maid.md | 4 ---- src/content/drinks/kentucky-maid.md | 4 ---- src/content/drinks/la-louisiane.md | 4 ---- src/content/drinks/lemon-drop-martini.md | 4 ---- src/content/drinks/london-gypsy.md | 4 ---- src/content/drinks/lucien-gaudin.md | 4 ---- src/content/drinks/manhattan.md | 4 ---- src/content/drinks/martinez.md | 4 ---- src/content/drinks/martini.md | 4 ---- src/content/drinks/mojito.md | 4 ---- src/content/drinks/negroni.md | 3 --- src/content/drinks/new-york-sour.md | 4 ---- src/content/drinks/old-fashioned.md | 4 ---- src/content/drinks/orange-bite.md | 4 ---- src/content/drinks/perfect-manhattan.md | 4 ---- src/content/drinks/pike-bay-special.md | 4 ---- src/content/drinks/raspberry-martini.md | 4 ---- src/content/drinks/raspberryy-cocktail.md | 4 ---- src/content/drinks/rosemary-gin-fizz.md | 4 ---- src/content/drinks/rosemary-sour.md | 4 ---- src/content/drinks/sazerac.md | 4 ---- src/content/drinks/stormy-morning.md | 4 ---- src/content/drinks/tom-collins.md | 4 ---- src/content/drinks/trinidad-sour.md | 4 ---- src/content/drinks/vieux-carre.md | 4 ---- src/content/drinks/watermelon-martini.md | 4 ---- src/content/drinks/whiskey-daisy.md | 4 ---- src/content/drinks/whiskey-smash.md | 4 ---- src/content/drinks/whiskey-sour.md | 4 ---- src/content/drinks/wisconsin-old-fashioned.md | 4 ---- src/content/food/-index.md | 1 - src/content/food/_food.md | 8 +++----- src/content/food/banana-bread.md | 1 - src/content/food/blt.md | 3 --- src/content/food/bruschetta.md | 3 --- src/content/food/fish-tacos.md | 3 --- src/content/food/granola.md | 2 -- src/content/food/guacamole.md | 3 --- src/content/food/margherita-pizza.md | 3 --- src/content/food/pad-thai.md | 3 --- src/content/food/pesto-flatbread.md | 3 --- src/content/food/pierogis.md | 3 --- src/content/food/punch-salad.md | 3 --- src/content/food/tofu-burritos.md | 3 --- src/content/homepage/-index.md | 1 - src/content/projects/-index.md | 1 - src/content/puzzles/-index.md | 1 - src/content/puzzles/action-riddles.md | 2 -- src/content/puzzles/conventional-riddles.md | 2 -- src/content/puzzles/low-grade-riddles.md | 2 -- src/content/puzzles/number-theory.md | 2 -- src/content/puzzles/situation-riddles.md | 2 -- src/content/puzzles/what-am-i-riddles.md | 2 -- src/content/terms/-index.md | 2 -- src/layouts/Base.astro | 9 ++++----- src/pages/404.astro | 2 +- src/pages/about.astro | 5 ++--- src/pages/blog/[single].astro | 5 ++--- src/pages/blog/categories/[category].astro | 2 +- src/pages/blog/categories/index.astro | 2 +- src/pages/blog/index.astro | 3 +-- src/pages/blog/page/[slug].astro | 3 +-- src/pages/blog/tags/[tag].astro | 2 +- src/pages/blog/tags/index.astro | 2 +- src/pages/conversation.astro | 5 ++--- src/pages/drinks/[single].astro | 5 ++--- src/pages/drinks/bottles/[bottle].astro | 2 +- src/pages/drinks/bottles/index.astro | 2 +- src/pages/drinks/index.astro | 3 +-- src/pages/drinks/page/[slug].astro | 3 +-- src/pages/drinks/spirits/[spirit].astro | 2 +- src/pages/drinks/spirits/index.astro | 2 +- src/pages/drinks/tags/[tag].astro | 2 +- src/pages/drinks/tags/index.astro | 2 +- src/pages/food/[single].astro | 5 ++--- src/pages/food/index.astro | 3 +-- src/pages/food/page/[slug].astro | 3 +-- src/pages/index.astro | 5 ++--- src/pages/projects.astro | 6 ++---- src/pages/puzzles/[single].astro | 5 ++--- src/pages/puzzles/index.astro | 3 +-- src/pages/search.astro | 2 +- src/pages/terms.astro | 5 ++--- 119 files changed, 53 insertions(+), 336 deletions(-) diff --git a/src/content/about/-index.md b/src/content/about/-index.md index ff0fd19..7dfed8a 100644 --- a/src/content/about/-index.md +++ b/src/content/about/-index.md @@ -1,8 +1,6 @@ --- title: About -meta_title: About description: About Reed Nelson. -draft: false --- I am a software engineer at Infinite Campus, and a graduate of UW-Madison with a BS in Computer Science, Mathematics, and Philosophy. Previously, I worked in the [Solís-Lemus Lab](https://solislemuslab.github.io/) at the Wisconsin Institute for Discovery, developing MiNAA: Microbial Network Alignment Algorithm. diff --git a/src/content/blog/-index.md b/src/content/blog/-index.md index 8d15760..b3a1498 100755 --- a/src/content/blog/-index.md +++ b/src/content/blog/-index.md @@ -1,5 +1,4 @@ --- title: Blog Posts -meta_title: Blog description: Reed Nelson's blog. --- diff --git a/src/content/blog/crypto.md b/src/content/blog/crypto.md index 06e551b..7272f97 100644 --- a/src/content/blog/crypto.md +++ b/src/content/blog/crypto.md @@ -1,6 +1,5 @@ --- title: Cryptography -meta_title: Cryptography description: none date: 2022-08-30T05:00:00Z categories: [Cryptography] diff --git a/src/content/blog/debruijn.md b/src/content/blog/debruijn.md index 4b110bc..e76a7be 100644 --- a/src/content/blog/debruijn.md +++ b/src/content/blog/debruijn.md @@ -1,6 +1,5 @@ --- title: De Bruijn Sequences -meta_title: De Bruijn Sequences description: De Bruijn sequences make up a niche topic at an intersection of graph theory and combinatorics. We will discuss some of the properties of these sequences, and their surprising applications. date: 2021-05-05T06:00:00Z categories: [Mathematics] diff --git a/src/content/blog/dh.md b/src/content/blog/dh.md index 79082aa..8ad2a23 100644 --- a/src/content/blog/dh.md +++ b/src/content/blog/dh.md @@ -1,6 +1,5 @@ --- title: Diffie Hellman -meta_title: Diffie Hellman description: none date: 2022-07-10T05:00:00Z categories: [Cryptography] diff --git a/src/content/blog/dharma.md b/src/content/blog/dharma.md index e4e1b0b..833c0c8 100644 --- a/src/content/blog/dharma.md +++ b/src/content/blog/dharma.md @@ -1,6 +1,5 @@ --- title: A Theory on Dharma -meta_title: A Theory on Dharma description: Who are you meant to be? Is that who you are? How can you become that person? We discuss an actionable guide to answering these questions, which is based on the teachings of the Bhagavad Gita. date: 2020-10-10T05:00:00Z categories: [Philosophy] diff --git a/src/content/blog/drinks.md b/src/content/blog/drinks.md index 193a5fb..27deaab 100644 --- a/src/content/blog/drinks.md +++ b/src/content/blog/drinks.md @@ -1,6 +1,5 @@ --- title: On Drinks -meta_title: On Drinks description: yeah date: 2023-08-21T05:00:00Z author: Reed Nelson diff --git a/src/content/blog/huffman.md b/src/content/blog/huffman.md index 2c2fec5..c46347f 100644 --- a/src/content/blog/huffman.md +++ b/src/content/blog/huffman.md @@ -1,6 +1,5 @@ --- title: Huffman Compression -meta_title: Huffman Compression description: Data compression is a process of modifying the representation of some information so that it can be stored using less data. We discuss how information is quantified (entropy), and a simple, speedy, and greedy compression algorithm (the Huffman Coding). date: 2022-06-30T05:00:00Z categories: [Cryptography] diff --git a/src/content/blog/language.md b/src/content/blog/language.md index 29c336b..4be1441 100644 --- a/src/content/blog/language.md +++ b/src/content/blog/language.md @@ -1,6 +1,5 @@ --- title: Topics in Language and Meaning -meta_title: Topics in Language and Meaning description: This post is a crash course on the introductory topics in the Philosophy of Language and Meaning. If you're a natural language speaker, then in a sense, you're already an expert on these topics! date: 2021-04-04T05:00:00Z categories: [Philosophy] diff --git a/src/content/blog/love.md b/src/content/blog/love.md index 31fab5b..3410eb3 100644 --- a/src/content/blog/love.md +++ b/src/content/blog/love.md @@ -1,6 +1,5 @@ --- title: The Psychology of Love -meta_title: The Psychology of Love description: In this post, we discuss a General Theory of Love, which makes bold and uplifting claims about the power of the emotional mind. Whether or not the theory is completely true, there are valuable ideas to be gleaned. date: 2020-02-14T05:00:00Z categories: [Psychology] diff --git a/src/content/blog/microbiome.md b/src/content/blog/microbiome.md index 13a7257..2e46bd6 100644 --- a/src/content/blog/microbiome.md +++ b/src/content/blog/microbiome.md @@ -1,6 +1,5 @@ --- title: Microbiome Network Alignment -meta_title: Microbiome Network Alignment description: none date: 2022-08-15T05:00:00Z categories: [Mathematics] diff --git a/src/content/blog/phenomenology.md b/src/content/blog/phenomenology.md index a82f80c..13bd1fc 100644 --- a/src/content/blog/phenomenology.md +++ b/src/content/blog/phenomenology.md @@ -1,6 +1,5 @@ --- title: Artificial Consciousness and Phenomenology -meta_title: Artificial Consciousness and Phenomenology description: I believe that with a phenomenological examination of human consciousness and experience, we stand to better express what is necessary for a true, human-level artificial consciousness. date: 2022-04-07T05:00:00Z categories: [Philosophy] diff --git a/src/content/blog/power.md b/src/content/blog/power.md index 241555a..723bc28 100644 --- a/src/content/blog/power.md +++ b/src/content/blog/power.md @@ -1,6 +1,5 @@ --- title: The Will to Power -meta_title: The Will to Power description: Friedrich Nietzsche is one of the most significant philosophers of all time. Here we discuss Nietzsche's invigorating and liberating philosophy for living. date: 2021-09-25T05:00:00Z categories: [Philosophy] diff --git a/src/content/blog/rsa.md b/src/content/blog/rsa.md index e49d0c3..7e66432 100644 --- a/src/content/blog/rsa.md +++ b/src/content/blog/rsa.md @@ -1,6 +1,5 @@ --- title: RSA Encryption -meta_title: RSA Encryption description: You use the RSA encryption scheme every day. It's simple enough to understand, but quite powerful. In this post, we discuss the basics of ciphersystems, public key encryption, and why RSA works so well. date: 2022-06-10T05:00:00Z categories: [Cryptography] diff --git a/src/content/config.ts b/src/content/config.ts index 2ec11f7..97df19f 100755 --- a/src/content/config.ts +++ b/src/content/config.ts @@ -4,14 +4,13 @@ import { defineCollection, z } from "astro:content"; const blogCollection = defineCollection({ schema: z.object({ title: z.string(), - meta_title: z.string().optional(), description: z.string().optional(), date: z.date().optional(), author: z.string().default("Reed Nelson"), categories: z.array(z.string()).default(["none"]), tags: z.array(z.string()).default(["none"]), complexity: z.number().default(1), - draft: z.boolean().optional(), + draft: z.boolean().default(false), }), }); @@ -19,7 +18,6 @@ const blogCollection = defineCollection({ const drinkCollection = defineCollection({ schema: ({ image }) => z.object({ title: z.string(), - meta_title: z.string().optional(), description: z.string().optional(), date: z.date().optional(), cover: image().optional(), @@ -27,7 +25,7 @@ const drinkCollection = defineCollection({ spirits: z.array(z.string()).optional(), bottles: z.array(z.string()).optional(), tags: z.array(z.string()).optional(), - draft: z.boolean().optional(), + draft: z.boolean().default(false), ingredients: z.object({ list: z.array(z.string()).optional(), qty: z.array(z.string()).optional(), @@ -41,12 +39,11 @@ const drinkCollection = defineCollection({ const foodCollection = defineCollection({ schema: ({ image }) => z.object({ title: z.string(), - meta_title: z.string().optional(), description: z.string().optional(), date: z.date().optional(), cover: image().optional(), author: z.string().optional(), - draft: z.boolean().optional(), + draft: z.boolean().default(false), prep_time: z.number().optional(), servings: z.number().optional(), diet: z.string().optional(), @@ -63,9 +60,8 @@ const foodCollection = defineCollection({ const puzzleCollection = defineCollection({ schema: z.object({ title: z.string(), - meta_title: z.string().optional(), description: z.string().optional(), - draft: z.boolean().optional(), + draft: z.boolean().default(false), }), }); diff --git a/src/content/conversation/-index.md b/src/content/conversation/-index.md index 6690d64..6a9f698 100644 --- a/src/content/conversation/-index.md +++ b/src/content/conversation/-index.md @@ -1,8 +1,6 @@ --- title: Conversation Cards -meta_title: Conversation Cards description: I made a set of conversation cards so you don't have to buy one. -draft: false cards: - What was your first impression of me? What surprised you after getting to know me? diff --git a/src/content/drinks/-index.md b/src/content/drinks/-index.md index ded8775..78bbc4a 100644 --- a/src/content/drinks/-index.md +++ b/src/content/drinks/-index.md @@ -1,6 +1,5 @@ --- title: Drinks -meta_title: Drinks description: A selection of good cocktails. # SPIRITS: whiskey, gin, vodka, brandy, cognac, rum, tequila diff --git a/src/content/drinks/_drink.md b/src/content/drinks/_drink.md index a07b7f4..f88bbed 100644 --- a/src/content/drinks/_drink.md +++ b/src/content/drinks/_drink.md @@ -1,11 +1,9 @@ --- title: Drink -meta_title: Drink -author: Reed Nelson +author: "" draft: true cover: "@assets/drinks/.jpg" - -description: recipe. +description: "" spirits: [spirit] bottles: [bottle] tags: [tag] @@ -18,4 +16,7 @@ ingredients: instructions: - Step + +notes: + - Note --- diff --git a/src/content/drinks/amaretto-sour.md b/src/content/drinks/amaretto-sour.md index 8e71510..8777592 100644 --- a/src/content/drinks/amaretto-sour.md +++ b/src/content/drinks/amaretto-sour.md @@ -1,10 +1,6 @@ --- title: Amaretto Sour -meta_title: Amaretto Sour -author: Reed Nelson -draft: false cover: "@assets/drinks/amaretto-sour.jpg" - spirits: [whiskey] bottles: [amaretto] tags: [creamy] diff --git a/src/content/drinks/appler.md b/src/content/drinks/appler.md index 6172ff4..c91104c 100644 --- a/src/content/drinks/appler.md +++ b/src/content/drinks/appler.md @@ -1,10 +1,6 @@ --- title: Appler? I hardly know her! -meta_title: Appler? I hardly know her! -author: Reed Nelson -draft: false cover: "@assets/drinks/appler.jpg" - spirits: [whiskey] bottles: [] tags: [crisp, fruity] diff --git a/src/content/drinks/aviation.md b/src/content/drinks/aviation.md index 86b3090..aa2d9b9 100644 --- a/src/content/drinks/aviation.md +++ b/src/content/drinks/aviation.md @@ -1,10 +1,6 @@ --- title: Aviation -meta_title: Aviation -author: Reed Nelson -draft: false cover: "@assets/drinks/aviation.jpg" - spirits: [gin] bottles: [creme-de-violette, maraschino] tags: [citrusy] diff --git a/src/content/drinks/basilica.md b/src/content/drinks/basilica.md index 93cf525..b5d877a 100644 --- a/src/content/drinks/basilica.md +++ b/src/content/drinks/basilica.md @@ -1,10 +1,6 @@ --- title: Basilica -meta_title: Basilica -author: Reed Nelson -draft: false cover: "@assets/drinks/basilica.jpg" - spirits: [gin] bottles: [ango, st-germain] tags: [herbacious, floral] diff --git a/src/content/drinks/berlin.md b/src/content/drinks/berlin.md index 8abcbed..c52786b 100644 --- a/src/content/drinks/berlin.md +++ b/src/content/drinks/berlin.md @@ -1,10 +1,6 @@ --- title: Berlin -meta_title: Berlin -author: Reed Nelson -draft: false cover: "@assets/drinks/berlin.jpg" - spirits: [whiskey] bottles: [sweet-vermouth, benedictine] tags: [spirit-forward, bold] diff --git a/src/content/drinks/berry-smoothie.md b/src/content/drinks/berry-smoothie.md index 0362236..20f3e8c 100644 --- a/src/content/drinks/berry-smoothie.md +++ b/src/content/drinks/berry-smoothie.md @@ -1,10 +1,6 @@ --- title: Berry Smoothie -meta_title: Berry Smoothie -author: Reed Nelson -draft: false cover: "@assets/drinks/berry-smoothie.jpg" - spirits: [] bottles: [almande] tags: [light, creamy] diff --git a/src/content/drinks/boulevardier.md b/src/content/drinks/boulevardier.md index 90aa948..297be58 100644 --- a/src/content/drinks/boulevardier.md +++ b/src/content/drinks/boulevardier.md @@ -1,10 +1,6 @@ --- title: Boulevardier -meta_title: Boulevardier -author: Reed Nelson -draft: false cover: "@assets/drinks/boulevardier.jpg" - spirits: [whiskey] bottles: [sweet-vermouth, campari] tags: [classic, bold, bitter] diff --git a/src/content/drinks/bourbon-bash.md b/src/content/drinks/bourbon-bash.md index fb8c55e..e01a33a 100644 --- a/src/content/drinks/bourbon-bash.md +++ b/src/content/drinks/bourbon-bash.md @@ -1,10 +1,6 @@ --- title: Bourbon Bash -meta_title: Bourbon Bash -author: Reed Nelson -draft: false cover: "@assets/drinks/bourbon-bash.jpg" - spirits: [whiskey] bottles: [] tags: [citrusy] diff --git a/src/content/drinks/clark-old-fashioned.md b/src/content/drinks/clark-old-fashioned.md index f06453f..b970745 100644 --- a/src/content/drinks/clark-old-fashioned.md +++ b/src/content/drinks/clark-old-fashioned.md @@ -1,10 +1,6 @@ --- title: Clark Old Fashioned -meta_title: Clark Old Fashioned -author: Reed Nelson -draft: false cover: "@assets/drinks/clark-old-fashioned.jpg" - spirits: [brandy] bottles: [ango] tags: [sweet] diff --git a/src/content/drinks/cosmopolitan.md b/src/content/drinks/cosmopolitan.md index 5193a8b..b43d597 100644 --- a/src/content/drinks/cosmopolitan.md +++ b/src/content/drinks/cosmopolitan.md @@ -1,10 +1,6 @@ --- title: Cosmopolitan -meta_title: Cosmopolitan -author: Reed Nelson -draft: false cover: "@assets/drinks/cosmopolitan.jpg" - spirits: [vodka] bottles: [cointreau] tags: [classic, sweet, citrusy] diff --git a/src/content/drinks/cucumber-martini.md b/src/content/drinks/cucumber-martini.md index 906a234..7bafacb 100644 --- a/src/content/drinks/cucumber-martini.md +++ b/src/content/drinks/cucumber-martini.md @@ -1,10 +1,6 @@ --- title: Cucumber Martini -meta_title: Cucumber Martini -author: Reed Nelson -draft: false cover: "@assets/drinks/cucumber-martini.jpg" - spirits: [vodka] bottles: [] tags: [mellow, sweet] diff --git a/src/content/drinks/elderflower-martini.md b/src/content/drinks/elderflower-martini.md index 0cb0460..de13137 100644 --- a/src/content/drinks/elderflower-martini.md +++ b/src/content/drinks/elderflower-martini.md @@ -1,10 +1,6 @@ --- title: Elderflower Martini -meta_title: Elderflower Martini -author: Reed Nelson -draft: false cover: "@assets/drinks/elderflower-martini.jpg" - spirits: [vodka] bottles: [st-germain] tags: [floral] diff --git a/src/content/drinks/floradora.md b/src/content/drinks/floradora.md index 5d2f280..1dc6264 100644 --- a/src/content/drinks/floradora.md +++ b/src/content/drinks/floradora.md @@ -1,10 +1,6 @@ --- title: Floradora -meta_title: Floradora -author: Reed Nelson -draft: false cover: "@assets/drinks/floradora.jpg" - spirits: [gin] bottles: [] tags: [bubbly] diff --git a/src/content/drinks/gin-buck.md b/src/content/drinks/gin-buck.md index 70a70c2..2ad7ec7 100644 --- a/src/content/drinks/gin-buck.md +++ b/src/content/drinks/gin-buck.md @@ -1,10 +1,6 @@ --- title: Gin Buck -meta_title: Gin Buck -author: Reed Nelson -draft: false cover: "@assets/drinks/gin-buck.jpg" - spirits: [Gin] bottles: [] tags: [bubbly, crisp, citrusy] diff --git a/src/content/drinks/gin-gin-mule.md b/src/content/drinks/gin-gin-mule.md index 32e3df1..aaa05fb 100644 --- a/src/content/drinks/gin-gin-mule.md +++ b/src/content/drinks/gin-gin-mule.md @@ -1,10 +1,6 @@ --- title: Gin Gin Mule -meta_title: Gin Gin Mule -author: Reed Nelson -draft: false cover: "@assets/drinks/gin-gin-mule.jpg" - spirits: [Gin] bottles: [] tags: [bubbly, crisp, citrusy] diff --git a/src/content/drinks/hotel-georgia.md b/src/content/drinks/hotel-georgia.md index 82ede06..ff61798 100644 --- a/src/content/drinks/hotel-georgia.md +++ b/src/content/drinks/hotel-georgia.md @@ -1,10 +1,6 @@ --- title: Hotel Georgia -meta_title: Hotel Georgia -author: Reed Nelson -draft: false cover: "@assets/drinks/hotel-georgia.jpg" - spirits: [gin] bottles: [] tags: [citrusy] diff --git a/src/content/drinks/improved-japanese-cocktail.md b/src/content/drinks/improved-japanese-cocktail.md index 24857e1..3a9154b 100644 --- a/src/content/drinks/improved-japanese-cocktail.md +++ b/src/content/drinks/improved-japanese-cocktail.md @@ -1,10 +1,6 @@ --- title: Improved Japanese Cocktail -meta_title: Improved Japanese Cocktail -author: Reed Nelson -draft: false cover: "@assets/drinks/improved-japanese-cocktail.jpg" - spirits: [brandy] bottles: [peychauds] tags: [] diff --git a/src/content/drinks/improved-whiskey-cocktail.md b/src/content/drinks/improved-whiskey-cocktail.md index 2cdf2d7..21d313f 100644 --- a/src/content/drinks/improved-whiskey-cocktail.md +++ b/src/content/drinks/improved-whiskey-cocktail.md @@ -1,10 +1,6 @@ --- title: Improved Whiskey Cocktail -meta_title: Improved Whiskey Cocktail -author: Reed Nelson -draft: false cover: "@assets/drinks/improved-whiskey-cocktail.jpg" - spirits: [whiskey] bottles: [maraschino, absinthe] tags: [classic, spirit-forward, bold] diff --git a/src/content/drinks/irish-maid.md b/src/content/drinks/irish-maid.md index 2ecbce4..9b6886e 100644 --- a/src/content/drinks/irish-maid.md +++ b/src/content/drinks/irish-maid.md @@ -1,10 +1,6 @@ --- title: Irish Maid -meta_title: Irish Maid -author: Reed Nelson -draft: false cover: "@assets/drinks/irish-maid.jpg" - spirits: [whiskey] bottles: [] tags: [mellow, sweet] diff --git a/src/content/drinks/kentucky-maid.md b/src/content/drinks/kentucky-maid.md index 32b2462..321d675 100644 --- a/src/content/drinks/kentucky-maid.md +++ b/src/content/drinks/kentucky-maid.md @@ -1,10 +1,6 @@ --- title: Kentucky Maid -meta_title: Kentucky Maid -author: Reed Nelson -draft: false cover: "@assets/drinks/kentucky-maid.jpg" - spirits: [whiskey] bottles: [] tags: [sweet] diff --git a/src/content/drinks/la-louisiane.md b/src/content/drinks/la-louisiane.md index 20cd4e7..819f99e 100644 --- a/src/content/drinks/la-louisiane.md +++ b/src/content/drinks/la-louisiane.md @@ -1,10 +1,6 @@ --- title: La Louisiane -meta_title: La Louisiane -author: Reed Nelson -draft: false cover: "@assets/drinks/la-louisiane.jpg" - spirits: [whiskey] bottles: [peychauds, sweet-vermouth, benedictine, absinthe] tags: [bold] diff --git a/src/content/drinks/lemon-drop-martini.md b/src/content/drinks/lemon-drop-martini.md index a4da23c..2097daa 100644 --- a/src/content/drinks/lemon-drop-martini.md +++ b/src/content/drinks/lemon-drop-martini.md @@ -1,10 +1,6 @@ --- title: Lemon Drop Martini -meta_title: Lemon Drop Martini -author: Reed Nelson -draft: false cover: "@assets/drinks/lemon-drop-martini.jpg" - spirits: [vodka] bottles: [cointreau] tags: [sweet, citrusy] diff --git a/src/content/drinks/london-gypsy.md b/src/content/drinks/london-gypsy.md index 45f077f..9e8f686 100644 --- a/src/content/drinks/london-gypsy.md +++ b/src/content/drinks/london-gypsy.md @@ -1,10 +1,6 @@ --- title: London Gypsy -meta_title: London Gypsy -author: Reed Nelson -draft: false cover: "@assets/drinks/london-gypsy.jpg" - spirits: [gin] bottles: [ango, benedictine] tags: [bold, herbacious] diff --git a/src/content/drinks/lucien-gaudin.md b/src/content/drinks/lucien-gaudin.md index 26933e3..69e0d62 100644 --- a/src/content/drinks/lucien-gaudin.md +++ b/src/content/drinks/lucien-gaudin.md @@ -1,10 +1,6 @@ --- title: Lucien Gaudin -meta_title: Lucien Gaudin -author: Reed Nelson -draft: false cover: "@assets/drinks/lucien-gaudin.jpg" - spirits: [gin] bottles: [dry-vermouth, campari, cointreau] tags: [bold, bitter] diff --git a/src/content/drinks/manhattan.md b/src/content/drinks/manhattan.md index 9dad3e4..55cc5e1 100644 --- a/src/content/drinks/manhattan.md +++ b/src/content/drinks/manhattan.md @@ -1,10 +1,6 @@ --- title: Manhattan -meta_title: Manhattan cover: "@assets/drinks/manhattan.jpg" -author: Reed Nelson -draft: false - spirits: [whiskey] bottles: [sweet-vermouth, ango] tags: [classic, bold] diff --git a/src/content/drinks/martinez.md b/src/content/drinks/martinez.md index 1792ecd..d5e08a3 100644 --- a/src/content/drinks/martinez.md +++ b/src/content/drinks/martinez.md @@ -1,10 +1,6 @@ --- title: Martinez -meta_title: Martinez -author: Reed Nelson -draft: false cover: "@assets/drinks/martinez.jpg" - spirits: [gin] bottles: [ango, sweet-vermouth, maraschino] tags: [Classic, bold] diff --git a/src/content/drinks/martini.md b/src/content/drinks/martini.md index 9fa6de3..a72a905 100644 --- a/src/content/drinks/martini.md +++ b/src/content/drinks/martini.md @@ -1,10 +1,6 @@ --- title: Martini -meta_title: Martini -author: Reed Nelson -draft: false cover: "@assets/drinks/martini.jpg" - spirits: [gin] bottles: [dry-vermouth, orange-bitters] tags: [classic, spirit-forward] diff --git a/src/content/drinks/mojito.md b/src/content/drinks/mojito.md index 2bc77ce..81fbca8 100644 --- a/src/content/drinks/mojito.md +++ b/src/content/drinks/mojito.md @@ -1,10 +1,6 @@ --- title: Mojito -meta_title: Mojito -author: Reed Nelson -draft: false cover: "@assets/drinks/mojito.jpg" - spirits: [rum] bottles: [] tags: [crisp, citrusy, mellow] diff --git a/src/content/drinks/negroni.md b/src/content/drinks/negroni.md index 794d448..31c7fcf 100644 --- a/src/content/drinks/negroni.md +++ b/src/content/drinks/negroni.md @@ -1,8 +1,5 @@ --- title: Negroni -meta_title: Negroni -author: Reed Nelson -draft: false cover: "@assets/drinks/negroni.jpg" spirits: [gin] diff --git a/src/content/drinks/new-york-sour.md b/src/content/drinks/new-york-sour.md index 5ad3e51..2aea7ad 100644 --- a/src/content/drinks/new-york-sour.md +++ b/src/content/drinks/new-york-sour.md @@ -1,10 +1,6 @@ --- title: New York Sour -meta_title: New York Sour -author: Reed Nelson -draft: false cover: "@assets/drinks/new-york-sour.jpg" - spirits: [whiskey] bottles: [red-wine] tags: [creamy] diff --git a/src/content/drinks/old-fashioned.md b/src/content/drinks/old-fashioned.md index 13221fd..d5fc814 100644 --- a/src/content/drinks/old-fashioned.md +++ b/src/content/drinks/old-fashioned.md @@ -1,10 +1,6 @@ --- title: Old Fashioned -meta_title: Old Fashioned -author: Reed Nelson -draft: false cover: "@assets/drinks/old-fashioned.jpg" - spirits: [whiskey] bottles: [ango] tags: [classic, bold, spirit-forward] diff --git a/src/content/drinks/orange-bite.md b/src/content/drinks/orange-bite.md index 7053f5e..452b9f9 100644 --- a/src/content/drinks/orange-bite.md +++ b/src/content/drinks/orange-bite.md @@ -1,10 +1,6 @@ --- title: Orange Bite -meta_title: Orange Bite -author: Reed Nelson -draft: false cover: "@assets/drinks/orange-bite.jpg" - spirits: [gin] bottles: [cointreau, orange-bitters] tags: [creamy, bitter, citrusy] diff --git a/src/content/drinks/perfect-manhattan.md b/src/content/drinks/perfect-manhattan.md index ec632d9..81eaee1 100644 --- a/src/content/drinks/perfect-manhattan.md +++ b/src/content/drinks/perfect-manhattan.md @@ -1,10 +1,6 @@ --- title: Perfect Manhattan -meta_title: Perfect Manhattan cover: "@assets/drinks/perfect-manhattan.jpg" -author: Reed Nelson -draft: false - spirits: [whiskey] bottles: [sweet-vermouth, dry-vermouth, ango] tags: [classic, bold] diff --git a/src/content/drinks/pike-bay-special.md b/src/content/drinks/pike-bay-special.md index 7fa9ba8..d4e5fa3 100644 --- a/src/content/drinks/pike-bay-special.md +++ b/src/content/drinks/pike-bay-special.md @@ -1,10 +1,6 @@ --- title: Pike Bay Special -meta_title: Pike Bay Special -author: Reed Nelson -draft: false cover: "@assets/drinks/pike-bay-special.jpg" - spirits: [vodka] bottles: [irish-cream, schnapps] tags: [creamy, sweet] diff --git a/src/content/drinks/raspberry-martini.md b/src/content/drinks/raspberry-martini.md index 6695c91..ff60488 100644 --- a/src/content/drinks/raspberry-martini.md +++ b/src/content/drinks/raspberry-martini.md @@ -1,10 +1,6 @@ --- title: Raspberry Martini -meta_title: Raspberry Martini -author: Reed Nelson -draft: false cover: "@assets/drinks/raspberry-martini.jpg" - spirits: [vodka] bottles: [] tags: [fruity] diff --git a/src/content/drinks/raspberryy-cocktail.md b/src/content/drinks/raspberryy-cocktail.md index e8da2e9..28a9d89 100644 --- a/src/content/drinks/raspberryy-cocktail.md +++ b/src/content/drinks/raspberryy-cocktail.md @@ -1,10 +1,6 @@ --- title: Raspberryy Cocktail -meta_title: Raspberryy Cocktail -author: Reed Nelson -draft: false cover: "@assets/drinks/raspberryy-cocktail.jpg" - spirits: [whiskey] bottles: [peychauds] tags: [fruity, sweet] diff --git a/src/content/drinks/rosemary-gin-fizz.md b/src/content/drinks/rosemary-gin-fizz.md index 26d96ab..4008306 100644 --- a/src/content/drinks/rosemary-gin-fizz.md +++ b/src/content/drinks/rosemary-gin-fizz.md @@ -1,10 +1,6 @@ --- title: Rosemary Gin Fizz -meta_title: Rosemary Gin Fizz -author: Reed Nelson -draft: false cover: "@assets/drinks/rosemary-gin-fizz.jpg" - spirits: [gin] bottles: [] tags: [bubbly, citrusy, crisp] diff --git a/src/content/drinks/rosemary-sour.md b/src/content/drinks/rosemary-sour.md index d686b2f..b1963f9 100644 --- a/src/content/drinks/rosemary-sour.md +++ b/src/content/drinks/rosemary-sour.md @@ -1,10 +1,6 @@ --- title: Rosemary Sour -meta_title: Rosemary Sour -author: Reed Nelson -draft: false cover: "@assets/drinks/rosemary-sour.jpg" - spirits: [whiskey] bottles: [] tags: [creamy, herbacious] diff --git a/src/content/drinks/sazerac.md b/src/content/drinks/sazerac.md index d256629..0b54dce 100644 --- a/src/content/drinks/sazerac.md +++ b/src/content/drinks/sazerac.md @@ -1,10 +1,6 @@ --- title: Sazerac -meta_title: Sazerac -author: Reed Nelson -draft: false cover: "@assets/drinks/sazerac.jpg" - spirits: [whiskey, cognac] bottles: [peychauds, absinthe] tags: [classic, bold, spirit-forward] diff --git a/src/content/drinks/stormy-morning.md b/src/content/drinks/stormy-morning.md index 75d545d..ce5c657 100644 --- a/src/content/drinks/stormy-morning.md +++ b/src/content/drinks/stormy-morning.md @@ -1,10 +1,6 @@ --- title: Stormy Morning -meta_title: Stormy Morning -author: Reed Nelson -draft: false cover: "@assets/drinks/stormy-morning.jpg" - spirits: [] bottles: [creme-de-violette, st-germain, white-wine] tags: [citrusy, floral] diff --git a/src/content/drinks/tom-collins.md b/src/content/drinks/tom-collins.md index ff16edb..9a9a13d 100644 --- a/src/content/drinks/tom-collins.md +++ b/src/content/drinks/tom-collins.md @@ -1,10 +1,6 @@ --- title: Tom Collins -meta_title: Tom Collins -author: Reed Nelson -draft: false cover: "@assets/drinks/tom-collins.jpg" - spirits: [gin] bottles: [] tags: [mellow, citrusy, crisp] diff --git a/src/content/drinks/trinidad-sour.md b/src/content/drinks/trinidad-sour.md index 751ddb1..c663c95 100644 --- a/src/content/drinks/trinidad-sour.md +++ b/src/content/drinks/trinidad-sour.md @@ -1,10 +1,6 @@ --- title: Trinidad Sour -meta_title: Trinidad Sour -author: Reed Nelson -draft: false cover: "@assets/drinks/trinidad-sour.jpg" - spirits: [whiskey] bottles: [ango] tags: [classic, bold, bitter] diff --git a/src/content/drinks/vieux-carre.md b/src/content/drinks/vieux-carre.md index 05997bf..3fed0ee 100644 --- a/src/content/drinks/vieux-carre.md +++ b/src/content/drinks/vieux-carre.md @@ -1,10 +1,6 @@ --- title: Vieux Carré -meta_title: Vieux Carré -author: Reed Nelson -draft: false cover: "@assets/drinks/vieux-carre.jpg" - spirits: [whiskey, cognac] bottles: [ango, peychauds, sweet-vermouth, benedictine] tags: [classic, bold] diff --git a/src/content/drinks/watermelon-martini.md b/src/content/drinks/watermelon-martini.md index b0199f4..7dfc02b 100644 --- a/src/content/drinks/watermelon-martini.md +++ b/src/content/drinks/watermelon-martini.md @@ -1,10 +1,6 @@ --- title: Watermelon Martini -meta_title: Watermelon Martini -author: Reed Nelson -draft: false cover: "@assets/drinks/watermelon-martini.jpg" - spirits: [vodka] bottles: [cointreau] tags: [sweet, fruity] diff --git a/src/content/drinks/whiskey-daisy.md b/src/content/drinks/whiskey-daisy.md index 89772bf..9d66adf 100644 --- a/src/content/drinks/whiskey-daisy.md +++ b/src/content/drinks/whiskey-daisy.md @@ -1,10 +1,6 @@ --- title: Whiskey Daisy -meta_title: Whiskey Daisy -author: Reed Nelson -draft: false cover: "@assets/drinks/whiskey-daisy.jpg" - spirits: [whiskey] bottles: [] tags: [] diff --git a/src/content/drinks/whiskey-smash.md b/src/content/drinks/whiskey-smash.md index 0ba2c42..f97b381 100644 --- a/src/content/drinks/whiskey-smash.md +++ b/src/content/drinks/whiskey-smash.md @@ -1,10 +1,6 @@ --- title: Whiskey Smash -meta_title: Whiskey Smash -author: Reed Nelson -draft: false cover: "@assets/drinks/whiskey-smash.jpg" - spirits: [whiskey] bottles: [] tags: [classic, citrusy] diff --git a/src/content/drinks/whiskey-sour.md b/src/content/drinks/whiskey-sour.md index 7320abf..e1ba7b4 100644 --- a/src/content/drinks/whiskey-sour.md +++ b/src/content/drinks/whiskey-sour.md @@ -1,10 +1,6 @@ --- title: Whiskey Sour -meta_title: Whiskey Sour -author: Reed Nelson -draft: false cover: "@assets/drinks/whiskey-sour.jpg" - spirits: [Whiskey] bottles: [] tags: [classic, creamy, citrusy] diff --git a/src/content/drinks/wisconsin-old-fashioned.md b/src/content/drinks/wisconsin-old-fashioned.md index 8ec02c7..62ad368 100644 --- a/src/content/drinks/wisconsin-old-fashioned.md +++ b/src/content/drinks/wisconsin-old-fashioned.md @@ -1,10 +1,6 @@ --- title: Wisconsin Old Fashioned -meta_title: Wisconsin Old Fashioned -author: Reed Nelson -draft: false cover: "@assets/drinks/wisconsin-old-fashioned.jpg" - spirits: [brandy] bottles: [ango] tags: [classic, sweet] diff --git a/src/content/food/-index.md b/src/content/food/-index.md index 9f7cf58..9ecd35a 100644 --- a/src/content/food/-index.md +++ b/src/content/food/-index.md @@ -1,5 +1,4 @@ --- title: Food -meta_title: Food description: A modest recipe book. --- diff --git a/src/content/food/_food.md b/src/content/food/_food.md index e5cd5b9..4e120c7 100644 --- a/src/content/food/_food.md +++ b/src/content/food/_food.md @@ -1,14 +1,12 @@ --- -title: Food -meta_title: Food -description: recipe. -draft: true - +title: "" +description: "" cover: "@assets/food/.jpg" author: Reed Nelson prep_time: 0 servings: 0 diet: "" +draft: true ingredients: list: diff --git a/src/content/food/banana-bread.md b/src/content/food/banana-bread.md index 298eb70..1722b19 100644 --- a/src/content/food/banana-bread.md +++ b/src/content/food/banana-bread.md @@ -1,6 +1,5 @@ --- title: Banana Bread -meta_title: Banana Bread description: Banana bread recipe. draft: true diff --git a/src/content/food/blt.md b/src/content/food/blt.md index dfffc1e..7a4b18e 100644 --- a/src/content/food/blt.md +++ b/src/content/food/blt.md @@ -1,9 +1,6 @@ --- title: BLT -meta_title: BLT description: "What sets this BLT apart is the usage of the superior sandwich bread: croissant." -draft: false - cover: "@assets/food/blt.jpg" author: Reed Nelson prep_time: 25 diff --git a/src/content/food/bruschetta.md b/src/content/food/bruschetta.md index 699443e..2b7ed98 100644 --- a/src/content/food/bruschetta.md +++ b/src/content/food/bruschetta.md @@ -1,9 +1,6 @@ --- title: Bruschetta -meta_title: Bruschetta description: This is just some tame bruschetta. Truly the poor-man's mini pizza, though simultaneously a classy appetizer. -draft: false - cover: "@assets/food/bruschetta.jpg" author: Reed Nelson prep_time: 30 diff --git a/src/content/food/fish-tacos.md b/src/content/food/fish-tacos.md index 7198eda..a404ca2 100644 --- a/src/content/food/fish-tacos.md +++ b/src/content/food/fish-tacos.md @@ -1,9 +1,6 @@ --- title: Fish Tacos -meta_title: Fish Tacos description: This is a recipe for mango salsa fish tacos. This recipe is missing the essential component of how to prepare the fish. I don't know. -draft: false - cover: "@assets/food/fish-tacos.jpg" author: Ben prep_time: 60 diff --git a/src/content/food/granola.md b/src/content/food/granola.md index 6adffcc..f00e3c4 100644 --- a/src/content/food/granola.md +++ b/src/content/food/granola.md @@ -1,9 +1,7 @@ --- title: Granola -meta_title: Granola description: Granola recipe. draft: true - # cover: "@assets/food/granola.jpg" author: Rachel Croft prep_time: 0 diff --git a/src/content/food/guacamole.md b/src/content/food/guacamole.md index 82111d7..826d757 100644 --- a/src/content/food/guacamole.md +++ b/src/content/food/guacamole.md @@ -1,9 +1,6 @@ --- title: Guacamole -meta_title: Guacamole description: A basic guac recipe, in case you're into that. -draft: false - cover: "@assets/food/guacamole.jpg" author: Reed Nelson prep_time: 15 diff --git a/src/content/food/margherita-pizza.md b/src/content/food/margherita-pizza.md index 512c78d..8a9579f 100644 --- a/src/content/food/margherita-pizza.md +++ b/src/content/food/margherita-pizza.md @@ -1,9 +1,6 @@ --- title: Margherita Pizza -meta_title: Margherita Pizza description: The base recipe is a margherita, but using a little creativity and free will, you can make it better. -draft: false - cover: "@assets/food/margherita-pizza.jpg" author: Reed Nelson prep_time: 30 diff --git a/src/content/food/pad-thai.md b/src/content/food/pad-thai.md index bd023f7..6cf3e97 100644 --- a/src/content/food/pad-thai.md +++ b/src/content/food/pad-thai.md @@ -1,9 +1,6 @@ --- title: Pad Thai -meta_title: Pad Thai -draft: false description: This vegan pad thai recipe may not be the most culturally authentic one out there, but it is my own. - cover: "@assets/food/pad-thai.jpg" author: Reed Nelson prep_time: 45 diff --git a/src/content/food/pesto-flatbread.md b/src/content/food/pesto-flatbread.md index 52d463e..de082ea 100644 --- a/src/content/food/pesto-flatbread.md +++ b/src/content/food/pesto-flatbread.md @@ -1,9 +1,6 @@ --- title: Pesto Flatbread -meta_title: Pesto Flatbread description: This is a pesto recipe thinly disguised as a meal. -draft: false - cover: "@assets/food/pesto-flatbread.jpg" author: Rachel Croft prep_time: 25 diff --git a/src/content/food/pierogis.md b/src/content/food/pierogis.md index 39cf44d..c10191b 100644 --- a/src/content/food/pierogis.md +++ b/src/content/food/pierogis.md @@ -1,9 +1,6 @@ --- title: Pierogis -meta_title: Pierogis -draft: false description: A simple pierogi recipe leaning on flavors of lemon and thyme. - cover: "@assets/food/pierogis.jpg" author: Reed Nelson prep_time: 30 diff --git a/src/content/food/punch-salad.md b/src/content/food/punch-salad.md index 0f70d8b..eddce08 100644 --- a/src/content/food/punch-salad.md +++ b/src/content/food/punch-salad.md @@ -1,9 +1,6 @@ --- title: Punch Salad -meta_title: Punch Salad description: This is an attempt to recreate the incredible salad of the same name served by Punch Pizza. -draft: false - cover: "@assets/food/punch-salad.jpg" author: Reed Nelson prep_time: 15 diff --git a/src/content/food/tofu-burritos.md b/src/content/food/tofu-burritos.md index e44c16a..76b9150 100644 --- a/src/content/food/tofu-burritos.md +++ b/src/content/food/tofu-burritos.md @@ -1,9 +1,6 @@ --- title: Tofu Burritos -meta_title: Tofu Burritos -draft: false description: This (nearly) vegan recipe is great fresh or as meal prep. - cover: "@assets/food/tofu-burritos.jpg" author: Reed Nelson prep_time: 30 diff --git a/src/content/homepage/-index.md b/src/content/homepage/-index.md index 3b76076..e144d39 100755 --- a/src/content/homepage/-index.md +++ b/src/content/homepage/-index.md @@ -1,4 +1,3 @@ --- title: Home -meta_title: Home --- diff --git a/src/content/projects/-index.md b/src/content/projects/-index.md index 6a8bd97..20d7fab 100644 --- a/src/content/projects/-index.md +++ b/src/content/projects/-index.md @@ -1,6 +1,5 @@ --- title: Projects -meta_title: Projects description: Reed Nelson's projects. projects: diff --git a/src/content/puzzles/-index.md b/src/content/puzzles/-index.md index 5c37575..b136eb6 100644 --- a/src/content/puzzles/-index.md +++ b/src/content/puzzles/-index.md @@ -1,5 +1,4 @@ --- title: Puzzles -meta_title: Puzzles description: A selection of good puzzles. --- diff --git a/src/content/puzzles/action-riddles.md b/src/content/puzzles/action-riddles.md index 76a3daa..a12d786 100644 --- a/src/content/puzzles/action-riddles.md +++ b/src/content/puzzles/action-riddles.md @@ -1,8 +1,6 @@ --- title: Action Riddles -meta_title: Action Riddles description: These riddles are given by example. The solver has succeeded when discover the trick and can give examples as well as the riddler. -draft: false --- These riddles are given by example. The solver has succeeded when discover the trick and can give examples as well as the riddler. diff --git a/src/content/puzzles/conventional-riddles.md b/src/content/puzzles/conventional-riddles.md index 77806bc..aae4db9 100644 --- a/src/content/puzzles/conventional-riddles.md +++ b/src/content/puzzles/conventional-riddles.md @@ -1,8 +1,6 @@ --- title: Conventional Riddles -meta_title: Conventional Riddles description: This is a collection of riddles that don't have a special theme or mode. -draft: false ---
diff --git a/src/content/puzzles/low-grade-riddles.md b/src/content/puzzles/low-grade-riddles.md index 135d234..2af8147 100644 --- a/src/content/puzzles/low-grade-riddles.md +++ b/src/content/puzzles/low-grade-riddles.md @@ -1,8 +1,6 @@ --- title: Low Grade Riddles -meta_title: Low Grade Riddles description: These riddles give riddles everywhere a bad name. When someone offers you a riddle, and then gives you these, you are disappointed. -draft: false ---
diff --git a/src/content/puzzles/number-theory.md b/src/content/puzzles/number-theory.md index 189de38..2d4a475 100644 --- a/src/content/puzzles/number-theory.md +++ b/src/content/puzzles/number-theory.md @@ -1,8 +1,6 @@ --- title: Fun Problems in Number Theory -meta_title: Fun Problems in Number Theory description: Number Theory contains a rich set of interesting problems, some suitable for you or I, some entirely unsolvable. This is a selection of my favorites. -draft: false --- This is a collection of problems from Number Theory. What they all have in common is that the results involve concepts and operations we're all familiar with, so anyone can go "huh, that's a neat fact about numbers!". Regarding difficulty, the "easy" problems should be solvable for anyone, though they may not be that easy. The "medium" problems actually all come from homeworks from early in my undergraduate Number Theory course. They're quite solvable, but may require insights and ideas that are not reasonable to expect from the leyperson. The "hard" problems are quite hard. diff --git a/src/content/puzzles/situation-riddles.md b/src/content/puzzles/situation-riddles.md index 15779d9..9ec8a17 100644 --- a/src/content/puzzles/situation-riddles.md +++ b/src/content/puzzles/situation-riddles.md @@ -1,8 +1,6 @@ --- title: Situation Riddles -meta_title: Situation Riddles description: With these riddles, the riddler gives an initial prompt, and the solver(s) ask yes-or-no questions to decuce the full circumstances of the situation. -draft: false --- With these riddles, the riddler gives an initial prompt, and the solver(s) ask yes-or-no questions to decuce the full circumstances of the situation. diff --git a/src/content/puzzles/what-am-i-riddles.md b/src/content/puzzles/what-am-i-riddles.md index dcd0c72..30e4f65 100644 --- a/src/content/puzzles/what-am-i-riddles.md +++ b/src/content/puzzles/what-am-i-riddles.md @@ -1,8 +1,6 @@ --- title: What-Am-I Riddles -meta_title: What-Am-I Riddles description: These riddles list a set of properties, and the solver has to identify the (hopefully unique) thing that posesses them. -draft: false ---
diff --git a/src/content/terms/-index.md b/src/content/terms/-index.md index 7e77016..af35c4d 100644 --- a/src/content/terms/-index.md +++ b/src/content/terms/-index.md @@ -1,7 +1,5 @@ --- title: Terms & Conditions -meta_title: Terms & Conditions -draft: false --- ## Copyright diff --git a/src/layouts/Base.astro b/src/layouts/Base.astro index e0995dd..efdbb14 100755 --- a/src/layouts/Base.astro +++ b/src/layouts/Base.astro @@ -7,7 +7,6 @@ import "@/styles/main.scss"; // types for frontmatters export interface Props { - title?: string; meta_title?: string; description?: string; image?: string; @@ -15,7 +14,7 @@ export interface Props { canonical?: string; } -const { title, meta_title, description, image, noindex, canonical } = Astro.props; +const { meta_title, description, image, noindex, canonical } = Astro.props; --- @@ -47,7 +46,7 @@ const { title, meta_title, description, image, noindex, canonical } = Astro.prop - {plainify(meta_title ? meta_title : title ? title : config.site.title)} + {plainify(meta_title ? meta_title : config.site.title)} @@ -71,7 +70,7 @@ const { title, meta_title, description, image, noindex, canonical } = Astro.prop @@ -92,7 +91,7 @@ const { title, meta_title, description, image, noindex, canonical } = Astro.prop diff --git a/src/pages/404.astro b/src/pages/404.astro index 6f492bd..ea3a0ad 100755 --- a/src/pages/404.astro +++ b/src/pages/404.astro @@ -2,7 +2,7 @@ import Base from "@/layouts/Base.astro"; --- - +
diff --git a/src/pages/about.astro b/src/pages/about.astro index 07e1202..ad16678 100644 --- a/src/pages/about.astro +++ b/src/pages/about.astro @@ -7,12 +7,11 @@ import reed from "@assets/about/reed.jpg"; const about = await getEntryBySlug("about", "-index"); const { Content } = await about.render(); -const { title, description, meta_title } = about.data; +const { title, description } = about.data; --- diff --git a/src/pages/blog/[single].astro b/src/pages/blog/[single].astro index ca8aec5..d928ece 100755 --- a/src/pages/blog/[single].astro +++ b/src/pages/blog/[single].astro @@ -17,12 +17,11 @@ export async function getStaticPaths() { } const { post } = Astro.props; -const { title, meta_title, description, image } = post.data; +const { title, description, image } = post.data; --- diff --git a/src/pages/blog/categories/[category].astro b/src/pages/blog/categories/[category].astro index a24fcc2..84399e2 100644 --- a/src/pages/blog/categories/[category].astro +++ b/src/pages/blog/categories/[category].astro @@ -25,7 +25,7 @@ const posts = await getSinglePage(config.settings.blog_folder); const filterByCategories = taxonomyFilter(posts, "categories", category!); --- - +
diff --git a/src/pages/blog/categories/index.astro b/src/pages/blog/categories/index.astro index 8e3085a..448af37 100644 --- a/src/pages/blog/categories/index.astro +++ b/src/pages/blog/categories/index.astro @@ -10,7 +10,7 @@ const categories = await getTaxonomy(blog_folder, "categories"); const allCategories = await getAllTaxonomy(blog_folder, "categories"); --- - +
diff --git a/src/pages/blog/index.astro b/src/pages/blog/index.astro index f9355ce..5e4736b 100755 --- a/src/pages/blog/index.astro +++ b/src/pages/blog/index.astro @@ -22,8 +22,7 @@ const currentPosts = sortedPosts.slice(0, config.settings.blog_pagination); --- diff --git a/src/pages/blog/page/[slug].astro b/src/pages/blog/page/[slug].astro index 1b02dbe..14a02aa 100755 --- a/src/pages/blog/page/[slug].astro +++ b/src/pages/blog/page/[slug].astro @@ -41,8 +41,7 @@ export async function getStaticPaths() { --- diff --git a/src/pages/blog/tags/[tag].astro b/src/pages/blog/tags/[tag].astro index 9e64fe2..8fab420 100644 --- a/src/pages/blog/tags/[tag].astro +++ b/src/pages/blog/tags/[tag].astro @@ -22,7 +22,7 @@ const posts = await getSinglePage(config.settings.blog_folder); const filterByCategories = taxonomyFilter(posts, "tags", tag!); --- - +
diff --git a/src/pages/blog/tags/index.astro b/src/pages/blog/tags/index.astro index 6d39b43..f6e1249 100644 --- a/src/pages/blog/tags/index.astro +++ b/src/pages/blog/tags/index.astro @@ -10,7 +10,7 @@ const tags = await getTaxonomy(blog_folder, "tags"); const allTags = await getAllTaxonomy(blog_folder, "tags"); --- - +
diff --git a/src/pages/conversation.astro b/src/pages/conversation.astro index 9595bda..1ece4bf 100644 --- a/src/pages/conversation.astro +++ b/src/pages/conversation.astro @@ -4,12 +4,11 @@ import PageHeader from "@/components/PageHeader.astro"; import { getEntryBySlug } from "astro:content"; const conversation_page = await getEntryBySlug("conversation", "-index"); -const { title, meta_title, cards } = conversation_page.data; +const { title, cards } = conversation_page.data; ---
diff --git a/src/pages/drinks/[single].astro b/src/pages/drinks/[single].astro index e6d6dae..5a1573a 100644 --- a/src/pages/drinks/[single].astro +++ b/src/pages/drinks/[single].astro @@ -17,12 +17,11 @@ export async function getStaticPaths() { } const { post } = Astro.props; -const { title, meta_title, description, image } = post.data; +const { title, description, image } = post.data; --- diff --git a/src/pages/drinks/bottles/[bottle].astro b/src/pages/drinks/bottles/[bottle].astro index 5130183..a794e41 100644 --- a/src/pages/drinks/bottles/[bottle].astro +++ b/src/pages/drinks/bottles/[bottle].astro @@ -25,7 +25,7 @@ const posts = await getSinglePage(config.settings.drink_folder); const filterByBottles = taxonomyFilter(posts, "bottles", bottle!); --- - +
diff --git a/src/pages/drinks/bottles/index.astro b/src/pages/drinks/bottles/index.astro index aae535c..2b1cb59 100644 --- a/src/pages/drinks/bottles/index.astro +++ b/src/pages/drinks/bottles/index.astro @@ -9,7 +9,7 @@ const bottles = await getTaxonomy(drink_folder, "bottles"); const allBottles = await getAllTaxonomy(drink_folder, "bottles"); --- - +
diff --git a/src/pages/drinks/index.astro b/src/pages/drinks/index.astro index 9475868..a308328 100644 --- a/src/pages/drinks/index.astro +++ b/src/pages/drinks/index.astro @@ -22,8 +22,7 @@ const currentPosts = posts.slice(0, config.settings.drink_pagination); --- diff --git a/src/pages/drinks/page/[slug].astro b/src/pages/drinks/page/[slug].astro index b21140d..65a6686 100644 --- a/src/pages/drinks/page/[slug].astro +++ b/src/pages/drinks/page/[slug].astro @@ -43,8 +43,7 @@ export async function getStaticPaths() { --- diff --git a/src/pages/drinks/spirits/[spirit].astro b/src/pages/drinks/spirits/[spirit].astro index 72b99db..09ac29f 100644 --- a/src/pages/drinks/spirits/[spirit].astro +++ b/src/pages/drinks/spirits/[spirit].astro @@ -25,7 +25,7 @@ const posts = await getSinglePage(config.settings.drink_folder); const filterBySpirits = taxonomyFilter(posts, "spirits", spirit!); --- - +
diff --git a/src/pages/drinks/spirits/index.astro b/src/pages/drinks/spirits/index.astro index 8369a00..ee8162f 100644 --- a/src/pages/drinks/spirits/index.astro +++ b/src/pages/drinks/spirits/index.astro @@ -9,7 +9,7 @@ const spirits = await getTaxonomy(drink_folder, "spirits"); const allSpirits = await getAllTaxonomy(drink_folder, "spirits"); --- - +
diff --git a/src/pages/drinks/tags/[tag].astro b/src/pages/drinks/tags/[tag].astro index 6c992a4..7cbd3d6 100644 --- a/src/pages/drinks/tags/[tag].astro +++ b/src/pages/drinks/tags/[tag].astro @@ -22,7 +22,7 @@ const posts = await getSinglePage(config.settings.drink_folder); const filterByCategories = taxonomyFilter(posts, "tags", tag!); --- - +
diff --git a/src/pages/drinks/tags/index.astro b/src/pages/drinks/tags/index.astro index 14293a0..f6144c2 100644 --- a/src/pages/drinks/tags/index.astro +++ b/src/pages/drinks/tags/index.astro @@ -9,7 +9,7 @@ const tags = await getTaxonomy(drink_folder, "tags"); const allTags = await getAllTaxonomy(drink_folder, "tags"); --- - +
diff --git a/src/pages/food/[single].astro b/src/pages/food/[single].astro index e37b8db..05b5fb2 100644 --- a/src/pages/food/[single].astro +++ b/src/pages/food/[single].astro @@ -17,12 +17,11 @@ export async function getStaticPaths() { } const { post } = Astro.props; -const { title, meta_title, description, image } = post.data; +const { title, description, image } = post.data; --- diff --git a/src/pages/food/index.astro b/src/pages/food/index.astro index 4ca1e8a..74411c0 100644 --- a/src/pages/food/index.astro +++ b/src/pages/food/index.astro @@ -15,8 +15,7 @@ const currentPosts = posts.slice(0, config.settings.food_pagination); --- diff --git a/src/pages/food/page/[slug].astro b/src/pages/food/page/[slug].astro index 3dff9c5..cf3d9af 100644 --- a/src/pages/food/page/[slug].astro +++ b/src/pages/food/page/[slug].astro @@ -36,8 +36,7 @@ export async function getStaticPaths() { --- diff --git a/src/pages/index.astro b/src/pages/index.astro index e0d17de..caa36dd 100755 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -10,12 +10,11 @@ interface Homepage { } const homepage = await getEntryBySlug("homepage", "-index"); -const { title, meta_title }: Homepage = homepage.data; +const { title }: Homepage = homepage.data; ---
diff --git a/src/pages/projects.astro b/src/pages/projects.astro index 4645820..594a38c 100644 --- a/src/pages/projects.astro +++ b/src/pages/projects.astro @@ -14,17 +14,15 @@ interface Project { interface Projects { title: string; - meta_title: string; projects: Project[]; } const projects_page = await getEntryBySlug("projects", "-index"); -const { title, meta_title, projects }: Projects = projects_page.data; +const { title, projects }: Projects = projects_page.data; ---
diff --git a/src/pages/puzzles/[single].astro b/src/pages/puzzles/[single].astro index 602809a..c9b5d62 100644 --- a/src/pages/puzzles/[single].astro +++ b/src/pages/puzzles/[single].astro @@ -17,12 +17,11 @@ export async function getStaticPaths() { } const { post } = Astro.props; -const { title, meta_title, description } = post.data; +const { title, description } = post.data; --- diff --git a/src/pages/puzzles/index.astro b/src/pages/puzzles/index.astro index b91238d..e5bcb5e 100644 --- a/src/pages/puzzles/index.astro +++ b/src/pages/puzzles/index.astro @@ -12,8 +12,7 @@ const posts = await getSinglePage(puzzle_folder); --- diff --git a/src/pages/search.astro b/src/pages/search.astro index e90d927..9af1ceb 100755 --- a/src/pages/search.astro +++ b/src/pages/search.astro @@ -17,6 +17,6 @@ const searchList = posts.map((item) => ({ })); --- - + diff --git a/src/pages/terms.astro b/src/pages/terms.astro index a42ed9d..5a0ae56 100644 --- a/src/pages/terms.astro +++ b/src/pages/terms.astro @@ -5,12 +5,11 @@ import { getEntryBySlug } from "astro:content"; const terms = await getEntryBySlug("terms", "-index"); const { Content } = await terms.render(); -const { title, meta_title } = terms.data; +const { title } = terms.data; ---
From 1deb3cf125c1fc3beaf7e0e10212ddcaf5ce978a Mon Sep 17 00:00:00 2001 From: Reed Nelson Date: Wed, 6 Dec 2023 16:33:54 -0600 Subject: [PATCH 3/5] tweak puzzle and blog cards --- src/config/config.json | 2 +- src/content/blog/crypto.md | 2 +- src/content/blog/dh.md | 2 +- src/content/blog/huffman.md | 2 +- src/content/blog/rsa.md | 2 +- src/layouts/BlogSingle.astro | 30 +++++++------ src/layouts/components/BlogCard.astro | 50 +++++++++++----------- src/layouts/components/PuzzleCard.astro | 20 +++++---- src/pages/blog/categories/[category].astro | 4 +- src/pages/blog/index.astro | 6 +-- src/pages/blog/page/[slug].astro | 6 +-- src/pages/blog/tags/[tag].astro | 4 +- src/pages/blog/tags/index.astro | 1 - src/pages/puzzles/index.astro | 2 - 14 files changed, 67 insertions(+), 66 deletions(-) diff --git a/src/config/config.json b/src/config/config.json index 6d554ca..dd03da6 100755 --- a/src/config/config.json +++ b/src/config/config.json @@ -24,7 +24,7 @@ }, "metadata": { - "meta_author": "reednel", + "meta_author": "Reed Nelson", "meta_image": "/favicon.ico", "meta_description": "A place with things." } diff --git a/src/content/blog/crypto.md b/src/content/blog/crypto.md index 7272f97..f430403 100644 --- a/src/content/blog/crypto.md +++ b/src/content/blog/crypto.md @@ -4,7 +4,7 @@ description: none date: 2022-08-30T05:00:00Z categories: [Cryptography] author: Reed Nelson -tags: [crypto] +tags: [cryptography] complexity: 1 draft: true --- diff --git a/src/content/blog/dh.md b/src/content/blog/dh.md index 8ad2a23..29380be 100644 --- a/src/content/blog/dh.md +++ b/src/content/blog/dh.md @@ -4,7 +4,7 @@ description: none date: 2022-07-10T05:00:00Z categories: [Cryptography] author: Reed Nelson -tags: [math, crypto] +tags: [math, cryptography] complexity: 1 draft: true --- diff --git a/src/content/blog/huffman.md b/src/content/blog/huffman.md index c46347f..fc7e5de 100644 --- a/src/content/blog/huffman.md +++ b/src/content/blog/huffman.md @@ -4,7 +4,7 @@ description: Data compression is a process of modifying the representation of so date: 2022-06-30T05:00:00Z categories: [Cryptography] author: Reed Nelson -tags: [math, crypto, information-theory] +tags: [math, cryptography, information-theory] complexity: 1.7 draft: false --- diff --git a/src/content/blog/rsa.md b/src/content/blog/rsa.md index 7e66432..c7882d9 100644 --- a/src/content/blog/rsa.md +++ b/src/content/blog/rsa.md @@ -4,7 +4,7 @@ description: You use the RSA encryption scheme every day. It's simple enough to date: 2022-06-10T05:00:00Z categories: [Cryptography] author: Reed Nelson -tags: [math, crypto] +tags: [math, cryptography] complexity: 1.5 draft: false --- diff --git a/src/layouts/BlogSingle.astro b/src/layouts/BlogSingle.astro index be7beeb..283aa75 100755 --- a/src/layouts/BlogSingle.astro +++ b/src/layouts/BlogSingle.astro @@ -55,8 +55,8 @@ tags.sort((a: string, b: string) => a.localeCompare(b));
-
-
Tags:
+
+

Tags:

    { tags.map((tag: string) => ( @@ -85,21 +85,25 @@ tags.sort((a: string, b: string) => a.localeCompare(b));
+ { similarPosts.length > 0 && ( - -
-

Related Posts

-
- { - similarPosts.slice(0, 3).map((post) => ( -
- -
- )) - } +
+

Related Posts

+
+
+ { + similarPosts.slice(0, 2).map((post) => ( +
+ +
+ )) + } +
+
) } +
diff --git a/src/layouts/components/BlogCard.astro b/src/layouts/components/BlogCard.astro index dcfaa78..9b38f40 100644 --- a/src/layouts/components/BlogCard.astro +++ b/src/layouts/components/BlogCard.astro @@ -11,28 +11,30 @@ const { data } = Astro.props; const { title, description, categories, complexity } = data.data; --- -
-

- - {title} - -

- -

{description}

+
+
+

+ + {title} + +

+ +

{description}

+
diff --git a/src/layouts/components/PuzzleCard.astro b/src/layouts/components/PuzzleCard.astro index ff39fb8..284c89c 100644 --- a/src/layouts/components/PuzzleCard.astro +++ b/src/layouts/components/PuzzleCard.astro @@ -9,14 +9,16 @@ const { data } = Astro.props; const { title, description } = data.data; --- -
- -

- {title} -

- -

- {description} -

+
+
+ +

+ {title} +

+ +

+ {description} +

+
diff --git a/src/pages/blog/categories/[category].astro b/src/pages/blog/categories/[category].astro index 84399e2..6224ae5 100644 --- a/src/pages/blog/categories/[category].astro +++ b/src/pages/blog/categories/[category].astro @@ -29,10 +29,10 @@ const filterByCategories = taxonomyFilter(posts, "categories", category!);
-
+
{ filterByCategories.map((post) => ( -
+
)) diff --git a/src/pages/blog/index.astro b/src/pages/blog/index.astro index 5e4736b..405d10c 100755 --- a/src/pages/blog/index.astro +++ b/src/pages/blog/index.astro @@ -35,10 +35,8 @@ const currentPosts = sortedPosts.slice(0, config.settings.blog_pagination);
{ currentPosts.map((post) => ( -
-
- -
+
+
)) } diff --git a/src/pages/blog/page/[slug].astro b/src/pages/blog/page/[slug].astro index 14a02aa..5b6f702 100755 --- a/src/pages/blog/page/[slug].astro +++ b/src/pages/blog/page/[slug].astro @@ -54,10 +54,8 @@ export async function getStaticPaths() {
{ currentPosts.map((post) => ( -
-
- -
+
+
)) } diff --git a/src/pages/blog/tags/[tag].astro b/src/pages/blog/tags/[tag].astro index 8fab420..0345991 100644 --- a/src/pages/blog/tags/[tag].astro +++ b/src/pages/blog/tags/[tag].astro @@ -26,10 +26,10 @@ const filterByCategories = taxonomyFilter(posts, "tags", tag!);
-
+
{ filterByCategories.map((post) => ( -
+
)) diff --git a/src/pages/blog/tags/index.astro b/src/pages/blog/tags/index.astro index f6e1249..8baf430 100644 --- a/src/pages/blog/tags/index.astro +++ b/src/pages/blog/tags/index.astro @@ -2,7 +2,6 @@ import config from "@/config/config.json"; import Base from "@/layouts/Base.astro"; import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro"; -import { humanize } from "@/lib/utils/textConverter"; import PageHeader from "@/components/PageHeader.astro"; const { blog_folder }: { blog_folder: string } = config.settings; diff --git a/src/pages/puzzles/index.astro b/src/pages/puzzles/index.astro index e5bcb5e..2332322 100644 --- a/src/pages/puzzles/index.astro +++ b/src/pages/puzzles/index.astro @@ -24,9 +24,7 @@ const posts = await getSinglePage(puzzle_folder); posts.map((post) => ( // Puzzle Card
-
-
)) } From 8ead542bcafe3b1608c3a0a7037cd48e1ea86784 Mon Sep 17 00:00:00 2001 From: Reed Nelson Date: Wed, 6 Dec 2023 17:57:29 -0600 Subject: [PATCH 4/5] category casing --- src/content/blog/crypto.md | 2 +- src/content/blog/debruijn.md | 2 +- src/content/blog/dh.md | 2 +- src/content/blog/dharma.md | 2 +- src/content/blog/huffman.md | 2 +- src/content/blog/language.md | 2 +- src/content/blog/love.md | 2 +- src/content/blog/microbiome.md | 2 +- src/content/blog/phenomenology.md | 2 +- src/content/blog/power.md | 2 +- src/content/blog/rsa.md | 2 +- src/layouts/BlogSingle.astro | 8 ++++---- src/layouts/DrinkSingle.astro | 8 ++++---- src/layouts/FoodSingle.astro | 4 ++-- src/layouts/Search.tsx | 6 +++--- src/layouts/components/BlogCard.astro | 4 ++-- src/layouts/components/BlogSidebar.astro | 6 +++--- src/layouts/components/Breadcrumbs.astro | 7 ++++--- src/layouts/components/DrinkSidebar.astro | 7 ++++--- src/layouts/components/PageHeader.astro | 3 ++- src/layouts/shortcodes/Notice.tsx | 4 ++-- src/lib/utils/textConverter.ts | 19 ++++++++++++------- src/pages/blog/categories/index.astro | 4 ++-- src/pages/blog/tags/[tag].astro | 5 +++-- src/pages/blog/tags/index.astro | 3 ++- src/pages/drinks/bottles/[bottle].astro | 5 +++-- src/pages/drinks/bottles/index.astro | 3 ++- src/pages/drinks/spirits/[spirit].astro | 5 +++-- src/pages/drinks/spirits/index.astro | 4 +++- src/pages/drinks/tags/[tag].astro | 6 ++++-- src/pages/drinks/tags/index.astro | 3 ++- 31 files changed, 77 insertions(+), 59 deletions(-) diff --git a/src/content/blog/crypto.md b/src/content/blog/crypto.md index f430403..69e4e56 100644 --- a/src/content/blog/crypto.md +++ b/src/content/blog/crypto.md @@ -2,7 +2,7 @@ title: Cryptography description: none date: 2022-08-30T05:00:00Z -categories: [Cryptography] +categories: [computer-science] author: Reed Nelson tags: [cryptography] complexity: 1 diff --git a/src/content/blog/debruijn.md b/src/content/blog/debruijn.md index e76a7be..6fa1a99 100644 --- a/src/content/blog/debruijn.md +++ b/src/content/blog/debruijn.md @@ -2,7 +2,7 @@ title: De Bruijn Sequences description: De Bruijn sequences make up a niche topic at an intersection of graph theory and combinatorics. We will discuss some of the properties of these sequences, and their surprising applications. date: 2021-05-05T06:00:00Z -categories: [Mathematics] +categories: [mathematics] author: Reed Nelson tags: [math, graph] complexity: 1.5 diff --git a/src/content/blog/dh.md b/src/content/blog/dh.md index 29380be..937f654 100644 --- a/src/content/blog/dh.md +++ b/src/content/blog/dh.md @@ -2,7 +2,7 @@ title: Diffie Hellman description: none date: 2022-07-10T05:00:00Z -categories: [Cryptography] +categories: [computer-science] author: Reed Nelson tags: [math, cryptography] complexity: 1 diff --git a/src/content/blog/dharma.md b/src/content/blog/dharma.md index 833c0c8..969ec75 100644 --- a/src/content/blog/dharma.md +++ b/src/content/blog/dharma.md @@ -2,7 +2,7 @@ title: A Theory on Dharma description: Who are you meant to be? Is that who you are? How can you become that person? We discuss an actionable guide to answering these questions, which is based on the teachings of the Bhagavad Gita. date: 2020-10-10T05:00:00Z -categories: [Philosophy] +categories: [philosophy] author: Reed Nelson tags: [dharma, purpose] complexity: 1 diff --git a/src/content/blog/huffman.md b/src/content/blog/huffman.md index fc7e5de..6b10b4e 100644 --- a/src/content/blog/huffman.md +++ b/src/content/blog/huffman.md @@ -2,7 +2,7 @@ title: Huffman Compression description: Data compression is a process of modifying the representation of some information so that it can be stored using less data. We discuss how information is quantified (entropy), and a simple, speedy, and greedy compression algorithm (the Huffman Coding). date: 2022-06-30T05:00:00Z -categories: [Cryptography] +categories: [computer-science] author: Reed Nelson tags: [math, cryptography, information-theory] complexity: 1.7 diff --git a/src/content/blog/language.md b/src/content/blog/language.md index 4be1441..80cd22a 100644 --- a/src/content/blog/language.md +++ b/src/content/blog/language.md @@ -2,7 +2,7 @@ title: Topics in Language and Meaning description: This post is a crash course on the introductory topics in the Philosophy of Language and Meaning. If you're a natural language speaker, then in a sense, you're already an expert on these topics! date: 2021-04-04T05:00:00Z -categories: [Philosophy] +categories: [philosophy] author: Reed Nelson tags: [language] complexity: 1.2 diff --git a/src/content/blog/love.md b/src/content/blog/love.md index 3410eb3..b0c4aa1 100644 --- a/src/content/blog/love.md +++ b/src/content/blog/love.md @@ -2,7 +2,7 @@ title: The Psychology of Love description: In this post, we discuss a General Theory of Love, which makes bold and uplifting claims about the power of the emotional mind. Whether or not the theory is completely true, there are valuable ideas to be gleaned. date: 2020-02-14T05:00:00Z -categories: [Psychology] +categories: [uncategorized] author: Reed Nelson tags: [psychology, philosophy, love] complexity: 1.1 diff --git a/src/content/blog/microbiome.md b/src/content/blog/microbiome.md index 2e46bd6..b002dbf 100644 --- a/src/content/blog/microbiome.md +++ b/src/content/blog/microbiome.md @@ -2,7 +2,7 @@ title: Microbiome Network Alignment description: none date: 2022-08-15T05:00:00Z -categories: [Mathematics] +categories: [mathematics] author: Reed Nelson tags: [math, biology, graph] complexity: 1 diff --git a/src/content/blog/phenomenology.md b/src/content/blog/phenomenology.md index 13bd1fc..70a5c50 100644 --- a/src/content/blog/phenomenology.md +++ b/src/content/blog/phenomenology.md @@ -2,7 +2,7 @@ title: Artificial Consciousness and Phenomenology description: I believe that with a phenomenological examination of human consciousness and experience, we stand to better express what is necessary for a true, human-level artificial consciousness. date: 2022-04-07T05:00:00Z -categories: [Philosophy] +categories: [philosophy] author: Reed Nelson tags: [ai] complexity: 1.2 diff --git a/src/content/blog/power.md b/src/content/blog/power.md index 723bc28..3ed8ca2 100644 --- a/src/content/blog/power.md +++ b/src/content/blog/power.md @@ -2,7 +2,7 @@ title: The Will to Power description: Friedrich Nietzsche is one of the most significant philosophers of all time. Here we discuss Nietzsche's invigorating and liberating philosophy for living. date: 2021-09-25T05:00:00Z -categories: [Philosophy] +categories: [philosophy] author: Reed Nelson tags: [purpose, power, nietzsche] complexity: 1.1 diff --git a/src/content/blog/rsa.md b/src/content/blog/rsa.md index c7882d9..a90b60f 100644 --- a/src/content/blog/rsa.md +++ b/src/content/blog/rsa.md @@ -2,7 +2,7 @@ title: RSA Encryption description: You use the RSA encryption scheme every day. It's simple enough to understand, but quite powerful. In this post, we discuss the basics of ciphersystems, public key encryption, and why RSA works so well. date: 2022-06-10T05:00:00Z -categories: [Cryptography] +categories: [computer-science] author: Reed Nelson tags: [math, cryptography] complexity: 1.5 diff --git a/src/layouts/BlogSingle.astro b/src/layouts/BlogSingle.astro index 283aa75..19159de 100755 --- a/src/layouts/BlogSingle.astro +++ b/src/layouts/BlogSingle.astro @@ -5,7 +5,7 @@ import config from "@/config/config.json"; import { getSinglePage } from "@/lib/contentParser.astro"; import dateFormat from "@/lib/utils/dateFormat"; import similerItems from "@/lib/utils/similarItems"; -import { humanize, markdownify, slugify } from "@/lib/utils/textConverter"; +import { lowerHumanize, upperHumanize, markdownify, slugify } from "@/lib/utils/textConverter"; import { FaRegCalendarAlt, @@ -32,7 +32,7 @@ tags.sort((a: string, b: string) => a.localeCompare(b));
  • - {humanize(author)} + {upperHumanize(author)}
  • @@ -43,7 +43,7 @@ tags.sort((a: string, b: string) => a.localeCompare(b)); { categories.map((category: string, index: number) => ( - {humanize(category)} + {upperHumanize(category)} {index !== categories.length - 1 && ","} )) @@ -65,7 +65,7 @@ tags.sort((a: string, b: string) => a.localeCompare(b)); class="m-1 block rounded bg-theme-light px-3 py-1 hover:bg-primary hover:text-white dark:bg-darkmode-theme-light dark:hover:bg-darkmode-primary dark:hover:text-dark" href={`/blog/tags/${slugify(tag)}`} > - {tag} + {lowerHumanize(tag)}
    • )) diff --git a/src/layouts/DrinkSingle.astro b/src/layouts/DrinkSingle.astro index 97cc7a2..db8a31a 100644 --- a/src/layouts/DrinkSingle.astro +++ b/src/layouts/DrinkSingle.astro @@ -4,7 +4,7 @@ import Share from "@/components/Share.astro"; import config from "@/config/config.json"; import { getSinglePage } from "@/lib/contentParser.astro"; import similerItems from "@/lib/utils/similarItems"; -import { markdownify } from "@/lib/utils/textConverter"; +import { lowerHumanize, markdownify } from "@/lib/utils/textConverter"; import { Image } from "astro:assets"; interface Recipe { @@ -65,7 +65,7 @@ const { ingredients, instructions, notes }: Recipe = post.data; class="m-1 inline-block rounded bg-white px-3 py-1 hover:bg-primary hover:text-white dark:bg-darkmode-body dark:hover:bg-darkmode-primary dark:hover:text-dark" href={`/drinks/spirits/${spirit}`} > - {spirit} + {lowerHumanize(spirit)} ))} @@ -82,7 +82,7 @@ const { ingredients, instructions, notes }: Recipe = post.data; class="m-1 inline-block rounded bg-white px-3 py-1 hover:bg-primary hover:text-white dark:bg-darkmode-body dark:hover:bg-darkmode-primary dark:hover:text-dark" href={`/drinks/bottles/${bottle}`} > - {bottle} + {lowerHumanize(bottle)} ))} @@ -98,7 +98,7 @@ const { ingredients, instructions, notes }: Recipe = post.data; class="m-1 inline-block rounded bg-white px-3 py-1 hover:bg-primary hover:text-white dark:bg-darkmode-body dark:hover:bg-darkmode-primary dark:hover:text-dark" href={`/drinks/tags/${tag}`} > - {tag} + {lowerHumanize(tag)} ))} diff --git a/src/layouts/FoodSingle.astro b/src/layouts/FoodSingle.astro index 28a4036..1e5801f 100644 --- a/src/layouts/FoodSingle.astro +++ b/src/layouts/FoodSingle.astro @@ -2,7 +2,7 @@ import Share from "@/components/Share.astro"; import config from "@/config/config.json"; import { Image } from "astro:assets"; -import { humanize, markdownify } from "@/lib/utils/textConverter"; +import { upperHumanize, markdownify } from "@/lib/utils/textConverter"; import { FaRegClock, @@ -56,7 +56,7 @@ const { ingredients, instructions, notes }: Recipe = post.data; { author && (
    - {humanize(author)} + {upperHumanize(author)}
    )} diff --git a/src/layouts/Search.tsx b/src/layouts/Search.tsx index 8e24cba..84da1d4 100755 --- a/src/layouts/Search.tsx +++ b/src/layouts/Search.tsx @@ -1,5 +1,5 @@ import config from "@/config/config.json"; -import { humanize, plainify, slugify } from "@/lib/utils/textConverter"; +import { upperHumanize, plainify, slugify } from "@/lib/utils/textConverter"; import Fuse from "fuse.js"; import React, { useEffect, useRef, useState } from "react"; import { @@ -125,7 +125,7 @@ const Search = ({ searchList }: Props) => { - {humanize(item.data.author)} + {upperHumanize(item.data.author)}
  • @@ -135,7 +135,7 @@ const Search = ({ searchList }: Props) => { href={`/blog/categories/${slugify(category)}`} key={category} > - {humanize(category)} + {upperHumanize(category)} {index !== item.data.categories.length - 1 && ", "} ), diff --git a/src/layouts/components/BlogCard.astro b/src/layouts/components/BlogCard.astro index 9b38f40..b210306 100644 --- a/src/layouts/components/BlogCard.astro +++ b/src/layouts/components/BlogCard.astro @@ -1,6 +1,6 @@ --- import config from "@/config/config.json"; -import { humanize, slugify } from "@/lib/utils/textConverter"; +import { upperHumanize, slugify } from "@/lib/utils/textConverter"; import { FaRegFolder, FaRegClock } from "react-icons/fa/index.js"; import readingTime from "@/lib/utils/readingTime"; @@ -24,7 +24,7 @@ const { title, description, categories, complexity } = data.data; { categories.map((category: string, index: number) => ( - {humanize(category)} + {upperHumanize(category)} {index !== categories.length - 1 && ","} )) diff --git a/src/layouts/components/BlogSidebar.astro b/src/layouts/components/BlogSidebar.astro index 778a983..6a40aa5 100644 --- a/src/layouts/components/BlogSidebar.astro +++ b/src/layouts/components/BlogSidebar.astro @@ -1,5 +1,5 @@ --- -import { humanize } from "@/lib/utils/textConverter"; +import { lowerHumanize, upperHumanize } from "@/lib/utils/textConverter"; const { tags, categories, allCategories } = Astro.props; --- @@ -23,7 +23,7 @@ const { tags, categories, allCategories } = Astro.props; class="flex justify-between hover:text-primary dark:hover:text-darkmode-primary" href={`/blog/categories/${category}`} > - {humanize(category)} ({count}) + {upperHumanize(category)} ({count})
    • ); @@ -47,7 +47,7 @@ const { tags, categories, allCategories } = Astro.props; class="m-1 block rounded bg-white px-3 py-1 hover:bg-primary hover:text-white dark:bg-darkmode-body dark:hover:bg-darkmode-primary dark:hover:text-dark" href={`/blog/tags/${tag}`} > - {tag} + {lowerHumanize(tag)} ); diff --git a/src/layouts/components/Breadcrumbs.astro b/src/layouts/components/Breadcrumbs.astro index e7fd76b..2d6c783 100644 --- a/src/layouts/components/Breadcrumbs.astro +++ b/src/layouts/components/Breadcrumbs.astro @@ -1,4 +1,5 @@ --- +import { lowerHumanize } from "@/lib/utils/textConverter"; const { className }: { className?: string } = Astro.props; const paths = Astro.url.pathname.split("/").filter((x) => x); @@ -14,7 +15,7 @@ paths.forEach((label: string, i: number) => { const href = `/${paths.slice(0, i + 1).join("/")}`; label !== "page" && parts.push({ - label: label.replace(/[-_]/g, " ") || "", + label: label, href, "aria-label": Astro.url.pathname === href ? "page" : undefined, }); @@ -29,10 +30,10 @@ paths.forEach((label: string, i: number) => { {index > 0 && /} {index !== parts.length - 1 ? ( - {label} + {lowerHumanize(label)} ) : ( - {label} + {lowerHumanize(label)} )} )) diff --git a/src/layouts/components/DrinkSidebar.astro b/src/layouts/components/DrinkSidebar.astro index 79db4ed..3d92fc6 100644 --- a/src/layouts/components/DrinkSidebar.astro +++ b/src/layouts/components/DrinkSidebar.astro @@ -1,4 +1,5 @@ --- +import { lowerHumanize } from "@/lib/utils/textConverter"; const { tags, spirits, bottles, allSpirits, allBottles } = Astro.props; --- @@ -18,7 +19,7 @@ const { tags, spirits, bottles, allSpirits, allBottles } = Astro.props; class="m-1 block rounded bg-white px-3 py-1 hover:bg-primary hover:text-white dark:bg-darkmode-body dark:hover:bg-darkmode-primary dark:hover:text-dark" href={`/drinks/spirits/${spirit}`} > - {spirit} + {lowerHumanize(spirit)} ); @@ -39,7 +40,7 @@ const { tags, spirits, bottles, allSpirits, allBottles } = Astro.props; class="m-1 block rounded bg-white px-3 py-1 hover:bg-primary hover:text-white dark:bg-darkmode-body dark:hover:bg-darkmode-primary dark:hover:text-dark" href={`/drinks/bottles/${bottle}`} > - {bottle} + {lowerHumanize(bottle)} ); @@ -60,7 +61,7 @@ const { tags, spirits, bottles, allSpirits, allBottles } = Astro.props; class="m-1 block rounded bg-white px-3 py-1 hover:bg-primary hover:text-white dark:bg-darkmode-body dark:hover:bg-darkmode-primary dark:hover:text-dark" href={`/drinks/tags/${tag}`} > - {tag} + {lowerHumanize(tag)} ); diff --git a/src/layouts/components/PageHeader.astro b/src/layouts/components/PageHeader.astro index 2a9d27f..ec10ada 100644 --- a/src/layouts/components/PageHeader.astro +++ b/src/layouts/components/PageHeader.astro @@ -1,5 +1,6 @@ --- import Breadcrumbs from "@/components/Breadcrumbs.astro"; +import { upperHumanize } from "@/lib/utils/textConverter"; const { title = "" }: { title?: string } = Astro.props; --- @@ -9,7 +10,7 @@ const { title = "" }: { title?: string } = Astro.props;
    -

    +

diff --git a/src/layouts/shortcodes/Notice.tsx b/src/layouts/shortcodes/Notice.tsx index 48c4364..f32823b 100644 --- a/src/layouts/shortcodes/Notice.tsx +++ b/src/layouts/shortcodes/Notice.tsx @@ -1,4 +1,4 @@ -import { humanize } from "@/lib/utils/textConverter"; +import { upperHumanize } from "@/lib/utils/textConverter"; import React from "react"; function Notice({ @@ -75,7 +75,7 @@ function Notice({ /> )} -

{humanize(type)}

+

{upperHumanize(type)}

{children}
diff --git a/src/lib/utils/textConverter.ts b/src/lib/utils/textConverter.ts index 02f5e3d..2e189ae 100644 --- a/src/lib/utils/textConverter.ts +++ b/src/lib/utils/textConverter.ts @@ -16,14 +16,19 @@ export const markdownify = (content: string, div?: boolean) => { return div ? marked.parse(content) : marked.parseInline(content); }; -// humanize -export const humanize = (content: string) => { +// hyphen to space, uppercase only first letter in each word +export const upperHumanize = (content: string) => { return content - .replace(/^[\s_]+|[\s_]+$/g, "") - .replace(/[_\s]+/g, " ") - .replace(/^[a-z]/, function (m) { - return m.toUpperCase(); - }); + .toLowerCase() + .replace(/-/g, " ") + .replace(/(^\w{1})|(\s{1}\w{1})/g, (match) => match.toUpperCase()); +}; + +// hyphen to space, lowercase all letters +export const lowerHumanize = (content: string) => { + return content + .toLowerCase() + .replace(/-/g, " "); }; // plainify diff --git a/src/pages/blog/categories/index.astro b/src/pages/blog/categories/index.astro index 448af37..c590760 100644 --- a/src/pages/blog/categories/index.astro +++ b/src/pages/blog/categories/index.astro @@ -2,7 +2,7 @@ import config from "@/config/config.json"; import Base from "@/layouts/Base.astro"; import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro"; -import { humanize } from "@/lib/utils/textConverter"; +import { upperHumanize } from "@/lib/utils/textConverter"; import PageHeader from "@/components/PageHeader.astro"; const { blog_folder }: { blog_folder: string } = config.settings; @@ -24,7 +24,7 @@ const allCategories = await getAllTaxonomy(blog_folder, "categories"); href={`/blog/categories/${category}`} class="block rounded bg-theme-light px-4 py-2 text-xl text-dark dark:bg-darkmode-theme-light dark:text-darkmode-dark" > - {humanize(category)}{" "} + {upperHumanize(category)}{" "} {count} diff --git a/src/pages/blog/tags/[tag].astro b/src/pages/blog/tags/[tag].astro index 0345991..23be910 100644 --- a/src/pages/blog/tags/[tag].astro +++ b/src/pages/blog/tags/[tag].astro @@ -4,6 +4,7 @@ import config from "@/config/config.json"; import Base from "@/layouts/Base.astro"; import { getSinglePage } from "@/lib/contentParser.astro"; import { getTaxonomy } from "@/lib/taxonomyParser.astro"; +import { lowerHumanize } from "@/lib/utils/textConverter"; import taxonomyFilter from "@/lib/utils/taxonomyFilter"; import PageHeader from "@/components/PageHeader.astro"; @@ -22,8 +23,8 @@ const posts = await getSinglePage(config.settings.blog_folder); const filterByCategories = taxonomyFilter(posts, "tags", tag!); --- - - + +
diff --git a/src/pages/blog/tags/index.astro b/src/pages/blog/tags/index.astro index 8baf430..ead5d56 100644 --- a/src/pages/blog/tags/index.astro +++ b/src/pages/blog/tags/index.astro @@ -2,6 +2,7 @@ import config from "@/config/config.json"; import Base from "@/layouts/Base.astro"; import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro"; +import { lowerHumanize } from "@/lib/utils/textConverter"; import PageHeader from "@/components/PageHeader.astro"; const { blog_folder }: { blog_folder: string } = config.settings; @@ -23,7 +24,7 @@ const allTags = await getAllTaxonomy(blog_folder, "tags"); href={`/blog/tags/${tag}`} class="block rounded bg-theme-light px-4 py-2 text-xl text-dark dark:bg-darkmode-theme-light dark:text-darkmode-dark" > - {tag}{" "} + {lowerHumanize(tag)}{" "} {count} diff --git a/src/pages/drinks/bottles/[bottle].astro b/src/pages/drinks/bottles/[bottle].astro index a794e41..93734e2 100644 --- a/src/pages/drinks/bottles/[bottle].astro +++ b/src/pages/drinks/bottles/[bottle].astro @@ -4,6 +4,7 @@ import config from "@/config/config.json"; import Base from "@/layouts/Base.astro"; import { getSinglePage } from "@/lib/contentParser.astro"; import { getTaxonomy } from "@/lib/taxonomyParser.astro"; +import { lowerHumanize } from "@/lib/utils/textConverter"; import taxonomyFilter from "@/lib/utils/taxonomyFilter"; import PageHeader from "@/components/PageHeader.astro"; @@ -25,8 +26,8 @@ const posts = await getSinglePage(config.settings.drink_folder); const filterByBottles = taxonomyFilter(posts, "bottles", bottle!); --- - - + +
diff --git a/src/pages/drinks/bottles/index.astro b/src/pages/drinks/bottles/index.astro index 2b1cb59..0d87e49 100644 --- a/src/pages/drinks/bottles/index.astro +++ b/src/pages/drinks/bottles/index.astro @@ -2,6 +2,7 @@ import config from "@/config/config.json"; import Base from "@/layouts/Base.astro"; import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro"; +import { lowerHumanize } from "@/lib/utils/textConverter"; import PageHeader from "@/components/PageHeader.astro"; const { drink_folder }: { drink_folder: string } = config.settings; @@ -23,7 +24,7 @@ const allBottles = await getAllTaxonomy(drink_folder, "bottles"); href={`/drinks/bottles/${bottle}`} class="block rounded bg-theme-light px-4 py-2 text-xl text-dark dark:bg-darkmode-theme-light dark:text-darkmode-dark" > - {bottle}{" "} + {lowerHumanize(bottle)}{" "} {count} diff --git a/src/pages/drinks/spirits/[spirit].astro b/src/pages/drinks/spirits/[spirit].astro index 09ac29f..f694b8f 100644 --- a/src/pages/drinks/spirits/[spirit].astro +++ b/src/pages/drinks/spirits/[spirit].astro @@ -4,6 +4,7 @@ import config from "@/config/config.json"; import Base from "@/layouts/Base.astro"; import { getSinglePage } from "@/lib/contentParser.astro"; import { getTaxonomy } from "@/lib/taxonomyParser.astro"; +import { lowerHumanize } from "@/lib/utils/textConverter"; import taxonomyFilter from "@/lib/utils/taxonomyFilter"; import PageHeader from "@/components/PageHeader.astro"; @@ -25,8 +26,8 @@ const posts = await getSinglePage(config.settings.drink_folder); const filterBySpirits = taxonomyFilter(posts, "spirits", spirit!); --- - - + +
diff --git a/src/pages/drinks/spirits/index.astro b/src/pages/drinks/spirits/index.astro index ee8162f..68b8883 100644 --- a/src/pages/drinks/spirits/index.astro +++ b/src/pages/drinks/spirits/index.astro @@ -2,8 +2,10 @@ import config from "@/config/config.json"; import Base from "@/layouts/Base.astro"; import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro"; +import { lowerHumanize } from "@/lib/utils/textConverter"; import PageHeader from "@/components/PageHeader.astro"; + const { drink_folder }: { drink_folder: string } = config.settings; const spirits = await getTaxonomy(drink_folder, "spirits"); const allSpirits = await getAllTaxonomy(drink_folder, "spirits"); @@ -23,7 +25,7 @@ const allSpirits = await getAllTaxonomy(drink_folder, "spirits"); href={`/drinks/spirits/${spirit}`} class="block rounded bg-theme-light px-4 py-2 text-xl text-dark dark:bg-darkmode-theme-light dark:text-darkmode-dark" > - {spirit}{" "} + {lowerHumanize(spirit)}{" "} {count} diff --git a/src/pages/drinks/tags/[tag].astro b/src/pages/drinks/tags/[tag].astro index 7cbd3d6..8428660 100644 --- a/src/pages/drinks/tags/[tag].astro +++ b/src/pages/drinks/tags/[tag].astro @@ -4,9 +4,11 @@ import config from "@/config/config.json"; import Base from "@/layouts/Base.astro"; import { getSinglePage } from "@/lib/contentParser.astro"; import { getTaxonomy } from "@/lib/taxonomyParser.astro"; +import { lowerHumanize } from "@/lib/utils/textConverter"; import taxonomyFilter from "@/lib/utils/taxonomyFilter"; import PageHeader from "@/components/PageHeader.astro"; + export async function getStaticPaths() { const tags = await getTaxonomy(config.settings.drink_folder, "tags"); @@ -22,8 +24,8 @@ const posts = await getSinglePage(config.settings.drink_folder); const filterByCategories = taxonomyFilter(posts, "tags", tag!); --- - - + +
diff --git a/src/pages/drinks/tags/index.astro b/src/pages/drinks/tags/index.astro index f6144c2..dfe2511 100644 --- a/src/pages/drinks/tags/index.astro +++ b/src/pages/drinks/tags/index.astro @@ -2,6 +2,7 @@ import config from "@/config/config.json"; import Base from "@/layouts/Base.astro"; import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro"; +import { lowerHumanize } from "@/lib/utils/textConverter"; import PageHeader from "@/components/PageHeader.astro"; const { drink_folder }: { drink_folder: string } = config.settings; @@ -23,7 +24,7 @@ const allTags = await getAllTaxonomy(drink_folder, "tags"); href={`/drinks/tags/${tag}`} class="block rounded bg-theme-light px-4 py-2 text-xl text-dark dark:bg-darkmode-theme-light dark:text-darkmode-dark" > - {tag}{" "} + {lowerHumanize(tag)}{" "} {count} From 5657336f508b504d85eb362ba139984f3e5f8674 Mon Sep 17 00:00:00 2001 From: Reed Nelson Date: Wed, 6 Dec 2023 19:23:15 -0600 Subject: [PATCH 5/5] nav spacing --- src/layouts/components/Header.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/components/Header.astro b/src/layouts/components/Header.astro index 97fe5d8..786e7d4 100644 --- a/src/layouts/components/Header.astro +++ b/src/layouts/components/Header.astro @@ -43,7 +43,7 @@ const { pathname } = Astro.url;