Skip to content

Commit 81ab42a

Browse files
TristanMarionTristanMarion
committed
refactor: reorder imports
1 parent e6430a6 commit 81ab42a

File tree

4 files changed

+72
-72
lines changed

4 files changed

+72
-72
lines changed

‎backend/__tests__/api/controllers/user.spec.ts

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
import { LeaderboardEntry } from "@monkeytype/contracts/schemas/leaderboards";
2-
import { PersonalBest } from "@monkeytype/contracts/schemas/shared";
3-
import { MonkeyMail, UserStreak } from "@monkeytype/contracts/schemas/users";
4-
import { FirebaseError } from "firebase-admin";
5-
import _ from "lodash";
6-
import { ObjectId } from "mongodb";
7-
import { randomUUID } from "node:crypto";
81
import request from "supertest";
9-
import { generateCurrentTestActivity } from "../../../src/api/controllers/user";
102
import app from "../../../src/app";
11-
import * as ApeKeys from "../../../src/dal/ape-keys";
12-
import * as ApeKeysDal from "../../../src/dal/ape-keys";
3+
import * as Configuration from "../../../src/init/configuration";
4+
import { generateCurrentTestActivity } from "../../../src/api/controllers/user";
5+
import * as UserDal from "../../../src/dal/user";
6+
import * as AuthUtils from "../../../src/utils/auth";
137
import * as BlocklistDal from "../../../src/dal/blocklist";
14-
import * as ConfigDal from "../../../src/dal/config";
15-
import * as LeaderboardDal from "../../../src/dal/leaderboards";
16-
import * as LogDal from "../../../src/dal/logs";
8+
import * as ApeKeys from "../../../src/dal/ape-keys";
179
import * as PresetDal from "../../../src/dal/preset";
18-
import * as ReportDal from "../../../src/dal/report";
10+
import * as ConfigDal from "../../../src/dal/config";
1911
import * as ResultDal from "../../../src/dal/result";
20-
import * as UserDal from "../../../src/dal/user";
21-
import * as Configuration from "../../../src/init/configuration";
22-
import * as FirebaseAdmin from "../../../src/init/firebase-admin";
23-
import GeorgeQueue from "../../../src/queues/george-queue";
24-
import * as WeeklyXpLeaderboard from "../../../src/services/weekly-xp-leaderboard";
25-
import * as AuthUtils from "../../../src/utils/auth";
26-
import * as Captcha from "../../../src/utils/captcha";
12+
import * as ReportDal from "../../../src/dal/report";
2713
import * as DailyLeaderboards from "../../../src/utils/daily-leaderboards";
14+
import * as LeaderboardDal from "../../../src/dal/leaderboards";
15+
import GeorgeQueue from "../../../src/queues/george-queue";
2816
import * as DiscordUtils from "../../../src/utils/discord";
29-
import MonkeyError, { isFirebaseError } from "../../../src/utils/error";
17+
import * as Captcha from "../../../src/utils/captcha";
18+
import * as FirebaseAdmin from "../../../src/init/firebase-admin";
19+
import { FirebaseError } from "firebase-admin";
20+
import * as ApeKeysDal from "../../../src/dal/ape-keys";
21+
import * as LogDal from "../../../src/dal/logs";
22+
import { ObjectId } from "mongodb";
23+
import { PersonalBest } from "@monkeytype/contracts/schemas/shared";
24+
import { pb } from "../../dal/leaderboards.spec";
3025
import {
3126
mockAuthenticateWithApeKey,
3227
mockBearerAuthentication,
3328
} from "../../__testData__/auth";
34-
import { pb } from "../../dal/leaderboards.spec";
29+
import { randomUUID } from "node:crypto";
30+
import _ from "lodash";
31+
import { MonkeyMail, UserStreak } from "@monkeytype/contracts/schemas/users";
32+
import MonkeyError, { isFirebaseError } from "../../../src/utils/error";
33+
import { LeaderboardEntry } from "@monkeytype/contracts/schemas/leaderboards";
34+
import * as WeeklyXpLeaderboard from "../../../src/services/weekly-xp-leaderboard";
3535

3636
const mockApp = request(app);
3737
const configuration = Configuration.getCachedConfiguration();

‎frontend/src/ts/elements/account/result-filters.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1+
import * as Misc from "../../utils/misc";
2+
import * as Strings from "../../utils/strings";
3+
import * as JSONData from "../../utils/json-data";
4+
import * as DB from "../../db";
5+
import Config from "../../config";
6+
import * as Notifications from "../notifications";
7+
import Ape from "../../ape/index";
8+
import * as Loader from "../loader";
9+
import SlimSelect from "slim-select";
110
import { QuoteLength } from "@monkeytype/contracts/schemas/configs";
211
import {
312
ResultFilters,
13+
ResultFiltersSchema,
414
ResultFiltersGroup,
515
ResultFiltersGroupItem,
6-
ResultFiltersSchema,
716
} from "@monkeytype/contracts/schemas/users";
8-
import { getAllFunboxes } from "@monkeytype/funbox";
9-
import SlimSelect from "slim-select";
10-
import Ape from "../../ape/index";
11-
import Config from "../../config";
17+
import { LocalStorageWithSchema } from "../../utils/local-storage-with-schema";
1218
import defaultResultFilters from "../../constants/default-result-filters";
19+
import { getAllFunboxes } from "@monkeytype/funbox";
1320
import { SnapshotUserTag } from "../../constants/default-snapshot";
14-
import * as DB from "../../db";
15-
import * as JSONData from "../../utils/json-data";
16-
import { LocalStorageWithSchema } from "../../utils/local-storage-with-schema";
17-
import * as Misc from "../../utils/misc";
18-
import * as Strings from "../../utils/strings";
19-
import * as Loader from "../loader";
20-
import * as Notifications from "../notifications";
2121

