From 61918f78e03fd813d201c644cca759be502c5cec Mon Sep 17 00:00:00 2001
From: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Date: Tue, 26 May 2026 11:14:01 -0700
Subject: [PATCH 1/2] feat: rebranding, possibility for own brand

Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
---
 .docker/server.bake.Dockerfile                            | 5 +++++
 AdminPanel/client/src/App.css                             | 4 ++--
 .../src/components/AccessRules/AccessRules.module.scss    | 4 ++--
 .../client/src/components/Button/Button.module.scss       | 8 ++++----
 .../client/src/components/Checkbox/Checkbox.module.scss   | 4 ++--
 AdminPanel/client/src/components/Note/Note.js             | 6 +++---
 AdminPanel/client/src/components/Note/Note.module.scss    | 4 ++--
 .../client/src/components/Select/Select.module.scss       | 2 +-
 AdminPanel/client/src/components/Tabs/Tabs.module.scss    | 6 +++---
 9 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/.docker/server.bake.Dockerfile b/.docker/server.bake.Dockerfile
index 7c756ee72..5062df072 100644
--- a/.docker/server.bake.Dockerfile
+++ b/.docker/server.bake.Dockerfile
@@ -20,6 +20,8 @@ ARG PRODUCT_VERSION
 ARG BUILD_ROOT
 ARG TARGETARCH
 
+ARG BRANDING_DIR
+
 ENV PRODUCT_VERSION=${PRODUCT_VERSION}
 
 COPY server/Common/package*.json /server/Common/
@@ -42,6 +44,9 @@ RUN --mount=type=cache,target=/root/.npm cd /server/AdminPanel/client && npm ins
 
 COPY server/ /server
 
+### Branding
+COPY ${BRANDING_DIR}/server/ /server
+
 ENV BUILD_ROOT=${BUILD_ROOT}
 
 RUN TARGETARCH_PKG=$(echo "$TARGETARCH" | sed 's/amd64/x64/') && \
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/Note/Note.js b/AdminPanel/client/src/components/Note/Note.js
index a4c87e340..0084fc4be 100644
--- a/AdminPanel/client/src/components/Note/Note.js
+++ b/AdminPanel/client/src/components/Note/Note.js
@@ -14,11 +14,11 @@ function Note({type = 'note', children}) {
       className: styles.note,
       icon: (
         <svg className={styles.icon} width='24' height='24' viewBox='0 0 24 24' fill='none'>
-          <circle cx='12' cy='12' r='10' stroke='#FF6F3D' strokeWidth='2' />
-          <path d='M12 7C12.5523 7 13 7.44772 13 8C13 8.55228 12.5523 9 12 9C11.4477 9 11 8.55228 11 8C11 7.44772 11.4477 7 12 7Z' fill='#FF6F3D' />
+          <circle cx='12' cy='12' r='10' stroke='#0082C9' strokeWidth='2' />
+          <path d='M12 7C12.5523 7 13 7.44772 13 8C13 8.55228 12.5523 9 12 9C11.4477 9 11 8.55228 11 8C11 7.44772 11.4477 7 12 7Z' fill='#0082C9' />
           <path
             d='M12 10C12.5523 10 13 10.4477 13 11V17C13 17.5523 12.5523 18 12 18C11.4477 18 11 17.5523 11 17V11C11 10.4477 11.4477 10 12 10Z'
-            fill='#FF6F3D'
+            fill='#0082C9'
           />
         </svg>
       )
diff --git a/AdminPanel/client/src/components/Note/Note.module.scss b/AdminPanel/client/src/components/Note/Note.module.scss
index 79117f858..0bdaf8971 100644
--- a/AdminPanel/client/src/components/Note/Note.module.scss
+++ b/AdminPanel/client/src/components/Note/Note.module.scss
@@ -65,10 +65,10 @@
 
 /* Note variant - Orange */
 .note {
-  border-left: 2px solid #ff6f3d;
+  border-left: 2px solid #0082C9;
 
   .title {
-    color: #ff6f3d;
+    color: #0082C9;
   }
 }
 
diff --git a/AdminPanel/client/src/components/Select/Select.module.scss b/AdminPanel/client/src/components/Select/Select.module.scss
index ff03817ac..0918c04f6 100644
--- a/AdminPanel/client/src/components/Select/Select.module.scss
+++ b/AdminPanel/client/src/components/Select/Select.module.scss
@@ -96,7 +96,7 @@
   }
 
   &--selected {
-    color: #ff6f3d;
+    color: #0082C9;
     font-weight: 600;
   }
 }
