From: abias Date: Fri, 16 Jun 2023 22:17:17 +0000 (-0400) Subject: Merge branch 'main' into route-data-refactor X-Git-Url: http://these/git/%22%7Burl%7D/%7B%60%24%7BghostArchiveUrl%7D/%7BelementUrl%7D?a=commitdiff_plain;h=4d716e039b8b96e6f4296f7e1ba7ae25d578741e;p=lemmy-ui.git Merge branch 'main' into route-data-refactor --- 4d716e039b8b96e6f4296f7e1ba7ae25d578741e diff --cc src/shared/utils.ts index 97d05fc,df7673a..7007a21 --- a/src/shared/utils.ts +++ b/src/shared/utils.ts @@@ -42,16 -42,9 +42,16 @@@ import moment from "moment" import tippy from "tippy.js"; import Toastify from "toastify-js"; import { getHttpBase } from "./env"; - import { i18n, languages } from "./i18next"; + import { i18n } from "./i18next"; -import { CommentNodeI, DataType, IsoData, VoteType } from "./interfaces"; +import { + CommentNodeI, + DataType, + IsoData, + RouteData, + VoteType, +} from "./interfaces"; import { HttpService, UserService } from "./services"; +import { RequestState } from "./services/HttpService"; let Tribute: any; if (isBrowser()) {