Compare commits

..

No commits in common. "cb8be12b63804370f6525adf628f030ab08cb030" and "b9b1111307ace0313b59c5413c32f6ef7fd51fde" have entirely different histories.

6 changed files with 7 additions and 11 deletions

View File

@ -4,10 +4,8 @@ COPY package*.json ./
RUN npm i RUN npm i
COPY . . COPY . .
ENV PUBLIC_PB_URL=http://pb:8080 ENV PUBLIC_PB_URL=http://pb:8080
ENV PUBLIC_URL=http://localhost:4321
RUN npm run build RUN npm run build
EXPOSE 4321 EXPOSE 4321
CMD ["npm", "run", "dev", "--", "--host"] CMD ["npm", "run", "preview", "--", "--host"]
# CMD [ "node", "dist/sever/entry.mjs"]

View File

@ -21,8 +21,6 @@ export default defineConfig({
plugins: [tailwindcss()], plugins: [tailwindcss()],
server: { server: {
proxy: { proxy: {
// The idea is to proxy the Pocketbase connection to the current domain so the user doesn't have to open two ports
// Currently works in dev (npm run dev -- --host) with the correct PUBLIC_URL var set but not through docker
'/api': { '/api': {
target: PUBLIC_PB_URL, target: PUBLIC_PB_URL,
changeOrigin: true, changeOrigin: true,

View File

@ -2,7 +2,6 @@ services:
web: web:
build: . build: .
env_file: .env env_file: .env
network_mode: host
ports: ports:
- "4321:4321" - "4321:4321"

View File

@ -3,7 +3,7 @@
"type": "module", "type": "module",
"version": "0.0.1", "version": "0.0.1",
"scripts": { "scripts": {
"dev": "docker compose up pb -d; astro dev --host", "dev": "astro dev",
"build": "astro build", "build": "astro build",
"preview": "astro preview", "preview": "astro preview",
"astro": "astro" "astro": "astro"

View File

@ -1,4 +1,5 @@
import Pocketbase from "pocketbase" import Pocketbase from "pocketbase"
const client = new Pocketbase(import.meta.env.PUBLIC_URL) const client = new Pocketbase(import.meta.env.PUBLIC_URL)
export default client; export default client;
// export const client = new Pocketbase("http://localhost:8080")

View File

@ -7,12 +7,12 @@ const recipies = await client.collection("recipes").getFullList()
--- ---
<PageLayout> <PageLayout>
<p class="w-full bg-yellow-100 p-5 text-3xl font-medium">Recipie</p> <p class="w-full bg-yellow-100 p-5 text-3xl pb-4 font-medium">Recipie</p>
<div id="content" class="p-5 pt-2"> <div id="content" class="p-5">
<p class="pb-2">What would you like today?</p> <p class="pb-2">What would you like today?</p>
<div class="grid gap-2 grid-cols-1 md:grid-cols-2 lg:grid-cols-4"> <div class="grid gap-2 grid-cols-1 md:grid-cols-2 lg:grid-cols-3">
{ {
recipies.map(r => ( recipies.map(r => (
<OverviewCard recipe={r} /> <OverviewCard recipe={r} />