diff --git a/AdminPanel/client/src/components/Tabs/Tabs.module.scss b/AdminPanel/client/src/components/Tabs/Tabs.module.scss
index 13e793eae..b0d7a2c2a 100644
--- a/AdminPanel/client/src/components/Tabs/Tabs.module.scss
+++ b/AdminPanel/client/src/components/Tabs/Tabs.module.scss
@@ -39,12 +39,12 @@
   }
 
   &--active {
-    color: #ff6f3d;
+    color: #0082C9;
 
     &:hover,
     &:focus,
     &:active {
-      color: #ff6f3d; /* ensure orange while focused/pressed */
+      color: #0082C9; /* ensure orange while focused/pressed */
     }
 
     &::after {
@@ -54,7 +54,7 @@
       left: 0;
       right: 0;
       height: 2px;
-      background: #ff6f3d;
+      background: #0082C9;
     }
   }
 }

From 1c23e45042ecd255283605afe89889ed255c0d55 Mon Sep 17 00:00:00 2001
From: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Date: Tue, 26 May 2026 20:44:21 -0700
Subject: [PATCH 2/2] feat: some more rebranding

Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
---
 .docker/server.bake.Dockerfile                | 71 ++++++++++---------
 AdminPanel/client/public/index.html           |  2 +-
 AdminPanel/client/src/components/Menu/Menu.js |  4 +-
 .../client/src/pages/Login/LoginPage.js       |  4 +-
 .../client/src/pages/Setup/SetupPage.js       |  4 +-
 AdminPanel/client/webpack.config.js           | 12 +++-
 6 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/.docker/server.bake.Dockerfile b/.docker/server.bake.Dockerfile
index 5062df072..5fae3e9ec 100644
--- a/.docker/server.bake.Dockerfile
+++ b/.docker/server.bake.Dockerfile
@@ -16,49 +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
 
-ARG BRANDING_DIR
+    ARG BRANDING_DIR
 
-ENV PRODUCT_VERSION=${PRODUCT_VERSION}
+    ENV PRODUCT_VERSION=${PRODUCT_VERSION}
 
-COPY server/Common/package*.json /server/Common/
-RUN --mount=type=cache,target=/root/.npm cd /server/Common && npm install
+    COPY server/Common/package*.json /server/Common/
+    RUN --mount=type=cache,target=/root/.npm cd /server/Common && npm install
 
-COPY server/DocService/package*.json /server/DocService/
-RUN --mount=type=cache,target=/root/.npm cd /server/DocService && npm install
+    COPY server/DocService/package*.json /server/DocService/
+    RUN --mount=type=cache,target=/root/.npm cd /server/DocService && npm install
 
-COPY server/FileConverter/package*.json /server/FileConverter/
-RUN --mount=type=cache,target=/root/.npm cd /server/FileConverter && npm install
+    COPY server/FileConverter/package*.json /server/FileConverter/
+    RUN --mount=type=cache,target=/root/.npm cd /server/FileConverter && npm install
 
-COPY server/Metrics/package*.json /server/Metrics/
-RUN --mount=type=cache,target=/root/.npm cd /server/Metrics && npm install
+    COPY server/Metrics/package*.json /server/Metrics/
+    RUN --mount=type=cache,target=/root/.npm cd /server/Metrics && 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/AdminPanel/server/package*.json /server/AdminPanel/server/
+    RUN --mount=type=cache,target=/root/.npm cd /server/AdminPanel/server && 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/client/package*.json /server/AdminPanel/client/
+    RUN --mount=type=cache,target=/root/.npm cd /server/AdminPanel/client && npm install
 
-COPY server/ /server
+    COPY server/ /server
 
-### Branding
-COPY ${BRANDING_DIR}/server/ /server
+    ### Branding
+    COPY ${BRANDING_DIR}/server/ /server
 
-ENV BUILD_ROOT=${BUILD_ROOT}
+    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"
+    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"
 
