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

Move functions and apply new audit log backend.

Browse Source
This commit is contained in:
Joshua Sigona 2021-08-22 21:35:15 +09:00
parent 9195dedc15
commit 9a570d8597
1 changed files with 63 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/App.js
View File

@ -11,6 +11,8 @@ import Navbar from 'react-bootstrap/Navbar';
import Button from 'react-bootstrap/Button'; import Button from 'react-bootstrap/Button';
import ProgressBar from 'react-bootstrap/ProgressBar'; import ProgressBar from 'react-bootstrap/ProgressBar';
import Accordion from 'react-bootstrap/Accordion'; import Accordion from 'react-bootstrap/Accordion';
import ToastContainer from 'react-bootstrap/ToastContainer'
import Toast from 'react-bootstrap/Toast'
import { FaCheckCircle } from 'react-icons/fa'; import { FaCheckCircle } from 'react-icons/fa';
@ -24,6 +26,7 @@ const BACKEND_URL = "https://projectdivar.com:4505"
function ItemGroup(p) { function ItemGroup(p) {
const { data } = p const { data } = p
const { contributor } = p
const { setData1,setData2,setData3,setData4,setLastModified,lastModified } = p const { setData1,setData2,setData3,setData4,setLastModified,lastModified } = p
const [displayData,setDisplayData] = useState([]) const [displayData,setDisplayData] = useState([])
@ -51,6 +54,12 @@ function ItemGroup(p) {
} }
}) })
},[displayData]) },[displayData])
function updateItem(item,target,contributor) {
var correctedVal=Math.min(item.required,target.value);
if (correctedVal===item.obtained) {return;}
axios.post(BACKEND_URL+"/updateItem",{obtained:correctedVal,id:item.id,last_modified:new Date(),item_name:item.name,username:contributor,required:item.required,operation:correctedVal==item.required?"FINISH":correctedVal>item.obtained?"INCREASE":"SET",previous_amt:item.obtained});
}
return <Accordion.Item className="bg-dark" eventKey={p.akey}> return <Accordion.Item className="bg-dark" eventKey={p.akey}>
<Accordion.Header className="panel-body bg-dark">{p.name}</Accordion.Header> <Accordion.Header className="panel-body bg-dark">{p.name}</Accordion.Header>
@ -61,14 +70,10 @@ function ItemGroup(p) {
</Col> </Col>
<Col> <Col>
<input id={"field_"+item.id} style={{width:"5em"}} defaultValue={item.obtained} className="mt-1 bg-secondary" onChange={(f)=>{ <input id={"field_"+item.id} style={{width:"5em"}} defaultValue={item.obtained} className="mt-1 bg-secondary" onChange={(f)=>{
var correctedVal=Math.min(item.required,f.currentTarget.value); if (f.currentTarget.value>=item.required) {f.currentTarget.blur()} if (f.currentTarget.value>=item.required) {f.currentTarget.blur()}
axios.post(BACKEND_URL+"/updateItem",{obtained:correctedVal,id:item.id,last_modified:new Date()}); }} onBlur={(f)=>{updateItem(item,f.currentTarget,contributor)}} type="number" min="0" max={item.required}/> / {item.required} {item.required!==item.obtained&&<FaCheckCircle style={{color:"green"}} onClick={(f)=>{
}} type="number" min="0" max={item.required}/> / {item.required} {item.required!==item.obtained&&<FaCheckCircle style={{color:"green"}} onClick={(f)=>{ updateItem(item,{value:item.required},contributor)
var correctedVal=item.required; if (f.currentTarget.value>=item.required) {f.currentTarget.blur()} axios.post(BACKEND_URL+"/updateItem",{obtained:correctedVal,id:item.id,last_modified:new Date()}); var newData=[...displayData];newData[i].obtained=correctedVal;p.setLastModified(new Date());setDisplayData(newData.sort((a,b)=>{ }}/>}
if (b.required===b.obtained&&a.required!==a.obtained) {return -1}
if (b.required===b.obtained&&a.required===a.obtained) {return a.id-b.id}
if (b.required!==b.obtained&&a.required!==a.obtained) {return a.id-b.id}
}));}}/>}
</Col> </Col>
<Col> <Col>
<a style={{position:"relative",top:"8px"}} className="text-muted" href={"https://garlandtools.org/db/#item/"+item.itemid} target="tools">View Item Info</a> <a style={{position:"relative",top:"8px"}} className="text-muted" href={"https://garlandtools.org/db/#item/"+item.itemid} target="tools">View Item Info</a>
@ -91,6 +96,8 @@ function App() {
const [total,setTotal] = useState(0) const [total,setTotal] = useState(0)
const [listData,setListData] = useState([]) const [listData,setListData] = useState([])
const [lastModified,setLastModified] = useState(new Date()) const [lastModified,setLastModified] = useState(new Date())
const [contributor,setContributor] = useState("")
useEffect(()=>{ useEffect(()=>{
const interval = setInterval(()=>{ const interval = setInterval(()=>{
@ -198,40 +205,56 @@ function App() {
<Navbar.Brand href="#home"> <Navbar.Brand href="#home">
<img src={process.env.PUBLIC_URL+"/favicon.ico"} width="30" height="30" className="d-inline-block align-top" alt="BUN logo"/> BUN Collab App <img src={process.env.PUBLIC_URL+"/favicon.ico"} width="30" height="30" className="d-inline-block align-top" alt="BUN logo"/> BUN Collab App
</Navbar.Brand> </Navbar.Brand>
{contributor.length>0&&<span className="text-light font-weight-light font-italic">Signed in as {contributor}</span>}
</Container> </Container>
</Navbar> </Navbar>
<Container> <Container>
{data.length>0? {contributor.length===0?<>
<> <input placeHolder="Bun" onKeyDown={(k)=>{if (k.key==='Enter') {setContributor(document.getElementById("username").value)}}} id="username"/>
<Accordion className="bg-dark" defaultActiveKey="0"> <button type="Submit" onClick={(f)=>{setContributor(document.getElementById("username").value)}}>Submit</button>
<ItemGroup name="Gathering Items" akey="0" data={data} lastModified={lastModified} setLastModified={setLastModified} setData={setData} setData1={setData} setData2={setData2} setData3={setData3} setData4={setData4}/> </>:
<ItemGroup name="Other Items" akey="1" data={data2} lastModified={lastModified} setLastModified={setLastModified} setData={setData2} setData1={setData} setData2={setData2} setData3={setData3} setData4={setData4}/> data.length>0?
<ItemGroup name="Pre-crafting" akey="2" data={data3} lastModified={lastModified} setLastModified={setLastModified} setData={setData3} setData1={setData} setData2={setData2} setData3={setData3} setData4={setData4}/> <>
<ItemGroup name="Crafting Items" akey="3" data={data4} lastModified={lastModified} setLastModified={setLastModified} setData={setData4} setData1={setData} setData2={setData2} setData3={setData3} setData4={setData4}/> <Accordion className="bg-dark" defaultActiveKey="0">
</Accordion> <ItemGroup name="Gathering Items" contributor={contributor} akey="0" data={data} lastModified={lastModified} setLastModified={setLastModified} setData={setData} setData1={setData} setData2={setData2} setData3={setData3} setData4={setData4}/>
</>: <ItemGroup name="Other Items" contributor={contributor} akey="1" data={data2} lastModified={lastModified} setLastModified={setLastModified} setData={setData2} setData1={setData} setData2={setData2} setData3={setData3} setData4={setData4}/>
!disabled&& <ItemGroup name="Pre-crafting" contributor={contributor} akey="2" data={data3} lastModified={lastModified} setLastModified={setLastModified} setData={setData3} setData1={setData} setData2={setData2} setData3={setData3} setData4={setData4}/>
<Row> <ItemGroup name="Crafting Items" contributor={contributor} akey="3" data={data4} lastModified={lastModified} setLastModified={setLastModified} setData={setData4} setData1={setData} setData2={setData2} setData3={setData3} setData4={setData4}/>
<Col> </Accordion>
{total===0?<caption><label className="buttonLabel" for="uploads">Import List</label><input onChange={(f)=>{ </>:
const reader = new FileReader() !disabled&&
reader.onload=(ev)=>{ <Row>
setFileData(ev.target.result) <Col>
} {total===0?<caption><label className="buttonLabel" for="uploads">Import List</label><input onChange={(f)=>{
reader.readAsText(f.target.files[0]) const reader = new FileReader()
}} style={{opacity:0}} id="uploads" type="file" accept=".txt,.csv"/></caption>: reader.onload=(ev)=>{
<> setFileData(ev.target.result)
<ProgressBar> }
<ProgressBar animated striped variant="success" now={Math.round(succeeded/total)*100} /> reader.readAsText(f.target.files[0])
<ProgressBar animated striped variant="danger" now={Math.round(failed/total)*100} /> }} style={{opacity:0}} id="uploads" type="file" accept=".txt,.csv"/></caption>:
</ProgressBar> <>
<div className="text-center">{Math.round(((failed+succeeded)/total)*100)+"%"}</div> <ProgressBar>
</> <ProgressBar animated striped variant="success" now={Math.round(succeeded/total)*100} />
} <ProgressBar animated striped variant="danger" now={Math.round(failed/total)*100} />
</Col> </ProgressBar>
</Row> <div className="text-center">{Math.round(((failed+succeeded)/total)*100)+"%"}</div>
} </>
</Container> }
</Col>
</Row>
}
<div style={{pointerEvents:"none",position:"fixed",top:"0px",left:"0px",width:"100%",height:"100%"}}>
<ToastContainer position="bottom-end">
<Toast autohide delay={10000} onClose={()=>{console.log("closing")}} bg="primary">
<Toast.Header closeButton={true}>
<strong className="me-auto">Testing</strong>
<small>11 mins ago</small>
</Toast.Header>
</Toast>
</ToastContainer>
</div>
</Container>
</Container> </Container>
); );
} }