diff --git a/.docker/server.bake.Dockerfile b/.docker/server.bake.Dockerfile index 7c756ee72..5fae3e9ec 100644 --- a/.docker/server.bake.Dockerfile +++ b/.docker/server.bake.Dockerfile @@ -16,44 +16,54 @@ FROM ubuntu:24.04 AS web-base #### SERVER #### FROM web-base AS server -ARG PRODUCT_VERSION -ARG BUILD_ROOT -ARG TARGETARCH + ARG PRODUCT_VERSION + ARG COMPANY_NAME + ARG BUILD_ROOT + ARG TARGETARCH + ARG PRODUCT_NAME -ENV PRODUCT_VERSION=${PRODUCT_VERSION} + ARG BRANDING_DIR -COPY server/Common/package*.json /server/Common/ -RUN --mount=type=cache,target=/root/.npm cd /server/Common && npm install + ENV PRODUCT_VERSION=${PRODUCT_VERSION} -COPY server/DocService/package*.json /server/DocService/ -RUN --mount=type=cache,target=/root/.npm cd /server/DocService && npm install + COPY server/Common/package*.json /server/Common/ + RUN --mount=type=cache,target=/root/.npm cd /server/Common && npm install -COPY server/FileConverter/package*.json /server/FileConverter/ -RUN --mount=type=cache,target=/root/.npm cd /server/FileConverter && npm install + COPY server/DocService/package*.json /server/DocService/ + RUN --mount=type=cache,target=/root/.npm cd /server/DocService && npm install -COPY server/Metrics/package*.json /server/Metrics/ -RUN --mount=type=cache,target=/root/.npm cd /server/Metrics && npm install + COPY server/FileConverter/package*.json /server/FileConverter/ + RUN --mount=type=cache,target=/root/.npm cd /server/FileConverter && npm install -COPY server/AdminPanel/server/package*.json /server/AdminPanel/server/ -RUN --mount=type=cache,target=/root/.npm cd /server/AdminPanel/server && npm install + COPY server/Metrics/package*.json /server/Metrics/ + RUN --mount=type=cache,target=/root/.npm cd /server/Metrics && npm install -COPY server/AdminPanel/client/package*.json /server/AdminPanel/client/ -RUN --mount=type=cache,target=/root/.npm cd /server/AdminPanel/client && npm install + COPY server/AdminPanel/server/package*.json /server/AdminPanel/server/ + RUN --mount=type=cache,target=/root/.npm cd /server/AdminPanel/server && npm install -COPY server/ /server + COPY server/AdminPanel/client/package*.json /server/AdminPanel/client/ + RUN --mount=type=cache,target=/root/.npm cd /server/AdminPanel/client && npm install -ENV BUILD_ROOT=${BUILD_ROOT} + COPY server/ /server -RUN TARGETARCH_PKG=$(echo "$TARGETARCH" | sed 's/amd64/x64/') && \ - cd /server/Common && \ - sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i sources/commondefines.js && \ - cd /server/DocService && \ - pkg . -t linux-"$TARGETARCH_PKG" --node-options="--max_old_space_size=4096" -o "${BUILD_ROOT}/docservice" && \ - cd /server/FileConverter && \ - pkg . -t linux-"$TARGETARCH_PKG" --node-options="--max_old_space_size=4096" -o "${BUILD_ROOT}/fileconverter" && \ - cd /server/Metrics && \ - pkg . -t linux-"$TARGETARCH_PKG" --node-options="--max_old_space_size=4096" -o "${BUILD_ROOT}/metrics" && \ - cd /server/AdminPanel/server && \ - pkg . -t linux-"$TARGETARCH_PKG" --node-options="--max_old_space_size=4096" -o "${BUILD_ROOT}/adminpanel" + ### Branding + COPY ${BRANDING_DIR}/server/ /server -RUN cd /server/AdminPanel/client && npm run build \ No newline at end of file + ENV BUILD_ROOT=${BUILD_ROOT} + + RUN TARGETARCH_PKG=$(echo "$TARGETARCH" | sed 's/amd64/x64/') && \ + cd /server/Common && \ + sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i sources/commondefines.js && \ + cd /server/DocService && \ + pkg . -t linux-"$TARGETARCH_PKG" --node-options="--max_old_space_size=4096" -o "${BUILD_ROOT}/docservice" && \ + cd /server/FileConverter && \ + pkg . -t linux-"$TARGETARCH_PKG" --node-options="--max_old_space_size=4096" -o "${BUILD_ROOT}/fileconverter" && \ + cd /server/Metrics && \ + pkg . -t linux-"$TARGETARCH_PKG" --node-options="--max_old_space_size=4096" -o "${BUILD_ROOT}/metrics" && \ + cd /server/AdminPanel/server && \ + pkg . -t linux-"$TARGETARCH_PKG" --node-options="--max_old_space_size=4096" -o "${BUILD_ROOT}/adminpanel" + + ENV APP_NAME=${COMPANY_NAME} + + RUN cd /server/AdminPanel/client && \ + npm run build \ No newline at end of file diff --git a/AdminPanel/client/public/index.html b/AdminPanel/client/public/index.html index 6d4428d4a..ef6c8ee23 100644 --- a/AdminPanel/client/public/index.html +++ b/AdminPanel/client/public/index.html @@ -6,7 +6,7 @@ - Euro-Office Admin + <%= appName %> Admin diff --git a/AdminPanel/client/src/App.css b/AdminPanel/client/src/App.css index 677aabc6c..f7a148396 100644 --- a/AdminPanel/client/src/App.css +++ b/AdminPanel/client/src/App.css @@ -76,13 +76,13 @@ body::-webkit-scrollbar-thumb { } a { - color: #ff6f3d; + color: #0082C9; text-decoration: underline; font-weight: 400; } a:hover { - color: #e55a2b; + color: #00a5fd; } /* Spinner animation */ diff --git a/AdminPanel/client/src/components/AccessRules/AccessRules.module.scss b/AdminPanel/client/src/components/AccessRules/AccessRules.module.scss index 90e4e16b9..485b79163 100644 --- a/AdminPanel/client/src/components/AccessRules/AccessRules.module.scss +++ b/AdminPanel/client/src/components/AccessRules/AccessRules.module.scss @@ -34,7 +34,7 @@ } .addButton { - background: #ff6f3d; + background: #0082C9; color: #ffffff; border: none; height: 48px; @@ -56,7 +56,7 @@ justify-content: center; &:hover:not(:disabled) { - background: #e55a2b; + background: #00a5fd; } &:disabled { diff --git a/AdminPanel/client/src/components/Button/Button.module.scss b/AdminPanel/client/src/components/Button/Button.module.scss index 30981c7ee..ed1f83068 100644 --- a/AdminPanel/client/src/components/Button/Button.module.scss +++ b/AdminPanel/client/src/components/Button/Button.module.scss @@ -1,5 +1,5 @@ .button { - background: #ff6f3d; + background: #0082C9; width: 154px; height: 48px; padding: 13px 24px; @@ -16,16 +16,16 @@ justify-content: center; &:hover:not(:disabled) { - background: #e55a2b; + background: #00a5fd; } &--disabled { - background: #ffd4c5; + background: #84c8ed; cursor: not-allowed; } &--loading { - background: #ff6f3d; + background: #0082C9; cursor: wait; } diff --git a/AdminPanel/client/src/components/Checkbox/Checkbox.module.scss b/AdminPanel/client/src/components/Checkbox/Checkbox.module.scss index 000540e0a..e9ca6c4ba 100644 --- a/AdminPanel/client/src/components/Checkbox/Checkbox.module.scss +++ b/AdminPanel/client/src/components/Checkbox/Checkbox.module.scss @@ -43,8 +43,8 @@ } .checkbox:checked ~ .checkmark { - background: #ff6f3d; - border-color: #ff6f3d; + background: #0082C9; + border-color: #0082C9; &::after { display: block; diff --git a/AdminPanel/client/src/components/Menu/Menu.js b/AdminPanel/client/src/components/Menu/Menu.js index da438ba86..d377a1b60 100644 --- a/AdminPanel/client/src/components/Menu/Menu.js +++ b/AdminPanel/client/src/components/Menu/Menu.js @@ -12,6 +12,8 @@ function Menu({isOpen, onClose}) { const navigate = useNavigate(); const dispatch = useDispatch(); + const appName = process.env.APP_NAME; + const handleLogout = async () => { try { await logout(); @@ -40,7 +42,7 @@ function Menu({isOpen, onClose}) {