Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
open-webui
Commits
8d5c3ee5
Commit
8d5c3ee5
authored
Dec 25, 2023
by
Timothy J. Baek
Browse files
feat: backend required error page
parent
540b50e1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
62 additions
and
13 deletions
+62
-13
backend/config.py
backend/config.py
+3
-3
src/routes/+layout.svelte
src/routes/+layout.svelte
+15
-10
src/routes/error/+page.svelte
src/routes/error/+page.svelte
+44
-0
No files found.
backend/config.py
View file @
8d5c3ee5
...
@@ -31,13 +31,13 @@ if ENV == "prod":
...
@@ -31,13 +31,13 @@ if ENV == "prod":
# WEBUI_VERSION
# WEBUI_VERSION
####################################
####################################
WEBUI_VERSION
=
os
.
environ
.
get
(
"WEBUI_VERSION"
,
"v1.0.0-alpha.4
0
"
)
WEBUI_VERSION
=
os
.
environ
.
get
(
"WEBUI_VERSION"
,
"v1.0.0-alpha.4
2
"
)
####################################
####################################
# WEBUI_AUTH
# WEBUI_AUTH
(Required for security)
####################################
####################################
WEBUI_AUTH
=
True
if
os
.
environ
.
get
(
"WEBUI_AUTH"
,
"FALSE"
)
==
"TRUE"
else
False
WEBUI_AUTH
=
True
####################################
####################################
# WEBUI_JWT_SECRET_KEY
# WEBUI_JWT_SECRET_KEY
...
...
src/routes/+layout.svelte
View file @
8d5c3ee5
...
@@ -11,7 +11,8 @@
...
@@ -11,7 +11,8 @@
let loaded = false;
let loaded = false;
onMount(async () => {
onMount(async () => {
const resBackend = await fetch(`${WEBUI_API_BASE_URL}/`, {
// Check Backend Status
const res = await fetch(`${WEBUI_API_BASE_URL}/`, {
method: 'GET',
method: 'GET',
headers: {
headers: {
'Content-Type': 'application/json'
'Content-Type': 'application/json'
...
@@ -26,13 +27,14 @@
...
@@ -26,13 +27,14 @@
return null;
return null;
});
});
console.log(resBackend);
if (res) {
await config.set(resBackend);
await config.set(res);
console.log(res);
if ($config) {
if ($config) {
if ($config.auth) {
if (localStorage.token) {
if (localStorage.token) {
const res = await fetch(`${WEBUI_API_BASE_URL}/auths`, {
// Get Session User Info
const sessionUser = await fetch(`${WEBUI_API_BASE_URL}/auths`, {
method: 'GET',
method: 'GET',
headers: {
headers: {
'Content-Type': 'application/json',
'Content-Type': 'application/json',
...
@@ -49,8 +51,8 @@
...
@@ -49,8 +51,8 @@
return null;
return null;
});
});
if (
r
es) {
if (
s
es
sionUser
) {
await user.set(
r
es);
await user.set(
s
es
sionUser
);
} else {
} else {
localStorage.removeItem('token');
localStorage.removeItem('token');
await goto('/auth');
await goto('/auth');
...
@@ -59,6 +61,8 @@
...
@@ -59,6 +61,8 @@
await goto('/auth');
await goto('/auth');
}
}
}
}
} else {
await goto(`/error`);
}
}
await tick();
await tick();
...
@@ -69,8 +73,9 @@
...
@@ -69,8 +73,9 @@
<svelte:head>
<svelte:head>
<title>Ollama</title>
<title>Ollama</title>
</svelte:head>
</svelte:head>
<Toaster />
{#if
$config !== undefined &&
loaded}
{#if loaded}
<slot />
<slot />
{/if}
{/if}
<Toaster />
src/routes/error/+page.svelte
0 → 100644
View file @
8d5c3ee5
<script>
import { goto } from '$app/navigation';
import { config } from '$lib/stores';
import { onMount } from 'svelte';
let loaded = false;
onMount(async () => {
if ($config) {
await goto('/');
}
loaded = true;
});
</script>
{#if loaded}
<div class="absolute w-full h-full flex z-50">
<div class="absolute rounded-xl w-full h-full backdrop-blur bg-gray-900/5 flex justify-center">
<div class="m-auto pb-44 flex flex-col justify-center">
<div class="max-w-md">
<div class="text-center text-2xl font-medium z-50">Ollama WebUI Backend Required</div>
<div class=" mt-4 text-center text-sm w-full">
Oops! It seems like your Ollama WebUI needs a little attention. <br
class=" hidden sm:flex"
/>
describe troubleshooting/installation, help @ discord
<!-- TODO: update text -->
</div>
<div class=" mt-6 mx-auto relative group w-fit">
<button
class="relative z-20 flex px-5 py-2 rounded-full bg-gray-100 hover:bg-gray-200 transition font-medium text-sm"
>
Check Again
</button>
</div>
</div>
</div>
</div>
</div>
{/if}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment