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

Add full-save-file.json to .gitignore

Prevents full-save-file.json from being tracked by git, likely because it is a generated or environment-specific file.

Author: JorchCortez

.gitignore

@@ -17,6 +17,7 @@
 .env.development.local
 .env.test.local
 .env.production.local
+full-save-file.json
 
 npm-debug.log*
 yarn-debug.log*

src/Components/AchieveTabs/Cooking.tsx

@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react'
-import type { generalFormatedItemType } from 'types/savefile';
+import type { generalFormatedItemType } from 'types/displayDataTypes';
 
 interface dishesCookedType {
     cookedItems: generalFormatedItemType[];

src/Components/AchieveTabs/Crops.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import type { cropsShippedType } from 'types/savefile';
+import type { cropsShippedType } from 'types/displayDataTypes';
 
 interface CropsShippedWrapperType {
     cropsShipped: cropsShippedType;

src/Components/Skills/SkillContainer/SkillContainer.css

@@ -71,11 +71,11 @@
 
 .skill-container__progress-fill {
     height: 100%;
-    background: linear-gradient(90deg, #A8511B, #CC7625);
+    background: linear-gradient(90deg, #4caf50, #81c784);
     border-radius: 4px;
     transition: width 0.3s ease;
     min-width: 2px;
-    box-shadow: 0 0 8px rgba(168, 81, 27, 0.5);
+    box-shadow: 0 0 8px rgba(76, 175, 80, 0.5);
 }
 
 .skill-container__icon {

src/Components/Utility/Utility.tsx

@@ -12,23 +12,25 @@ import MonsterCat from '@utility/monsterCategorie.json' with { type: "json" };
 import Museum from '@utility/museum.json' with { type: "json" };
 import townSR from './TownSpecialReq.json' with { type: "json" };
 import QiSR from './QiSpecialReq.json' with { type: "json" };
-import type { 
-    cropsShippedType, 
-    experienceType, 
-    formatedFriendshipDataType, 
-    formatedMonsterDataType, 
+import type {
     friendshipDataType, 
-    gameLocationType, 
-    generalFormatedItemType, 
-    itemFoundType, 
+    gameLocationType,
     itemsType, 
-    itemType, 
-    maxMonoType, 
-    playerType, 
-    professionsType, 
+    itemType,
+    playerType,
     questType, 
     specialOrderType 
 } from 'types/savefile';
+import type { 
+    cropsShippedType, 
+    generalFormatedItemType, 
+    professionsType, 
+    maxMonoType, 
+    itemFoundType, 
+    experienceType, 
+    formatedFriendshipDataType,
+    formatedMonsterDataType
+} from 'types/displayDataTypes';
 import type { fullPlayerDataType, museumCollectionType } from 'types/displayDataTypes';
 
 //Gets the info from the farm hands as an array of the same type
@@ -95,7 +97,7 @@ const parseData = ({playerData, collectionStatus, specialRequests, availableSpec
         professions: GetProfessionData(playerData.professions.int) , //DONE?
         shippedItems: GetShippedItems(playerData.basicShipped) || [],//DONE
         cropsShipped: GetCropsAchievements(playerData.basicShipped?.item),//Refactored DONE
-        mineralsFound: GetArrayData(playerData.mineralsFound?.item) || [], //DONE
+        //mineralsFound: GetArrayData(playerData.mineralsFound?.item) || [], //DONE
         cookedItems: GetCookingData(playerData.recipesCooked, playerData.cookingRecipes.item) || [], //DONE
         fishCaught: GetFishes(playerData.fishCaught.item) || [], 
         tailoredItems: GetArrayDataTimeless(playerData.tailoredItems) || [],
@@ -142,6 +144,7 @@ const GetProfessionData = (professions: number[]): professionsType[] =>{
             }
         });
     }
+    console.log('Profession Data:', data);
     return data;
 }
 

src/Components/stats/stats.tsx

@@ -38,7 +38,8 @@ const Stats = ({playerData, farmName, farmhandData}: formattedSaveFileType) => {
                 <Achievements 
                     cookedItems={p.cookedItems}
                     itemsCrafted={p.itemsCrafted}  
-                    cropsShipped={p.cropsShipped} 
+                    cropsShipped={p.cropsShipped}
+                    professions={p.professions}
                     fishCaught={p.fishCaught}
                     friendship={p.friendship}
                     monstersKilled={p.monstersKilled}
@@ -75,6 +76,7 @@ const Stats = ({playerData, farmName, farmhandData}: formattedSaveFileType) => {
                             <Achievements 
                                 cookedItems={playerData.cookedItems} 
                                 itemsCrafted={playerData.itemsCrafted}  
+                                professions={playerData.professions}
                                 cropsShipped={playerData.cropsShipped}  
                                 fishCaught={playerData.fishCaught}
                                 friendship={playerData.friendship}

src/serviceWorker.js

@@ -12,7 +12,7 @@
 
 
 
-export function unregister() {
+export default function unregister() {
   if ('serviceWorker' in navigator) {
     navigator.serviceWorker.ready
       .then(registration => {

src/types/displayDataTypes.ts

@@ -12,7 +12,7 @@ export type fullPlayerDataType = {
     professions: professionsType[];
     shippedItems: generalFormatedItemType[];
     cropsShipped: cropsShippedType;
-    mineralsFound: itemFoundType[];
+    mineralsFound?: itemFoundType[];
     cookedItems: generalFormatedItemType[];
     museumCollection: museumCollectionType;
     availableSpecialRequests: string[];

src/types/savefile.ts

@@ -266,56 +266,6 @@ export type playerType = {
     fishCaught: itemType,
 }
 
-export type professionsType = {
-    id: number;
-    name: string;
-}
-
-export type cropsShippedType = {
-    hasMonoculture: boolean;
-    hasPolyculture: boolean;
-    mono_extras: generalFormatedItemType[];
-    poly_crops: generalFormatedItemType[];
-    maxMono: null | maxMonoType;
-};
-
-export type maxMonoType = {
-    name: string;
-    shipped: number;
-}
-
-export type generalFormatedItemType = {
-    id?: number;
-    image: string;
-    name: string;
-    link?: string;
-    knownDish?: boolean;
-    times?: number;
-    shipped?: number;
-    fished?: boolean;
-    found?: boolean;
-    inMuseum?: boolean;
-}
-
-export type formatedFriendshipDataType = {
-    name: string;
-    dateable: boolean;
-    points: number;
-    level: number;
-    lvlup: number;
-}
-export type formatedMonsterDataType = {
-    category: string;
-    goal: number;
-    images: monsterImageType[];
-    timesKilled: number;
-};
-
-type monsterImageType = {
-    img: string;
-    name: string;
-}
-
 type batType = {
     goal: number;
     monsters: string[];
@@ -343,11 +293,6 @@ type friendshipDataItemType = {
     item: friendshipDataType[]
 }
 
-export type itemFoundType = {
-    item: number | string,
-    timesFound: number
-}
-
 export type friendshipDataType = {
     key: {
         string: "Robin"
@@ -541,13 +486,4 @@ export type questType = {
     dueDate: number;
     duration: string;
     questState: string;
-}
-
-export type experienceType = {
-    levelInfo: {
-        id: number;
-        val: number;
-    };
-    skill: string;
-    xp: number;
-};
+}