From ca5c504d2cbfac050b874707328369d7c90afb33 Mon Sep 17 00:00:00 2001 From: Pihkaal Date: Thu, 30 May 2024 16:01:17 +0200 Subject: [PATCH] refactor: put types in utils --- src/components/Music/Cava.tsx | 2 +- src/components/Music/SpotifyPlayer.tsx | 2 +- src/context/KittyContext.tsx | 7 ------- src/utils/types.ts | 15 +++++++++++++++ 4 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 src/utils/types.ts diff --git a/src/components/Music/Cava.tsx b/src/components/Music/Cava.tsx index dacfa84..bbf4798 100644 --- a/src/components/Music/Cava.tsx +++ b/src/components/Music/Cava.tsx @@ -5,7 +5,7 @@ import { useRef, useState, } from "react"; -import { type InnerKittyProps } from "../../context/KittyContext"; +import { type InnerKittyProps } from "~/utils/types"; import { CHAR_WIDTH } from "../Kitty"; import { useKitty } from "~/hooks/useKitty"; diff --git a/src/components/Music/SpotifyPlayer.tsx b/src/components/Music/SpotifyPlayer.tsx index 6daf0ae..1f257f1 100644 --- a/src/components/Music/SpotifyPlayer.tsx +++ b/src/components/Music/SpotifyPlayer.tsx @@ -2,7 +2,7 @@ import { useState } from "react"; import { formatMMSS } from "../../utils/time"; import { CharArray } from "../../utils/string"; import { CHAR_HEIGHT, CHAR_WIDTH } from "../Kitty"; -import { type InnerKittyProps } from "../../context/KittyContext"; +import { type InnerKittyProps } from "~/utils/types"; import { useKitty } from "~/hooks/useKitty"; export const SpotifyPlayer = (props: { diff --git a/src/context/KittyContext.tsx b/src/context/KittyContext.tsx index ff2c3c9..4cfa880 100644 --- a/src/context/KittyContext.tsx +++ b/src/context/KittyContext.tsx @@ -9,10 +9,3 @@ export type KittyContextProps = { cols: number; active: boolean; }; - -type Prettify = NonNullable<{ [K in keyof T]: T[K] }>; - -// eslint-disable-next-line @typescript-eslint/no-explicit-any -export type InnerKittyProps any> = Prettify< - Parameters[0] & KittyContextProps ->; diff --git a/src/utils/types.ts b/src/utils/types.ts new file mode 100644 index 0000000..86dbfeb --- /dev/null +++ b/src/utils/types.ts @@ -0,0 +1,15 @@ +import { KittyContextProps } from "~/context/KittyContext"; + +export type Prettify = NonNullable<{ [K in keyof T]: T[K] }>; + +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export type InnerKittyProps any> = Prettify< + Parameters[0] & KittyContextProps +>; + +export type Manifest = { + projects: Array<{ + name: string; + files: Array; + }>; +};