Fix some capitalisation issues, change rating display

src/components/Detail/InfoView.astro

@@ -1,29 +0,0 @@
----
-import TagRow from "../Card/TagRow.astro";
-
-
-const { re } = Astro.props
-
-function formatTime(seconds) {
-    if (seconds === 0) return null
-    const h = Math.floor(seconds / 3600);
-    const m = Math.floor((seconds % 3600) / 60);
-    let result = "";
-    if (h > 0) result += `${h}h`;
-    if (m > 0) result += `${m}m`;
-    if (result === "") result = "0m";
-    return result;
-}
-
-const workTime = formatTime(re.worktime)
-const waitTime = formatTime(re.waittime)
----
-
-<p class="text-white/60 text-sm mt-1 italic">{re.description}</p>
-<div class="flex pt-1 items-center">
-    {re.servings !== 0 && (<p class="border-r pr-2">Serves: {re.servings}</p>)}
-    {workTime && (<p class="border-r px-2">{workTime} Work</p>)}
-    {waitTime && (<p class="border-r px-2">{waitTime} Wait</p>)}
-    {re.rating !== 0 && (<p class="pl-2">{re.rating}</p><p class="text-white/40 text-xs">/10</p>)}
-</div>
-<TagRow tagIds={re.tags}/>

src/components/Detail/IngredientTableView.astro

@@ -2,36 +2,35 @@
 // const { ingredients } = Astro.props
 
 const { class: className, ingredients } = Astro.props
-const tableView = true
 ---
 
-{!tableView && (
+<!-- <div class=`bg-[#2a2b2c] rounded-lg grid grid-cols-3 text-center ${className}`>
-    <div class={`bg-[#2a2b2c] p-3 rounded-lg w-full text-left ${className}`}>
+    <span class="font-bold">Quantity</span>
+    <span class="font-bold">Unit</span>
+    <span class="font-bold">Food</span>
     {
         ingredients.map(ing => (
-            <div class="text-white/70">
+            <span>{ing.quantity}</span>
-                <p>• {ing.quantity}&nbsp;{ing.unit}&nbsp;{ing.name}</p>
+            <span>{ing.unit}</span>
-            </div>
+            <span>{ing.name}</span>
         ))
     }
 
-    </div>
+</div> -->
-)}
 
