Merge pull request #6 from TheCodeRaccoons/te-taking-project

JorchCortez · web-flow · commit 0a03e508c3c9 · 2025-10-20T22:10:26.000-07:00
Te taking project
diff --git a/src/Components/AchieveTabs/Collection.tsx b/src/Components/AchieveTabs/Collection.tsx
@@ -1,23 +1,11 @@
 import React, { useState, useEffect } from 'react'
+import type { museumCollectionType } from 'types/displayDataTypes';
 
 interface CollectionProps {
-    museumCollection: {
-        artifacts: Array<{
-            found: boolean;
-            inMuseum: boolean;
-            image: string;
-            name: string;
-        }>;
-        minerals: Array<{
-            found: boolean;
-            inMuseum: boolean;
-            image: string;
-            name: string;
-        }>;
-    };
+    museumCollection: museumCollectionType;
 }
 
-const Collection: React.FC<CollectionProps> = ({ museumCollection }) => {
+const Collection = ({ museumCollection }: CollectionProps) => {
     const [totalFound, setTotalFound] = useState(0);
     const [totalDelivered, setTotalDelivered] = useState(0);
     const [total, setTotal] = useState(0);
diff --git a/src/Components/AchieveTabs/Cooking.tsx b/src/Components/AchieveTabs/Cooking.tsx
@@ -2,24 +2,25 @@ import { useState, useEffect } from 'react'
 import type { generalFormatedItemType } from 'types/savefile';
 
 interface dishesCookedType {
-    recipesCooked: generalFormatedItemType[];
+    cookedItems: generalFormatedItemType[];
 }
 
-const Food = ( recipesCooked  : dishesCookedType) => {
+const Food = ( {cookedItems}  : dishesCookedType) => {
     const [dishesCooked, setDishesCooked] = useState(0);
-    if(!recipesCooked) return <div>No cooking data available.</div>;
+    if(!cookedItems) return <div>No cooking data available.</div>;
 
-    const canMap = (recipesCooked.recipesCooked && recipesCooked.recipesCooked.length > 0);
+    const canMap = (cookedItems && cookedItems.length > 0);
+    console.log("Cooking data:", cookedItems);
     useEffect(() => {  
-        const cookedCount = canMap ? recipesCooked.recipesCooked.map((num) => (num.times !== undefined && num.times > 0) ? 1 : 0).reduce((n: number, next: number) => n + next, 0) : 0;
+        const cookedCount = canMap ? cookedItems.map((num) => (num.times !== undefined && num.times > 0) ? 1 : 0).reduce((n: number, next: number) => n + next, 0) : 0;
         setDishesCooked(cookedCount);
-    }, [recipesCooked]);
-    const cookedCount = canMap ? recipesCooked.recipesCooked.map((num) => (num.times !== undefined && num.times > 0) ? 1 : 0).reduce((n: number, next: number) => n + next, 0) : 0;
-    const knownCount = canMap ? recipesCooked.recipesCooked.map((num) => (num.times !== undefined && num.times >= 0) ? 1 : 0).reduce((n: number, next: number) => n + next, 0) : 0;
+    }, [cookedItems]);
+    const cookedCount = canMap ? cookedItems.map((num) => (num.times !== undefined && num.times > 0) ? 1 : 0).reduce((n: number, next: number) => n + next, 0) : 0;
+    const knownCount = canMap ? cookedItems.map((num) => (num.times !== undefined && num.times >= 0) ? 1 : 0).reduce((n: number, next: number) => n + next, 0) : 0;
 
     return ( 
         <div className="progress-container">   
-            <span className="a-title"><h1>You have cooked {cookedCount}, knowing {knownCount} out of {recipesCooked.recipesCooked.length} recipes</h1></span>
+            <span className="a-title"><h1>You have cooked {cookedCount}, knowing {knownCount} out of {cookedItems.length} recipes</h1></span>
             <br />
             <h2>Cooking Achievements</h2>
             <ul className="a-List"> 
@@ -29,7 +30,7 @@ const Food = ( recipesCooked  : dishesCookedType) => {
             </ul>
             <br />
             { canMap ? 
-                recipesCooked.recipesCooked.map((d, i) => <a href={`https://stardewvalleywiki.com/${d.link}`} target="blank" key={i}><img src={`https://stardew-tracker.s3.amazonaws.com/Cooking/${d.image}.png`} alt={d.name} className={ (d.times !== undefined) ? ((d.times > 0) ? "done" : "known" ): "" } title={(d.times !== undefined) ? (d.times > 0) ? `Cooked ${d.name}  ${d.times} times` : `You haven't cooked ${d.name}` : `You don't know how to cook ${d.name}`} ></img></a>) 
+                cookedItems.map((d, i) => <a href={`https://stardewvalleywiki.com/${d.link}`} target="blank" key={i}><img src={`https://stardew-tracker.s3.amazonaws.com/Cooking/${d.image}.png`} alt={d.name} className={ (d.times !== undefined) ? ((d.times > 0) ? "done" : "known" ): "" } title={(d.times !== undefined) ? (d.times > 0) ? `Cooked ${d.name}  ${d.times} times` : `You haven't cooked ${d.name}` : `You don't know how to cook ${d.name}`} ></img></a>) 
                 : null
             }
         </div>
diff --git a/src/Components/AchieveTabs/Fish.tsx b/src/Components/AchieveTabs/Fish.tsx
@@ -1,19 +1,14 @@
 import React, { useState, useEffect } from 'react'
-
-interface FishItem {
-    fished: boolean;
-    image: string;
-    name: string;
-}
+import type { generalFormatedItemType } from 'types/displayDataTypes';
 
 interface FishProps {
-    fishCaught: FishItem[];
+    fishCaught: generalFormatedItemType[];
 }
 
-const Fish: React.FC<FishProps> = ({ fishCaught }) => {
+const Fish = ({ fishCaught }: FishProps) => {
     const [totalFished, setTotalFished] = useState(0);
 
-    const getCraftedItems = (items: FishItem[]) => {
+    const getCraftedItems = (items: generalFormatedItemType[]) => {
         return items.map((num) => (num.fished) ? 1 : 0).reduce((n: number, next: number) => next + n, 0);
     };
     
diff --git a/src/Components/Achievements/Achievements.tsx b/src/Components/Achievements/Achievements.tsx
@@ -12,8 +12,28 @@ import Shipping from '../AchieveTabs/Shipping'
 import Earnings from '../AchieveTabs/moneyEarned'
 import Collection from '../AchieveTabs/Collection'
 import Quests from '../AchieveTabs/quests'
+import type { fullPlayerDataType } from 'types/displayDataTypes.js';
 
-const Achievements = (props) => {
+const Achievements = ({
+    playerName,
+    farmName,
+    experience,
+    moneyEarned,
+    professions,
+    shippedItems,
+    cropsShipped,
+    mineralsFound,
+    cookedItems,
+    museumCollection,
+    availableSpecialRequests,
+    fishCaught,
+    friendship,
+    itemsCrafted,
+    monstersKilled,
+    questsDone,
+    specialRequests,
+    tailoredItems,
+    }: fullPlayerDataType ) => {
     const TabImg = [
         {img: TabCook, alt: "Cooking"}, 
         {img: TabCraft, alt: "Crafting"}, 
@@ -37,59 +57,59 @@ const Achievements = (props) => {
                 </TabList>
             <TabPanel> 
                 <section className="achievement-container"> 
-                    <Food recipesCooked={props.recipesCooked}></Food>
+                    <Food cookedItems={cookedItems}></Food>
                 </section>
             </TabPanel> 
             <TabPanel> 
                 <section className="achievement-container">  
-                    <Crafting itemsCrafted={props.itemsCrafted}></Crafting>
+                    <Crafting itemsCrafted={itemsCrafted}></Crafting>
                 </section>
             </TabPanel> 
             <TabPanel> 
                 <section className="achievement-container">
-                    <Crops cropsShipped={props.cropsShipped} />
+                    <Crops cropsShipped={cropsShipped} />
                 </section>
             </TabPanel> 
             <TabPanel> 
                 <section className="achievement-container">
-                    <Fish fishCaught={props.fishCaught} />
+                    <Fish fishCaught={fishCaught} />
                 </section>
             </TabPanel> 
             <TabPanel> 
                 <section className="achievement-container">
-                    <Friendship friendship={props.friendship}/>
+                    <Friendship friendship={friendship}/>
                 </section>
             </TabPanel> 
             <TabPanel> 
                 <section className="achievement-container">
-                    <Monsters monstersKilled={props.monstersKilled}/>
+                    <Monsters monstersKilled={monstersKilled}/>
                 </section>
             </TabPanel> 
             <TabPanel> 
                 <section className="achievement-container">
-                    <Shipping shippedItems={props.shippedItems}/>
+                    <Shipping shippedItems={shippedItems}/>
                 </section>
             </TabPanel> 
             <TabPanel> 
                 <section className="achievement-container">
-                    <Earnings moneyEarned={props.moneyEarned}/>
+                    <Earnings moneyEarned={moneyEarned}/>
                 </section>
             </TabPanel> 
             <TabPanel> 
                 <section className="achievement-container">
-                    <Collection museumCollection={props.museumCollection} />
+                    <Collection museumCollection={museumCollection} />
                 </section>
             </TabPanel> 
-            <TabPanel> 
+            {/* <TabPanel> 
                 <section className="achievement-container"> 
-                    <Quests questsDone={props.questsDone} specialReq={props.specialReq} pendingSpecialReq={props.pendingSpecialReq} />
+                    <Quests questsDone={questsDone} specialReq={specialRequests} pendingSpecialReq={pendingSpecialReq} />
                 </section>
             </TabPanel>
             <TabPanel> 
                 <section className="achievement-container"> 
-                    <Quests questsDone={props.questsDone} specialReq={props.specialReq} pendingSpecialReq={props.pendingSpecialReq} />
+                    <Quests questsDone={questsDone} specialReq={specialRequests} pendingSpecialReq={pendingSpecialReq} />
                 </section>
-            </TabPanel>
+            </TabPanel> */}
             </Tabs>
         </div>
     );
diff --git a/src/Components/Main/Main.tsx b/src/Components/Main/Main.tsx
@@ -8,32 +8,28 @@ import Window4 from '@media/Windows/Window4.png'
 import Loader from '@media/loader.gif'
 import AdComponent from '../adsense/adComponent.js'
 import { useState } from 'react';
+import type { formattedSaveFileType, fullPlayerDataType } from 'types/displayDataTypes.js';
 //TODO: enable ads
 //import AdSense from 'react-adsense';
 
 const Main = () => {
     const [hasData, setHasData] = useState(false);
     const [showLoader, setShowLoader] = useState(false);
-    const [playerData, setPlayerData] = useState(null);
-    const [farmhands, setFarmhands] = useState([])
+    const [playerData, setPlayerData] = useState<fullPlayerDataType>({} as fullPlayerDataType);
+    const [farmhands, setFarmhands] = useState<fullPlayerDataType[]>([]);
+    const [globalFarmName, setFarmName] = useState("My Farm");
 
-    const UpdatePlayerData = (_playerData) => {
+    const UpdatePlayerData = ({farmName, playerData, farmhandData}: formattedSaveFileType) => {
+        console.log("Player data received", playerData, farmhandData);
+        if(!playerData) {
+            console.error("No player data received in Main component");
+            return;
+        }
         setHasData(true);
         setShowLoader(false);
-        setFarmhands(_playerData.farmhandData);
-        setPlayerData(_playerData.playerData[0]);
-    }
-
-    const UpdateGamePrefix = (pref) => {
-        console.log("Using prefix: " + pref)
-    }
-
-    const GetCollection = (collection) => { 
-        let museumPieces = []
-        if(collection.museumPieces.item !== undefined){
-            museumPieces = [...collection.museumPieces.item]
-        }
-        return (museumPieces.length > 0) ? museumPieces : [] 
+        setFarmName(farmName ? playerData.farmName : "My Farm");
+        setFarmhands(farmhandData);
+        setPlayerData(playerData);
     }
 
     return (
@@ -75,13 +71,8 @@ const Main = () => {
                 <div className="main-container"> 
                     {
                         hasData ? 
-                            <Stats playerData={playerData} farmhands={farmhands} /> : 
-                            <Viewer 
-                                UpdatePlayerData={UpdatePlayerData} 
-                                UpdateGamePrefix={UpdateGamePrefix}
-                                GetCollection={GetCollection}
-                                ShowLoader={setShowLoader}
-                            />
+                            <Stats farmName={globalFarmName} playerData={playerData} farmhandData={farmhands} /> : 
+                            <Viewer UpdatePlayerData={UpdatePlayerData} />
                     }
                 </div>
                 <div className="adds"> 
diff --git a/src/Components/Skills/Skills.tsx b/src/Components/Skills/Skills.tsx
@@ -1,19 +1,22 @@
 import { useState } from 'react'
 import SkillContainer from './SkillContainer/SkillContainer'
 import {Farming, Mining, Foraging, Fishing, Combat} from '@media/Skills'
+import type { experienceType } from 'types/displayDataTypes'
 
-const Skills = (props) => {
-    let [skills, setSkills] = useState(props.xp)
-    let [skillImg, setSkillImg] = useState([Farming, Fishing, Foraging, Mining, Combat])
+interface SkillsProps {
+    experience: experienceType[];
+}
 
+const Skills = ({ experience }: SkillsProps) => {
+    const skillImg =[Farming, Fishing, Foraging, Mining, Combat];
+    console.log("Skills data:", experience);
         return (
             <section className="stats-container"> 
                 <div className="skill-info"> 
-                    {skills.map((item, i: number) => (i === 5) ? "" :  
+                    {experience.map((item, i: number) => (i === 5) ? "" :  
                     <SkillContainer 
                         key={i} 
-                        index={i} 
-                        skillImg={skillImg[i]} 
+                        skillImg={skillImg[i] || ""} 
                         skillName={item.skill} 
                         xp={item.xp} 
                         levelInfo={item.levelInfo}
diff --git a/src/Components/Utility/Utility.tsx b/src/Components/Utility/Utility.tsx
@@ -29,6 +29,7 @@ import type {
     questType, 
     specialOrderType 
 } from 'types/savefile';
+import type { fullPlayerDataType, museumCollectionType } from 'types/displayDataTypes';
 
 //Gets the info from the farm hands as an array of the same type
 const GetFarmHands = (locations: gameLocationType[]): playerType[] => {
@@ -65,13 +66,16 @@ type getParsedUserDataType = Omit<getDetailedInfoType, 'playerData'> & {
 
 //Calls the parser and creates an array of players depending on wether it is a single player or multiple
 const GetDetailedInfo = ({playerData , collectionStatus, specialRequests, availableSpecialRequests}: getDetailedInfoType) =>{ 
-    let fullPlayerData: any = []
+    let fullPlayerData: fullPlayerDataType[] = []
     if(Array.isArray(playerData)){
         playerData.forEach(p => { 
-            let playerFull = {
+            let playerFull: fullPlayerDataType
+            = {
                 //...p, 
                 ...parseData({playerData: p, collectionStatus, specialRequests, availableSpecialRequests})
             }
+            
+            if(playerFull !== null)
             fullPlayerData.push(playerFull)
         }) 
     }
@@ -80,12 +84,11 @@ const GetDetailedInfo = ({playerData , collectionStatus, specialRequests, availa
 } 
     
 //Creates an object per player with the cleanup playerData.from the file
-const parseData = ({playerData, collectionStatus, specialRequests, availableSpecialRequests}: getParsedUserDataType) => { 
-    if(!playerData) return null;
+const parseData = ({playerData, collectionStatus, specialRequests, availableSpecialRequests}: getParsedUserDataType) : fullPlayerDataType => { 
     //Not finished  
     console.log("Parsing data for:", playerData)
-    let fullPlayerData = {
-        playerName: playerData.name,
+    let fullPlayerData : fullPlayerDataType = {
+        playerName: playerData.name || "Unknown",
         farmName: playerData.farmName, //TODO: Remove and make global if even needed
         experience: GetXpInfo(playerData.experiencePoints.int), //DONE
         moneyEarned: playerData.totalMoneyEarned || 0, //DONE
@@ -123,7 +126,7 @@ const GetXpInfo = (xp: number[]): experienceType[] => {
                 levelInfo: Levels.find((level) => level.val >= _skill) || { id: 10, val: 15000 }
             })
         }
-    })  
+    })
     return skillLevelData
 }
 /* End of XP Data */
@@ -355,7 +358,7 @@ const GetMonsterQuests = (allMonsters: itemsType[], slimesKilled: number): forma
         })
         return(mData) 
 }
-const GetMCollection = (archeology: itemsType[], geology: itemsType[], currentCollection: itemsType[]) =>{
+const GetMCollection = (archeology: itemsType[], geology: itemsType[], currentCollection: itemsType[]) : museumCollectionType =>{
 
     if(currentCollection === undefined || currentCollection.length === 0) return {artifacts: [], minerals: []};
 
diff --git a/src/Components/Utility/monsterCategorie.json b/src/Components/Utility/monsterCategorie.json
@@ -91,5 +91,6 @@
         "monsters": [
             "Serpent"
         ]
-    }]
+    }
+]
 }
diff --git a/src/Components/Viewer/Viewer.tsx b/src/Components/Viewer/Viewer.tsx
@@ -4,12 +4,9 @@ import useLoadSaveFile from '@hooks/useLoadSaveFile';
 
 interface ViewerProps {
     UpdatePlayerData: (playerData: any) => void;
-    UpdateGamePrefix?: (prefix: string) => void;
-    GetCollection?: (collection: any) => any[];
-    ShowLoader?: (show: boolean) => void;
 }
 
-const Viewer = ({ UpdatePlayerData, UpdateGamePrefix, GetCollection, ShowLoader }: ViewerProps) => {
+const Viewer = ({ UpdatePlayerData }: ViewerProps) => {
     const inputRef = useRef<HTMLInputElement>(null);
     const { playerData, fileData, isLoading, error, selectFile } = useLoadSaveFile();
 
diff --git a/src/Components/stats/stats.tsx b/src/Components/stats/stats.tsx
diff --git a/src/hooks/useLoadSaveFile.tsx b/src/hooks/useLoadSaveFile.tsx
diff --git a/src/types/displayDataTypes.ts b/src/types/displayDataTypes.ts

Original file line number	Diff line number	Diff line change
`@@ -91,5 +91,6 @@`
`91`	`91`	`"monsters": [`
`92`	`92`	`"Serpent"`
`93`	`93`	`]`
`94`		`- }]`
	`94`	`+ }`
	`95`	`+]`
`95`	`96`	`}`