Starting the Grandpa's evaluation tab

Author: JorchCortez

src/Components/AchieveTabs/quests.js

@@ -30,10 +30,10 @@ class Quests extends React.Component {
                 </ul> 
                 <span className="a-title-big"><h1>Special Orders.</h1></span> 
                 <ul className="m-List"> 
-                    {this.state.specialReq.map(m =>  <li> <span className="completed">{m.name}: {m.description}</span> </li>)}
+                    {this.state.specialReq.map((m,i) =>  <li key={i}> <span className="completed">{m.name}: {m.description}</span> </li>)}
                 </ul> 
                 <ul className="m-List">
-                    {this.state.pendingSpecialReq.map(m => <li><span className="pending">{m.name}: {m.description}.</span></li>)} 
+                    {this.state.pendingSpecialReq.map((m,i) => <li key={i}><span className="pending" >{m.name}: {m.description}.</span></li>)} 
                 </ul>  
             </div>
         );

src/Components/Achievements/Achievements.js

@@ -12,6 +12,7 @@ import AchItems from '../../Media/Achievements/AchItems.png'
 import AchMoney from '../../Media/Achievements/AchMoney.png'
 import AchMuseum from '../../Media/Achievements/AchMuseum.png'
 import AchQuests from '../../Media/Achievements/AchQuests.png'
+import AchGrandpa from '../../Media/Achievements/AchGrandpa.png'
 import Star from '../../Media/Star.png'
 import Crops from '../AchieveTabs/Crops';
 import Fish from '../AchieveTabs/Fish';
@@ -36,7 +37,8 @@ class Achievements extends React.Component {
                 {img:AchItems, alt: "Items"}, 
                 {img:AchMoney, alt: "Money"}, 
                 {img:AchMuseum, alt: "Museum"}, 
-                {img:AchQuests, alt: "Quests"}]
+                {img:AchQuests, alt: "Quests"}, 
+                {img:AchGrandpa, alt: "Grandpa's evaluation"}]
         }
     }
 
@@ -99,6 +101,11 @@ class Achievements extends React.Component {
                         <Quests questsDone={this.props.questsDone} specialReq={this.props.specialReq} pendingSpecialReq={this.props.pendingSpecialReq} />
                     </section>
                 </TabPanel>
+                <TabPanel> 
+                    <section className="achievement-container"> 
+                        <Quests questsDone={this.props.questsDone} specialReq={this.props.specialReq} pendingSpecialReq={this.props.pendingSpecialReq} />
+                    </section>
+                </TabPanel>
                 </Tabs>
             </div>
         );

src/Components/Main/Main.js

@@ -42,7 +42,8 @@ class Main extends React.Component {
         let museumPieces = []
         if(collection.museumPieces.item !== undefined){
             museumPieces = [...collection.museumPieces.item]
-        } 
+        }         console.log(museumPieces)
+
         return (museumPieces.length > 0) ? [...museumPieces] : [] 
     }
 

src/Components/Utility/Utility.js

@@ -38,7 +38,6 @@ const GetDetailedInfo = (data, collectionStatus, specialRequests, pendingSpecial
         }) 
     }
 
-    console.log(playerData)
     return playerData
 } 
 //Creates an object per player with the cleanup data from the file
@@ -76,6 +75,25 @@ const parseData = (data, collectionStatus,specialRequests, pendingSpecialRequest
     /*Get Special requests */ 
     let SpecialReqDone = GetSpecialRequests(specialRequests.string, townSR.Requests) 
     let SpecialReqPending = GetPendingSpecialRequests(specialRequests.string, townSR.Requests) 
+ 
+
+    
+    console.log("%c Grandpa's eval", 'color: #7289DA')
+    console.group() 
+    console.log("rusty key", data.hasRustyKey._text)
+    console.log("Skull key",data.hasSkullKey._text)
+    console.log("money", moneyEarned)
+    console.log("museum", collectionStatus)
+    console.log("fish", fishCaught)
+    console.log("Master of 5 ways", xp)
+    console.log("Legend", "NA")
+    console.log("friendship", FriendshipData)
+    console.log("Pet", FriendshipData)
+    console.log("married")
+    console.log("skull key")
+    console.log("rusty key")
+    console.log("total skill points") 
+    console.groupEnd();
 
     //Not finished  
     /* Get professions */
@@ -102,8 +120,7 @@ const parseData = (data, collectionStatus,specialRequests, pendingSpecialRequest
             questsDone: questsDone,
             specialRequests: SpecialReqDone,
             pendingSpecialRequests: SpecialReqPending
-    }
-    console.log(playerData)
+    } 
     return playerData;
 } 
 
@@ -606,14 +623,19 @@ const GetSpecialRequests = (requests, info) =>{
     } 
     return data
 } 
-const GetPendingSpecialRequests= (requests, info) =>{
-    console.log("info", info)
+const GetPendingSpecialRequests= (requests, info) =>{ 
     let data = info;  
     if(Array.isArray(requests)){  
 
         requests.forEach(req =>{ data = data.filter(item => item.name !== req._text)})
     } 
     return data
+}
+
+const GetGrantpasEval = () =>{
+
+
+
 }
 
 /* Required Methods */ 

src/Components/Viewer/Viewer.js

@@ -30,6 +30,7 @@ class Viewer extends React.Component {
             let availableSpecialRequests = json.SaveGame.availableSpecialOrders; 
             /* Gather data */
             let player          = json.SaveGame.player;
+            console.log(player)
             let farmHands       = GetFarmHands(json.SaveGame.locations.GameLocation[1].buildings.Building); 
             let players = {
                 playerData: GetDetailedInfo([player], collectionStatus, specialRequests, availableSpecialRequests),