diff --git a/.gitignore b/.gitignore index 3492006..f40977b 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,7 @@ Thumbs.db # Worktrees .worktrees/ + +# Generated by postinstall from @cameleer/design-system +ui/public/favicon-32.png +ui/public/favicon-192.png diff --git a/src/main/java/net/siegeln/cameleer/saas/config/SecurityConfig.java b/src/main/java/net/siegeln/cameleer/saas/config/SecurityConfig.java index 426235f..e433390 100644 --- a/src/main/java/net/siegeln/cameleer/saas/config/SecurityConfig.java +++ b/src/main/java/net/siegeln/cameleer/saas/config/SecurityConfig.java @@ -45,7 +45,7 @@ public class SecurityConfig { .requestMatchers("/api/config").permitAll() .requestMatchers("/", "/index.html", "/login", "/callback", "/environments/**", "/license", "/admin/**").permitAll() - .requestMatchers("/_app/**", "/favicon.ico", "/favicon.svg", "/favicon-32.png", "/favicon-192.png", "/cameleer-logo-48.png", "/logo.svg", "/logo-dark.svg").permitAll() + .requestMatchers("/_app/**", "/favicon.ico", "/favicon-32.png", "/favicon-192.png", "/logo.svg", "/logo-dark.svg").permitAll() .anyRequest().authenticated() ) .oauth2ResourceServer(oauth2 -> oauth2.jwt(jwt -> diff --git a/ui/package.json b/ui/package.json index ec93bdc..1cf3cc2 100644 --- a/ui/package.json +++ b/ui/package.json @@ -6,7 +6,8 @@ "scripts": { "dev": "vite", "build": "tsc -b && vite build", - "preview": "vite preview" + "preview": "vite preview", + "postinstall": "node -e \"const fs=require('fs'),p='node_modules/@cameleer/design-system/assets/';[['cameleer3-32.png','public/favicon-32.png'],['cameleer3-192.png','public/favicon-192.png']].forEach(([s,d])=>fs.copyFileSync(p+s,d))\"" }, "dependencies": { "@cameleer/design-system": "0.1.33", diff --git a/ui/public/cameleer-logo-48.png b/ui/public/cameleer-logo-48.png deleted file mode 100644 index 01aa924..0000000 Binary files a/ui/public/cameleer-logo-48.png and /dev/null differ diff --git a/ui/public/favicon-192.png b/ui/public/favicon-192.png deleted file mode 100644 index fe9c65e..0000000 Binary files a/ui/public/favicon-192.png and /dev/null differ diff --git a/ui/public/favicon-32.png b/ui/public/favicon-32.png deleted file mode 100644 index 2298f90..0000000 Binary files a/ui/public/favicon-32.png and /dev/null differ diff --git a/ui/sign-in/public/cameleer-logo-48.png b/ui/sign-in/public/cameleer-logo-48.png deleted file mode 100644 index 01aa924..0000000 Binary files a/ui/sign-in/public/cameleer-logo-48.png and /dev/null differ diff --git a/ui/sign-in/src/SignInPage.tsx b/ui/sign-in/src/SignInPage.tsx index a6e7cfe..bfdcf6b 100644 --- a/ui/sign-in/src/SignInPage.tsx +++ b/ui/sign-in/src/SignInPage.tsx @@ -1,5 +1,6 @@ import { type FormEvent, useMemo, useState } from 'react'; import { Card, Input, Button, Alert, FormField } from '@cameleer/design-system'; +import cameleerLogo from '@cameleer/design-system/assets/cameleer3-48.png'; import { signIn } from './experience-api'; import styles from './SignInPage.module.css'; @@ -56,7 +57,7 @@ export function SignInPage() {
- + cameleer3

{subtitle}

diff --git a/ui/src/components/Layout.tsx b/ui/src/components/Layout.tsx index d7603f5..a2cc15a 100644 --- a/ui/src/components/Layout.tsx +++ b/ui/src/components/Layout.tsx @@ -8,11 +8,12 @@ import { import { useAuth } from '../auth/useAuth'; import { useScopes } from '../auth/useScopes'; import { EnvironmentTree } from './EnvironmentTree'; +import cameleerLogo from '@cameleer/design-system/assets/cameleer3-48.png'; function CameleerLogo() { return (