From 64506c1dba53b6ca353c532e8ff2802416b59e45 Mon Sep 17 00:00:00 2001 From: Aldemylla Date: Tue, 26 Mar 2024 15:50:37 -0300 Subject: [PATCH 1/5] fix: Dockerfile, docker-entrypoint and log of env variables --- docker-entrypoint.sh | 2 +- docker/Dockerfile | 30 ++++++++++++------------------ src/services/api/resources/GPT.js | 2 ++ 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index cbe8e51f..8fb881a5 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -3,6 +3,6 @@ export JSON_STRING='window.configs = { \ "VITE_GPT_URL":"'${VITE_GPT_URL}'", \ "VITE_GPT_AUTH":"'${VITE_GPT_AUTH}'", \ }' -sed "s|//CONFIGURATIONS_PLACEHOLDER|${JSON_STRING}|" /usr/share/nginx/html/insights/index.html.tmpl > /tmp/index.html +sed -i "s|//CONFIGURATIONS_PLACEHOLDER|${JSON_STRING}|" /usr/share/nginx/html/index.html exec "$@" \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 982eaca2..f3b78aba 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,7 @@ ARG BASE_VERSION="alpine3.17" FROM node:${NODE_VERSION}-${BASE_VERSION} as builder -WORKDIR /app +WORKDIR /home/app ARG VITE_GPT_URL ARG VITE_GPT_AUTH @@ -13,26 +13,20 @@ ARG VITE_GPT_AUTH ENV VITE_GPT_URL $VITE_GPT_URL ENV VITE_GPT_AUTH $VITE_GPT_AUTH -RUN apk --no-cache add git - -COPY package.json yarn.lock ./ - -RUN --mount=type=cache,target=/root/.yarn \ - YARN_CACHE_FOLDER=/root/.yarn yarn install - -COPY . ./ - +COPY package.json . +COPY yarn.lock . +RUN yarn install +COPY . . RUN yarn build -FROM nginxinc/nginx-unprivileged:1.25-alpine +FROM nginx + +COPY --from=builder /home/app/dist /usr/share/nginx/html -COPY --chown=nginx:nginx docker/nginx/nginx.conf /etc/nginx/nginx.conf -COPY --from=builder --chown=nginx:nginx /app/dist /usr/share/nginx/html/insights/ -COPY docker-entrypoint.sh / -RUN mv /usr/share/nginx/html/insights/index.html /usr/share/nginx/html/insights/index.html.tmpl \ - && cd /usr/share/nginx/html/insights/ \ - && ln -s /tmp/index.html +COPY ./docker/nginx/nginx.conf /etc/nginx +COPY docker-entrypoint.sh /usr/share/nginx/ +RUN chmod +x /usr/share/nginx/docker-entrypoint.sh EXPOSE 8080 -ENTRYPOINT ["/docker-entrypoint.sh"] +ENTRYPOINT [ "/usr/share/nginx/docker-entrypoint.sh" ] CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/src/services/api/resources/GPT.js b/src/services/api/resources/GPT.js index b5bf3aca..244c44ba 100644 --- a/src/services/api/resources/GPT.js +++ b/src/services/api/resources/GPT.js @@ -9,6 +9,8 @@ const http = axios.create({ export default { async getInsights(prompt) { + console.log('VITE_GPT_AUTH:', env('VITE_GPT_AUTH')); + console.log('VITE_GPT_URL:', env('VITE_GPT_URL')); const response = await http.post(env('VITE_GPT_URL'), { input: { prompt: `[INST] ${prompt} [/INST]`, From ca6f0ac1a720fd31650de3c3262c048029da1a3c Mon Sep 17 00:00:00 2001 From: aldemylla Date: Wed, 27 Mar 2024 09:11:52 -0300 Subject: [PATCH 2/5] Revert "fix: Dockerfile, docker-entrypoint and log of env variables" This reverts commit 64506c1dba53b6ca353c532e8ff2802416b59e45. --- docker-entrypoint.sh | 2 +- docker/Dockerfile | 30 ++++++++++++++++++------------ src/services/api/resources/GPT.js | 2 -- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 8fb881a5..cbe8e51f 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -3,6 +3,6 @@ export JSON_STRING='window.configs = { \ "VITE_GPT_URL":"'${VITE_GPT_URL}'", \ "VITE_GPT_AUTH":"'${VITE_GPT_AUTH}'", \ }' -sed -i "s|//CONFIGURATIONS_PLACEHOLDER|${JSON_STRING}|" /usr/share/nginx/html/index.html +sed "s|//CONFIGURATIONS_PLACEHOLDER|${JSON_STRING}|" /usr/share/nginx/html/insights/index.html.tmpl > /tmp/index.html exec "$@" \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index f3b78aba..982eaca2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,7 @@ ARG BASE_VERSION="alpine3.17" FROM node:${NODE_VERSION}-${BASE_VERSION} as builder -WORKDIR /home/app +WORKDIR /app ARG VITE_GPT_URL ARG VITE_GPT_AUTH @@ -13,20 +13,26 @@ ARG VITE_GPT_AUTH ENV VITE_GPT_URL $VITE_GPT_URL ENV VITE_GPT_AUTH $VITE_GPT_AUTH -COPY package.json . -COPY yarn.lock . -RUN yarn install -COPY . . -RUN yarn build +RUN apk --no-cache add git + +COPY package.json yarn.lock ./ + +RUN --mount=type=cache,target=/root/.yarn \ + YARN_CACHE_FOLDER=/root/.yarn yarn install -FROM nginx +COPY . ./ + +RUN yarn build -COPY --from=builder /home/app/dist /usr/share/nginx/html +FROM nginxinc/nginx-unprivileged:1.25-alpine -COPY ./docker/nginx/nginx.conf /etc/nginx -COPY docker-entrypoint.sh /usr/share/nginx/ -RUN chmod +x /usr/share/nginx/docker-entrypoint.sh +COPY --chown=nginx:nginx docker/nginx/nginx.conf /etc/nginx/nginx.conf +COPY --from=builder --chown=nginx:nginx /app/dist /usr/share/nginx/html/insights/ +COPY docker-entrypoint.sh / +RUN mv /usr/share/nginx/html/insights/index.html /usr/share/nginx/html/insights/index.html.tmpl \ + && cd /usr/share/nginx/html/insights/ \ + && ln -s /tmp/index.html EXPOSE 8080 -ENTRYPOINT [ "/usr/share/nginx/docker-entrypoint.sh" ] +ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/src/services/api/resources/GPT.js b/src/services/api/resources/GPT.js index 244c44ba..b5bf3aca 100644 --- a/src/services/api/resources/GPT.js +++ b/src/services/api/resources/GPT.js @@ -9,8 +9,6 @@ const http = axios.create({ export default { async getInsights(prompt) { - console.log('VITE_GPT_AUTH:', env('VITE_GPT_AUTH')); - console.log('VITE_GPT_URL:', env('VITE_GPT_URL')); const response = await http.post(env('VITE_GPT_URL'), { input: { prompt: `[INST] ${prompt} [/INST]`, From 08e256f8c4d94be51c4c37a9a6e390150a1d0f3e Mon Sep 17 00:00:00 2001 From: aldemylla Date: Tue, 2 Apr 2024 13:12:49 -0300 Subject: [PATCH 3/5] feat: Remade ResizableBar resize behavior --- src/components/ResizableBarNext.vue | 149 +++++++++++++++++++++++++++ src/layouts/InsightsLayout/index.vue | 2 +- 2 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 src/components/ResizableBarNext.vue diff --git a/src/components/ResizableBarNext.vue b/src/components/ResizableBarNext.vue new file mode 100644 index 00000000..96677dc2 --- /dev/null +++ b/src/components/ResizableBarNext.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/layouts/InsightsLayout/index.vue b/src/layouts/InsightsLayout/index.vue index ec35d1ae..ad5d2ad5 100644 --- a/src/layouts/InsightsLayout/index.vue +++ b/src/layouts/InsightsLayout/index.vue @@ -13,7 +13,7 @@ - - diff --git a/src/components/insights/ResizableBar/ResizableBarCards.vue b/src/components/insights/ResizableBar/ResizableBarCards.vue new file mode 100644 index 00000000..ccc49834 --- /dev/null +++ b/src/components/insights/ResizableBar/ResizableBarCards.vue @@ -0,0 +1,224 @@ + + + + + diff --git a/src/components/ResizableBarNext.vue b/src/components/insights/ResizableBar/index.vue similarity index 85% rename from src/components/ResizableBarNext.vue rename to src/components/insights/ResizableBar/index.vue index 96677dc2..bcddcf01 100644 --- a/src/components/ResizableBarNext.vue +++ b/src/components/insights/ResizableBar/index.vue @@ -26,12 +26,19 @@ height: `${contentHeight}vh`, transition: resizeTransition, }" - > + > + + +