-{tableView && (
+<table class={`table-auto text-left bg-[#2a2b2c] rounded-lg ${className} w-full`}>
-    <table class={`table-auto text-left bg-[#2a2b2c] rounded-lg ${className}`}>
     <thead>
         <tr>
             <th class="px-4 py-2">Quantity</th>
             <th class="px-4 py-2">Unit</th>
-                <th class="px-4 py-2">Ingredient</th>
+            <th class="px-4 py-2">Food</th>
         </tr>
     </thead>
     <tbody>
         {
-            ingredients.map((ing, index) => (
+        ingredients.map(ing => (
             <>
-                    <tr class="border-t border-white/10 cursor-pointer hover:bg-white/10 transition-opacity ingredient-row" data-index={index}>
+                <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>
@@ -41,28 +40,3 @@ const tableView = true
         }
     </tbody>
 </table>
-)}
-
-<style>
-    .ingredient-row.completed {
-        /* background-color: rgba(0, 0, 0, 0.4) !important; */
-        opacity: 0.6;
-    }
-    
-    .ingredient-row.completed td {
-        text-decoration: line-through;
-        color: rgba(255, 255, 255, 0.5);
-    }
-</style>
-
-<script>
-    document.addEventListener('DOMContentLoaded', function() {
-        const rows = document.querySelectorAll('.ingredient-row');
-        
-        rows.forEach(row => {
-            row.addEventListener('click', function() {
-                this.classList.toggle('completed');
-            });
-        });
-    });
-</script>

src/components/Detail/StepIngredientSideView.astro

@@ -1,17 +0,0 @@
----
-import client from "@/data/pocketbase";
-
-const { ingredients, class: className } = Astro.props;
-
-const ings = await Promise.all(
-    ingredients.map(async i => await client.collection("ingredients").getOne(i))
-)
----
-
-<div class={className}>
-    {ings.map(i => (
-        <div class="text-sm">
-            <p>• {i.quantity} {i.unit || " "}  {i.name}</p>
-        </div>
-    ))}
-</div>

src/components/Detail/StepView.astro

@@ -1,25 +0,0 @@
----
-import { record } from "astro:schema"
-import client from "@/data/pocketbase"
-import StepIngredientSideView from "./StepIngredientSideView.astro"
-
-const { steps, class: className } = Astro.props
----
-
-<div class={className}>
-    <p class="text-[22pt] font-bold md:hidden">Steps</p>
-    { steps.map(s => (
-        <div class="bg-[#2a2b2c] rounded-lg mb-2 p-3">
-            <p class="text-bold text-[10pt]">Step {s.index + 1}</p>
-            
-            <div class="flex flex-col md:flex-row md:items-stretch">
-                <p class="w-full md:flex-2/3 pr-1 text-left">{s.instruction}</p>
-                {s.ingredients && s.ingredients.length > 0 && (
-                    <div class="w-full md:w-auto md:flex-2/5 mt-2 md:mt-0 md:ml-2 md:pl-3 md:border-l text-white/70 border-white/70">
-                        <StepIngredientSideView class="text-left" ingredients={s.ingredients} />
-                    </div>
-                )}
-            </div>
-        </div>
-    )) }
-</div>

src/components/Header.astro

@@ -7,8 +7,8 @@
     </a>
 
     <div class="ml-auto space-x-5">
-        <a class="hover:underline underline-offset-4 "  href="/recipe/new">new</a>
+        <a>new</a>
-        <a class="hover:underline underline-offset-4 " >tags</a>
+        <a>tags</a>
-        <a class="hover:underline underline-offset-4 " >search</a>
+        <a>search</a>
     </div>
 </div>

src/pages/recipe/[recipeid].astro

@@ -3,8 +3,6 @@ import client from "@/data/pocketbase";
 import SiteLayout from "@/layouts/base";
 import ImageCarousel from "@/components/Detail/ImageCarousel";
 import IngredientTableView from "@/components/Detail/IngredientTableView";
-import StepView from "@/components/Detail/StepView";
-import InfoView from "@/components/Detail/InfoView";
 
 const { recipeid } = Astro.params;
 
@@ -25,24 +23,56 @@ const ingredients = await Promise.all(
         await client.collection("ingredients").getOne(s)
     )
 )
+
+function formatTime(seconds) {
+    if (seconds === 0) return null
+    const h = Math.floor(seconds / 3600);
+    const m = Math.floor((seconds % 3600) / 60);
+    let result = "";
+    if (h > 0) result += `${h}h`;
+    if (m > 0) result += `${m}m`;
+    if (result === "") result = "0m";
+    return result;
+}
+
+const workTime = formatTime(re.worktime)
+const waitTime = formatTime(re.waittime)
 ---
 
 <SiteLayout>
-    <div class="flex flex-col md:flex-row mx-auto justify-center w-full lg:max-w-3/4 xl:max-w-2/3 2xl:max-w-1/2">
+    <div class="flex flex-col md:flex-row">
-        <div class="flex md:flex-1/3 flex-col mt-2 md:mt-4 sticky">
+        <div class="flex flex-col mt-2 md:mt-4 sticky">
             <ImageCarousel class="w-full" recipe={re} />
-            <p class="text-[28pt] font-bold leading-11 mt-2">{re.name}</p>
+            <p class=" md:hidden text-[28pt] font-bold leading-none mt-2">{re.name}</p>
 
             <!-- Details -->
-            <InfoView re={re} />
+            <p class="text-white/60 text-sm mt-1 italic">{re.description}</p>
+            <div class="flex pt-1 items-center">
+                {re.servings !== 0 && (<p class="border-r pr-2">Serves: {re.servings}</p>)}
+                {workTime && (<p class="border-r px-2">{workTime} Work</p>)}
+                {waitTime && (<p class="border-r px-2">{waitTime} Wait</p>)}
+                {re.rating !== 0 && (<p class="pl-2">{re.rating}</p><p class="text-white/40 text-xs">/10</p>)}
+            </div>
 
             <p class="text-[22pt] font-bold 'md:mt-4'">Ingredients</p>
             <IngredientTableView class:list={['md:w-80', 'px-4']} ingredients={ingredients}  />
         </div>
         
-        <div class="flex mt-4 md:flex-2/3 w-full flex-col">
+        <div class="flex w-full flex-col">
+            <p class="hidden md:block text-[28pt] font-bold pl-5">{re.name}</p>
+
             <!-- Steps -->
-            <StepView class="md:ml-3" steps={steps} />
+            <div class="md:ml-5 mt-2 md:mt-0">
+                <p class="text-[22pt] font-bold md:hidden">Steps</p>
+                { steps.map(s => (
+                    <div class="bg-[#2a2b2c] rounded-lg mb-2 p-3 md:">
+                        <p class="text-bold text-[10pt]">Step {s.index + 1}</p>
+                        <p>{s.instruction}</p>
+                    </div>
+                )) }
+            </div>
+
+            
         </div>
 
     </div>

src/pages/recipe/new.astro

@@ -1,94 +0,0 @@
----
-import SiteLayout from "@/layouts/base";
-
-const { recipeid } = Astro.params;
-
-// Actually post the recipe with the stored variables
-async function submitRecipe() {
-    
-}
-
----
-<script src="@/script/newRecipe.ts"/>
-
-<SiteLayout>
-    <div class="flex flex-col md:flex-row mx-auto justify-center w-full lg:max-w-3/4 xl:max-w-2/3 2xl:max-w-1/2">
-        <div class="flex md:flex-1/3 flex-col mt-2 md:mt-4 sticky">
-            <div class="relative">
-                <input 
-                    id="photo" 
-                    type="file" 
-                    accept="image/png,image/jpeg" 
-                    class="w-full bg-white/10 rounded-lg h-50
-                           file:mr-4 file:py-2 file:px-4 
-                           file:rounded-lg file:border-0 file:hidden
-                           before:content-['camera'] before:w-full before:h-full before:flex 
-                           before:items-center before:justify-center before:absolute
-                           relative cursor-pointer
-                           [&::-webkit-file-upload-button]:hidden"
-                >
-            </div>
-            <textarea
-                id="rec-name"
-                rows="1"
-                placeholder="Name"
-                class="text-[28pt] font-bold p-1 leading-none mt-2 bg-white/10 rounded-lg resize-none overflow-hidden"
-                oninput="this.style.height = ''; this.style.height = this.scrollHeight + 'px'"
-            />
-                <!-- if it works :3  -->
-
-            <!-- Details -->
-            <!-- <InfoView re={re} /> -->
-
-            <div class="flex flex-row align-middle items-center">
-                <p class="mt-4 text-[22pt] font-bold 'mt-4'">Ingredients</p>
-                <button disabled class="disabled:text-white/20 transition-colors ml-auto mt-5 text-white bg-white/10 rounded-lg px-3 py-1 " id="add-ingredient-btn" >Add</button>
-            </div>
-            <table class={`table-fixed  text-left bg-[#2a2b2c] rounded-lg w-full`}>
-                <thead>
-                    <tr>
-                        <th class="px-4 py-2 w-18">Qty</th>
-                        <th class="px-4 py-2 w-20">Unit</th>
-                        <th class="px-4 py-2">Ingredient</th>
-                    </tr>
-                </thead>
-                <tbody id="ingredient-table" class="w-full border-t px-4 py-2 border-white/10">
-                    <tr id="ingredient-input" class="">
-                        <td class="px-2 py-1">
-                            <input id="ing-qty" class="w-full h-9 my-1 bg-white/10 rounded-lg px-2 py-2" type="text" placeholder="Qty">
-                        </td>
-                        <td class="px-2 py-1">
-                            <input id="ing-unit" class="w-full h-9 bg-white/10 rounded-lg px-2 py-2" type="text" placeholder="Unit">
-                        </td>
-                        <td class="px-2 py-1">
-                            <!-- <textarea id="ing-name" class="w-full h-11 bg-white/20 rounded-lg px-2 py-3 mt-1 resize-none leading-tight" placeholder="Ingredient" rows="1"/> -->
-                             <input id="ing-name" class="w-full h-9 bg-white/10 rounded-lg px-2 py-2" type="text" placeholder="Ingredient">
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-        
-        <div class="flex mt-4 md:flex-2/3 w-full flex-col md:ml-3">
-            <!-- <p class="hidden md:block text-[28pt] font-bold pl-5">Helloi</p> -->
-
-            <!-- Steps -->
-            <p class="text-[22pt] font-bold md:hidden">Steps</p>
- 
-            <div class="bg-[#2a2b2c] rounded-lg mb-2 p-2">
-                <!-- <p class="text-bold text-[10pt]">Step</p> -->
-                <textarea
-                        id="new-instruction"
-                        class="block bg-white/10 w-full h-full rounded-lg resize-none px-3 py-1"
-                        placeholder="New Step"
-                        oninput="this.style.height = ''; this.style.height = this.scrollHeight + 'px'"
-                    />
-            </div>
-
-            <button disabled class="disabled:text-white/20 ml-auto mb-2 transition-colors text-white bg-white/10 rounded-lg px-3 py-1 " id="add-step-btn" >Add</button>
-
-            <ul id="step-list"></ul>
-        </div>
-
-    </div>
-</SiteLayout>

src/script/newRecipe.ts

@@ -1,185 +0,0 @@
-let ingredientFields: HTMLInputElement[] = []
-let ingredientTable: HTMLTableSectionElement = document.querySelector('#ingredient-table')!
-let ingredientAddButton: HTMLButtonElement = document.querySelector('#add-ingredient-btn')!
-
-let stepInput: HTMLTextAreaElement = document.querySelector('#new-instruction')!
-let stepAddButton: HTMLButtonElement = document.querySelector('#add-step-btn')!
-let stepList: HTMLUListElement = document.querySelector('#step-list')!
-let currentStepIndex = 0
-
-// - VARS
-let ingredients: {qty: string, unit: string, name: string}[] = []
-let steps: {
-    index: number,
-    instruction: string,
-    ingredients: string[], // IDs of ingredient fields
-}[] = []
-
-// - INIT
-document.addEventListener('DOMContentLoaded', function() {
-    
-    ingredientFields.push(
-        document.querySelector('#ing-qty')!,
-        document.querySelector('#ing-unit')!,
-        document.querySelector('#ing-name')!
-    )
-
-    stepInput.addEventListener('input', showAddStepButton)
-    
-    // show plus button once the user types in the text fields
-    ingredientFields.forEach(f => {
-        f.addEventListener('input', showAddIngredientButton)
-        f.addEventListener('keydown', showAddIngredientButton)
-    })
-    // onclick for add button
-    document.querySelector('#add-ingredient-btn')?.addEventListener('click', addIngredient);
-
-    // Enter key navigation for ingredient fields
-    ingredientFields[0].addEventListener('keydown', e => {
-        if (e.key === 'Enter') {
-            ingredientFields[1].focus() // Move from qty to unit
-        }
-    })
-    
-    ingredientFields[1].addEventListener('keydown', e => {
-        if (e.key === 'Enter') {
-            ingredientFields[2].focus() // Move from unit to name
-        }
-    })
-    
-    // for pressing enter to add ingredient (on the last field)
-    ingredientFields[2].addEventListener('keydown', e => {if (e.key === 'Enter') addIngredient()} )
-    
-    // Initial check for button state
-    showAddIngredientButton()
-    showAddStepButton()
-
-    // Steps
-    stepInput.addEventListener('keyup', e => { if (e.key === 'Enter' && e.shiftKey) addStep()  } )
-    stepAddButton.addEventListener('click', addStep)
-});
-
-// - ADD
-function addIngredient() {
-    const ing = {
-        qty: ingredientFields[0].value,
-        unit: ingredientFields[1].value,
-        name: ingredientFields[2].value
-    }
-
-    ingredients.push(ing)
-    
-    const newRow = document.createElement('tr')
-    newRow.innerHTML = `
-        <td class="px-4 py-2 border-t border-white/10">${ing.qty}</td>
-        <td class="px-4 py-2 border-t border-white/10">${ing.unit}</td>
-        <td class="px-4 py-2 border-t border-white/10">${ing.name}</td>
-    `
-    
-    // Add row to table and clear fields
-    ingredientTable.appendChild(newRow)
-    ingredientFields.forEach(f => f.value = '')
-    ingredientAddButton.disabled = true // Hide Add Ingredient button
-    // move cursor to Qty field again
-    ingredientFields[0].focus()
-}
-
-function addStep() {
-    const step = {
-        index: currentStepIndex++,
-        instruction: stepInput.value,
-        ingredients: []
-    }
-
-    steps.push(step)
-    renderSteps()
-    stepInput.value = ''
-    stepAddButton.disabled = true
-    stepInput.focus()
-}
-
-function renderSteps() {
-    // clear the step list
-    stepList.innerHTML = ''
-    
-    // re-render all steps in their current order
-    steps.forEach((step, displayIndex) => {
-        const newStep = document.createElement('div')
-        // times like this i regret using astro
-        newStep.innerHTML = `
-            <div class="flex justify-between items-start ">
-                <div class="flex flex-col">
-                    <p class="text-bold text-[10pt]">Step ${displayIndex + 1}</p>
-                    <div class="flex flex-col md:flex-row md:items-stretch">
-                        <p class="w-full md:flex-2/3 pr-1 text-left">${step.instruction}</p>
-                    </div>
-                </div>
-
-                <div class="flex flex-col gap-1">
-                    <button id="move-up-btn" class="px-2 py-1 bg-white/10 hover:bg-white/30 transition-colors rounded text-xs" data-step-index="${step.index}" ${displayIndex === 0 ? 'disabled' : ''}>↑</button>
-                    
-                    <button id="move-down-btn" class="px-2 py-1 bg-white/10 hover:bg-white/30 transition-colors rounded text-xs" data-step-index="${step.index}" ${displayIndex === steps.length - 1 ? 'disabled' : ''}>↓</button>
-                </div>
-            </div>
-        `
-        newStep.id = `step-${step.index}`
-        newStep.className = "bg-[#2a2b2c] rounded-lg mb-2 p-3"
-        stepList.appendChild(newStep)
-    })
-    
-    // event listeners to reorder buttons
-    document.querySelectorAll('#move-up-btn').forEach(btn => {
-        btn.addEventListener('click', (e) => {
-            const stepIndex = parseInt((e.target as HTMLButtonElement).dataset.stepIndex!)
-            moveStep(stepIndex, -1)
-        })
-    })
-    
-    document.querySelectorAll('#move-down-btn').forEach(btn => {
-        btn.addEventListener('click', (e) => {
-            const stepIndex = parseInt((e.target as HTMLButtonElement).dataset.stepIndex!)
-            moveStep(stepIndex, 1)
-        })
-    })
-}
-
-// - UTILS
-function showAddIngredientButton() {
-    const hasQty = ingredientFields[0].value.trim().length > 0
-    const hasName = ingredientFields[2].value.trim().length > 0
-    
-    if (hasQty && hasName) {
-        ingredientAddButton.disabled = false
-    } else {
-        ingredientAddButton.disabled = true
-    }
-}
-
-function showAddStepButton() {
-    if (stepInput.value.trim().length > 0) {
-        stepAddButton.disabled = false
-    } else {
-        stepAddButton.disabled = true
-    }
-}
-
-// shift: the direction to move. should be +1 to move down or -1 to move up the list
-function moveStep(stepIndex: number, shift: number) {
-    // Find the step in the array
-    const currentStepArrayIndex = steps.findIndex(step => step.index === stepIndex)
-    
-    if (currentStepArrayIndex === -1) return // step not found
-    
-    const newIndex = currentStepArrayIndex + shift
-    
-    // check bounds
-    if (newIndex < 0 || newIndex >= steps.length) return
-    
-    // swap the steps in the array
-    const temp = steps[currentStepArrayIndex]
-    steps[currentStepArrayIndex] = steps[newIndex]
-    steps[newIndex] = temp
-    
-    // re-render the steps
-    renderSteps()
-}

tsconfig.json

@@ -7,7 +7,6 @@
     "paths": {
 			"@/components/*": ["src/components/*.astro"],
 			"@/layouts/*": ["src/layouts/*.astro"],
-			"@/script/*": ["src/script/*"],
 			"@/utils": ["src/utils/index.ts"],
 			"@/data/*": ["src/data/*"],
 			"@/site-config": ["src/site.config.ts"]