Fix all warnings.
This commit is contained in:
parent
e06047174a
commit
ed837603ee
@ -786,7 +786,7 @@ function LoginForm(p) {
|
|||||||
console.log(err.message)
|
console.log(err.message)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},[checkForLogin])
|
},[checkForLogin,history])
|
||||||
|
|
||||||
return <>
|
return <>
|
||||||
<button onClick={()=>{window.location.href=process.env.REACT_APP_LOCAL_REDIRECT?"https://discord.com/api/oauth2/authorize?client_id=885738904685281291&redirect_uri=https%3A%2F%2Flocalhost%3A3000%23%2Flogin&response_type=code&scope=identify%20email":"https://discord.com/api/oauth2/authorize?client_id=885738904685281291&redirect_uri=https%3A%2F%2Fngsplanner.com%23%2Flogin&response_type=code&scope=identify%20email"}}>Login</button>
|
<button onClick={()=>{window.location.href=process.env.REACT_APP_LOCAL_REDIRECT?"https://discord.com/api/oauth2/authorize?client_id=885738904685281291&redirect_uri=https%3A%2F%2Flocalhost%3A3000%23%2Flogin&response_type=code&scope=identify%20email":"https://discord.com/api/oauth2/authorize?client_id=885738904685281291&redirect_uri=https%3A%2F%2Fngsplanner.com%23%2Flogin&response_type=code&scope=identify%20email"}}>Login</button>
|
||||||
|
@ -8,7 +8,6 @@ import axios from 'axios';
|
|||||||
import Helmet from 'react-helmet'
|
import Helmet from 'react-helmet'
|
||||||
import ReactPlaceholder from 'react-placeholder';
|
import ReactPlaceholder from 'react-placeholder';
|
||||||
import "react-placeholder/lib/reactPlaceholder.css";
|
import "react-placeholder/lib/reactPlaceholder.css";
|
||||||
import { UncontrolledTooltip } from 'reactstrap';
|
|
||||||
|
|
||||||
import { useLocation,useHistory,useParams,matchPath } from 'react-router'
|
import { useLocation,useHistory,useParams,matchPath } from 'react-router'
|
||||||
|
|
||||||
@ -293,8 +292,8 @@ function SkillTreeContainer(p){
|
|||||||
}
|
}
|
||||||
|
|
||||||
function FoodItem(p) {
|
function FoodItem(p) {
|
||||||
const {description,dmg_res,editors_choice,
|
const {/*description,*/dmg_res,/*editors_choice,*/
|
||||||
hp,hp_recovery,icon,id,name,popularity,potency,
|
hp,hp_recovery,icon,/*id,*/name,/*popularity,*/potency,
|
||||||
pp,pp_consumption,pp_recovery,weak_point_dmg,rarity,
|
pp,pp_consumption,pp_recovery,weak_point_dmg,rarity,
|
||||||
food_type} = p.item
|
food_type} = p.item
|
||||||
const {modifyPoints} = p
|
const {modifyPoints} = p
|
||||||
@ -373,15 +372,8 @@ function FoodPopupWindow(p) {
|
|||||||
const {GetData,foodPointData,setFoodPointData} = p
|
const {GetData,foodPointData,setFoodPointData} = p
|
||||||
|
|
||||||
const MAX_SELECTED=10;
|
const MAX_SELECTED=10;
|
||||||
const [FOODLIST,setFOODLIST] = useState(Object.keys(GetData("food")))
|
|
||||||
const [FOODS,setFOODS] = useState(GetData("food"))
|
|
||||||
const FOODCOUNT = Object.keys(foodPointData).reduce((total,food)=>foodPointData[food]+total,0)
|
const FOODCOUNT = Object.keys(foodPointData).reduce((total,food)=>foodPointData[food]+total,0)
|
||||||
|
|
||||||
useEffect(()=>{
|
|
||||||
setFOODLIST(Object.keys(GetData("food")))
|
|
||||||
setFOODS(GetData("food"))
|
|
||||||
},[GetData])
|
|
||||||
|
|
||||||
function modifyPoints(foodName,add) {
|
function modifyPoints(foodName,add) {
|
||||||
var temp = {...foodPointData}
|
var temp = {...foodPointData}
|
||||||
var total = FOODCOUNT
|
var total = FOODCOUNT
|
||||||
@ -480,35 +472,6 @@ const [prevFoodPointData,setPrevFoodPointData] = useState({})
|
|||||||
|
|
||||||
const [BUFFS,setBUFFS] = useState({})
|
const [BUFFS,setBUFFS] = useState({})
|
||||||
|
|
||||||
function CalculateBuffs(foodPointData) {
|
|
||||||
|
|
||||||
const boost_prefixes = {
|
|
||||||
pp_consumption:"Rich",
|
|
||||||
pp_recovery:"Light",
|
|
||||||
weak_point_dmg:"Crisp",
|
|
||||||
hp_recovery:"Robust",
|
|
||||||
}
|
|
||||||
const boost_suffixes = {
|
|
||||||
potency:"Meat",
|
|
||||||
pp:"Fruit",
|
|
||||||
dmg_res:"Vegetable",
|
|
||||||
hp:"Seafood",
|
|
||||||
}
|
|
||||||
|
|
||||||
var categories= {}
|
|
||||||
Object.keys(GetData("food_mult","0")).filter((key)=>key!=="id"&&key!=="amount").forEach((key)=>{categories[key]={count:0}})
|
|
||||||
Object.keys(foodPointData).map((key)=>{return {...GetData("food",key),amount:foodPointData[key]}}).forEach((item)=>{
|
|
||||||
for (var key of Object.keys(item)) {
|
|
||||||
if (key in categories && item[key]) {
|
|
||||||
categories[key].count+=item.amount
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
var finalObj = {}
|
|
||||||
Object.keys(categories).filter((key)=>categories[key].count>0).forEach((key)=>finalObj[key]={...categories[key],from:boost_prefixes[key]??boost_suffixes[key]})
|
|
||||||
return finalObj
|
|
||||||
}
|
|
||||||
|
|
||||||
function SaveData() {
|
function SaveData() {
|
||||||
var saveObj = {
|
var saveObj = {
|
||||||
level:level,
|
level:level,
|
||||||
@ -615,8 +578,38 @@ useEffect(()=>{
|
|||||||
},[BUILDID,GetData,BACKENDURL,p])
|
},[BUILDID,GetData,BACKENDURL,p])
|
||||||
|
|
||||||
useEffect(()=>{
|
useEffect(()=>{
|
||||||
|
|
||||||
|
function CalculateBuffs(foodPointData) {
|
||||||
|
const boost_prefixes = {
|
||||||
|
pp_consumption:"Rich",
|
||||||
|
pp_recovery:"Light",
|
||||||
|
weak_point_dmg:"Crisp",
|
||||||
|
hp_recovery:"Robust",
|
||||||
|
}
|
||||||
|
const boost_suffixes = {
|
||||||
|
potency:"Meat",
|
||||||
|
pp:"Fruit",
|
||||||
|
dmg_res:"Vegetable",
|
||||||
|
hp:"Seafood",
|
||||||
|
}
|
||||||
|
|
||||||
|
var categories= {}
|
||||||
|
Object.keys(GetData("food_mult","0")).filter((key)=>key!=="id"&&key!=="amount").forEach((key)=>{categories[key]={count:0}})
|
||||||
|
Object.keys(foodPointData).map((key)=>{return {...GetData("food",key),amount:foodPointData[key]}}).forEach((item)=>{
|
||||||
|
for (var key of Object.keys(item)) {
|
||||||
|
if (key in categories && item[key]) {
|
||||||
|
categories[key].count+=item.amount
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
var finalObj = {}
|
||||||
|
Object.keys(categories).filter((key)=>categories[key].count>0).forEach((key)=>finalObj[key]={...categories[key],from:boost_prefixes[key]??boost_suffixes[key]})
|
||||||
|
return finalObj
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
setBUFFS(CalculateBuffs(foodPointData)??[])
|
setBUFFS(CalculateBuffs(foodPointData)??[])
|
||||||
},[foodPointData])
|
},[foodPointData,GetData])
|
||||||
|
|
||||||
//console.log(p.GetData("class",p.className,"icon"))
|
//console.log(p.GetData("class",p.className,"icon"))
|
||||||
|
|
||||||
@ -839,7 +832,7 @@ function deepCopySkills(skillData) {
|
|||||||
<PageControl pages={2} currentPage={effectPage} setCurrentPage={setEffectPage}/>
|
<PageControl pages={2} currentPage={effectPage} setCurrentPage={setEffectPage}/>
|
||||||
{effectPage===1?<><h3>Effect Name</h3><ul className="infoBuffs"><li onClick={()=>{setPrevFoodPointData({...foodPointData});setFoodMenuWindowOpen(true)}}>Food Boost Effect
|
{effectPage===1?<><h3>Effect Name</h3><ul className="infoBuffs"><li onClick={()=>{setPrevFoodPointData({...foodPointData});setFoodMenuWindowOpen(true)}}>Food Boost Effect
|
||||||
<ul>
|
<ul>
|
||||||
{Object.keys(BUFFS).length==0&&<li>Add Quick Food</li>}
|
{Object.keys(BUFFS).length===0&&<li>Add Quick Food</li>}
|
||||||
{Object.keys(BUFFS).map((key)=><li><img alt="" src="https://i.imgur.com/TQ8EBW2.png" /> [{BUFFS[key].from}] {key} +{BUFFS[key].count}</li>)}
|
{Object.keys(BUFFS).map((key)=><li><img alt="" src="https://i.imgur.com/TQ8EBW2.png" /> [{BUFFS[key].from}] {key} +{BUFFS[key].count}</li>)}
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user