sigonasr2/ngsplanner
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix all warnings for public push

Browse Source
This commit is contained in:
Nic0Nic0Nii 2021-08-19 06:53:56 +00:00
parent 38ad39d8da
commit e70b20fb4b
3 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/TestPanel.js
View File

@ -89,6 +89,8 @@ function PopupWindow(p) {
function SelectorWindow(p) {
const { onModalOpen } = p
const [itemList,setItemList] = useState([])
const [tabPage,setTabPage] = useState(1)
@ -102,10 +104,10 @@ function SelectorWindow(p) {
},[p])
useEffect(()=>{
if (p.onModalOpen) {
p.onModalOpen(setTabPage)
if (onModalOpen) {
onModalOpen(setTabPage)
}
},[p.modalOpen])
},[onModalOpen])
return <PopupWindow page={tabPage} setPage={setTabPage} modalOpen={p.modalOpen} setModalOpen={p.setModalOpen} showCloseButton={true} title={p.title}
pageNames={p.pageNames}
@ -239,6 +241,9 @@ function SkillTreeBoxes(p) {
}
function SkillTreeContainer(p){
const { GetData } = p
const [skillTreeData,setSkillTreeData] = useState([])
const [skillTreeSkillData,setSkillTreeSkillData] = useState([])
const [skillTreeLineColor,setSkillTreeLineColor] = useState("")
@ -252,9 +257,9 @@ function SkillTreeContainer(p){
const [halflineheight,setHalfLineHeight] = useState(60)
useEffect(()=>{
if (Object.keys(p.GetData("skill_tree_data")).length>1) {
for (var skillTree of p.GetData("skill_tree_data")) {
if (skillTree.class_id===p.GetData("class",p.cl,'id')) {
if (Object.keys(GetData("skill_tree_data")).length>1) {
for (var skillTree of GetData("skill_tree_data")) {
if (skillTree.class_id===GetData("class",p.cl,'id')) {
var data = skillTree.data.split(",")
var skillData = skillTree.skill_data.split(";")
setSkillTreeData(data)
@ -272,7 +277,7 @@ function SkillTreeContainer(p){
}
}
}
},[p.cl])
},[p.cl,GetData])
return <div className="skillTreeContainer customScrollbar">
<div style={{ position: "relative" }}>
@ -288,6 +293,9 @@ function SkillTreeContainer(p){
}
function TestPanel(p) {
const { GetData } = p
const [bpGraphMax,setbpGraphMax] = useState(1000)
const [hpGraphMax,sethpGraphMax] = useState(1000)
const [ppGraphMax,setppGraphMax] = useState(1000)
@ -343,7 +351,7 @@ useEffect(()=>{
},[p.bp])
useEffect(()=>{
var keys = Object.keys(p.GetData("class"))
var keys = Object.keys(GetData("class"))
var pointsArr = []
var pointsDataArr = []
for (var i=0;i<keys.length;i++) {
@ -355,7 +363,7 @@ useEffect(()=>{
}
setPoints(pointsArr)
setSkillPointData(pointsDataArr)
},[className,p.GetData])
},[className,GetData])
//console.log(p.GetData("class",p.className,"icon"))

40
src/skilltree/skillTreeEditor.js
View File

@ -1,11 +1,12 @@
import { SkillTree } from "./skillTree";
import { useEffect, useState } from "react";
import { useEffect,useState,useMemo,useCallback } from "react";
import { SkillTreeSelector } from "./skillTreeSelector";
import axios from "axios";
function SkillTreeEditor(p) {
const { GetData } = p
const ADJUSTMENT = [-32,32]
const ADJUSTMENT = useMemo(()=>[-32,32],[])
const [firstLoad,setFirstLoad] = useState(true)
@ -21,20 +22,21 @@ function SkillTreeEditor(p) {
const [gridPaddingX,setGridPaddingX] = useState(10)
const [gridPaddingY,setGridPaddingY] = useState(10)
const [renderedInputs,setRenderedInputs] = useState([])
const [skillLinesTemp,setSkillLinesTemp] = useState([])
const [skillLines,setSkillLines] = useState([])
const [skillData,setSkillData] = useState([])
const [message,setMessage] = useState("")
const [loading,setLoading] = useState(false)
const [halflineheight,setHalfLineHeight] = useState(60)
function GetSkills(x,y) {
const GetSkills = useCallback((x,y)=>{
var filtered = skillData.filter((skill)=>Number(skill.split(",")[0])===Number(x)&&Number(skill.split(",")[1])===Number(y))
if (filtered.length>0) {
return filtered[0]
} else {
return ""
}
}
},[skillData])
function SaveSkillTrees() {
axios.post(p.BACKENDURL+"/saveskilltree",{
@ -65,9 +67,9 @@ function SkillTreeEditor(p) {
}
useEffect(()=>{
setClassList(p.GetData("class",undefined,undefined,true))
setSkillTreeData(p.GetData("skill_tree_data",undefined,undefined,true))
},[p.GetData])
setClassList(GetData("class",undefined,undefined,true))
setSkillTreeData(GetData("skill_tree_data",undefined,undefined,true))
},[GetData])
useEffect(()=>{
var keys = Object.keys(skillTreeData)
@ -75,9 +77,9 @@ function SkillTreeEditor(p) {
for (var id of keys) {
//console.log(cl+"/"+skillTreeData[id].class_id)
if (Number(skillTreeData[id].class_id)===Number(cl)) {
var data = skillTreeData[id].data.split(',')
var skill = skillTreeData[id].skill_data.split(';')
setSkillLines(data)
var data = skillTreeData[id].data?.split(',')
var skill = skillTreeData[id].skill_data?.split(';')
setSkillLinesTemp(data)
setSkillData(skill)
setDimensionX(data[0].length)
setDimensionY(data.length)
@ -92,7 +94,7 @@ function SkillTreeEditor(p) {
}
}
if (!found) {
setSkillLines([])
setSkillLinesTemp([])
setSkillData([])
setDimensionX(6)
setDimensionY(6)
@ -101,13 +103,13 @@ function SkillTreeEditor(p) {
useEffect(()=>{
if (firstLoad) {
setCl(Object.keys(classList)[0])
setCl(Number(Object.keys(classList)[0]))
setFirstLoad(false)
}
},[classList])
},[classList,firstLoad])
useEffect(()=>{
var skillTreeString = [...skillLines]
var skillTreeString = [...skillLinesTemp]
while (skillTreeString.length<dimensionY) {
skillTreeString.push(" ".repeat(dimensionX))
@ -119,7 +121,7 @@ function SkillTreeEditor(p) {
}
}
setSkillLines(skillTreeString)
},[dimensionX,dimensionY])
},[dimensionX,dimensionY,skillLinesTemp])
useEffect(()=>{
var controls = []
@ -128,7 +130,7 @@ function SkillTreeEditor(p) {
var padX = x!==0?gridPaddingX*x:0
var padY = y!==0?gridPaddingY*y:0
if (y<dimensionY&&x<dimensionX) {
controls.push(<SkillTreeSelector GetData={p.GetData} cl={Number(cl)} defaultValue={skillLines[y][x]} callback={(char,x,y)=>{
controls.push(<SkillTreeSelector GetData={GetData} cl={Number(cl)} defaultValue={skillLines[y][x]} callback={(char,x,y)=>{
var string = [...skillLines]
var stringLine = string[y].split('')
var newSkillData = [...skillData]
@ -144,7 +146,7 @@ function SkillTreeEditor(p) {
}
}
string[y] = stringLine.join('')
setSkillLines(string)
setSkillLinesTemp(string)
}
} skill={GetSkills(x,y)} skillCallback={(x,y,skill)=>{
var newSkillData = [...skillData]
@ -167,12 +169,12 @@ function SkillTreeEditor(p) {
}
}
setRenderedInputs(controls)
},[skillLines,gridSizeX,gridSizeY,gridPaddingX,gridPaddingY,cl,dimensionY,dimensionX,skillData])
},[skillLines,gridSizeX,gridSizeY,gridPaddingX,gridPaddingY,cl,dimensionY,dimensionX,skillData,halflineheight,GetData,ADJUSTMENT,GetSkills])
return <>
{loading?<img src={process.env.PUBLIC_URL+"/spinner.gif"} alt=""/>:<>
<h2>{message}</h2>
<label for="classSelect">Class Select:</label><select id="classSelect" value={cl} onChange={(f)=>{setCl(f.currentTarget.value)}}>
<label for="classSelect">Class Select:</label><select id="classSelect" value={cl} onChange={(f)=>{setCl(Number(f.currentTarget.value))}}>
<option value=""></option>
{Object.keys(classList).map((c)=><option value={c}>{c+" - "+classList[c].name}</option>)}
</select>

6
src/skilltree/skillTreeSelector.js
View File

@ -2,11 +2,13 @@ import { useEffect, useState } from 'react'
function SkillTreeSelector(p) {
const { GetData } = p
const [skillList,setSkillList] = useState([])
useEffect(()=>{
setSkillList(p.GetData("class_skill"))
},[p.cl])
setSkillList(GetData("class_skill"))
},[p.cl,GetData])
return <>
<select onChange={(f)=>{p.callback(f.currentTarget.value,Number(p.x),Number(p.y))}} style={{position:"absolute",left:p.ADJUSTMENT[0]+(p.x*p.gridSizeX+p.padX+p.gridSizeX/2),top:p.ADJUSTMENT[1]+((p.y/2)*p.gridSizeY+(p.y/2-1)*p.halflineheight+p.padY+(p.y===0?p.halflineheight:p.gridSizeY)/2)}} value={p.defaultValue}>