5419: Combined frontend changes

Author: cableman

backend/open_webui/config.py

@@ -1043,6 +1043,32 @@ def oidc_oauth_register(client: OAuth):
     ),
 )
 
+
+# PATCH EXTRA LOGIN INFO
+SYSTEM_REGISTER_URL = PersistentConfig(
+    "SYSTEM_REGISTER_URL",
+    "ui.SYSTEM_REGISTER_URL",
+    os.environ.get("SYSTEM_REGISTER_URL", ""),
+)
+
+
+SYSTEM_REGISTER_GUIDE_URL = PersistentConfig(
+    "SYSTEM_REGISTER_GUIDE_URL",
+    "ui.SYSTEM_REGISTER_GUIDE_URL",
+    os.environ.get("SYSTEM_REGISTER_GUIDE_URL", ""),
+)
+# /PATCH EXTRA LOGIN INFO
+
+
+# PATCH ADD LOGO TO SIDEBAR
+LOGO_URL = PersistentConfig(
+    "LOGO_URL",
+    "ui.LOGO_URL",
+    os.environ.get("LOGO_URL", ""),
+)
+# /PATCH ADD LOGO TO SIDEBAR
+
+
 ENABLE_LOGIN_FORM = PersistentConfig(
     "ENABLE_LOGIN_FORM",
     "ui.ENABLE_LOGIN_FORM",

backend/open_webui/main.py

@@ -342,6 +342,13 @@
     PENDING_USER_OVERLAY_TITLE,
     DEFAULT_PROMPT_SUGGESTIONS,
     DEFAULT_MODELS,
+    # PATCH EXTRA LOGIN INFO
+    SYSTEM_REGISTER_URL,
+    SYSTEM_REGISTER_GUIDE_URL,
+    # /PATCH EXTRA LOGIN INFO
+    # PATCH ADD LOGO TO SIDEBAR
+    LOGO_URL,
+    # /PATCH ADD LOGO TO SIDEBAR
     DEFAULT_ARENA_MODEL,
     MODEL_ORDER_LIST,
     EVALUATION_ARENA_MODELS,
@@ -711,6 +718,18 @@ async def lifespan(app: FastAPI):
 app.state.config.DEFAULT_PROMPT_SUGGESTIONS = DEFAULT_PROMPT_SUGGESTIONS
 app.state.config.DEFAULT_USER_ROLE = DEFAULT_USER_ROLE
 
+
+# PATCH EXTRA LOGIN INFO
+app.state.config.SYSTEM_REGISTER_URL = SYSTEM_REGISTER_URL
+app.state.config.SYSTEM_REGISTER_GUIDE_URL = SYSTEM_REGISTER_GUIDE_URL
+# /PATCH EXTRA LOGIN INFO
+
+
+# PATCH ADD LOGO TO SIDEBAR
+app.state.config.LOGO_URL = LOGO_URL
+# /PATCH ADD LOGO TO SIDEBAR
+
+
 app.state.config.PENDING_USER_OVERLAY_CONTENT = PENDING_USER_OVERLAY_CONTENT
 app.state.config.PENDING_USER_OVERLAY_TITLE = PENDING_USER_OVERLAY_TITLE
 
@@ -1711,6 +1730,16 @@ async def get_app_config(request: Request):
                 for name, config in OAUTH_PROVIDERS.items()
             }
         },
