- Adds /recipe/:id page - (Almost!) fully designed and functional recipe view - Has steps, images, ingredients, peripheral info (work/wait time, rating, description, servings) - New colour scheme! Much more monotone but in a nice way (imo) - New font, not condensed - Several more smaller design changes Co-authored-by: june <self@breadone.net> Co-committed-by: june <self@breadone.net>
This commit was merged in pull request #6.
This commit is contained in:
@@ -1,27 +1,31 @@
|
||||
---
|
||||
import client from "@/data/pocketbase"
|
||||
import TagRow from "./TagRow.astro"
|
||||
|
||||
const { recipe } = Astro.props;
|
||||
|
||||
const headerImage = await client.collection("images").getOne(recipe.images[0])
|
||||
const image = await client.files.getURL(headerImage, headerImage.image)
|
||||
---
|
||||
|
||||
<div class="relative z-0 flex h-60">
|
||||
<div class="relative z-0 flex h-50">
|
||||
<img
|
||||
class="w-full h-full object-cover rounded-xl"
|
||||
src={ image }
|
||||
/>
|
||||
|
||||
<div class="absolute bottom-0 left-0 w-full p-2 h-25 backdrop-filter backdrop-blur-lg rounded-b-xl">
|
||||
<p class="text-[14pt] text-white opacity-90 font-bold" >{recipe.name}</p>
|
||||
<p class="text-white text-[10pt]"> {recipe.description} </p>
|
||||
<div id="bottom-info-panel" class="absolute bottom-0 left-0 w-full p-2 h-20 backdrop-filter backdrop-blur-lg rounded-b-xl z-1">
|
||||
<p id="recipe-name" class="text-[14pt] text-white opacity-90 font-bold line-clamp-1" >{recipe.name}</p>
|
||||
<!-- <p id="recipe-desc" class="text-white text-[10pt]"> {recipe.description} </p> -->
|
||||
|
||||
<div class="flex flex-row">
|
||||
{recipe.tags.map(async tag => (
|
||||
<p class="text-white bg-white/20 px-2 mr-2 mt-2 rounded-md">{
|
||||
(await client.collection("tags").getOne(tag)).name
|
||||
}</p>
|
||||
))}
|
||||
<div id="tag-row" class="">
|
||||
<TagRow tagIds={recipe.tags}/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<a id="link" href={`/recipe/${recipe.id}`} class="absolute inset-0 z-0">
|
||||
<span class="block w-full h-full hover:bg-black/10 transition-colors">
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</div>
|
||||
33
src/components/Card/TagRow.astro
Normal file
33
src/components/Card/TagRow.astro
Normal file
@@ -0,0 +1,33 @@
|
||||
---
|
||||
import client from "../../data/pocketbase"
|
||||
|
||||
interface Props {
|
||||
tagIds: string[]
|
||||
}
|
||||
|
||||
const { tagIds } = Astro.props
|
||||
|
||||
const tags = tagIds && tagIds.length > 0
|
||||
? await Promise.all(tagIds.map(async (tagId: string) => {
|
||||
try {
|
||||
const tagData = await client.collection("tags").getOne(tagId)
|
||||
return { name: tagData.name, id: tagId }
|
||||
} catch (error) {
|
||||
return null
|
||||
}
|
||||
}))
|
||||
: []
|
||||
---
|
||||
|
||||
<div class="">
|
||||
{
|
||||
tags.map(tag => (
|
||||
<a
|
||||
href={`/tag/${tag.id}`}
|
||||
class="text-white bg-white/20 px-2 mr-2 mt-2 rounded-md inline-block hover:bg-white/30"
|
||||
>
|
||||
{tag.name}
|
||||
</a>
|
||||
))
|
||||
}
|
||||
</div>
|
||||
58
src/components/Detail/ImageCarousel.astro
Normal file
58
src/components/Detail/ImageCarousel.astro
Normal file
@@ -0,0 +1,58 @@
|
||||
---
|
||||
import client from "@/data/pocketbase";
|
||||
const { class: className, recipe } = Astro.props
|
||||
|
||||
async function getLink(img: string) {
|
||||
const record = await client.collection("images").getOne(img)
|
||||
const link = await client.files.getURL(record, record.image)
|
||||
return link
|
||||
}
|
||||
|
||||
// Use Promise.all to wait for all async operations to complete
|
||||
const links = await Promise.all(
|
||||
recipe.images.map((img: string) => getLink(img))
|
||||
)
|
||||
|
||||
---
|
||||
|
||||
<script>
|
||||
let pos = 0;
|
||||
const dataElement = document.getElementById('carousel-data');
|
||||
const links = dataElement ? JSON.parse(dataElement.textContent || '[]') : [];
|
||||
const cap = links.length - 1;
|
||||
const img = document.getElementById('carousel-img') as HTMLImageElement;
|
||||
|
||||
if (cap == 0) {
|
||||
const b0 = document.getElementById('dec-button')
|
||||
const b1 = document.getElementById('inc-button')
|
||||
|
||||
b0!.hidden = true
|
||||
b1!.hidden = true
|
||||
}
|
||||
|
||||
function inc() {
|
||||
pos = pos === cap ? 0 : pos + 1;
|
||||
if (img) img.src = links[pos];
|
||||
}
|
||||
|
||||
function dec() {
|
||||
pos = pos === 0 ? cap : pos - 1;
|
||||
if (img) img.src = links[pos];
|
||||
}
|
||||
|
||||
// make functions globally accessible
|
||||
(window as any).inc = inc;
|
||||
(window as any).dec = dec;
|
||||
</script>
|
||||
|
||||
<div class={className}>
|
||||
<!-- Hidden element to pass server data to client -->
|
||||
<div class="hidden" id="carousel-data">{JSON.stringify(links)}</div>
|
||||
|
||||
<div class="relative flex items-center w-full h-60">
|
||||
<button id="dec-button" class="absolute left-2" onclick="dec()"><</button>
|
||||
<img id="carousel-img" class="rounded-lg w-full h-full object-cover" src={links[0]} />
|
||||
<!-- <div class="w-70 h-60 bg-green-600" /> -->
|
||||
<button id="inc-button" class="absolute right-2" onclick="inc()">></button>
|
||||
</div>
|
||||
</div>
|
||||
42
src/components/Detail/IngredientTableView.astro
Normal file
42
src/components/Detail/IngredientTableView.astro
Normal file
@@ -0,0 +1,42 @@
|
||||
---
|
||||
// const { ingredients } = Astro.props
|
||||
|
||||
const { class: className, ingredients } = Astro.props
|
||||
---
|
||||
|
||||
<!-- <div class=`bg-[#2a2b2c] rounded-lg grid grid-cols-3 text-center ${className}`>
|
||||
<span class="font-bold">Quantity</span>
|
||||
<span class="font-bold">Unit</span>
|
||||
<span class="font-bold">Food</span>
|
||||
{
|
||||
ingredients.map(ing => (
|
||||
<span>{ing.quantity}</span>
|
||||
<span>{ing.unit}</span>
|
||||
<span>{ing.name}</span>
|
||||
))
|
||||
}
|
||||
|
||||
</div> -->
|
||||
|
||||
<table class={`table-auto text-left bg-[#2a2b2c] rounded-lg ${className} w-full`}>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="px-4 py-2">Quantity</th>
|
||||
<th class="px-4 py-2">Unit</th>
|
||||
<th class="px-4 py-2">Food</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{
|
||||
ingredients.map(ing => (
|
||||
<>
|
||||
<tr class="border-t border-gray-600">
|
||||
<td class="px-4 py-2">{ing.quantity}</td>
|
||||
<td class="px-4 py-2">{ing.unit}</td>
|
||||
<td class="px-4 py-2">{ing.name}</td>
|
||||
</tr>
|
||||
</>
|
||||
))
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -1,13 +1,14 @@
|
||||
|
||||
<div class="flex w-full items-center bg-yellow-100 p-5">
|
||||
<div class="flex w-full items-center bg-[#2a2b2c] text-white p-5">
|
||||
<a class="flex" href="/">
|
||||
<p class=" text-3xl">Reci</p>
|
||||
<p class=" text-3xl text-amber-500">pie</p>
|
||||
<p class="text-3xl">Recipie</p>
|
||||
<!-- <p class=" text-3xl text-amber-500">pie</p> -->
|
||||
🥧
|
||||
</a>
|
||||
|
||||
<div class="flex ml-10 space-x-5">
|
||||
<!-- <span>new</span>
|
||||
<span>sf</span> -->
|
||||
<div class="ml-auto space-x-5">
|
||||
<a>new</a>
|
||||
<a>tags</a>
|
||||
<a>search</a>
|
||||
</div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user