diff --git a/front/apps/web/src/pages/_app.tsx b/front/apps/web/src/pages/_app.tsx index 4f2d07b1..28db2a8c 100755 --- a/front/apps/web/src/pages/_app.tsx +++ b/front/apps/web/src/pages/_app.tsx @@ -27,16 +27,16 @@ import { ConnectionErrorContext, type QueryIdentifier, type QueryPage, + type ServerInfo, ServerInfoP, + SetupStep, UserP, createQueryClient, fetchQuery, getTokenWJ, setSsrApiUrl, - useUserTheme, - SetupStep, - type ServerInfo, useFetch, + useUserTheme, } from "@kyoo/models"; import { getCurrentAccount, readCookie, updateAccount } from "@kyoo/models/src/account-internal"; import { @@ -54,12 +54,12 @@ import arrayShuffle from "array-shuffle"; import NextApp, { type AppContext, type AppProps } from "next/app"; import { Poppins } from "next/font/google"; import Head from "next/head"; -import { type ComponentType, useContext, useState, useEffect } from "react"; +import { type NextRouter, useRouter } from "next/router"; +import { type ComponentType, useContext, useEffect, useState } from "react"; import { Tooltip } from "react-tooltip"; import superjson from "superjson"; import { StyleRegistryProvider, useMobileHover, useStyleRegistry, useTheme } from "yoshiki/web"; import { withTranslations } from "../i18n"; -import { NextRouter, useRouter } from "next/router"; const font = Poppins({ weight: ["300", "400", "900"], subsets: ["latin"], display: "swap" }); diff --git a/front/packages/ui/src/errors/setup.tsx b/front/packages/ui/src/errors/setup.tsx index 4d434417..ef41dd28 100644 --- a/front/packages/ui/src/errors/setup.tsx +++ b/front/packages/ui/src/errors/setup.tsx @@ -1,12 +1,12 @@ -import { SetupStep, type QueryPage } from "@kyoo/models"; -import { Button, Icon, Link, P, ts } from "@kyoo/primitives"; -import { useTranslation } from "react-i18next"; import { Main } from "@expo/html-elements"; -import { useYoshiki } from "yoshiki/native"; +import { type QueryPage, SetupStep } from "@kyoo/models"; +import { Button, Icon, Link, P, ts } from "@kyoo/primitives"; import Register from "@material-symbols/svg-400/rounded/app_registration.svg"; -import { Navbar, NavbarProfile } from "../navbar"; import { useEffect } from "react"; +import { useTranslation } from "react-i18next"; import { useRouter } from "solito/router"; +import { useYoshiki } from "yoshiki/native"; +import { Navbar, NavbarProfile } from "../navbar"; import { KyooLongLogo } from "../navbar/icon"; export const SetupPage: QueryPage<{ step: SetupStep }> = ({ step }) => { diff --git a/front/packages/ui/src/navbar/index.tsx b/front/packages/ui/src/navbar/index.tsx index 9aeaaafc..d2ccf7b6 100644 --- a/front/packages/ui/src/navbar/index.tsx +++ b/front/packages/ui/src/navbar/index.tsx @@ -38,11 +38,11 @@ import Login from "@material-symbols/svg-400/rounded/login.svg"; import Logout from "@material-symbols/svg-400/rounded/logout.svg"; import Search from "@material-symbols/svg-400/rounded/search-fill.svg"; import Settings from "@material-symbols/svg-400/rounded/settings.svg"; -import { ReactElement, forwardRef, useEffect, useRef, useState } from "react"; +import { type ReactElement, forwardRef, useEffect, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; import { Platform, type TextInput, View, type ViewProps } from "react-native"; import { useRouter } from "solito/router"; -import { type Stylable, useYoshiki, percent } from "yoshiki/native"; +import { type Stylable, percent, useYoshiki } from "yoshiki/native"; import { AdminPage } from "../admin"; import { KyooLongLogo } from "./icon";