+        # Environment variables for patches
+        "extended_features": {
+            # PATCH EXTRA LOGIN INFO
+            "system_register_url": app.state.config.SYSTEM_REGISTER_URL,
+            "system_register_guide_url": app.state.config.SYSTEM_REGISTER_GUIDE_URL,
+            # /PATCH EXTRA LOGIN INFO
+            # PATCH ADD LOGO TO SIDEBAR
+            "logo_url": app.state.config.LOGO_URL,
+            # /PATCH ADD LOGO TO SIDEBAR
+        },
         "features": {
             "auth": WEBUI_AUTH,
             "auth_trusted_header": bool(app.state.AUTH_TRUSTED_EMAIL_HEADER),

src/lib/components/layout/Sidebar.svelte

@@ -1131,7 +1131,9 @@
 				</Folder>
 			</div>
 
-			<div class="px-1.5 pt-1.5 pb-2 sticky bottom-0 z-10 bg-gray-50 dark:bg-gray-950 sidebar">
+ 			<!-- PATCH ADD LOGO TO SIDEBAR: pb-[50px]-class added -->
+			 <div class="px-1.5 pt-1.5 pb-2 sticky bottom-0 z-10 bg-gray-50 dark:bg-gray-950 sidebar pb-[50px]">
+				<!-- /PATCH ADD LOGO TO SIDEBAR -->
 				<div class="flex flex-col font-primary">
 					{#if $user !== undefined && $user !== null}
 						<UserMenu
@@ -1160,6 +1162,15 @@
 				</div>
 			</div>
 		</div>
+		<!-- PATCH ADD LOGO TO SIDEBAR -->
+		 <div class="relative">
+			<div class="-mb-2 flex items-center py-2.5 px-4.5 w-full bg-gray-800 absolute left-0 bottom-0 z-20">
+				<div class="self-center mr-3">
+					<img src={$config?.extended_features?.logo_url ? JSON.parse($config?.extended_features?.logo_url) : ""} class="max-w-[150px] object-cover" alt="" />
+				</div>
+			</div>
+		</div>
+		<!-- /PATCH ADD LOGO TO SIDEBAR -->
 	</div>
 {/if}
 

src/lib/stores/index.ts

@@ -261,6 +261,18 @@ type Config = {
 		enable_direct_connections: boolean;
 		enable_version_update_check: boolean;
 	};
+
+	// Environment variables for patches
+	extended_features: {
+		// PATCH EXTRA LOGIN INFO
+		system_register_url: string;
+		system_register_guide_url: string;
+		// /PATCH EXTRA LOGIN INFO
+		// PATCH ADD LOGO TO SIDEBAR
+		logo_url: string;
+		// /PATCH ADD LOGO TO SIDEBAR
+	};
+
 	oauth: {
 		providers: {
 			[key: string]: string;

src/routes/auth/+page.svelte

@@ -21,6 +21,10 @@
 	import SensitiveInput from '$lib/components/common/SensitiveInput.svelte';
 	import { redirect } from '@sveltejs/kit';
 
+    // PATCH EXTRA LOGIN INFO
+	import Banner from '$lib/components/common/Banner.svelte';
+	// /PATCH EXTRA LOGIN INFO
+
 	const i18n = getContext('i18n');
 
 	let loaded = false;
@@ -401,7 +405,20 @@
 									{/if}
 								</div>
 							</form>
-
+							<!-- PATCH EXTRA LOGIN INFO -->
+							{#if $config?.extended_features?.system_register_url && $config?.extended_features?.system_register_guide_url}
+								<Banner
+									banner={{
+										timestamp: Math.floor(Date.now() / 1000),
+										type: 'info',
+										id: '1',
+										dismissible: false,
+										title: 'Vigtigt før du logger ind første gang!',
+										content: `<div>Du skal have adgang til AI-Platform i Aarhus Kommunes Systemregister.</div><div><a target="_blank" rel="noopener noreferrer" class='underline' href='${JSON.parse($config?.extended_features?.system_register_url)}'>Anmod om adgang i systemregistret</a></div>.</div><div>Du kan <a target="_blank" rel="noopener noreferrer" class='underline' href='${JSON.parse($config?.extended_features?.system_register_guide_url)}'>hente en vejledning til hvordan man anmoder om adgang til systemregistret</a></div>`
+									}}
+								></Banner>
+							{/if}
+							<!-- /PATCH EXTRA LOGIN INFO -->
 							{#if Object.keys($config?.oauth?.providers ?? {}).length > 0}
 								<div class="inline-flex items-center justify-center w-full">
 									<hr class="w-32 h-px my-4 border-0 dark:bg-gray-100/10 bg-gray-700/10" />