From 93da5012ed2174b2136e3278cda9642c04eacce6 Mon Sep 17 00:00:00 2001 From: Evan <64989416+Ferotiq@users.noreply.github.com> Date: Mon, 6 Mar 2023 04:38:38 -0600 Subject: [PATCH] organize imports to remove duplicate imports (#4042) ferotiq --- .../src/ts/controllers/chart-controller.ts | 47 ++++++++----------- frontend/src/ts/test/result.ts | 38 ++++++++------- 2 files changed, 40 insertions(+), 45 deletions(-) diff --git a/frontend/src/ts/controllers/chart-controller.ts b/frontend/src/ts/controllers/chart-controller.ts index 4c2ed84bf..019739f35 100644 --- a/frontend/src/ts/controllers/chart-controller.ts +++ b/frontend/src/ts/controllers/chart-controller.ts @@ -1,21 +1,32 @@ import { - Chart, BarController, BarElement, CategoryScale, + Chart, Filler, - LinearScale, LineController, LineElement, + LinearScale, PointElement, ScatterController, TimeScale, TimeSeriesScale, Tooltip, + type AnimationSpec, + type CartesianScaleOptions, + type ChartConfiguration, + type ChartDataset, + type ChartType, + type DefaultDataPoint, + type PluginChartOptions, + type ScaleChartOptions, } from "chart.js"; +import chartAnnotation, { + type AnnotationOptions, + type LabelOptions, +} from "chartjs-plugin-annotation"; import chartTrendline from "chartjs-plugin-trendline"; -import chartAnnotation from "chartjs-plugin-annotation"; Chart.register( BarController, @@ -40,31 +51,13 @@ Chart.register( Chart.defaults.elements.line.tension = 0.3; Chart.defaults.elements.line.fill = "origin"; -import * as TestInput from "../test/test-input"; -import * as ThemeColors from "../elements/theme-colors"; -import * as Misc from "../utils/misc"; -import Config from "../config"; -import * as ConfigEvent from "../observables/config-event"; -import format from "date-fns/format"; import "chartjs-adapter-date-fns"; - -// eslint-disable-next-line no-duplicate-imports -- need to ignore because eslint doesnt know what import type is -import type { - AnimationSpec, - CartesianScaleOptions, - ChartConfiguration, - ChartDataset, - ChartType, - DefaultDataPoint, - PluginChartOptions, - ScaleChartOptions, -} from "chart.js"; - -// eslint-disable-next-line no-duplicate-imports -- need to ignore because eslint doesnt know what import type is -import type { - AnnotationOptions, - LabelOptions, -} from "chartjs-plugin-annotation"; +import format from "date-fns/format"; +import Config from "../config"; +import * as ThemeColors from "../elements/theme-colors"; +import * as ConfigEvent from "../observables/config-event"; +import * as TestInput from "../test/test-input"; +import * as Misc from "../utils/misc"; class ChartWithUpdateColors< TType extends ChartType = ChartType, diff --git a/frontend/src/ts/test/result.ts b/frontend/src/ts/test/result.ts index 6cfea4e36..dda8d6d66 100644 --- a/frontend/src/ts/test/result.ts +++ b/frontend/src/ts/test/result.ts @@ -1,31 +1,33 @@ -import * as TestUI from "./test-ui"; +import { + Chart, + type PluginChartOptions, + type ScaleChartOptions, +} from "chart.js"; import Config from "../config"; -import * as Misc from "../utils/misc"; -import * as TestStats from "./test-stats"; -import * as Keymap from "../elements/keymap"; +import * as AdController from "../controllers/ad-controller"; import * as ChartController from "../controllers/chart-controller"; -import * as ThemeColors from "../elements/theme-colors"; +import QuotesController from "../controllers/quotes-controller"; import * as DB from "../db"; -import * as TodayTracker from "./today-tracker"; -import * as PbCrown from "./pb-crown"; +import * as Keymap from "../elements/keymap"; +import * as Loader from "../elements/loader"; +import * as Notifications from "../elements/notifications"; +import * as ThemeColors from "../elements/theme-colors"; +import { Auth } from "../firebase"; import * as QuoteRatePopup from "../popups/quote-rate-popup"; import * as GlarsesMode from "../states/glarses-mode"; -import * as TestInput from "./test-input"; -import * as Notifications from "../elements/notifications"; -import * as Loader from "../elements/loader"; -import QuotesController from "../controllers/quotes-controller"; -import * as AdController from "../controllers/ad-controller"; -import * as TestConfig from "./test-config"; -import { Chart } from "chart.js"; -import { Auth } from "../firebase"; import * as SlowTimer from "../states/slow-timer"; +import * as Misc from "../utils/misc"; import * as FunboxList from "./funbox/funbox-list"; +import * as PbCrown from "./pb-crown"; +import * as TestConfig from "./test-config"; +import * as TestInput from "./test-input"; +import * as TestStats from "./test-stats"; +import * as TestUI from "./test-ui"; +import * as TodayTracker from "./today-tracker"; -// eslint-disable-next-line no-duplicate-imports -- need to ignore because eslint doesnt know what import type is -import type { PluginChartOptions, ScaleChartOptions } from "chart.js"; +import confetti from "canvas-confetti"; import type { AnnotationOptions } from "chartjs-plugin-annotation"; import Ape from "../ape"; -import confetti from "canvas-confetti"; let result: MonkeyTypes.Result; let maxChartVal: number;