Tauri CSP fixes, + bannerfix

NationalLibraryOfNorway · Dec 18, 2024 · 68b4209 · 68b4209
1 parent 7efdb40
commit 68b4209
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 12 deletions.
diff --git a/public/banner.png b/public/banner.png
diff --git a/public/tauri.svg b/public/tauri.svg
diff --git a/public/vite.svg b/public/vite.svg
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -43,7 +43,7 @@
         },
         "enable": true
       },
-      "csp": "default-src 'self'; img-src 'self' asset: https://asset.localhost; connect-src ipc: http://ipc.localhost"
+      "csp": "default-src 'self'; img-src 'self' asset: https://asset.localhost; connect-src 'self' https://sentry.nb.no ipc: http://ipc.localhost"
     },
     "windows": [
       {

diff --git a/src/App.tsx b/src/App.tsx
@@ -96,7 +96,7 @@ const Content: React.FC<ContentProps> = ({ openSettings, setOpenSettings }) => {
     if (loggedOut && !isLoggingIn) {
         return (
             <div className={'w-screen h-screen flex flex-col justify-center items-center text-center'}>
-                <img alt={'Trøkk logo'} src="banner.png" className={'w-96 pb-10'}></img>
+                <img alt={'Trøkk logo'} src="/banner.png" className={'w-96 pb-10'}></img>
                 <Button className={'w-[150px] h-[75px] text-2xl'} onClick={login}>Logg inn</Button>
             </div>
         );
@@ -105,7 +105,7 @@ const Content: React.FC<ContentProps> = ({ openSettings, setOpenSettings }) => {
     if (isLoggingIn && !authResponse) {
         return (
             <div className={'w-screen h-screen flex flex-col justify-center items-center text-center'}>
-                <img alt={'Trøkk logo'} src="banner.png" className={'w-96 pb-10'}></img>
+                <img alt={'Trøkk logo'} src="/banner.png" className={'w-96 pb-10'}></img>
                 <h2 className={'h-[75px]'}>Nytt innloggingsvindu åpnet, vennligst logg inn der...</h2>
             </div>
         );
@@ -114,7 +114,7 @@ const Content: React.FC<ContentProps> = ({ openSettings, setOpenSettings }) => {
     if (!authResponse) {
         return (
             <div className={'w-screen h-screen flex flex-col justify-center items-center text-center'}>
-                <img alt={'Trøkk logo'} src="banner.png" className={'w-96 pb-10'}></img>
+                <img alt={'Trøkk logo'} src="/banner.png" className={'w-96 pb-10'}></img>
                 <Button className={'w-[150px] h-[75px] text-2xl'} onClick={login}>Logg inn</Button>
             </div>
         );

diff --git a/vite.config.ts b/vite.config.ts
@@ -6,7 +6,6 @@ const host = process.env.TAURI_DEV_HOST;
 // https://vitejs.dev/config/
 export default defineConfig(async () => ({
     plugins: [react()],
-
     // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
     //
     // 1. prevent vite from obscuring rust errors