diff --git a/src/general.ts b/src/general.ts index 859cd6d..5d77a86 100644 --- a/src/general.ts +++ b/src/general.ts @@ -6,3 +6,11 @@ export function overrideTailwindClasses( ) { return otc(classNamesString, optionsArgs).trim() } + +export function plural( + n: number, + singular: string, + plural: string = singular + 's' +) { + return n === 1 ? singular : plural +} diff --git a/src/pages/Bots.tsx b/src/pages/Bots.tsx index 0953835..79ae3e8 100644 --- a/src/pages/Bots.tsx +++ b/src/pages/Bots.tsx @@ -3,15 +3,18 @@ import { Link } from "react-router-dom" import { authFetch, useAuthFetchRepeat } from "../authorization" import { SVGPlus, SVGx } from "../components/Icons" import { Button, InputPassword } from "../components/Inputs" -import { overrideTailwindClasses } from "../general" +import { overrideTailwindClasses, plural } from "../general" interface DiscordBot { - id: string - username: string - discriminator: string - avatar: string - bot: boolean - verified: boolean + user: { + id: string + username: string + discriminator: string + avatar: string + bot: boolean + verified: boolean + } + token_count: number } function BotContainer({ children, ...props }: { children: React.ReactNode } & React.HTMLAttributes) { @@ -37,18 +40,19 @@ function BotContainer({ children, ...props }: { children: React.ReactNode } & Re function Bot({ bot }: { bot: DiscordBot }) { console.log(bot) + const { user, token_count } = bot return ( - +
- {bot.username} - #{bot.discriminator} + {user.username} + #{user.discriminator}
- X Assigned tokens + {token_count} Assigned {plural(token_count, 'Token')}
diff --git a/src/pages/settings/LoginTokensMini.tsx b/src/pages/settings/LoginTokensMini.tsx index b470476..8379391 100644 --- a/src/pages/settings/LoginTokensMini.tsx +++ b/src/pages/settings/LoginTokensMini.tsx @@ -1,4 +1,5 @@ import { useAuthFetch } from "../../authorization" +import { plural } from "../../general" interface LoginToken { id: string @@ -24,7 +25,7 @@ export function LoginTokensMini() { return tokens && (
- {tokens.length} Login Token{tokens.length === 1 ? "" : "s"} + {tokens.length} Login {plural(tokens.length, 'Token')}
)