From e66573b315a4e2a00a24d031a425b82cc76b9bcd Mon Sep 17 00:00:00 2001 From: lonelyhentxi Date: Sat, 8 Mar 2025 02:49:49 +0800 Subject: [PATCH] fix: fix typos --- apps/webui/package.json | 46 +- apps/webui/src/auth/hooks.ts | 31 +- .../src/components/layout/app-layout.tsx | 9 +- .../src/components/layout/app-not-found.tsx | 2 +- .../src/components/layout/app-sidebar.tsx | 84 +- .../src/components/layout/app-skeleton.tsx | 6 +- apps/webui/src/config/app-layout.ts | 92 ++ apps/webui/src/routeTree.gen.ts | 203 ++- .../routes/_app/{ => _explore}/explore.tsx | 2 +- apps/webui/src/routes/_app/_explore/feed.tsx | 15 + .../_app/playground/graphql-api.lazy.tsx | 8 +- .../routes/_app/playground/graphql-api.tsx | 2 + .../src/routes/{_app.tsx => _app/route.tsx} | 0 .../src/routes/_app/settings/downloader.tsx | 13 + apps/webui/src/routes/auth/oidc/callback.tsx | 81 +- apps/webui/src/routes/index.tsx | 2 +- apps/webui/src/utils/route/index.ts | 2 +- pnpm-lock.yaml | 1146 +++++++++++------ 18 files changed, 1159 insertions(+), 585 deletions(-) create mode 100644 apps/webui/src/config/app-layout.ts rename apps/webui/src/routes/_app/{ => _explore}/explore.tsx (84%) create mode 100644 apps/webui/src/routes/_app/_explore/feed.tsx rename apps/webui/src/routes/{_app.tsx => _app/route.tsx} (100%) create mode 100644 apps/webui/src/routes/_app/settings/downloader.tsx diff --git a/apps/webui/package.json b/apps/webui/package.json index e829ff9..95d3884 100644 --- a/apps/webui/package.json +++ b/apps/webui/package.json @@ -9,6 +9,7 @@ "preview": "rsbuild preview" }, "dependencies": { + "@abraham/reflection": "^0.12.0", "@ark-ui/solid": "^4.10.2", "@codemirror/language": "6.0.0", "@corvu/drawer": "^0.2.3", @@ -17,44 +18,43 @@ "@graphiql/toolkit": "^0.11.1", "@kobalte/core": "^0.13.9", "@kobalte/tailwindcss": "^0.9.0", + "@outposts/injection-js": "^2.5.1", "@solid-primitives/graphql": "^2.2.0", "@solid-primitives/refs": "^1.1.0", "@tailwindcss/postcss": "^4.0.9", - "@tanstack/solid-router": "^1.112.2", + "@tanstack/react-router": "^1.112.13", + "@tanstack/router-devtools": "^1.112.13", + "@tanstack/solid-router": "^1.112.12", + "arktype": "^2.1.6", "chart.js": "^4.4.8", + "class-variance-authority": "^0.7.1", + "clsx": "^2.1.1", "cmdk-solid": "^1.1.2", "embla-carousel-solid": "^8.5.2", "graphiql": "^3.8.3", "lucide-solid": "^0.477.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "oidc-client-rx": "0.1.0-alpha.9", + "react": "^18.3.1", + "react-dom": "^18.3.1", + "rxjs": "^7.8.2", "solid-js": "^1.9.5", "solid-sonner": "^0.2.8", - "tailwindcss": "^3.4.17", "tailwind-merge": "^3.0.2", - "tailwindcss-animate": "^1.0.7", - "@tanstack/react-router": "^1.112.0", - "@tanstack/router-devtools": "^1.112.6", - "class-variance-authority": "^0.7.1", - "@abraham/reflection": "^0.12.0", - "@outposts/injection-js": "^2.5.1", - "arktype": "^2.1.2", - "clsx": "^2.1.1", - "oidc-client-rx": "0.1.0-alpha.8", - "rxjs": "^7.8.2" + "tailwindcss": "^3.4.17", + "tailwindcss-animate": "^1.0.7" }, "devDependencies": { - "@rsbuild/core": "^1.2.14", + "@rsbuild/core": "^1.2.15", "@rsbuild/plugin-babel": "^1.0.4", + "@rsbuild/plugin-solid": "^1.0.5", + "@tailwindcss/postcss": "^4.0.9", + "@tanstack/react-router": "^1.112.0", + "@tanstack/router-devtools": "^1.112.6", + "@tanstack/router-plugin": "^1.112.13", + "@types/react": "^18.3.18", + "@types/react-dom": "^18.3.5", "chalk": "^5.4.1", "commander": "^13.1.0", - "postcss": "^8.5.3", - "@rsbuild/plugin-solid": "^1.0.5", - "@tanstack/react-router": "^1.112.0", - "@types/react": "^18.0.0", - "@types/react-dom": "^18.0.0", - "@tailwindcss/postcss": "^4.0.9", - "@tanstack/router-devtools": "^1.112.6", - "@tanstack/router-plugin": "^1.112.3" + "postcss": "^8.5.3" } } diff --git a/apps/webui/src/auth/hooks.ts b/apps/webui/src/auth/hooks.ts index dd12229..6fc7a0f 100644 --- a/apps/webui/src/auth/hooks.ts +++ b/apps/webui/src/auth/hooks.ts @@ -3,8 +3,8 @@ import { InjectorContextVoidInjector, useOidcClient, } from 'oidc-client-rx/adapters/solid-js'; -import { NEVER, of } from 'rxjs'; -import { createMemo, from } from 'solid-js'; +import { NEVER, map, of } from 'rxjs'; +import { from } from 'solid-js'; import { isBasicAuth, isOidcAuth } from './config'; const BASIC_AUTH_IS_AUTHENTICATED$ = of({ @@ -17,34 +17,39 @@ const BASIC_AUTH_USER_DATA$ = of({ allUserData: [], }); -const useOidcClientExt = isOidcAuth ? useOidcClient : () => ({ oidcSecurityService: undefined, injector: InjectorContextVoidInjector }) +const useOidcClientExt = isOidcAuth + ? useOidcClient + : () => ({ + oidcSecurityService: undefined, + injector: InjectorContextVoidInjector, + }); export function useAuth() { const { oidcSecurityService, injector } = useOidcClientExt(); - const isAuthenticatedObj = from( + const isAuthenticated$ = ( oidcSecurityService?.isAuthenticated$ ?? BASIC_AUTH_IS_AUTHENTICATED$ - ); + ).pipe(map((s) => s.isAuthenticated)); - const userDataObj = from( + const userData$ = ( oidcSecurityService?.userData$ ?? BASIC_AUTH_USER_DATA$ - ); + ).pipe(map((s) => s.userData)); - const isAuthenticated = createMemo( - () => isAuthenticatedObj()?.isAuthenticated ?? false - ); + const isAuthenticated = from(isAuthenticated$); - const userData = createMemo(() => userDataObj()?.userData ?? {}); + const userData = from(userData$); - const checkAuthResultEvent = isBasicAuth + const checkAuthResultEvent$ = isBasicAuth ? NEVER : injector.get(CHECK_AUTH_RESULT_EVENT); return { oidcSecurityService, + isAuthenticated$, isAuthenticated, + userData$, userData, injector, - checkAuthResultEvent, + checkAuthResultEvent$, }; } diff --git a/apps/webui/src/components/layout/app-layout.tsx b/apps/webui/src/components/layout/app-layout.tsx index e2df074..ab54346 100644 --- a/apps/webui/src/components/layout/app-layout.tsx +++ b/apps/webui/src/components/layout/app-layout.tsx @@ -94,9 +94,9 @@ export function AppAside(props: AppAsideProps) { return ( <> - {index() > 0 && ( + 0}>