starred/UpSnap
1
0
Fork 0
mirror of https://github.com/seriousm4x/UpSnap.git synced 2026-07-24 14:34:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix wrong icon url for prod env, fix #70

Browse Source
This commit is contained in:
seriousm4x
2023-04-12 23:27:42 +02:00
parent 72e3d3d343
commit fdf125d071
6 changed files with 407 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -199,3 +199,4 @@ backend/pb_public/*
!backend/pb_public/.gitkeep
dist/
vite.config.js.timestamp*

762
frontend/pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

5
frontend/src/components/Login.svelte
View File

@@ -1,4 +1,5 @@
<script>
import { dev } from '$app/environment';
import { pocketbase, authorizedStore, settings_public } from '@stores/pocketbase';
let username;
@@ -91,7 +92,9 @@
<div class="col text-center p-3 p-md-5">
<img
src={$settings_public.favicon !== ''
? `${$pocketbase.baseUrl}/api/files/settings_public/${$settings_public.id}/${$settings_public.favicon}`
? `${dev ? $pocketbase.baseUrl : ''}/api/files/settings_public/${
$settings_public.id
}/${$settings_public.favicon}`
: '/gopher.svg'}
alt={$settings_public.website_title ? $settings_public.website_title : 'UpSnap'}
class="logo pe-none user-select-none"

5
frontend/src/components/Navbar.svelte
View File

@@ -1,4 +1,5 @@
<script>
import { dev } from '$app/environment';
import { onMount } from 'svelte';
import { page } from '$app/stores';
import { theme } from '@stores/theme';
@@ -41,7 +42,9 @@
<a class="navbar-brand" href="/">
<img
src={$settings_public.favicon !== ''
? `${$pocketbase.baseUrl}/api/files/settings_public/${$settings_public.id}/${$settings_public.favicon}`
? `${dev ? $pocketbase.baseUrl : ''}/api/files/settings_public/${
$settings_public.id
}/${$settings_public.favicon}`
: '/gopher.svg'}
alt={$settings_public.website_title ? $settings_public.website_title : 'UpSnap'}
width="45"

5
frontend/src/routes/+layout.svelte
View File

@@ -1,4 +1,5 @@
<script>
import { dev } from '$app/environment';
import { onMount } from 'svelte';
import { page } from '$app/stores';
import Navbar from '@components/Navbar.svelte';
@@ -75,7 +76,9 @@
favicon.href =
$settings_public.favicon === ''
? '/gopher.svg'
: `${$pocketbase.baseUrl}/api/files/settings_public/${$settings_public.id}/${$settings_public.favicon}`;
: `${dev ? $pocketbase.baseUrl : ''}/api/files/settings_public/${
$settings_public.id
}/${$settings_public.favicon}`;
document.title =
$settings_public.website_title === '' ? 'UpSnap' : $settings_public.website_title;
}

4
frontend/src/routes/settings/+page.svelte
View File

@@ -48,7 +48,9 @@
$: if (iconPreview && iconFiles.length > 0) {
iconPreview.src = URL.createObjectURL(iconFiles[0]);
} else if (iconPreview && $settings_public.favicon !== '') {
iconPreview.src = `${$pocketbase.baseUrl}/api/files/settings_public/${$settings_public.id}/${$settings_public.favicon}`;
iconPreview.src = `${dev ? $pocketbase.baseUrl : ''}/api/files/settings_public/${
$settings_public.id
}/${$settings_public.favicon}`;
} else if (iconPreview) {
iconPreview.src = '/gopher.svg';
}