Compare commits

..

5 Commits

Author SHA1 Message Date
e6c86d8391 one line fixed it :3 but also i don't want to remove the other two cos they're useful 2025-08-13 21:25:04 +12:00
ee9cb8972a OOH that's closer 2025-08-13 20:42:08 +12:00
82c9c5b826 Attempted combining dockerfiles but this crashed colima as a whole i think. proceed with caution 2025-08-13 20:27:46 +12:00
db6df2053a [PIE-11] Add option to change from table to list view (!9)
Option interface not implemented, will be in a future settings page. But anyway idk i like the table view more
Co-authored-by: june <self@breadone.net>
Co-committed-by: june <self@breadone.net>
2025-08-13 19:46:34 +12:00
c12a4ab1aa [PIE-17] Design refinements and improvements (!8)
Add ingredients to each step in detailview, add tags, and some refactoring and smaller improvements

Reviewed-on: #8
Co-authored-by: june <self@breadone.net>
Co-committed-by: june <self@breadone.net>
2025-08-13 19:24:09 +12:00
3 changed files with 105 additions and 39 deletions

50
Dockerfile.combined Normal file
View File

@@ -0,0 +1,50 @@
# Multi-stage build combining both services
# Stage 1: Build the Node.js/Astro application
FROM node:24-alpine AS app-builder
WORKDIR /app
COPY package*.json ./
RUN npm i
COPY . .
ENV PUBLIC_PB_URL=http://localhost:8080
ENV PUBLIC_URL=http://localhost:4321
RUN npm run build
ARG PB_VERSION=0.29.2
WORKDIR /pb
RUN apk add --no-cache \
unzip \
curl \
ca-certificates \
bash \
nodejs \
npm
# Download and unzip PocketBase
ADD https://github.com/pocketbase/pocketbase/releases/download/v${PB_VERSION}/pocketbase_${PB_VERSION}_linux_amd64.zip /tmp/pb.zip
RUN unzip /tmp/pb.zip -d /pb/
# Copy PocketBase entrypoint
COPY api/docker-entrypoint.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
# # Set environment variables (keeping them as they are)
# ENV PUBLIC_PB_URL=http://pb:8080
# ENV PUBLIC_URL=http://localhost:4321
VOLUME [ "/pb/pb_data", "/pb/pb_migrations", "/pb/pb_hooks" ]
# VOLUME [ "/pb/pb_data" ]
EXPOSE 8080 4321
# Create a startup script that runs both services
RUN echo '#!/bin/bash' > /usr/local/bin/start-services.sh && \
echo 'cd /pb && docker-entrypoint.sh serve --http=0.0.0.0:8080 &' >> /usr/local/bin/start-services.sh && \
echo 'cd /app && npm run preview -- --host &' >> /usr/local/bin/start-services.sh && \
echo 'wait' >> /usr/local/bin/start-services.sh && \
chmod +x /usr/local/bin/start-services.sh
ENTRYPOINT ["start-services.sh"]

View File

@@ -1,16 +1,30 @@
# services:
# web:
# build: .
# env_file: .env
# ports:
# - "4321:4321"
# pb:
# build: api
# env_file: .env
# volumes:
# - ./api/pb_data:/pb/pb_data
# - ./api/pb_migrations:/pb/pb_migrations
# - ./api/pb_hooks:/pb/pb_hooks
# ports:
# - "8080:8080"
services: services:
web: recipie:
build: . build:
context: .
dockerfile: Dockerfile.combined
env_file: .env env_file: .env
ports: ports:
- "4321:4321" - "4321:4321"
- "8080:8080" # optional, for manual pocketbase access
pb:
build: api
env_file: .env
volumes: volumes:
- ./api/pb_data:/pb/pb_data - ./api/pb_data:/pb/pb_data
- ./api/pb_migrations:/pb/pb_migrations - ./api/pb_migrations:/pb/pb_migrations
- ./api/pb_hooks:/pb/pb_hooks - ./api/pb_hooks:/pb/pb_hooks
ports:
- "8080:8080"

View File

@@ -2,41 +2,43 @@
// const { ingredients } = Astro.props // const { ingredients } = Astro.props
const { class: className, ingredients } = Astro.props const { class: className, ingredients } = Astro.props
const tableView = true
--- ---
<!-- <div class=`bg-[#2a2b2c] rounded-lg grid grid-cols-3 text-center ${className}`> {!tableView && (
<span class="font-bold">Quantity</span> <div class={`bg-[#2a2b2c] p-3 rounded-lg w-full text-left ${className}`}>
<span class="font-bold">Unit</span>
<span class="font-bold">Food</span>
{ {
ingredients.map(ing => ( ingredients.map(ing => (
<span>{ing.quantity}</span> <div class="text-white/70">
<span>{ing.unit}</span> <p>• {ing.quantity}&nbsp;{ing.unit}&nbsp;{ing.name}</p>
<span>{ing.name}</span> </div>
)) ))
} }
</div> --> </div>
)}
<table class={`table-auto text-left bg-[#2a2b2c] rounded-lg ${className} w-full`}> {tableView && (
<thead> <table class={`table-auto text-left bg-[#2a2b2c] rounded-lg ${className} w-full`}>
<tr> <thead>
<th class="px-4 py-2">Quantity</th> <tr>
<th class="px-4 py-2">Unit</th> <th class="px-4 py-2">Quantity</th>
<th class="px-4 py-2">Food</th> <th class="px-4 py-2">Unit</th>
</tr> <th class="px-4 py-2">Ingredient</th>
</thead> </tr>
<tbody> </thead>
{ <tbody>
ingredients.map(ing => ( {
<> ingredients.map(ing => (
<tr class="border-t border-gray-600"> <>
<td class="px-4 py-2">{ing.quantity}</td> <tr class="border-t border-gray-600">
<td class="px-4 py-2">{ing.unit}</td> <td class="px-4 py-2">{ing.quantity}</td>
<td class="px-4 py-2">{ing.name}</td> <td class="px-4 py-2">{ing.unit}</td>
</tr> <td class="px-4 py-2">{ing.name}</td>
</> </tr>
)) </>
} ))
</tbody> }
</table> </tbody>
</table>
)}