Moving things around base don new design.

AdamKyle · AdamKyle · commit ec40a3d9ef0d · 2025-04-20T22:37:13.000-04:00
diff --git a/resources/js/game-data/api-data-definitions/character/character-sheet-definition.ts b/resources/js/game-data/api-data-definitions/character/character-sheet-definition.ts
@@ -1,7 +1,7 @@
 import InventoryCountDefinition from './inventory-count-definition';
 
 import ElementalAtonementDefinition from 'game-data/api-data-definitions/character/elemental-atonement-definition';
-import ReincarnationInfoDefinition from 'game-data/api-data-definitions/character/reincarnation-info-definition';
+import { ReincarnationInfoDefinition } from 'game-data/api-data-definitions/character/reincarnation-info-definition';
 import ResistanceInfoDefinition from 'game-data/api-data-definitions/character/resistance-info-definition';
 
 export default interface CharacterSheetDefinition {
diff --git a/resources/js/game-data/api-data-definitions/character/reincarnation-info-definition.ts b/resources/js/game-data/api-data-definitions/character/reincarnation-info-definition.ts
@@ -1,7 +1,11 @@
-export default interface ReincarnationInfoDefinition {
+export interface ReincarnationBaseInfoDefinition {
   base_damage_stat_mod: number;
   base_stat_mod: number;
   reincarnated_stat_increase: number;
   reincarnated_times: number;
   xp_penalty: number;
 }
+
+export interface ReincarnationInfoDefinition {
+  data: ReincarnationBaseInfoDefinition
+}
diff --git a/resources/js/game/components/actions/partials/actions/actions.tsx b/resources/js/game/components/actions/partials/actions/actions.tsx
@@ -16,7 +16,7 @@ import { useManageCraftingCardVisibility } from '../floating-cards/crafting-sect
 import Card from 'ui/cards/card';
 
 const Actions = (props: ActionsProps): ReactNode => {
-  const { scrollY, isMobile } = useScrollIconMenu();
+  const { isMobile } = useScrollIconMenu();
   const { showMonsterStats } = props;
 
   const { showCharacterCard } = useManageCharacterCardVisibility();
@@ -56,7 +56,7 @@ const Actions = (props: ActionsProps): ReactNode => {
           })}
         >
           <aside className="flex justify-between lg:flex-col lg:space-y-2 border-b lg:border-b-0 lg:border-r pb-2 lg:pb-0">
-            <NavigationActionsComponent scrollY={scrollY} isMobile={isMobile} />
+            <NavigationActionsComponent isMobile={isMobile} />
           </aside>
 
           <div className="flex flex-col items-center space-y-4">
diff --git a/resources/js/game/components/actions/partials/actions/navigation-actions.tsx b/resources/js/game/components/actions/partials/actions/navigation-actions.tsx
@@ -12,12 +12,6 @@ const NavigationActionsComponent = (props: NavigationActions): ReactNode => {
         </div>
       ) : (
         <div
-          style={{
-            position: 'absolute',
-            top: `${props.scrollY + 10}px`,
-            left: '10px',
-            transition: 'top 0.2s',
-          }}
         >
           <IconSection />
         </div>
diff --git a/resources/js/game/components/actions/partials/actions/types/navigation-actions-props.ts b/resources/js/game/components/actions/partials/actions/types/navigation-actions-props.ts
@@ -1,4 +1,3 @@
 export default interface NavigationActions {
-  scrollY: number;
   isMobile: boolean;
 }
diff --git a/resources/js/game/components/actions/partials/floating-cards/character-details/hooks/use-manage-character-card-visibility.ts b/resources/js/game/components/actions/partials/floating-cards/character-details/hooks/use-manage-character-card-visibility.ts
@@ -39,12 +39,8 @@ export const useManageCharacterCardVisibility =
       const closeCraftingCardEvent = eventSystem.getEventEmitter<{
         [key: string]: boolean;
       }>(ActionCardEvents.OPEN_CRATING_CARD);
-      const closeChatCardEvent = eventSystem.getEventEmitter<{
-        [key: string]: boolean;
-      }>(ActionCardEvents.OPEN_CHAT_CARD);
 
       closeCraftingCardEvent.emit(ActionCardEvents.OPEN_CRATING_CARD, false);
-      closeChatCardEvent.emit(ActionCardEvents.OPEN_CHAT_CARD, false);
 
       manageCardEventEmitter.emit(ActionCardEvents.OPEN_CHARACTER_CARD, true);
     };
diff --git a/resources/js/game/components/actions/partials/floating-cards/character-details/hooks/use-manage-character-inventory-visibility.ts b/resources/js/game/components/actions/partials/floating-cards/character-details/hooks/use-manage-character-inventory-visibility.ts
@@ -17,15 +17,11 @@ export const useManageCharacterInventoryVisibility =
       const closeCraftingCardEvent = eventSystem.getEventEmitter<{
         [key: string]: boolean;
       }>(ActionCardEvents.OPEN_CRATING_CARD);
-      const closeChatCardEvent = eventSystem.getEventEmitter<{
-        [key: string]: boolean;
-      }>(ActionCardEvents.OPEN_CHAT_CARD);
       const closeCharacterCardEvent = eventSystem.getEventEmitter<{
         [key: string]: boolean;
       }>(ActionCardEvents.OPEN_CHARACTER_CARD);
 
       closeCraftingCardEvent.emit(ActionCardEvents.OPEN_CRATING_CARD, false);
-      closeChatCardEvent.emit(ActionCardEvents.OPEN_CHAT_CARD, false);
       closeCharacterCardEvent.emit(ActionCardEvents.OPEN_CHARACTER_CARD, false);
 
       manageCharacterInventoryEmitter.emit(
diff --git a/resources/js/game/components/actions/partials/floating-cards/crafting-section/hooks/use-manage-crafting-card-visibility.ts b/resources/js/game/components/actions/partials/floating-cards/crafting-section/hooks/use-manage-crafting-card-visibility.ts
@@ -37,12 +37,8 @@ export const useManageCraftingCardVisibility =
       const closeCharacterCardEvent = eventSystem.getEventEmitter<{
         [key: string]: boolean;
       }>(ActionCardEvents.OPEN_CHARACTER_CARD);
-      const closeChatCardEvent = eventSystem.getEventEmitter<{
-        [key: string]: boolean;
-      }>(ActionCardEvents.OPEN_CHAT_CARD);
 
       closeCharacterCardEvent.emit(ActionCardEvents.OPEN_CHARACTER_CARD, false);
-      closeChatCardEvent.emit(ActionCardEvents.OPEN_CHAT_CARD, false);
 
       openCardEventEmitter.emit(ActionCardEvents.OPEN_CRATING_CARD, true);
     };
diff --git a/resources/js/game/components/actions/partials/floating-cards/event-types/action-cards.ts b/resources/js/game/components/actions/partials/floating-cards/event-types/action-cards.ts
@@ -1,5 +1,4 @@
 export enum ActionCardEvents {
   OPEN_CHARACTER_CARD = 'open_character_card',
   OPEN_CRATING_CARD = 'open_crafting_card',
-  OPEN_CHAT_CARD = 'open_chat_card',
 }
diff --git a/resources/js/game/components/character-sheet/character-reincarnation.tsx b/resources/js/game/components/character-sheet/character-reincarnation.tsx
@@ -12,6 +12,7 @@ import LinkButton from 'ui/buttons/link-button';
 const CharacterReincarnation = ({
   reincarnation_info,
 }: CharacterReincarnationProps): ReactNode => {
+
   const linkLabel = (): ReactNode => {
     return (
       <span>
diff --git a/resources/js/game/components/character-sheet/character-sheet.tsx b/resources/js/game/components/character-sheet/character-sheet.tsx
@@ -53,7 +53,7 @@ const CharacterSheet = (props: CharacterSheetProps): ReactNode => {
     return match({ showReincarnation, showClassRanks, showInventory })
       .with({ showReincarnation: true }, () => (
         <CharacterReincarnation
-          reincarnation_info={characterData.reincarnation_info}
+          reincarnation_info={characterData.reincarnation_info.data}
         />
       ))
       .with({ showClassRanks: true }, () => <CharacterClassRanks />)
diff --git a/resources/js/game/components/character-sheet/types/character-reincarnation-props.ts b/resources/js/game/components/character-sheet/types/character-reincarnation-props.ts
@@ -1,5 +1,6 @@
-import ReincarnationInfoDefinition from 'game-data/api-data-definitions/character/reincarnation-info-definition';
+import { ReincarnationBaseInfoDefinition } from 'game-data/api-data-definitions/character/reincarnation-info-definition';
+
 
 export default interface CharacterReincarnationProps {
-  reincarnation_info: ReincarnationInfoDefinition;
+  reincarnation_info: ReincarnationBaseInfoDefinition;
 }
diff --git a/resources/js/game/components/chat-section/chat.tsx b/resources/js/game/components/chat-section/chat.tsx
@@ -0,0 +1,63 @@
+import Card from 'ui/cards/card';
+import Button from 'ui/buttons/button';
+import { ButtonVariant } from 'ui/buttons/enums/button-variant-enum';
+import React from 'react';
+
+const Chat = () => {
+  return (
+    <div className="w-full lg:w-3/4 mx-auto my-4">
+      <Card>
+        <div className="flex items-center mb-2">
+          <Button
+            label="Send"
+            on_click={() => {}}
+            variant={ButtonVariant.PRIMARY}
+            additional_css="mr-2"
+          />
+          <input
+            type="text"
+            placeholder="Type your message"
+            className="flex-grow border border-gray-300 rounded-md p-2"
+          />
+        </div>
+        <div className="bg-gray-700 dark:bg-gray-800 p-2 w-full h-96 overflow-y-auto rounded-md text-gray-400">
+          <ul className="space-y-4">
+            <li>
+                <span className="underline font-bold">
+                  [SUR: xxxx/yyyy] Character Name
+                </span>
+              : Message here...
+            </li>
+            <li>
+                <span className="underline font-bold">
+                  [LABY: xxxx/yyyy] Other Character Name
+                </span>
+              : In the quiet town of Elderville, nestled between rolling hills
+              and lush forests, a sense of calm enveloped the streets. The sun
+              dipped low in the sky, casting a golden hue over the cobblestone
+              paths. Children played in the park, laughter echoing through the
+              air as families gathered for evening picnics. The aroma of
+              freshly baked bread wafted from the local bakery, mingling with
+              the scent of blooming flowers. As the stars began to twinkle, a
+              gentle breeze carried the promise of a peaceful night, inviting
+              all to pause and reflect on the beauty surrounding
+              them.resources/
+            </li>
+            <li>
+                <span className="underline font-bold">
+                  [HELL: xxxx/yyyy] RandomUerName
+                </span>
+              : In the heart of the city, a small coffee shop buzzed with
+              energy. Baristas crafted lattes with intricate foam designs
+              while patrons enjoyed their drinks, some lost in books and
+              others engaged in animated conversations. The scent of fresh
+              coffee filled the air, creating a warm atmosphere.
+            </li>
+          </ul>
+        </div>
+      </Card>
+    </div>
+  )
+}
+
+export default Chat;
diff --git a/resources/js/game/components/game-card.tsx b/resources/js/game/components/game-card.tsx
@@ -15,9 +15,7 @@ import { useManageCharacterSheetVisibility } from './hooks/use-manage-character-
 import CharacterAttackTypeBreakdown from './partials/character-attack-type-breakdown';
 import CharacterInventory from './partials/character-inventory';
 
-import Button from 'ui/buttons/button';
-import { ButtonVariant } from 'ui/buttons/enums/button-variant-enum';
-import Card from 'ui/cards/card';
+import Chat from './chat-section/chat';
 
 export const GameCard = (): ReactNode => {
   const { closeCharacterSheet } = useManageCharacterSheetVisibility();
@@ -77,58 +75,7 @@ export const GameCard = (): ReactNode => {
   return (
     <div>
       <Actions showMonsterStats={showMonsterStats} />
-      <div className="w-full lg:w-3/4 mx-auto my-4">
-        <Card>
-          <div className="flex items-center mb-2">
-            <Button
-              label="Send"
-              on_click={() => {}}
-              variant={ButtonVariant.PRIMARY}
-              additional_css="mr-2"
-            />
-            <input
-              type="text"
-              placeholder="Type your message"
-              className="flex-grow border border-gray-300 rounded-md p-2"
-            />
-          </div>
-          <div className="bg-gray-700 dark:bg-gray-800 p-2 w-full h-96 overflow-y-auto rounded-md text-gray-400">
-            <ul className="space-y-4">
-              <li>
-                <span className="underline font-bold">
-                  [SUR: xxxx/yyyy] Character Name
-                </span>
-                : Message here...
-              </li>
-              <li>
-                <span className="underline font-bold">
-                  [LABY: xxxx/yyyy] Other Character Name
-                </span>
-                : In the quiet town of Elderville, nestled between rolling hills
-                and lush forests, a sense of calm enveloped the streets. The sun
-                dipped low in the sky, casting a golden hue over the cobblestone
-                paths. Children played in the park, laughter echoing through the
-                air as families gathered for evening picnics. The aroma of
-                freshly baked bread wafted from the local bakery, mingling with
-                the scent of blooming flowers. As the stars began to twinkle, a
-                gentle breeze carried the promise of a peaceful night, inviting
-                all to pause and reflect on the beauty surrounding
-                them.resources/
-              </li>
-              <li>
-                <span className="underline font-bold">
-                  [HELL: xxxx/yyyy] RandomUerName
-                </span>
-                : In the heart of the city, a small coffee shop buzzed with
-                energy. Baristas crafted lattes with intricate foam designs
-                while patrons enjoyed their drinks, some lost in books and
-                others engaged in animated conversations. The scent of fresh
-                coffee filled the air, creating a warm atmosphere.
-              </li>
-            </ul>
-          </div>
-        </Card>
-      </div>
+      <Chat />
     </div>
   );
 };
diff --git a/resources/js/game/components/hooks/use-manage-character-sheet-visibility.ts b/resources/js/game/components/hooks/use-manage-character-sheet-visibility.ts
@@ -16,15 +16,11 @@ export const useManageCharacterSheetVisibility =
       const closeCraftingCardEvent = eventSystem.getEventEmitter<{
         [key: string]: boolean;
       }>(ActionCardEvents.OPEN_CRATING_CARD);
-      const closeChatCardEvent = eventSystem.getEventEmitter<{
-        [key: string]: boolean;
-      }>(ActionCardEvents.OPEN_CHAT_CARD);
       const closeCharacterCardEvent = eventSystem.getEventEmitter<{
         [key: string]: boolean;
       }>(ActionCardEvents.OPEN_CHARACTER_CARD);
 
       closeCraftingCardEvent.emit(ActionCardEvents.OPEN_CRATING_CARD, false);
-      closeChatCardEvent.emit(ActionCardEvents.OPEN_CHAT_CARD, false);
       closeCharacterCardEvent.emit(ActionCardEvents.OPEN_CHARACTER_CARD, false);
 
       manageCharacterSheetEmitter.emit(

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`export default interface NavigationActions {`
`2`		`- scrollY: number;`
`3`	`2`	`isMobile: boolean;`
`4`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`export enum ActionCardEvents {`
`2`	`2`	`OPEN_CHARACTER_CARD = 'open_character_card',`
`3`	`3`	`OPEN_CRATING_CARD = 'open_crafting_card',`
`4`		`- OPEN_CHAT_CARD = 'open_chat_card',`
`5`	`4`	`}`