diff --git a/.gitignore b/.gitignore index f40977b..91a5ba2 100644 --- a/.gitignore +++ b/.gitignore @@ -23,5 +23,4 @@ Thumbs.db .worktrees/ # Generated by postinstall from @cameleer/design-system -ui/public/favicon-32.png -ui/public/favicon-192.png +ui/public/favicon.svg 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 e433390..d2bd847 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-32.png", "/favicon-192.png", "/logo.svg", "/logo-dark.svg").permitAll() + .requestMatchers("/_app/**", "/favicon.ico", "/favicon.svg", "/logo.svg", "/logo-dark.svg").permitAll() .anyRequest().authenticated() ) .oauth2ResourceServer(oauth2 -> oauth2.jwt(jwt -> diff --git a/ui/index.html b/ui/index.html index 3bcd08a..45cb00c 100644 --- a/ui/index.html +++ b/ui/index.html @@ -3,8 +3,7 @@ - - + Cameleer SaaS diff --git a/ui/package-lock.json b/ui/package-lock.json index 4b96f9a..8c4b57f 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.0", "hasInstallScript": true, "dependencies": { - "@cameleer/design-system": "0.1.34", + "@cameleer/design-system": "0.1.36", "@logto/react": "^4.0.13", "@tanstack/react-query": "^5.90.0", "lucide-react": "^1.7.0", @@ -309,9 +309,9 @@ } }, "node_modules/@cameleer/design-system": { - "version": "0.1.34", - "resolved": "https://gitea.siegeln.net/api/packages/cameleer/npm/%40cameleer%2Fdesign-system/-/0.1.34/design-system-0.1.34.tgz", - "integrity": "sha512-z2B4VF4v0hwRil6G9N31qadk1rN5PQQC4I5A5DO9gZKnyPZ18+KlgNB5zSyYKvl1MV++id9xdSMg2hDGy3Aybg==", + "version": "0.1.36", + "resolved": "https://gitea.siegeln.net/api/packages/cameleer/npm/%40cameleer%2Fdesign-system/-/0.1.36/design-system-0.1.36.tgz", + "integrity": "sha512-8PLAGY6tQTYuV+s132fpGFyvSA+D9TJxVWaitxkiwuvL6cQnfZ3ujuP7CI60BRVaL2LhM+RLh+dcFDUo6NRBhQ==", "dependencies": { "lucide-react": "^1.7.0", "react": "^19.0.0", diff --git a/ui/package.json b/ui/package.json index ec7f376..e19244d 100644 --- a/ui/package.json +++ b/ui/package.json @@ -7,10 +7,10 @@ "dev": "vite", "build": "tsc -b && vite build", "preview": "vite preview", - "postinstall": "node -e \"const fs=require('fs'),p='node_modules/@cameleer/design-system/assets/';if(fs.existsSync('public')){[['cameleer3-32.png','public/favicon-32.png'],['cameleer3-192.png','public/favicon-192.png']].forEach(([s,d])=>fs.copyFileSync(p+s,d))}\"" + "postinstall": "node -e \"const fs=require('fs'),p='node_modules/@cameleer/design-system/assets/';if(fs.existsSync('public')){fs.copyFileSync(p+'cameleer3-logo.svg','public/favicon.svg')}\"" }, "dependencies": { - "@cameleer/design-system": "0.1.34", + "@cameleer/design-system": "0.1.36", "@logto/react": "^4.0.13", "@tanstack/react-query": "^5.90.0", "lucide-react": "^1.7.0", diff --git a/ui/public/favicon.svg b/ui/public/favicon.svg deleted file mode 100644 index b83d1b0..0000000 --- a/ui/public/favicon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/sign-in/index.html b/ui/sign-in/index.html index 0ac1a39..4be561f 100644 --- a/ui/sign-in/index.html +++ b/ui/sign-in/index.html @@ -4,7 +4,7 @@ Sign in — cameleer3 - +
diff --git a/ui/sign-in/package-lock.json b/ui/sign-in/package-lock.json index 12c0f46..78e4565 100644 --- a/ui/sign-in/package-lock.json +++ b/ui/sign-in/package-lock.json @@ -8,7 +8,7 @@ "name": "cameleer-sign-in", "version": "0.1.0", "dependencies": { - "@cameleer/design-system": "0.1.34", + "@cameleer/design-system": "0.1.36", "react": "^19.0.0", "react-dom": "^19.0.0" }, @@ -303,9 +303,9 @@ } }, "node_modules/@cameleer/design-system": { - "version": "0.1.34", - "resolved": "https://gitea.siegeln.net/api/packages/cameleer/npm/%40cameleer%2Fdesign-system/-/0.1.34/design-system-0.1.34.tgz", - "integrity": "sha512-z2B4VF4v0hwRil6G9N31qadk1rN5PQQC4I5A5DO9gZKnyPZ18+KlgNB5zSyYKvl1MV++id9xdSMg2hDGy3Aybg==", + "version": "0.1.36", + "resolved": "https://gitea.siegeln.net/api/packages/cameleer/npm/%40cameleer%2Fdesign-system/-/0.1.36/design-system-0.1.36.tgz", + "integrity": "sha512-8PLAGY6tQTYuV+s132fpGFyvSA+D9TJxVWaitxkiwuvL6cQnfZ3ujuP7CI60BRVaL2LhM+RLh+dcFDUo6NRBhQ==", "dependencies": { "lucide-react": "^1.7.0", "react": "^19.0.0", diff --git a/ui/sign-in/package.json b/ui/sign-in/package.json index 8a34c1a..9c8a828 100644 --- a/ui/sign-in/package.json +++ b/ui/sign-in/package.json @@ -9,7 +9,7 @@ "preview": "vite preview" }, "dependencies": { - "@cameleer/design-system": "0.1.34", + "@cameleer/design-system": "0.1.36", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/ui/sign-in/public/favicon.svg b/ui/sign-in/public/favicon.svg index b83d1b0..75f6111 100644 --- a/ui/sign-in/public/favicon.svg +++ b/ui/sign-in/public/favicon.svg @@ -1,3 +1,144 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui/sign-in/src/SignInPage.tsx b/ui/sign-in/src/SignInPage.tsx index bfdcf6b..5f0315f 100644 --- a/ui/sign-in/src/SignInPage.tsx +++ b/ui/sign-in/src/SignInPage.tsx @@ -1,6 +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 cameleerLogo from '@cameleer/design-system/assets/cameleer3-logo.svg'; import { signIn } from './experience-api'; import styles from './SignInPage.module.css'; diff --git a/ui/src/components/Layout.tsx b/ui/src/components/Layout.tsx index a2cc15a..27bf780 100644 --- a/ui/src/components/Layout.tsx +++ b/ui/src/components/Layout.tsx @@ -8,7 +8,7 @@ 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'; +import cameleerLogo from '@cameleer/design-system/assets/cameleer3-logo.svg'; function CameleerLogo() { return (