From 653329fa6c041bb5bdfe098130e3f0f8f0e0bd01 Mon Sep 17 00:00:00 2001
From: Bill <billsonnn@live.com>
Date: Tue, 1 Mar 2022 11:20:25 -0500
Subject: [PATCH] Changes

---
 .../badge-info/BadgeInformationView.tsx       |  7 ++++++-
 .../badge-info/BadgeInformationView.types.ts  |  5 -----
 .../shared/friendly-time/FriendlyTimeView.tsx | 19 ++++++++++---------
 .../friendly-time/FriendlyTimeView.types.ts   |  7 -------
 src/views/shared/item-count/ItemCountView.tsx |  6 +++++-
 .../shared/item-count/ItemCountView.types.ts  |  4 ----
 src/views/shared/pet-image/PetImageView.tsx   | 16 ++++++++++++++--
 .../shared/pet-image/PetImageView.types.ts    | 14 --------------
 .../shared/rarity-level/RarityLevelView.tsx   |  8 ++++++--
 .../rarity-level/RarityLevelView.types.ts     |  6 ------
 .../room-previewer/RoomPreviewerView.tsx      |  9 +++++++--
 .../room-previewer/RoomPreviewerView.types.ts |  7 -------
 12 files changed, 48 insertions(+), 60 deletions(-)
 delete mode 100644 src/views/shared/badge-image/badge-info/BadgeInformationView.types.ts
 delete mode 100644 src/views/shared/friendly-time/FriendlyTimeView.types.ts
 delete mode 100644 src/views/shared/item-count/ItemCountView.types.ts
 delete mode 100644 src/views/shared/pet-image/PetImageView.types.ts
 delete mode 100644 src/views/shared/rarity-level/RarityLevelView.types.ts
 delete mode 100644 src/views/shared/room-previewer/RoomPreviewerView.types.ts

diff --git a/src/views/shared/badge-image/badge-info/BadgeInformationView.tsx b/src/views/shared/badge-image/badge-info/BadgeInformationView.tsx
index f7e7db74..1a1817f7 100644
--- a/src/views/shared/badge-image/badge-info/BadgeInformationView.tsx
+++ b/src/views/shared/badge-image/badge-info/BadgeInformationView.tsx
@@ -1,5 +1,10 @@
 import { FC } from 'react';
-import { BadgeInformationViewProps } from './BadgeInformationView.types';
+
+interface BadgeInformationViewProps
+{
+    title: string;
+    description: string;
+}
 
 export const BadgeInformationView: FC<BadgeInformationViewProps> = props =>
 {
diff --git a/src/views/shared/badge-image/badge-info/BadgeInformationView.types.ts b/src/views/shared/badge-image/badge-info/BadgeInformationView.types.ts
deleted file mode 100644
index dcabc965..00000000
--- a/src/views/shared/badge-image/badge-info/BadgeInformationView.types.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface BadgeInformationViewProps
-{
-    title: string;
-    description: string;
-}
diff --git a/src/views/shared/friendly-time/FriendlyTimeView.tsx b/src/views/shared/friendly-time/FriendlyTimeView.tsx
index 4df913e6..41a24426 100644
--- a/src/views/shared/friendly-time/FriendlyTimeView.tsx
+++ b/src/views/shared/friendly-time/FriendlyTimeView.tsx
@@ -1,16 +1,19 @@
 import { FriendlyTime } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useMemo, useState } from 'react';
-import { FriendlyTimeViewProps } from './FriendlyTimeView.types';
+import { Base, BaseProps } from '../../../common';
+
+interface FriendlyTimeViewProps extends BaseProps<HTMLDivElement>
+{
+    seconds: number;
+    isShort?: boolean;
+}
 
 export const FriendlyTimeView: FC<FriendlyTimeViewProps> = props =>
 {
-    const { seconds = 0, isShort = false, ...rest } = props;
+    const { seconds = 0, isShort = false, children = null, ...rest } = props;
     const [ updateId, setUpdateId ] = useState(-1);
 
-    const getStartSeconds = useMemo(() =>
-    {
-        return (Math.round(new Date().getSeconds()) - seconds);
-    }, [ seconds ]);
+    const getStartSeconds = useMemo(() => (Math.round(new Date().getSeconds()) - seconds), [ seconds ]);
 
     const getFriendlyTime = useCallback(() =>
     {
@@ -28,7 +31,5 @@ export const FriendlyTimeView: FC<FriendlyTimeViewProps> = props =>
         return () => clearInterval(interval);
     }, []);
 
-    return (
-        <div { ...rest }>{ getFriendlyTime() }</div>
-    );
+    return <Base { ...rest }>{ getFriendlyTime() }</Base>;
 }
diff --git a/src/views/shared/friendly-time/FriendlyTimeView.types.ts b/src/views/shared/friendly-time/FriendlyTimeView.types.ts
deleted file mode 100644
index 7ce31f31..00000000
--- a/src/views/shared/friendly-time/FriendlyTimeView.types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { DetailsHTMLAttributes } from 'react';
-
-export interface FriendlyTimeViewProps extends DetailsHTMLAttributes<HTMLDivElement>
-{
-    seconds: number;
-    isShort?: boolean;
-}
diff --git a/src/views/shared/item-count/ItemCountView.tsx b/src/views/shared/item-count/ItemCountView.tsx
index 5287b708..80ea3f65 100644
--- a/src/views/shared/item-count/ItemCountView.tsx
+++ b/src/views/shared/item-count/ItemCountView.tsx
@@ -1,5 +1,9 @@
 import { FC } from 'react';
-import { ItemCountViewProps } from './ItemCountView.types';
+
+interface ItemCountViewProps
+{
+    count: number;
+}
 
 export const ItemCountView: FC<ItemCountViewProps> = props =>
 {
diff --git a/src/views/shared/item-count/ItemCountView.types.ts b/src/views/shared/item-count/ItemCountView.types.ts
deleted file mode 100644
index 9435b1a7..00000000
--- a/src/views/shared/item-count/ItemCountView.types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface ItemCountViewProps
-{
-    count: number;
-}
diff --git a/src/views/shared/pet-image/PetImageView.tsx b/src/views/shared/pet-image/PetImageView.tsx
index 8db94d62..07eb1f64 100644
--- a/src/views/shared/pet-image/PetImageView.tsx
+++ b/src/views/shared/pet-image/PetImageView.tsx
@@ -1,7 +1,19 @@
-import { PetFigureData, TextureUtils, Vector3d } from '@nitrots/nitro-renderer';
+import { PetCustomPart, PetFigureData, TextureUtils, Vector3d } from '@nitrots/nitro-renderer';
 import { FC, useEffect, useRef, useState } from 'react';
 import { GetRoomEngine } from '../../../api';
-import { PetImageViewProps } from './PetImageView.types';
+
+interface PetImageViewProps
+{
+    figure?: string;
+    typeId?: number;
+    paletteId?: number;
+    color?: number;
+    customParts?: PetCustomPart[];
+    posture?: string;
+    headOnly?: boolean;
+    direction?: number;
+    scale?: number;
+}
 
 export const PetImageView: FC<PetImageViewProps> = props =>
 {
diff --git a/src/views/shared/pet-image/PetImageView.types.ts b/src/views/shared/pet-image/PetImageView.types.ts
deleted file mode 100644
index 34fdfe0e..00000000
--- a/src/views/shared/pet-image/PetImageView.types.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { PetCustomPart } from '@nitrots/nitro-renderer';
-
-export interface PetImageViewProps
-{
-    figure?: string;
-    typeId?: number;
-    paletteId?: number;
-    color?: number;
-    customParts?: PetCustomPart[];
-    posture?: string;
-    headOnly?: boolean;
-    direction?: number;
-    scale?: number;
-}
diff --git a/src/views/shared/rarity-level/RarityLevelView.tsx b/src/views/shared/rarity-level/RarityLevelView.tsx
index 1b99f36f..b986f8d5 100644
--- a/src/views/shared/rarity-level/RarityLevelView.tsx
+++ b/src/views/shared/rarity-level/RarityLevelView.tsx
@@ -1,6 +1,10 @@
 import { FC, useMemo } from 'react';
-import { Base } from '../../../common/Base';
-import { RarityLevelViewProps } from './RarityLevelView.types';
+import { Base, BaseProps } from '../../../common';
+
+interface RarityLevelViewProps extends BaseProps<HTMLDivElement>
+{
+    level: number;
+}
 
 export const RarityLevelView: FC<RarityLevelViewProps> = props =>
 {
diff --git a/src/views/shared/rarity-level/RarityLevelView.types.ts b/src/views/shared/rarity-level/RarityLevelView.types.ts
deleted file mode 100644
index 9abaab54..00000000
--- a/src/views/shared/rarity-level/RarityLevelView.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { BaseProps } from '../../../common/Base';
-
-export interface RarityLevelViewProps extends BaseProps<HTMLDivElement>
-{
-    level: number;
-}
diff --git a/src/views/shared/room-previewer/RoomPreviewerView.tsx b/src/views/shared/room-previewer/RoomPreviewerView.tsx
index 4691fd45..14ad35ff 100644
--- a/src/views/shared/room-previewer/RoomPreviewerView.tsx
+++ b/src/views/shared/room-previewer/RoomPreviewerView.tsx
@@ -1,7 +1,12 @@
-import { ColorConverter, IRoomRenderingCanvas, TextureUtils } from '@nitrots/nitro-renderer';
+import { ColorConverter, IRoomRenderingCanvas, RoomPreviewer, TextureUtils } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useRef, useState } from 'react';
 import { GetNitroInstance } from '../../../api';
-import { RoomPreviewerViewProps } from './RoomPreviewerView.types';
+
+interface RoomPreviewerViewProps
+{
+    roomPreviewer: RoomPreviewer;
+    height?: number;
+}
 
 export const RoomPreviewerView: FC<RoomPreviewerViewProps> = props =>
 {
diff --git a/src/views/shared/room-previewer/RoomPreviewerView.types.ts b/src/views/shared/room-previewer/RoomPreviewerView.types.ts
deleted file mode 100644
index 85dfd5d5..00000000
--- a/src/views/shared/room-previewer/RoomPreviewerView.types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { RoomPreviewer } from '@nitrots/nitro-renderer';
-
-export interface RoomPreviewerViewProps
-{
-    roomPreviewer: RoomPreviewer;
-    height?: number;
-}