From 4076cd34a0ab017b835ae606b42ef427ebc0e416 Mon Sep 17 00:00:00 2001 From: Redm4x <2829180+Redm4x@users.noreply.github.com> Date: Wed, 15 May 2024 12:30:22 -0400 Subject: [PATCH] fix(deploy-web): fix localstorage auto-import url --- .github/workflows/docker-build-stats-web.yml | 4 ++-- deploy-web/Dockerfile | 9 ++++----- .../context/SettingsProvider/SettingsProviderContext.tsx | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-build-stats-web.yml b/.github/workflows/docker-build-stats-web.yml index 2f36e0d57..9f3f05ea2 100644 --- a/.github/workflows/docker-build-stats-web.yml +++ b/.github/workflows/docker-build-stats-web.yml @@ -2,9 +2,9 @@ name: Stats Web CI on: push: - branches: ["main", "collab-rebrand"] + branches: ["main"] pull_request: - branches: ["main", "collab-rebrand"] + branches: ["main"] jobs: build: diff --git a/deploy-web/Dockerfile b/deploy-web/Dockerfile index a7681d460..81bb64046 100644 --- a/deploy-web/Dockerfile +++ b/deploy-web/Dockerfile @@ -1,5 +1,4 @@ FROM node:18 AS base -# Pinned to 3.18 to avoid this issue: https://github.com/nodejs/docker-node/issues/2009 # Install dependencies only when needed FROM base AS deps @@ -51,10 +50,10 @@ RUN setcap cap_net_bind_service=+ep `readlink -f \`which node\`` USER nextjs -EXPOSE 3001 -# EXPOSE 80 +#EXPOSE 3001 +EXPOSE 80 -ENV PORT 3001 -# ENV PORT 80 +#ENV PORT 3001 +ENV PORT 80 CMD ["node", "server.js"] \ No newline at end of file diff --git a/deploy-web/src/context/SettingsProvider/SettingsProviderContext.tsx b/deploy-web/src/context/SettingsProvider/SettingsProviderContext.tsx index 122548426..d50dcf641 100644 --- a/deploy-web/src/context/SettingsProvider/SettingsProviderContext.tsx +++ b/deploy-web/src/context/SettingsProvider/SettingsProviderContext.tsx @@ -356,7 +356,7 @@ export function SettingsProvider({ children }: React.PropsWithChildren<{}>) { {children} {/* iframe for localstorage automatic import */} - {isSettingsInit &&