Merge branch 'master' of https://github.com/sigonasr2/ngsplanner
This commit is contained in:
commit
9131a5003c
BIN
public/icons/nicodotpng.png.png
Normal file
BIN
public/icons/nicodotpng.png.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 127 KiB |
@ -570,6 +570,9 @@ function DamageCalculator(p) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function LoginForm(p) {
|
function LoginForm(p) {
|
||||||
|
const [username,setUsername] = useState("")
|
||||||
|
const [password,setPassword] = useState("")
|
||||||
|
const [rememberMe,setRememberMe] = useState(false)
|
||||||
return <>Login Form here.</>
|
return <>Login Form here.</>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
8
src/DEFAULTS.js
Normal file
8
src/DEFAULTS.js
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
const NICONICONII = process.env.PUBLIC_URL+"/icons/nicodotpng.png.png"
|
||||||
|
|
||||||
|
function DisplayIcon(icon) {
|
||||||
|
console.log(icon)
|
||||||
|
return icon?process.env.PUBLIC_URL+icon:NICONICONII
|
||||||
|
}
|
||||||
|
|
||||||
|
export {NICONICONII,DisplayIcon};
|
@ -1,7 +1,7 @@
|
|||||||
import React, { useEffect,useState,useRef } from 'react';
|
import React, { useEffect,useState,useRef } from 'react';
|
||||||
import ReactTooltip from 'react-tooltip' //https://wwayne.github.io/react-tooltip/
|
import ReactTooltip from 'react-tooltip' //https://wwayne.github.io/react-tooltip/
|
||||||
import Modal from 'react-modal'
|
import Modal from 'react-modal'
|
||||||
import { urlencoded } from 'express';
|
import { DisplayIcon } from './DEFAULTS';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hook that alerts clicks outside of the passed ref
|
* Hook that alerts clicks outside of the passed ref
|
||||||
@ -277,10 +277,10 @@ useEffect(()=>{
|
|||||||
<div className="boxTitleBar">
|
<div className="boxTitleBar">
|
||||||
<h1>Equip</h1></div>
|
<h1>Equip</h1></div>
|
||||||
<div className="equipPalette">
|
<div className="equipPalette">
|
||||||
<div onClick={()=>{setWeaponSelectWindowOpen(true)}} className="equipPaletteSlot"><h3>Weapons</h3><div className="equipPaletteSlotWrapper"><span>1</span><img alt="" className="r4" src={process.env.PUBLIC_URL+selectedWeapon[WEAPON_EXISTENCE_DATA]?.icon} /></div></div>
|
<div onClick={()=>{setWeaponSelectWindowOpen(true)}} className="equipPaletteSlot"><h3>Weapons</h3><div className="equipPaletteSlotWrapper"><span>1</span><img alt="" className="r4" src={DisplayIcon(selectedWeapon[WEAPON_EXISTENCE_DATA]?.icon)} /></div></div>
|
||||||
<div className="equipPaletteSlot"><h3>Armor 1</h3><div className="equipPaletteSlotWrapper"><img alt="" className="r3" src="https://i.imgur.com/GtusK2X.png" /></div></div>
|
<div className="equipPaletteSlot"><h3>Armor 1</h3><div className="equipPaletteSlotWrapper"><img alt="" className="r3" src={DisplayIcon("https://i.imgur.com/GtusK2X.png")} /></div></div>
|
||||||
<div className="equipPaletteSlot"><h3>Armor 2</h3><div className="equipPaletteSlotWrapper"><img alt="" className="r3" src="https://i.imgur.com/GtusK2X.png" /></div></div>
|
<div className="equipPaletteSlot"><h3>Armor 2</h3><div className="equipPaletteSlotWrapper"><img alt="" className="r3" src={DisplayIcon("https://i.imgur.com/GtusK2X.png")} /></div></div>
|
||||||
<div className="equipPaletteSlot"><h3>Armor 3</h3><div className="equipPaletteSlotWrapper"><img alt="" className="r3" src="https://i.imgur.com/GtusK2X.png" /></div></div>
|
<div className="equipPaletteSlot"><h3>Armor 3</h3><div className="equipPaletteSlotWrapper"><img alt="" className="r3" src={DisplayIcon("https://i.imgur.com/GtusK2X.png")} /></div></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -526,7 +526,7 @@ useEffect(()=>{
|
|||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
displayFunction={(item)=>{
|
displayFunction={(item)=>{
|
||||||
return <li className={"itemwep r"+item[WEAPON_WEAPON].rarity} onClick={()=>{setSelectedWeapon(item);setWeaponSelectWindowOpen(false)}}><div class="itemWeaponWrapper"><img className="itemimg" alt="" src={process.env.PUBLIC_URL+item[WEAPON_EXISTENCE_DATA]?.icon} /><em className="rifle">{item[WEAPON_WEAPON].name} {item[WEAPON_WEAPONTYPE].name}</em></div><br /><span className="atk">{item[WEAPON_WEAPON].atk}</span> <ExpandTooltip id={"mouseover-tooltip"+item[WEAPON_WEAPONTYPE].id+"_"+item[WEAPON_WEAPON].id+"_"+item[WEAPON_POTENTIAL].id+"_"+item[WEAPON_POTENTIAL_TOOLTIP].id} tooltip={<>{item[WEAPON_POTENTIAL_TOOLTIP].map((pot,i)=><>{(i!==0)&&<br/>}{pot.name}: {pot.description?pot.description.split("\\n").map((it)=><>{it}<br/> </>):<></>}</>)}</>}>
|
return <li className={"itemwep r"+item[WEAPON_WEAPON].rarity} onClick={()=>{setSelectedWeapon(item);setWeaponSelectWindowOpen(false)}}><div class="itemWeaponWrapper"><img className="itemimg" alt="" src={DisplayIcon(item[WEAPON_EXISTENCE_DATA]?.icon)} /><em className="rifle">{item[WEAPON_WEAPON].name} {item[WEAPON_WEAPONTYPE].name}</em></div><br /><span className="atk">{item[WEAPON_WEAPON].atk}</span> <ExpandTooltip id={"mouseover-tooltip"+item[WEAPON_WEAPONTYPE].id+"_"+item[WEAPON_WEAPON].id+"_"+item[WEAPON_POTENTIAL].id+"_"+item[WEAPON_POTENTIAL_TOOLTIP].id} tooltip={<>{item[WEAPON_POTENTIAL_TOOLTIP].map((pot,i)=><>{(i!==0)&&<br/>}{pot.name}: {pot.description?pot.description.split("\\n").map((it)=><>{it}<br/> </>):<></>}</>)}</>}>
|
||||||
<span className="pot">{item[WEAPON_POTENTIAL].name}</span>
|
<span className="pot">{item[WEAPON_POTENTIAL].name}</span>
|
||||||
</ExpandTooltip></li>}}
|
</ExpandTooltip></li>}}
|
||||||
/>
|
/>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user