-RUN cd /server/AdminPanel/client && npm run build
\ No newline at end of file
+    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 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta name="description" content="Document Server Admin Panel" />
-    <title>Euro-Office Admin</title>
+    <title><%= appName %> Admin</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
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}) {
       <button className={styles['menu__closeButton']} onClick={onClose} aria-label='Close menu' />
       <div className={styles['menu__header']}>
         <div className={styles['menu__logoContainer']}>
-          <img src={AppMenuLogo} alt='Euro-Office' className={styles['menu__logo']} />
+          <img src={AppMenuLogo} alt={appName} className={styles['menu__logo']} />
         </div>
         <div className={styles['menu__title']}>DocServer Admin Panel</div>
         <div className={styles['menu__separator']}></div>
diff --git a/AdminPanel/client/src/pages/Login/LoginPage.js b/AdminPanel/client/src/pages/Login/LoginPage.js
index 5d8290cbc..ff33221e9 100644
--- a/AdminPanel/client/src/pages/Login/LoginPage.js
+++ b/AdminPanel/client/src/pages/Login/LoginPage.js
@@ -12,6 +12,8 @@ export default function Login() {
   const dispatch = useDispatch();
   const buttonRef = useRef();
 
+  const appName = process.env.APP_NAME;
+
   const handleSubmit = async () => {
     setError('');
 
@@ -37,7 +39,7 @@ export default function Login() {
   return (
     <div className={styles.loginContainer}>
       <div className={styles.loginCard}>
-        <h1 className={styles.title}>Euro-Office Admin Panel</h1>
+        <h1 className={styles.title}>{appName} Admin Panel</h1>
         <p className={styles.subtitle}>Enter your password to access the admin panel</p>
         <div className={styles.descriptionContainer}>
           <p className={styles.description}>The session is valid for 60 minutes.</p>
diff --git a/AdminPanel/client/src/pages/Setup/SetupPage.js b/AdminPanel/client/src/pages/Setup/SetupPage.js
index 39edbbe49..3b8cff631 100644
--- a/AdminPanel/client/src/pages/Setup/SetupPage.js
+++ b/AdminPanel/client/src/pages/Setup/SetupPage.js
@@ -17,6 +17,8 @@ export default function Setup() {
   const dispatch = useDispatch();
   const buttonRef = useRef();
 
+  const appName = process.env.APP_NAME;
+
   const {isValid: passwordIsValid, isLoading} = usePasswordValidation(password);
 
   // Check if form can be submitted
@@ -64,7 +66,7 @@ export default function Setup() {
   return (
     <div className={styles.loginContainer}>
       <div className={styles.loginCard}>
-        <h1 className={styles.title}>Euro-Office Admin Panel</h1>
+        <h1 className={styles.title}>{appName} Admin Panel</h1>
         <p className={styles.subtitle}>Initial Setup</p>
         <p className={styles.description}>Enter the bootstrap token from server logs and create your admin password.</p>
 
diff --git a/AdminPanel/client/webpack.config.js b/AdminPanel/client/webpack.config.js
index 662129eb6..9e8d5e8c6 100644
--- a/AdminPanel/client/webpack.config.js
+++ b/AdminPanel/client/webpack.config.js
@@ -8,6 +8,8 @@ const outputDir = process.env.BUILD_ROOT
                   ? path.resolve(process.env.BUILD_ROOT, 'build')
                   : path.resolve(__dirname, 'build');
 
+const appName = process.env.APP_NAME || 'Euro-Office';
+
 module.exports = (env, argv) => {
   const mode = argv && argv.mode ? argv.mode : 'development';
 
@@ -52,7 +54,10 @@ module.exports = (env, argv) => {
 
     plugins: [
       new HtmlWebpackPlugin({
-        template: path.join(__dirname, 'public', 'index.html')
+        template: path.join(__dirname, 'public', 'index.html'),
+        templateParameters: {
+          appName,
+        },
       }),
       new CopyPlugin({
         patterns: [
@@ -90,8 +95,9 @@ module.exports = (env, argv) => {
         ]
       }),
       new webpack.DefinePlugin({
-        'process.env.REACT_APP_BACKEND_URL': JSON.stringify(process.env.REACT_APP_BACKEND_URL)
-      })
+        'process.env.REACT_APP_BACKEND_URL': JSON.stringify(process.env.REACT_APP_BACKEND_URL),
+        'process.env.APP_NAME': JSON.stringify(appName),
+      }),
     ],
 
     module: {