2222
export function mergeWithDefaultFilters(
2323
filters: Partial<ResultFilters>

‎frontend/src/ts/pages/account.ts

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
import * as DB from "../db";
2+
import * as ResultFilters from "../elements/account/result-filters";
3+
import * as ThemeColors from "../elements/theme-colors";
4+
import * as ChartController from "../controllers/chart-controller";
5+
import Config, * as UpdateConfig from "../config";
6+
import * as MiniResultChartModal from "../modals/mini-result-chart";
7+
import * as PbTables from "../elements/account/pb-tables";
8+
import * as LoadingPage from "./loading";
9+
import * as Focus from "../test/focus";
10+
import * as TodayTracker from "../test/today-tracker";
11+
import * as Notifications from "../elements/notifications";
12+
import Page from "./page";
13+
import * as DateTime from "../utils/date-and-time";
14+
import * as Misc from "../utils/misc";
15+
import * as Arrays from "../utils/arrays";
16+
import * as Numbers from "@monkeytype/util/numbers";
17+
import { get as getTypingSpeedUnit } from "../utils/typing-speed-units";
18+
import * as Profile from "../elements/profile";
19+
import { format } from "date-fns/format";
20+
import * as ConnectionState from "../states/connection";
21+
import * as Skeleton from "../utils/skeleton";
22+
import type { ScaleChartOptions, LinearScaleOptions } from "chart.js";
23+
import * as ConfigEvent from "../observables/config-event";
24+
import * as ActivePage from "../states/active-page";
25+
import { Auth } from "../firebase";
26+
import * as Loader from "../elements/loader";
27+
import * as ResultBatches from "../elements/result-batches";
28+
import Format from "../utils/format";
29+
import * as TestActivity from "../elements/test-activity";
130
import { ChartData } from "@monkeytype/contracts/schemas/results";
231
import {
332
Difficulty,
@@ -6,38 +35,9 @@ import {
635
Mode2Custom,
736
} from "@monkeytype/contracts/schemas/shared";
837
import { ResultFiltersGroupItem } from "@monkeytype/contracts/schemas/users";
9-
import * as Numbers from "@monkeytype/util/numbers";
10-
import type { LinearScaleOptions, ScaleChartOptions } from "chart.js";
11-
import { format } from "date-fns/format";
12-
import Config, * as UpdateConfig from "../config";
38+
import { findLineByLeastSquares } from "../utils/numbers";
1339
import defaultResultFilters from "../constants/default-result-filters";
1440
import { SnapshotResult } from "../constants/default-snapshot";
15-
import * as ChartController from "../controllers/chart-controller";
16-
import * as DB from "../db";
17-
import * as PbTables from "../elements/account/pb-tables";
18-
import * as ResultFilters from "../elements/account/result-filters";
19-
import * as Loader from "../elements/loader";
20-
import * as Notifications from "../elements/notifications";
21-
import * as Profile from "../elements/profile";
22-
import * as ResultBatches from "../elements/result-batches";
23-
import * as TestActivity from "../elements/test-activity";
24-
import * as ThemeColors from "../elements/theme-colors";
25-
import { Auth } from "../firebase";
26-
import * as MiniResultChartModal from "../modals/mini-result-chart";
27-
import * as ConfigEvent from "../observables/config-event";
28-
import * as ActivePage from "../states/active-page";
29-
import * as ConnectionState from "../states/connection";
30-
import * as Focus from "../test/focus";
31-
import * as TodayTracker from "../test/today-tracker";
32-
import * as Arrays from "../utils/arrays";
33-
import * as DateTime from "../utils/date-and-time";
34-
import Format from "../utils/format";
35-
import * as Misc from "../utils/misc";
36-
import { findLineByLeastSquares } from "../utils/numbers";
37-
import * as Skeleton from "../utils/skeleton";
38-
import { get as getTypingSpeedUnit } from "../utils/typing-speed-units";
39-
import * as LoadingPage from "./loading";
40-
import Page from "./page";
4141

4242
let filterDebug = false;
4343
//toggle filterdebug

‎packages/contracts/src/schemas/users.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { z, ZodEffects, ZodOptional, ZodString } from "zod";
2-
import { doesNotContainProfanity } from "../validation/validation";
3-
import { CustomThemeColorsSchema } from "./configs";
2+
import { IdSchema, LanguageSchema, StringNumberSchema } from "./util";
43
import {
5-
DefaultTimeModeSchema,
6-
DefaultWordsModeSchema,
7-
DifficultySchema,
8-
Mode2Schema,
94
ModeSchema,
5+
Mode2Schema,
106
PersonalBestsSchema,
7+
DefaultWordsModeSchema,
8+
DefaultTimeModeSchema,
119
QuoteLengthSchema,
10+
DifficultySchema,
1211
} from "./shared";
13-
import { IdSchema, LanguageSchema, StringNumberSchema } from "./util";
12+
import { CustomThemeColorsSchema } from "./configs";
13+
import { doesNotContainProfanity } from "../validation/validation";
1414

1515
export const ResultFiltersSchema = z.object({
1616
_id: IdSchema,

0 commit comments

Comments
 (0)