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

Fix profiles not displaying if there's defined data types that are equal to 0 (they were coming out falsy)

Browse Source
pull/5/head
sigonasr2 4 years ago
parent 34afee1623
commit ec3a90c082
5 changed files with 146 additions and 23 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 78
      frontend/src/App.js
  2. 7
      frontend/src/setupProxy.js
  3. 15
      server/app.js
  4. BIN
      server/files/146.jpg
  5. 67
      updateNoteCounts.sql

78
frontend/src/App.js
Unescape View File

@ -170,7 +170,7 @@ function Sort(p){
function ProfileDataContainer(p){
return (
<div className={"col-md-"+p.width+" border"}>
<div className={"col-md-"+p.width+" border"} onMouseOver={()=>{if (p.setMouseOver) {p.setMouseOver(true)}}} onMouseOut={()=>{if(p.setMouseOver){p.setMouseOver(false)}}}>
<div className="row">
<div className="text-center label col-6 col-md-12">
{p.label}
@ -190,7 +190,7 @@ function StatisticsPanel(p) {
<div className="col-md-1"></div>
<ProfileDataContainer label="Play Count" data={p.playcount} width="2"/>
<ProfileDataContainer label="FC Count" data={p.fccount} width="2"/>
<ProfileDataContainer label="Cleared" data={p.cleared} width="4"/>
<ProfileDataContainer setMouseOver={p.setMouseOver} label="Cleared" data={p.cleared} width="4"/>
<ProfileDataContainer label="Accuracy" data={p.accuracy} width="2"/>
<div className="col-md-1"></div>
</div>
@ -376,11 +376,11 @@ function Play(p) {
if (p.mini) {
return (
<>
<div className={"d-none d-md-block below "+((p.play.src)?"background-songs-click":"")} onClick={(p.play.src)?()=>{p.setModalSrc(p.play)
<div className={"d-none d-md-block below border border-bottom "+((p.play.src)?"background-songs-click":"")} onClick={(p.play.src)?()=>{p.setModalSrc(p.play)
p.setModalVisible(true)}:null}>
<div className={((p.play.fine==0&&p.play.safe==0&&p.play.sad==0&&p.play.worst==0)?"pfchighlight":(p.play.safe==0&&p.play.sad==0&&p.play.worst==0)?"fchighlight":"")}>
<div className={"row align-middle"}>
<div className="col-md-2 order-1 order-md-1 text-center border-right align-middle text-nowrap overflow-hidden">{Math.floor(p.play.score)} pts<br/>{((p.play.fine==0&&p.play.safe==0&&p.play.sad==0&&p.play.worst==0)?<span className="badge pfc">✪PFC</span>:(p.play.safe==0&&p.play.sad==0&&p.play.worst==0)?<span className="badge fc">★FC</span>:<></>)}<Difficulty play={p.play} song={p.song}/></div>
<div className="col-md-2 order-1 order-md-1 text-center border-right align-middle text-nowrap overflow-hidden">{(p.title&&p.song)?<>{p.song.name}<br/></>:<></>}{((p.play.fine==0&&p.play.safe==0&&p.play.sad==0&&p.play.worst==0)?<span className="badge pfc">✪PFC</span>:(p.play.safe==0&&p.play.sad==0&&p.play.worst==0)?<span className="badge fc">★FC</span>:<></>)} <Difficulty play={p.play} song={p.song}/> {Math.floor(p.play.score)} pts</div>
<div className="col-md-3 order-3 order-md-2 text-center border-right align-middle text-nowrap overflow-hidden">{GetDateDisplay()}</div>
<div className="col-md-7 order-2 order-md-3">
<div className="row">
@ -407,7 +407,7 @@ function Play(p) {
</div>
<div className={"d-block d-small d-md-none "+((p.play.src)?"background-songs-click":"")} onClick={(p.play.src)?()=>{p.setModalSrc(p.play)
p.setModalVisible(true)}:null}>
<div className={((p.play.fine==0&&p.play.safe==0&&p.play.sad==0&&p.play.worst==0)?"pfchighlight":(p.play.safe==0&&p.play.sad==0&&p.play.worst==0)?"fchighlight":"")}>
<div className={((p.play.fine==0&&p.play.safe==0&&p.play.sad==0&&p.play.worst==0)?"pfchighlight":(p.play.safe==0&&p.play.sad==0&&p.play.worst==0)?"fchighlight":"")}>{(p.title&&p.song)?<>{p.song.name}<br/></>:<></>}
{<div className="row"><div className="offset-4 col-4 text-center">{((p.play.fine==0&&p.play.safe==0&&p.play.sad==0&&p.play.worst==0)?<span className="badge pfc">✪PFC</span>:(p.play.safe==0&&p.play.sad==0&&p.play.worst==0)?<span className="badge fc">★FC</span>:<></>)}<Difficulty play={p.play} song={p.song}/></div></div>}
<div className="row">
<div className="offset-2 col-4 text-center">
@ -426,7 +426,6 @@ function Play(p) {
</div>
</div>
</div>
<hr className="mb-0"/>
</>
);
} else {
@ -850,14 +849,22 @@ function ClearBadge(p) {
/*<span className="badge badge-primary">{easy}/{diffs.E}
{(fcdata&&fcdata.E>0)?<><br/>★{fcdata.E}</>:<></>}
{(pfcdata&&pfcdata.E>0)?<><br/>✪{pfcdata.E}</>:<></>}</span>*/
return(
<>
<span className={"badge badge-"+CalculateBadge(p.diff)} onMouseOver={()=>{
function toggle(state) {
if (state) {
setDisplay(<>{((p.fcdata&&p.fcdata[p.diff]>0)?<><br/>★ {p.fcdata[p.diff]}</>:<></>)}
{((p.pfcdata&&p.pfcdata[p.diff]>0)?<><br/>✪ {p.pfcdata[p.diff]}</>:<></>)}</>)
}} onMouseOut={()=>{
} else {
setDisplay(<></>)
}}>{p.count}/{p.diffs[p.diff]}{display}</span>
}
}
useEffect(()=>{
toggle(p.mouseOver)
},[p.mouseOver])
return(
<>
<span className={"badge badge-"+CalculateBadge(p.diff)} onTouchStart={()=>{toggle(true)}}>{p.count}/{p.diffs[p.diff]}{display}</span>
</>
)
}
@ -878,14 +885,15 @@ function Profile(p){
var [render,setRender] = useState(false);
var [modalsrc,setModalSrc] = useState({})
var [modalVisible,setModalVisible] = useState(false);
var [mouseOver,setMouseOver] = useState(false);
function CalculateClear(easy,normal,hard,ex,exex,fcdata,pfcdata) {
return <>
<ClearBadge diff="E" count={easy} diffs={diffs} fcdata={fcdata} pfcdata={pfcdata}/>
<ClearBadge diff="N" count={normal} diffs={diffs} fcdata={fcdata} pfcdata={pfcdata}/>
<ClearBadge diff="H" count={hard} diffs={diffs} fcdata={fcdata} pfcdata={pfcdata}/>
<ClearBadge diff="EX" count={ex} diffs={diffs} fcdata={fcdata} pfcdata={pfcdata}/>
<ClearBadge diff="EXEX" count={exex} diffs={diffs} fcdata={fcdata} pfcdata={pfcdata}/>
<ClearBadge mouseOver={mouseOver} diff="E" count={easy} diffs={diffs} fcdata={fcdata} pfcdata={pfcdata}/>
<ClearBadge mouseOver={mouseOver} diff="N" count={normal} diffs={diffs} fcdata={fcdata} pfcdata={pfcdata}/>
<ClearBadge mouseOver={mouseOver} diff="H" count={hard} diffs={diffs} fcdata={fcdata} pfcdata={pfcdata}/>
<ClearBadge mouseOver={mouseOver} diff="EX" count={ex} diffs={diffs} fcdata={fcdata} pfcdata={pfcdata}/>
<ClearBadge mouseOver={mouseOver} diff="EXEX" count={exex} diffs={diffs} fcdata={fcdata} pfcdata={pfcdata}/>
</>
}
@ -900,10 +908,10 @@ function Profile(p){
if (user!={}) {
setClear(CalculateClear(user.eclear,user.nclear,user.hclear,user.exclear,user.exexclear,user.fcdata,user.pfcdata))
}
},[diffs,user])
},[diffs,user,mouseOver])
useEffect(()=>{
setRender(user&&playcount&&fccount&&rating&&lastPlayed&&accuracy&&diffs&&cleared)
setRender(user!==undefined&&playcount!==undefined&&fccount!==undefined&&rating!==undefined&&lastPlayed!==undefined&&accuracy!==undefined&&diffs!==undefined&&cleared!==undefined)
},[user,playcount,fccount,rating,lastPlayed,accuracy,diffs,cleared])
return (
@ -911,7 +919,7 @@ function Profile(p){
<ImageDisplayer username={username} songs={p.songs} play={modalsrc} modalVisible={modalVisible} setModalVisible={setModalVisible}></ImageDisplayer>
<h2>{username+"'s Profile"}</h2>
{(render)?<>
<StatisticsPanel name="Statistics" username={username} playcount={playcount} fccount={fccount} cleared={cleared} accuracy={accuracy}/>
<StatisticsPanel name="Statistics" setMouseOver={setMouseOver} username={username} playcount={playcount} fccount={fccount} cleared={cleared} accuracy={accuracy}/>
<HitCountsPanel name="Hit Counts" username={username} user={user}/>
<BestPlaysPanel name="Best Plays" setModalVisible={setModalVisible} setModalSrc={setModalSrc} username={username} songs={p.songs}/>
<CompletionPanel name="Progress" setModalVisible={setModalVisible} setModalSrc={setModalSrc} username={username} songs={p.songs}/>
@ -986,8 +994,8 @@ function ImageUpload(p) {
}
const data = new FormData()
data.append('file', file)
data.append("username","The Internet");
data.append("authentication_token","sig");
data.append("username","GOD");
data.append("authentication_token","GOD");
if (!data.has("username") || !data.has("authentication_token")) {setError("Authentication failed!");return;}
if (file.size>15*1024*1024) {
@ -1177,6 +1185,30 @@ function Submit(p) {
)
}
function RecentPlays(p) {
const [update,setUpdate] = useState(false)
const [recentPlayData,setRecentPlayData] = useState([])
useEffect(()=>{
const interval = setInterval(()=>{
axios.get("http://projectdivar.com/recentplays/sigonasr2")
.then((data)=>{
setRecentPlayData(data.data);
})
.catch((err)=>{})
},5000);
return ()=>{clearInterval(interval)}
},[update])
return (
<>
{recentPlayData.map((play,i)=><Play index={i} play={play} song={p.songs[play.songid]} title={true} mini={true}/>)}
</>
)
}
function Website() {
const [songs,setSongs] = useState([])
const [update,setUpdate] = useState(false)
@ -1211,6 +1243,10 @@ function Website() {
<Route path="/submitplay">
<Submit songs={songs}/>
</Route>
<Route path="/recentplays">
<h1 className="title">Project DivaR</h1>
<RecentPlays songs={songs}/>
</Route>
<Route path="/">
<h1 className="title">Project DivaR</h1>
Under construction!

7
frontend/src/setupProxy.js
Unescape View File

@ -1,6 +1,13 @@
const { createProxyMiddleware } = require('http-proxy-middleware');
module.exports = function(app) {
app.use(
"/recentplays/:username",
createProxyMiddleware({
target: 'http://server:4501',
changeOrigin: true,
})
);
app.use(
"/plays/:username/:songname",
createProxyMiddleware({

15
server/app.js
Unescape View File

@ -53,7 +53,7 @@ app.get('/song/:songname', (req, res) => {
})
app.get('/songs', (req, res) => {
db.query('select songs.*,songdata.rating as rating,songdata.difficulty from songs left join songdata on songs.id=songdata.songid' , (error, results) => {
db.query('select songs.*,songdata.rating as rating,songdata.difficulty,songdata.notecount from songs left join songdata on songs.id=songdata.songid' , (error, results) => {
if (error) {
res.status(500).json(error.message)
} else {
@ -64,10 +64,14 @@ app.get('/songs', (req, res) => {
if (data[song.id]) {
if (typeof(data[song.id].rating)==="string"){
var oldRating = data[song.id].rating;
var oldNoteCount = data[song.id].notecount;
data[song.id].rating={}
data[song.id].notecount={}
data[song.id].rating[data[song.id].difficulty]=oldRating;
data[song.id].notecount[data[song.id].difficulty]=oldNoteCount;
}
data[song.id].rating[song.difficulty]=song.rating;
data[song.id].notecount[song.difficulty]=song.notecount;
} else {
data[song.id]=song
}})
@ -545,6 +549,15 @@ app.get('/rating/:username',(req,res)=>{
}
})
app.get('/recentplays/:username',(req,res)=>{
if (req.params.username) {
db.query('select plays.* from plays join users on users.id=plays.userid where users.username=$1 order by plays.id desc limit 10',[req.params.username])
.then((data)=>{if(data.rows.length>0){res.status(200).json(data.rows)}else{res.status(200).json([])}})
} else {
res.status(400).json("Invalid username!")
}
})
app.get('/users/:orderby/:sortorder',(req,res)=>{
if (req.params.orderby && req.params.sortorder && req.query.limit && req.query.offset) {
var valid = ["rating","last_played","playcount","username","fccount"];

BIN
server/files/146.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 353 KiB

67
updateNoteCounts.sql
Unescape View File

@ -751,3 +751,70 @@ update songdata set notecount= where songid=146 and difficulty='EXEX';
update songdata set notecount= where songid=148 and difficulty='EXEX';
update songdata set notecount=242 where songid=152 and difficulty='E';
update songdata set notecount=293 where songid=152 and difficulty='H';
update songdata set notecount=357 where songid=152 and difficulty='EX';
update songdata set notecount=372 where songid=152 and difficulty='EXEX';
update songdata set notecount=296 where songid=153 and difficulty='E';
update songdata set notecount=369 where songid=153 and difficulty='N';
update songdata set notecount=447 where songid=153 and difficulty='H';
update songdata set notecount=541 where songid=153 and difficulty='EX';
update songdata set notecount=561 where songid=153 and difficulty='EXEX';
update songdata set notecount=389 where songid=154 and difficulty='E';
update songdata set notecount=479 where songid=154 and difficulty='N';
update songdata set notecount=529 where songid=154 and difficulty='H';
update songdata set notecount=682 where songid=154 and difficulty='EX';
update songdata set notecount=758 where songid=154 and difficulty='EXEX';
update songdata set notecount=282 where songid=155 and difficulty='E';
update songdata set notecount=366 where songid=155 and difficulty='N';
update songdata set notecount=495 where songid=155 and difficulty='H';
update songdata set notecount=593 where songid=155 and difficulty='EX';
update songdata set notecount=332 where songid=156 and difficulty='E';
update songdata set notecount=421 where songid=156 and difficulty='N';
update songdata set notecount=535 where songid=156 and difficulty='H';
update songdata set notecount=808 where songid=156 and difficulty='EX';
update songdata set notecount=409 where songid=157 and difficulty='N';
update songdata set notecount=495 where songid=157 and difficulty='H';
update songdata set notecount=536 where songid=157 and difficulty='EX';
update songdata set notecount=545 where songid=157 and difficulty='EXEX';
update songdata set notecount=313 where songid=158 and difficulty='E';
update songdata set notecount=534 where songid=158 and difficulty='N';
update songdata set notecount=827 where songid=158 and difficulty='H';
update songdata set notecount=893 where songid=158 and difficulty='EX';
update songdata set notecount=196 where songid=159 and difficulty='E';
update songdata set notecount=242 where songid=159 and difficulty='N';
update songdata set notecount=276 where songid=159 and difficulty='H';
update songdata set notecount=282 where songid=159 and difficulty='EX';
update songdata set notecount=282 where songid=159 and difficulty='EXEX';
update songdata set notecount=224 where songid=160 and difficulty='E';
update songdata set notecount=297 where songid=160 and difficulty='N';
update songdata set notecount=388 where songid=160 and difficulty='H';
update songdata set notecount=415 where songid=160 and difficulty='EX';
update songdata set notecount=417 where songid=160 and difficulty='EXEX';
update songdata set notecount=449 where songid=161 and difficulty='N';
update songdata set notecount=537 where songid=161 and difficulty='H';
update songdata set notecount=644 where songid=161 and difficulty='EX';
update songdata set notecount=702 where songid=161 and difficulty='EXEX';
update songdata set notecount=344 where songid=162 and difficulty='E';
update songdata set notecount=434 where songid=162 and difficulty='N';
update songdata set notecount=482 where songid=162 and difficulty='H';
update songdata set notecount=486 where songid=162 and difficulty='EX';
update songdata set notecount=310 where songid=163 and difficulty='N';
update songdata set notecount=410 where songid=163 and difficulty='H';
update songdata set notecount=453 where songid=163 and difficulty='EX';
update songdata set notecount=337 where songid=164 and difficulty='E';
update songdata set notecount=414 where songid=164 and difficulty='N';
update songdata set notecount=495 where songid=164 and difficulty='H';
update songdata set notecount=525 where songid=164 and difficulty='EX';
update songdata set notecount=525 where songid=164 and difficulty='EXEX';

Write Preview
Loading…
Cancel
Save