Skip to content

Commit 933e7e3

Browse files
committed
Refactor cooking achievements prop names
Renamed the 'recipesCooked' prop to 'cookedItems' in Cooking, Achievements, and Stats components for consistency. Updated related references and destructuring to match the new prop name.
1 parent fb679ef commit 933e7e3

3 files changed

Lines changed: 28 additions & 27 deletions

File tree

src/Components/AchieveTabs/Cooking.tsx

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,25 @@ import { useState, useEffect } from 'react'
22
import type { generalFormatedItemType } from 'types/savefile';
33

44
interface dishesCookedType {
5-
recipesCooked: generalFormatedItemType[];
5+
cookedItems: generalFormatedItemType[];
66
}
77

8-
const Food = ( recipesCooked : dishesCookedType) => {
8+
const Food = ( {cookedItems} : dishesCookedType) => {
99
const [dishesCooked, setDishesCooked] = useState(0);
10-
if(!recipesCooked) return <div>No cooking data available.</div>;
10+
if(!cookedItems) return <div>No cooking data available.</div>;
1111

12-
const canMap = (recipesCooked && recipesCooked.length > 0);
12+
const canMap = (cookedItems && cookedItems.length > 0);
13+
console.log("Cooking data:", cookedItems);
1314
useEffect(() => {
14-
const cookedCount = canMap ? recipesCooked.map((num) => (num.times !== undefined && num.times > 0) ? 1 : 0).reduce((n: number, next: number) => n + next, 0) : 0;
15+
const cookedCount = canMap ? cookedItems.map((num) => (num.times !== undefined && num.times > 0) ? 1 : 0).reduce((n: number, next: number) => n + next, 0) : 0;
1516
setDishesCooked(cookedCount);
16-
}, [recipesCooked]);
17-
const cookedCount = canMap ? recipesCooked.map((num) => (num.times !== undefined && num.times > 0) ? 1 : 0).reduce((n: number, next: number) => n + next, 0) : 0;
18-
const knownCount = canMap ? recipesCooked.map((num) => (num.times !== undefined && num.times >= 0) ? 1 : 0).reduce((n: number, next: number) => n + next, 0) : 0;
17+
}, [cookedItems]);
18+
const cookedCount = canMap ? cookedItems.map((num) => (num.times !== undefined && num.times > 0) ? 1 : 0).reduce((n: number, next: number) => n + next, 0) : 0;
19+
const knownCount = canMap ? cookedItems.map((num) => (num.times !== undefined && num.times >= 0) ? 1 : 0).reduce((n: number, next: number) => n + next, 0) : 0;
1920

2021
return (
2122
<div className="progress-container">
22-
<span className="a-title"><h1>You have cooked {cookedCount}, knowing {knownCount} out of {recipesCooked.length} recipes</h1></span>
23+
<span className="a-title"><h1>You have cooked {cookedCount}, knowing {knownCount} out of {cookedItems.length} recipes</h1></span>
2324
<br />
2425
<h2>Cooking Achievements</h2>
2526
<ul className="a-List">
@@ -29,7 +30,7 @@ const Food = ( recipesCooked : dishesCookedType) => {
2930
</ul>
3031
<br />
3132
{ canMap ?
32-
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>)
33+
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>)
3334
: null
3435
}
3536
</div>

src/Components/Achievements/Achievements.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const Achievements = ({
5757
</TabList>
5858
<TabPanel>
5959
<section className="achievement-container">
60-
<Food recipesCooked={cookedItems}></Food>
60+
<Food cookedItems={cookedItems}></Food>
6161
</section>
6262
</TabPanel>
6363
<TabPanel>

src/Components/stats/stats.tsx

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,27 @@ const Stats = ({playerData, farmName, farmhandData}: formattedSaveFileType) => {
2727
);
2828

2929

30-
const playerStats = farmhandData.map((item, i) => (
30+
const playerStats = farmhandData.map((p, i) => (
3131
<TabPanel key={i}>
3232
<section className="wrapper">
33-
<Skills {...item.experience}></Skills>
33+
<Skills experience={p.experience}></Skills>
3434
<div className="ropes">
3535
<img src={Rope} alt=""></img>
3636
<img src={Rope} alt=""></img>
3737
</div>
3838
<Achievements
39-
recipesCooked={item.cookedItems}
40-
itemsCrafted={item.itemsCrafted}
41-
cropsShipped={item.cropsShipped}
42-
fishCaught={item.fishCaught}
43-
friendship={item.friendship}
44-
monstersKilled={item.monstersKilled}
45-
shippedItems={item.shippedItems}
46-
moneyEarned={item.moneyEarned}
47-
museumCollection={item.museumCollection}
48-
questsDone={item.questsDone}
49-
specialReq={item.specialRequests}
50-
pendingSpecialReq={item.pendingSpecialRequests}
39+
cookedItems={p.cookedItems}
40+
itemsCrafted={p.itemsCrafted}
41+
cropsShipped={p.cropsShipped}
42+
fishCaught={p.fishCaught}
43+
friendship={p.friendship}
44+
monstersKilled={p.monstersKilled}
45+
shippedItems={p.shippedItems}
46+
moneyEarned={p.moneyEarned}
47+
museumCollection={p.museumCollection}
48+
questsDone={p.questsDone}
49+
specialRequests={p.specialRequests}
50+
//availableSpecialRequests={p.availableSpecialRequests}
5151
></Achievements>
5252
</section>
5353
</TabPanel>
@@ -73,7 +73,7 @@ const Stats = ({playerData, farmName, farmhandData}: formattedSaveFileType) => {
7373
<img src={Rope} alt=""></img>
7474
</div>
7575
<Achievements
76-
recipesCooked={playerData.cookedItems}
76+
cookedItems={playerData.cookedItems}
7777
itemsCrafted={playerData.itemsCrafted}
7878
cropsShipped={playerData.cropsShipped}
7979
fishCaught={playerData.fishCaught}
@@ -83,7 +83,7 @@ const Stats = ({playerData, farmName, farmhandData}: formattedSaveFileType) => {
8383
moneyEarned={playerData.moneyEarned}
8484
museumCollection={playerData.museumCollection}
8585
questsDone={playerData.questsDone}
86-
specialReq={playerData.specialRequests}
86+
specialRequests={playerData.specialRequests}
8787
//pendingSpecialReq={playerData.pendingSpecialRequests}
8888
></Achievements>
8989
</>

0 commit comments

Comments
 (0)