From 008bd08ac87ba2e684a21796b6efc05dc6ebe36f Mon Sep 17 00:00:00 2001 From: zkldi <20380519+zkldi@users.noreply.github.com> Date: Wed, 17 Nov 2021 17:26:53 +0000 Subject: [PATCH] Fix advanced mode --- .../games/_game/_playtype/GPTChartPage.tsx | 3 +-- .../pages/dashboard/users/UserSettingsPage.tsx | 2 +- client/src/components/imports/ImportFileInfo.tsx | 1 - .../components/imports/KAIIntegrationPage.tsx | 5 +---- client/src/components/layout/Layout.tsx | 16 ++++++++-------- .../src/components/layout/misc/QuickTooltip.tsx | 1 - .../components/layout/screens/LoadingScreen.tsx | 2 +- .../components/layout/subheader/SubHeader.tsx | 6 +++--- client/src/components/util/LoadingWrapper.tsx | 2 +- client/src/components/util/SelectNav.tsx | 2 +- client/src/components/util/import/useImport.ts | 2 +- 11 files changed, 18 insertions(+), 24 deletions(-) diff --git a/client/src/app/pages/dashboard/games/_game/_playtype/GPTChartPage.tsx b/client/src/app/pages/dashboard/games/_game/_playtype/GPTChartPage.tsx index f6534112a..9020d3861 100644 --- a/client/src/app/pages/dashboard/games/_game/_playtype/GPTChartPage.tsx +++ b/client/src/app/pages/dashboard/games/_game/_playtype/GPTChartPage.tsx @@ -1,5 +1,4 @@ import useSetSubheader from "components/layout/header/useSetSubheader"; -import QuickTooltip from "components/layout/misc/QuickTooltip"; import Card from "components/layout/page/Card"; import LampCell from "components/tables/cells/LampCell"; import ScoreCell from "components/tables/cells/ScoreCell"; @@ -32,7 +31,7 @@ import { PBDataset } from "types/tables"; import { APIFetchV1, UnsuccessfulAPIFetchResponse } from "util/api"; import { CreateUserMap } from "util/data"; import { SelectRightChart } from "util/misc"; -import { FormatDate, MillisToSince } from "util/time"; +import { MillisToSince } from "util/time"; // This component forms a wrapper around the Real GPT Chart Page // which handles the case where activeChart == null. diff --git a/client/src/app/pages/dashboard/users/UserSettingsPage.tsx b/client/src/app/pages/dashboard/users/UserSettingsPage.tsx index d2b664461..4476201ce 100644 --- a/client/src/app/pages/dashboard/users/UserSettingsPage.tsx +++ b/client/src/app/pages/dashboard/users/UserSettingsPage.tsx @@ -111,7 +111,7 @@ function PreferencesForm({ reqUser }: { reqUser: PublicUserDocument }) { diff --git a/client/src/components/imports/ImportFileInfo.tsx b/client/src/components/imports/ImportFileInfo.tsx index f1e05fc37..ca3993dca 100644 --- a/client/src/components/imports/ImportFileInfo.tsx +++ b/client/src/components/imports/ImportFileInfo.tsx @@ -1,5 +1,4 @@ import MiniTable from "components/tables/components/MiniTable"; -import DebugContent from "components/util/DebugContent"; import Divider from "components/util/Divider"; import useImport from "components/util/import/useImport"; import prettyBytes from "pretty-bytes"; diff --git a/client/src/components/imports/KAIIntegrationPage.tsx b/client/src/components/imports/KAIIntegrationPage.tsx index 226d188f5..5ad73c8f4 100644 --- a/client/src/components/imports/KAIIntegrationPage.tsx +++ b/client/src/components/imports/KAIIntegrationPage.tsx @@ -6,15 +6,12 @@ import ExternalLink from "components/util/ExternalLink"; import useImport from "components/util/import/useImport"; import Loading from "components/util/Loading"; import useApiQuery from "components/util/query/useApiQuery"; -import UpdateUserGameStats from "components/util/UpdateUserGameStats"; import { UserContext } from "context/UserContext"; import { UserGameStatsContext } from "context/UserGameStatsContext"; import hashjs from "hash.js"; import React, { useContext, useMemo, useState } from "react"; import { Button, Form, InputGroup } from "react-bootstrap"; -import { APIImportTypes, GetGameConfig, ImportDocument } from "tachi-common"; -import { ImportStates, NotStartedState } from "types/import"; -import { APIFetchV1 } from "util/api"; +import { APIImportTypes, GetGameConfig } from "tachi-common"; import ImportStateRenderer from "./ImportStateRenderer"; interface Props { diff --git a/client/src/components/layout/Layout.tsx b/client/src/components/layout/Layout.tsx index cae663fb0..22af0e10b 100644 --- a/client/src/components/layout/Layout.tsx +++ b/client/src/components/layout/Layout.tsx @@ -1,13 +1,13 @@ -import React from "react"; -import { Header } from "./header/Header"; -import { HeaderMobile } from "./header/HeaderMobile"; -import { Footer } from "./footer/Footer"; -import { LayoutInit } from "../../_metronic/layout/components/LayoutInit"; -import { SubHeader } from "./subheader/SubHeader"; -import { AnimateLoading } from "../../_metronic/_partials/controls"; -import { JustChildren } from "types/react"; import BackgroundImage from "components/layout/misc/BackgroundImage"; import { BackgroundContextProvider } from "context/BackgroundContext"; +import React from "react"; +import { JustChildren } from "types/react"; +import { LayoutInit } from "../../_metronic/layout/components/LayoutInit"; +import { AnimateLoading } from "../../_metronic/_partials/controls"; +import { Footer } from "./footer/Footer"; +import { Header } from "./header/Header"; +import { HeaderMobile } from "./header/HeaderMobile"; +import { SubHeader } from "./subheader/SubHeader"; export function Layout({ children }: JustChildren) { return ( diff --git a/client/src/components/layout/misc/QuickTooltip.tsx b/client/src/components/layout/misc/QuickTooltip.tsx index 281d99f3b..a65d91edc 100644 --- a/client/src/components/layout/misc/QuickTooltip.tsx +++ b/client/src/components/layout/misc/QuickTooltip.tsx @@ -1,7 +1,6 @@ import { nanoid } from "nanoid"; import React from "react"; import { OverlayTrigger, Tooltip } from "react-bootstrap"; -import { JustChildren } from "types/react"; export default function QuickTooltip({ children, diff --git a/client/src/components/layout/screens/LoadingScreen.tsx b/client/src/components/layout/screens/LoadingScreen.tsx index 92c6cded9..1928b4c7c 100644 --- a/client/src/components/layout/screens/LoadingScreen.tsx +++ b/client/src/components/layout/screens/LoadingScreen.tsx @@ -1,6 +1,6 @@ import { UserContext } from "context/UserContext"; import { TachiConfig } from "lib/config"; -import React, { useContext, useState, useEffect } from "react"; +import React, { useContext, useEffect, useState } from "react"; import { PublicUserDocument } from "tachi-common"; import { JustChildren } from "types/react"; import { APIFetchV1 } from "util/api"; diff --git a/client/src/components/layout/subheader/SubHeader.tsx b/client/src/components/layout/subheader/SubHeader.tsx index efb7db782..7675d403f 100644 --- a/client/src/components/layout/subheader/SubHeader.tsx +++ b/client/src/components/layout/subheader/SubHeader.tsx @@ -1,7 +1,7 @@ -import React, { useContext } from "react"; -import { Breadcrumbs } from "./components/Breadcrumbs"; -import { SubheaderContext } from "../../../context/SubheaderContext"; import Divider from "components/util/Divider"; +import React, { useContext } from "react"; +import { SubheaderContext } from "../../../context/SubheaderContext"; +import { Breadcrumbs } from "./components/Breadcrumbs"; export function SubHeader() { const subheader = useContext(SubheaderContext); diff --git a/client/src/components/util/LoadingWrapper.tsx b/client/src/components/util/LoadingWrapper.tsx index 95e033795..9b83a29b2 100644 --- a/client/src/components/util/LoadingWrapper.tsx +++ b/client/src/components/util/LoadingWrapper.tsx @@ -1,5 +1,5 @@ -import React, { CSSProperties } from "react"; import Loading from "components/util/Loading"; +import React, { CSSProperties } from "react"; import { UnsuccessfulAPIResponse } from "tachi-common"; export default function LoadingWrapper({ diff --git a/client/src/components/util/SelectNav.tsx b/client/src/components/util/SelectNav.tsx index 62f439a22..dfc52a16a 100644 --- a/client/src/components/util/SelectNav.tsx +++ b/client/src/components/util/SelectNav.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Button, Nav } from "react-bootstrap"; +import { Nav } from "react-bootstrap"; import { JustChildren, SetState } from "types/react"; export default function SelectNav({ diff --git a/client/src/components/util/import/useImport.ts b/client/src/components/util/import/useImport.ts index b72b1d2b6..d39ddfa26 100644 --- a/client/src/components/util/import/useImport.ts +++ b/client/src/components/util/import/useImport.ts @@ -1,6 +1,6 @@ /* eslint-disable no-await-in-loop */ import { useState } from "react"; -import { ImportDocument, integer, SuccessfulAPIResponse } from "tachi-common"; +import { ImportDocument, integer } from "tachi-common"; import { ImportStates, NotStartedState } from "types/import"; import { APIFetchV1 } from "util/api"; import { Sleep } from "util/misc";