diff --git a/.gitignore b/.gitignore index 7ae432c..9ccb66d 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,7 @@ dist$ZIPNAME.zip ## time someone rebuilds. Keep the source committed, regenerate output. DorkNet.Server/wwwroot/admin/index.html DorkNet.Server/wwwroot/admin/assets/ +DorkNet.Server/wwwroot/admin/brand/ DorkNet.Server/wwwroot/admin/*.map DorkNet.Server/admin-ui/node_modules/ DorkNet.Server/admin-ui/dist/ @@ -58,6 +59,7 @@ DorkNet.Server/admin-ui/tsconfig.tsbuildinfo ## Same reasoning as admin-ui above: hashed output, regenerate per build. DorkNet.Server/wwwroot/site/index.html DorkNet.Server/wwwroot/site/assets/ +DorkNet.Server/wwwroot/site/brand/ DorkNet.Server/wwwroot/site/*.map DorkNet.Server/site/node_modules/ DorkNet.Server/site/dist/ @@ -83,4 +85,4 @@ Recovered/ Recovered(*)/ -local-releases/** \ No newline at end of file +local-releases/** diff --git a/DorkNet.Server/admin-ui/index.html b/DorkNet.Server/admin-ui/index.html index ad0f540..a4c08af 100644 --- a/DorkNet.Server/admin-ui/index.html +++ b/DorkNet.Server/admin-ui/index.html @@ -4,7 +4,9 @@ + DorkNet Admin + diff --git a/DorkNet.Server/admin-ui/public/brand/dorknet.svg b/DorkNet.Server/admin-ui/public/brand/dorknet.svg new file mode 100644 index 0000000..2bf84c6 --- /dev/null +++ b/DorkNet.Server/admin-ui/public/brand/dorknet.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DorkNet.Server/admin-ui/src/assets/dorknet.svg b/DorkNet.Server/admin-ui/src/assets/dorknet.svg new file mode 100644 index 0000000..2bf84c6 --- /dev/null +++ b/DorkNet.Server/admin-ui/src/assets/dorknet.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DorkNet.Server/admin-ui/src/components/BrandMark.tsx b/DorkNet.Server/admin-ui/src/components/BrandMark.tsx new file mode 100644 index 0000000..553f1e3 --- /dev/null +++ b/DorkNet.Server/admin-ui/src/components/BrandMark.tsx @@ -0,0 +1,9 @@ +import logoUrl from '../assets/dorknet.svg'; + +export function BrandMark({ className = 'size-8' }: { className?: string }) { + return ( + + + + ); +} diff --git a/DorkNet.Server/admin-ui/src/components/Sidebar.tsx b/DorkNet.Server/admin-ui/src/components/Sidebar.tsx index 0c4d437..06f78a3 100644 --- a/DorkNet.Server/admin-ui/src/components/Sidebar.tsx +++ b/DorkNet.Server/admin-ui/src/components/Sidebar.tsx @@ -4,6 +4,7 @@ import { LayoutDashboard, Users, Building2, Activity, Megaphone, MessageSquare, Settings, X, } from './Icons'; +import { BrandMark } from './BrandMark'; // Consolidated navigation. Per-player moderation (bans, grants, gifts, // password resets) lives in the player detail modal; the old Bans / @@ -67,9 +68,9 @@ export function Sidebar({ open, onClose, onNavigate }: { open: boolean; onClose: <>
-
D
+
-
DorkNet
+
DorkNet
admin
diff --git a/DorkNet.Server/admin-ui/src/pages/Login.tsx b/DorkNet.Server/admin-ui/src/pages/Login.tsx index 0810509..1331df5 100644 --- a/DorkNet.Server/admin-ui/src/pages/Login.tsx +++ b/DorkNet.Server/admin-ui/src/pages/Login.tsx @@ -2,6 +2,7 @@ import { useState } from 'react'; import { useNavigate, useLocation } from 'react-router-dom'; import { api, ApiError } from '../lib/api'; import { notifyAuthChange, setSession } from '../lib/auth'; +import { BrandMark } from '../components/BrandMark'; interface LoginResponse { access_token: string; @@ -51,12 +52,12 @@ export function Login() { }; return ( -
+
-
D
+
-

DorkNet Admin

+

DorkNet Admin

Sign in with an admin account.

diff --git a/DorkNet.Server/admin-ui/src/vite-env.d.ts b/DorkNet.Server/admin-ui/src/vite-env.d.ts new file mode 100644 index 0000000..11f02fe --- /dev/null +++ b/DorkNet.Server/admin-ui/src/vite-env.d.ts @@ -0,0 +1 @@ +/// diff --git a/DorkNet.Server/admin-ui/tailwind.config.js b/DorkNet.Server/admin-ui/tailwind.config.js index 2a1ab9d..20a7568 100644 --- a/DorkNet.Server/admin-ui/tailwind.config.js +++ b/DorkNet.Server/admin-ui/tailwind.config.js @@ -20,17 +20,17 @@ export default { 950: '#0a0b0e', }, brand: { - DEFAULT: '#7c5cff', - 50: '#f1edff', - 100: '#e1d8ff', - 200: '#c5b6ff', - 300: '#a48dff', - 400: '#8d72ff', - 500: '#7c5cff', - 600: '#6948e3', - 700: '#5236b8', - 800: '#3e2989', - 900: '#2a1c5f', + DEFAULT: '#0b95c7', + 50: '#ecfbff', + 100: '#c8f3ff', + 200: '#8bedff', + 300: '#51e5ff', + 400: '#22cfee', + 500: '#0b95c7', + 600: '#087aa8', + 700: '#096083', + 800: '#0a465f', + 900: '#082f40', }, success: '#3ecf8e', warn: '#f4b740', diff --git a/DorkNet.Server/site/index.html b/DorkNet.Server/site/index.html index a8d15e6..00d5010 100644 --- a/DorkNet.Server/site/index.html +++ b/DorkNet.Server/site/index.html @@ -4,8 +4,10 @@ + DorkNet + diff --git a/DorkNet.Server/site/public/brand/dorknet.svg b/DorkNet.Server/site/public/brand/dorknet.svg new file mode 100644 index 0000000..2bf84c6 --- /dev/null +++ b/DorkNet.Server/site/public/brand/dorknet.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DorkNet.Server/site/src/assets/dorknet.svg b/DorkNet.Server/site/src/assets/dorknet.svg new file mode 100644 index 0000000..2bf84c6 --- /dev/null +++ b/DorkNet.Server/site/src/assets/dorknet.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DorkNet.Server/site/src/components/BrandMark.tsx b/DorkNet.Server/site/src/components/BrandMark.tsx new file mode 100644 index 0000000..553f1e3 --- /dev/null +++ b/DorkNet.Server/site/src/components/BrandMark.tsx @@ -0,0 +1,9 @@ +import logoUrl from '../assets/dorknet.svg'; + +export function BrandMark({ className = 'size-8' }: { className?: string }) { + return ( + + + + ); +} diff --git a/DorkNet.Server/site/src/components/Header.tsx b/DorkNet.Server/site/src/components/Header.tsx index a5ae394..b03ca4d 100644 --- a/DorkNet.Server/site/src/components/Header.tsx +++ b/DorkNet.Server/site/src/components/Header.tsx @@ -1,5 +1,6 @@ import { NavLink, Link, useLocation, useNavigate } from 'react-router-dom'; import { useEffect, useRef, useState } from 'react'; +import { BrandMark } from './BrandMark'; const NAV = [ { to: '/', label: 'Home', exact: true }, @@ -30,8 +31,8 @@ export function Header() {
- - DorkNet + + DorkNet