From 7c6984012adcee8019312aa7d81699527bd267bd Mon Sep 17 00:00:00 2001 From: Jason Feibelman Date: Wed, 26 Mar 2025 16:37:04 -0400 Subject: [PATCH 1/4] Initial commit --- app.dockerfile | 12 ++++++++---- docker-compose.yaml | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app.dockerfile b/app.dockerfile index 11503fe..ac31668 100644 --- a/app.dockerfile +++ b/app.dockerfile @@ -2,29 +2,33 @@ FROM node:20.18.0-slim AS builder ENV NEXT_PUBLIC_AWS_DB_API_URL=https://lyxeetk4w1.execute-api.us-east-1.amazonaws.com/default/getFromStockalyzerDB ENV NEXT_PUBLIC_AWS_DB_API_KEY=0KcuAyP5zT8kk2vW4MXAU9lMi52Yorti4vRwLwia +ENV NODE_ENV=development +ENV CHOKIDAR_USEPOLLING=true WORKDIR /home/perplexica COPY package.json yarn.lock ./ RUN yarn install --frozen-lockfile --network-timeout 600000 +COPY . . COPY tsconfig.json next.config.mjs next-env.d.ts postcss.config.js drizzle.config.ts tailwind.config.ts ./ COPY src ./src COPY public ./public RUN mkdir -p /home/perplexica/data -RUN yarn build +# RUN yarn build FROM node:20.18.0-slim WORKDIR /home/perplexica COPY --from=builder /home/perplexica/public ./public -COPY --from=builder /home/perplexica/.next/static ./public/_next/static +# COPY --from=builder /home/perplexica/.next/static ./public/_next/static -COPY --from=builder /home/perplexica/.next/standalone ./ +# COPY --from=builder /home/perplexica/.next/standalone ./ COPY --from=builder /home/perplexica/data ./data RUN mkdir /home/perplexica/uploads -CMD ["node", "server.js"] \ No newline at end of file +# CMD ["node", "server.js"] +CMD ["yarn", "dev"] \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index b702b4e..ca5bc00 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -16,6 +16,7 @@ services: dockerfile: app.dockerfile environment: - SEARXNG_API_URL=http://searxng:8080 + - CHOKIDAR_USEPOLLING=true ports: - 3000:3000 networks: @@ -24,6 +25,7 @@ services: - backend-dbstore:/home/perplexica/data - uploads:/home/perplexica/uploads - ./config.toml:/home/perplexica/config.toml + - ./:/home/perplexica restart: unless-stopped networks: From 8d5ea43decb21447a85a767f65184b591e31a659 Mon Sep 17 00:00:00 2001 From: Jason Feibelman Date: Wed, 26 Mar 2025 16:46:23 -0400 Subject: [PATCH 2/4] Only page not working is Chats (SQL Lite error) --- docker-compose.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index ca5bc00..2b16bb5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -17,6 +17,9 @@ services: environment: - SEARXNG_API_URL=http://searxng:8080 - CHOKIDAR_USEPOLLING=true + - NEXT_PUBLIC_AWS_DB_API_URL=https://lyxeetk4w1.execute-api.us-east-1.amazonaws.com/default/getFromStockalyzerDB + - NEXT_PUBLIC_AWS_DB_API_KEY=0KcuAyP5zT8kk2vW4MXAU9lMi52Yorti4vRwLwia + - NODE_ENV=development ports: - 3000:3000 networks: From e00fe826b5d48fcf28d46154d8b8fbd24f2fa83f Mon Sep 17 00:00:00 2001 From: Jason Feibelman Date: Wed, 26 Mar 2025 17:09:41 -0400 Subject: [PATCH 3/4] Fast Refresh working (Except for Library Chats [SQL DB Not Found Error] --- app.dockerfile | 8 +++++--- docker-compose.yaml | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app.dockerfile b/app.dockerfile index ac31668..1a8de03 100644 --- a/app.dockerfile +++ b/app.dockerfile @@ -22,13 +22,15 @@ FROM node:20.18.0-slim WORKDIR /home/perplexica -COPY --from=builder /home/perplexica/public ./public +COPY --from=builder /home/perplexica /home/perplexica + +# COPY --from=builder /home/perplexica/public ./public # COPY --from=builder /home/perplexica/.next/static ./public/_next/static # COPY --from=builder /home/perplexica/.next/standalone ./ -COPY --from=builder /home/perplexica/data ./data +# COPY --from=builder /home/perplexica/data ./data -RUN mkdir /home/perplexica/uploads +RUN mkdir -p /home/perplexica/uploads # CMD ["node", "server.js"] CMD ["yarn", "dev"] \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 2b16bb5..c10b522 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -28,7 +28,8 @@ services: - backend-dbstore:/home/perplexica/data - uploads:/home/perplexica/uploads - ./config.toml:/home/perplexica/config.toml - - ./:/home/perplexica + - ./src:/home/perplexica/src + - ./public:/home/perplexica/public restart: unless-stopped networks: From 74bbf6c912529f755864b99e1a4e18fde996aac3 Mon Sep 17 00:00:00 2001 From: Jason Feibelman Date: Wed, 26 Mar 2025 17:23:47 -0400 Subject: [PATCH 4/4] Add latest News changes --- src/app/news/page.tsx | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/src/app/news/page.tsx b/src/app/news/page.tsx index 665db18..aa5911e 100644 --- a/src/app/news/page.tsx +++ b/src/app/news/page.tsx @@ -5,7 +5,7 @@ import { useEffect, useState } from 'react'; import Image from 'next/image'; import Link from 'next/link'; -export interface News { +interface News { id: string; title: string; summary: string; @@ -64,7 +64,27 @@ const NewsPageContent = () => { setExpanded((prev) => ({ ...prev, [id]: !prev[id] })); }; - if (loading) return

Loading news...

; + if (loading) return ( +
+ +
+ ); + if (error) return

Error: {error}

; return ( @@ -125,12 +145,4 @@ const NewsPageContent = () => { ); }; -const NewsPage = () => { - return ( - <> - - - ); -}; - -export default NewsPage; \ No newline at end of file +export default NewsPageContent; \ No newline at end of file