diff --git a/front/packages/models/src/query.tsx b/front/packages/models/src/query.tsx index bfe384e1..5d7c61f7 100644 --- a/front/packages/models/src/query.tsx +++ b/front/packages/models/src/query.tsx @@ -158,9 +158,11 @@ export type QueryPage = ComponentType & { }; const toQueryKey = (query: QueryIdentifier) => { + const prefix = Platform.OS !== "web" ? [kyooApiUrl] : [""]; + if (query.params) { return [ - kyooApiUrl, + ...prefix, ...query.path, "?" + Object.entries(query.params) @@ -169,7 +171,7 @@ const toQueryKey = (query: QueryIdentifier) => { .join("&"), ]; } else { - return [kyooApiUrl, ...query.path]; + return [...prefix, ...query.path]; } }; diff --git a/front/packages/ui/src/layout.tsx b/front/packages/ui/src/layout.tsx index 8d2f142f..c859a8b2 100644 --- a/front/packages/ui/src/layout.tsx +++ b/front/packages/ui/src/layout.tsx @@ -58,4 +58,4 @@ export const DefaultLayout = ({ ); }; -DefaultLayout.getFetchUrls = () => [Navbar.query(), MeQuery]; +DefaultLayout.getFetchUrls = () => [MeQuery]; diff --git a/front/packages/ui/src/navbar/index.tsx b/front/packages/ui/src/navbar/index.tsx index e7841a23..6690561f 100644 --- a/front/packages/ui/src/navbar/index.tsx +++ b/front/packages/ui/src/navbar/index.tsx @@ -21,11 +21,7 @@ import { AccountContext, deleteAccount, - Library, - LibraryP, logout, - Page, - Paged, QueryIdentifier, User, UserP, @@ -37,7 +33,6 @@ import { Header, Avatar, A, - Skeleton, tooltip, ts, Menu, @@ -48,14 +43,14 @@ import { Platform, TextInput, View, ViewProps } from "react-native"; import { useTranslation } from "react-i18next"; import { createParam } from "solito"; import { useRouter } from "solito/router"; -import { rem, Stylable, useYoshiki } from "yoshiki/native"; +import { Stylable, useYoshiki } from "yoshiki/native"; import MenuIcon from "@material-symbols/svg-400/rounded/menu-fill.svg"; import Search from "@material-symbols/svg-400/rounded/search-fill.svg"; import Login from "@material-symbols/svg-400/rounded/login.svg"; import Register from "@material-symbols/svg-400/rounded/app_registration.svg"; import Logout from "@material-symbols/svg-400/rounded/logout.svg"; import Delete from "@material-symbols/svg-400/rounded/delete.svg"; -import { Fetch, FetchNE } from "../fetch"; +import { FetchNE } from "../fetch"; import { KyooLongLogo } from "./icon"; import { forwardRef, useContext, useRef, useState } from "react"; import { useQueryClient } from "@tanstack/react-query"; @@ -116,7 +111,7 @@ export const NavbarProfile = () => { const { css, theme } = useYoshiki(); const { t } = useTranslation(); const queryClient = useQueryClient(); - const { type, accounts, selected, setSelected } = useContext(AccountContext); + const { accounts, selected, setSelected } = useContext(AccountContext); return ( @@ -276,33 +271,8 @@ export const Navbar = (props: Stylable) => { display: { xs: "none", sm: "flex" }, marginX: ts(2), })} - > - - {(library, i) => - !library.isLoading ? ( - - {library.name} - - ) : ( - - ) - } - - + /> ); }; - -Navbar.query = (): QueryIdentifier> => ({ - parser: Paged(LibraryP), - path: ["libraries"], -});