Skip to content

Frontend - combined #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cableman wants to merge 1 commit into
base: upstream/v0.11.0
Choose a base branch
from
Open

Frontend - combined #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions backend/open_webui/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1622,6 +1622,23 @@ def reachable(host: str, port: int) -> bool:

ENABLE_SIGNUP = False if not WEBUI_AUTH else os.getenv('ENABLE_SIGNUP', 'True').lower() == 'true'


# PATCH EXTRA LOGIN INFO
# Links shown on the login page: users must request access in Aarhus Kommune's
# system register before their first sign-in. Env-only, never admin-editable,
# so they are plain constants rather than DEFAULT_CONFIG entries.
SYSTEM_REGISTER_URL = os.environ.get('SYSTEM_REGISTER_URL', '')

SYSTEM_REGISTER_GUIDE_URL = os.environ.get('SYSTEM_REGISTER_GUIDE_URL', '')
# /PATCH EXTRA LOGIN INFO


# PATCH ADD LOGO TO SIDEBAR
# Municipality logo pinned to the bottom of the sidebar.
LOGO_URL = os.environ.get('LOGO_URL', '')
# /PATCH ADD LOGO TO SIDEBAR


ENABLE_LOGIN_FORM = os.getenv('ENABLE_LOGIN_FORM', 'True').lower() == 'true'

ENABLE_PASSWORD_CHANGE_FORM = os.getenv('ENABLE_PASSWORD_CHANGE_FORM', 'True').lower() == 'true'
Expand Down
18 changes: 18 additions & 0 deletions backend/open_webui/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@
ONEDRIVE_SHAREPOINT_URL,
STATIC_DIR,
THREAD_POOL_SIZE,
# 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
WEBUI_AUTH,
WEBUI_NAME,
async_reset_config,
Expand Down Expand Up @@ -2162,6 +2169,17 @@ async def get_app_config(request: Request):
),
'auto_redirect': config.get('oauth.auto_redirect'),
},
# Environment variables for patches. Public/pre-auth: the login page reads
# these before a token exists.
'extended_features': {
# PATCH EXTRA LOGIN INFO
'system_register_url': SYSTEM_REGISTER_URL,
'system_register_guide_url': SYSTEM_REGISTER_GUIDE_URL,
# /PATCH EXTRA LOGIN INFO
# PATCH ADD LOGO TO SIDEBAR
'logo_url': LOGO_URL,
# /PATCH ADD LOGO TO SIDEBAR
},
'features': {
# --- Public: required by login/signup page pre-auth ---
'auth': WEBUI_AUTH,
Expand Down
19 changes: 18 additions & 1 deletion src/lib/components/layout/Sidebar.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1672,7 +1672,9 @@
</SidebarSection>
</div>

<div class="px-1 pt-1 pb-1.5 sticky bottom-0 z-10 -mt-2 sidebar">
<!-- PATCH ADD LOGO TO SIDEBAR: pb-[50px]-class added -->
<div class="px-1 pt-1 pb-1.5 sticky bottom-0 z-10 -mt-2 sidebar pb-[50px]">
<!-- /PATCH ADD LOGO TO SIDEBAR -->
<div
class=" sidebar-bg-gradient-to-t bg-linear-to-t from-gray-50 dark:from-gray-950 to-transparent from-50% pointer-events-none absolute inset-0 -z-10 -mt-6"
></div>
Expand Down Expand Up @@ -1715,6 +1717,21 @@
</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}
class="max-w-[150px] object-cover"
alt=""
/>
</div>
</div>
</div>
<!-- /PATCH ADD LOGO TO SIDEBAR -->
</div>

{#if !$mobile}
Expand Down
12 changes: 12 additions & 0 deletions src/lib/stores/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,18 @@ type Config = {
enable_pyodide_file_persistence?: boolean;
folder_max_file_count?: number;
};

// 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;
Expand Down
40 changes: 39 additions & 1 deletion src/routes/auth/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,45 @@
{/if}
</div>
</form>

<!-- PATCH EXTRA LOGIN INFO -->
{#if $config?.extended_features?.system_register_url && $config?.extended_features?.system_register_guide_url}
<div
class="mx-4 px-3 flex justify-center items-center border border-gray-100 dark:border-gray-850 text-gray-800 dark:text-gary-100 bg-white dark:bg-gray-900"
>
<div class="flex flex-col md:items-center text-sm w-fit gap-1.5">
<div
class="m-4 bg-blue-500/20 text-blue-700 dark:text-blue-200 text-xs font-bold w-fit px-2 rounded-sm uppercase line-clamp-1 mr-0.5"
>
{$i18n.t('Info')}
</div>
<div class="text-xs text-gray-700 dark:text-white max-h-60 overflow-y-auto">
<div
class="text-xs text-gray-700 dark:text-white max-h-60 overflow-y-auto mb-2"
>
Du skal anmode om adgang til AarhusAI (AI-platform) i Aarhus Kommunes
systemregister, før du logger på første gang.
</div>
<div class="mb-2">
<a
target="_blank"
class="underline"
href={$config?.extended_features?.system_register_url}
>Anmod om adgang i Systemregisteret.</a
>
</div>
<div class="mb-2">
<a
target="_blank"
class="underline"
href={$config?.extended_features?.system_register_guide_url}
>Vejledning til at anmode om adgang i Systemregisteret på Serviceportalen.</a
>
</div>
</div>
</div>
</div>
{/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" />
Expand Down