Leahnaya/sendou.ink
1
0
Fork 0
mirror of https://github.com/Sendouc/sendou.ink.git synced 2026-09-10 13:15:47 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fixed distorted weapon / gear icons

Browse Source
This commit is contained in:
Sendou
2020-04-01 17:58:25 +03:00
parent 1109149f70
commit 07d1cbf471
10 changed files with 181 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

226
frontend-react/package-lock.json generated
View File

@@ -1881,29 +1881,29 @@
}
},
"@testing-library/dom": {
"version": "7.0.4",
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.0.4.tgz",
"integrity": "sha512-+vrLcGDvopLPsBB7JgJhf8ZoOhBSeCsI44PKJL9YoKrP2AvCkqrTg+z77wEEZJ4tSNdxV0kymil7hSvsQQ7jMQ==",
"version": "7.1.4",
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.1.4.tgz",
"integrity": "sha512-eifMaV8NW4xk/moC4+ga8Jpl6MNLNjQgBgimDBqmcZPVyDPcWYsapAMcp1HIGpVsTNAXBVB8ILza3uyu86v4ig==",
"requires": {
"@babel/runtime": "^7.8.4",
"@types/testing-library__dom": "^6.12.1",
"@babel/runtime": "^7.9.2",
"@types/testing-library__dom": "^7.0.0",
"aria-query": "^4.0.2",
"dom-accessibility-api": "^0.3.0",
"dom-accessibility-api": "^0.4.2",
"pretty-format": "^25.1.0"
},
"dependencies": {
"@babel/runtime": {
"version": "7.8.7",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz",
"integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==",
"version": "7.9.2",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
"integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
},
"@jest/types": {
"version": "25.1.0",
"resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
"integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
"version": "25.2.3",
"resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
"integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
@@ -1965,11 +1965,11 @@
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
"pretty-format": {
"version": "25.1.0",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.1.0.tgz",
"integrity": "sha512-46zLRSGLd02Rp+Lhad9zzuNZ+swunitn8zIpfD2B4OPCRLXbM87RJT2aBLBWYOznNUML/2l/ReMyWNC80PJBUQ==",
"version": "25.2.3",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.2.3.tgz",
"integrity": "sha512-IP4+5UOAVGoyqC/DiomOeHBUKN6q00gfyT2qpAsRH64tgOKB2yF7FHJXC18OCiU0/YFierACup/zdCOWw0F/0w==",
"requires": {
"@jest/types": "^25.1.0",
"@jest/types": "^25.2.3",
"ansi-regex": "^5.0.0",
"ansi-styles": "^4.0.0",
"react-is": "^16.12.0"
@@ -2128,19 +2128,19 @@
}
},
"@testing-library/react": {
"version": "10.0.1",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-10.0.1.tgz",
"integrity": "sha512-sMHWud2dcymOzq2AhEniICSijEwKeTiBX+K0y36FYNY7wH2t0SIP1o732Bf5dDY0jYoMC2hj2UJSVpZC/rDsWg==",
"version": "10.0.2",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-10.0.2.tgz",
"integrity": "sha512-YT6Mw0oJz7R6vlEkmo1FlUD+K15FeXApOB5Ffm9zooFVnrwkt00w18dUJFMOh1yRp9wTdVRonbor7o4PIpFCmA==",
"requires": {
"@babel/runtime": "^7.8.7",
"@testing-library/dom": "^7.0.2",
"@types/testing-library__react": "^9.1.3"
"@babel/runtime": "^7.9.2",
"@testing-library/dom": "^7.1.0",
"@types/testing-library__react": "^10.0.0"
},
"dependencies": {
"@babel/runtime": {
"version": "7.8.7",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz",
"integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==",
"version": "7.9.2",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
"integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
@@ -2383,18 +2383,18 @@
"integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw=="
},
"@types/reach__router": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.1.tgz",
"integrity": "sha512-E51ntVeunnxofXmOoPFiOvElHWf+jBEs3B56gGx7XhPHOkJdjWxWDY4V1AsUiwhtOCXPM7atFy30wj7glyv2Fg==",
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.2.tgz",
"integrity": "sha512-OTPBURw7aF3q+ejjcBQKjEFsiv4hr0oEFfIgUfdaSQfvnNSSu3I/Cfy1JvoDaTnbt6ZByiFWC5Y9AMhf4x0WOA==",
"requires": {
"@types/history": "*",
"@types/react": "*"
}
},
"@types/react": {
"version": "16.9.27",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.27.tgz",
"integrity": "sha512-j+RvQb9w7a2kZFBOgTh+s/elCwtqWUMN6RJNdmz0ntmwpeoMHKnyhUcmYBu7Yw94Rtj9938D+TJSn6WGcq2+OA==",
"version": "16.9.31",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.31.tgz",
"integrity": "sha512-NpYJpNMWScFXtx3A2BJMeew2G3+9SEslVWMdxNJ6DLvxIuxWjY1bizK9q5Y1ujhln31vtjmhjOAYDr9Xx3k9FQ==",
"requires": {
"@types/prop-types": "*",
"csstype": "^2.2.0"
@@ -2419,9 +2419,9 @@
}
},
"@types/react-dom": {
"version": "16.9.5",
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.5.tgz",
"integrity": "sha512-BX6RQ8s9D+2/gDhxrj8OW+YD4R+8hj7FEM/OJHGNR0KipE1h1mSsf39YeyC81qafkq+N3rU3h3RFbLSwE5VqUg==",
"version": "16.9.6",
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.6.tgz",
"integrity": "sha512-S6ihtlPMDotrlCJE9ST1fRmYrQNNwfgL61UB4I1W7M6kPulUKx9fXAleW5zpdIjUQ4fTaaog8uERezjsGUj9HQ==",
"requires": {
"@types/react": "*"
}
@@ -2481,35 +2481,17 @@
}
},
"@types/testing-library__dom": {
"version": "6.14.0",
"resolved": "https://registry.npmjs.org/@types/testing-library__dom/-/testing-library__dom-6.14.0.tgz",
"integrity": "sha512-sMl7OSv0AvMOqn1UJ6j1unPMIHRXen0Ita1ujnMX912rrOcawe4f7wu0Zt9GIQhBhJvH2BaibqFgQ3lP+Pj2hA==",
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/@types/testing-library__dom/-/testing-library__dom-7.0.0.tgz",
"integrity": "sha512-1TEPWyqQ6IQ7R1hCegZmFSA3KrBQjdzJW7yC9ybpRcFst5XuPOqBGNr0mTAKbxwI/TrTyc1skeyLJrpcvAf93w==",
"requires": {
"pretty-format": "^24.3.0"
}
},
"@types/testing-library__jest-dom": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.0.2.tgz",
"integrity": "sha512-dZP+/WHndgCSmdaImITy0KhjGAa9c0hlGGkzefbtrPFpnGEPZECDA0zyvfSp8RKhHECJJSKHFExjOwzo0rHyIA==",
"requires": {
"@types/jest": "*"
}
},
"@types/testing-library__react": {
"version": "9.1.3",
"resolved": "https://registry.npmjs.org/@types/testing-library__react/-/testing-library__react-9.1.3.tgz",
"integrity": "sha512-iCdNPKU3IsYwRK9JieSYAiX0+aYDXOGAmrC/3/M7AqqSDKnWWVv07X+Zk1uFSL7cMTUYzv4lQRfohucEocn5/w==",
"requires": {
"@types/react-dom": "*",
"@types/testing-library__dom": "*",
"pretty-format": "^25.1.0"
},
"dependencies": {
"@jest/types": {
"version": "25.1.0",
"resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
"integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
"version": "25.2.3",
"resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
"integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
@@ -2562,11 +2544,105 @@
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
"pretty-format": {
"version": "25.1.0",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.1.0.tgz",
"integrity": "sha512-46zLRSGLd02Rp+Lhad9zzuNZ+swunitn8zIpfD2B4OPCRLXbM87RJT2aBLBWYOznNUML/2l/ReMyWNC80PJBUQ==",
"version": "25.2.3",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.2.3.tgz",
"integrity": "sha512-IP4+5UOAVGoyqC/DiomOeHBUKN6q00gfyT2qpAsRH64tgOKB2yF7FHJXC18OCiU0/YFierACup/zdCOWw0F/0w==",
"requires": {
"@jest/types": "^25.1.0",
"@jest/types": "^25.2.3",
"ansi-regex": "^5.0.0",
"ansi-styles": "^4.0.0",
"react-is": "^16.12.0"
}
},
"supports-color": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
"integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"@types/testing-library__jest-dom": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.0.2.tgz",
"integrity": "sha512-dZP+/WHndgCSmdaImITy0KhjGAa9c0hlGGkzefbtrPFpnGEPZECDA0zyvfSp8RKhHECJJSKHFExjOwzo0rHyIA==",
"requires": {
"@types/jest": "*"
}
},
"@types/testing-library__react": {
"version": "10.0.0",
"resolved": "https://registry.npmjs.org/@types/testing-library__react/-/testing-library__react-10.0.0.tgz",
"integrity": "sha512-aByqRiRn9psCWbgW7a+gfW/LUQY/ChznnuPyWwLipcJm+rXaLNeYM4qL21jWPGn9W1H//oXgLE9aDlpkZSY3CQ==",
"requires": {
"@types/react-dom": "*",
"@types/testing-library__dom": "*",
"pretty-format": "^25.1.0"
},
"dependencies": {
"@jest/types": {
"version": "25.2.3",
"resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
"integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
"@types/yargs": "^15.0.0",
"chalk": "^3.0.0"
}
},
"@types/yargs": {
"version": "15.0.4",
"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz",
"integrity": "sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==",
"requires": {
"@types/yargs-parser": "*"
}
},
"ansi-styles": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"requires": {
"@types/color-name": "^1.1.1",
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
"pretty-format": {
"version": "25.2.3",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.2.3.tgz",
"integrity": "sha512-IP4+5UOAVGoyqC/DiomOeHBUKN6q00gfyT2qpAsRH64tgOKB2yF7FHJXC18OCiU0/YFierACup/zdCOWw0F/0w==",
"requires": {
"@jest/types": "^25.2.3",
"ansi-regex": "^5.0.0",
"ansi-styles": "^4.0.0",
"react-is": "^16.12.0"
@@ -5401,9 +5477,9 @@
}
},
"dom-accessibility-api": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.3.0.tgz",
"integrity": "sha512-PzwHEmsRP3IGY4gv/Ug+rMeaTIyTJvadCb+ujYXYeIylbHJezIyNToe8KfEgHTCEYyC+/bUghYOGg8yMGlZ6vA=="
"version": "0.4.3",
"resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.4.3.tgz",
"integrity": "sha512-JZ8iPuEHDQzq6q0k7PKMGbrIdsgBB7TRrtVOUm4nSMCExlg5qQG4KXWTH2k90yggjM4tTumRGwTKJSldMzKyLA=="
},
"dom-converter": {
"version": "0.2.0",
@@ -5555,9 +5631,9 @@
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
},
"ejs": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.0.1.tgz",
"integrity": "sha512-cuIMtJwxvzumSAkqaaoGY/L6Fc/t6YvoP9/VIaK0V/CyqKLEQ8sqODmYfy/cjXEdZ9+OOL8TecbJu+1RsofGDw=="
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.0.2.tgz",
"integrity": "sha512-IncmUpn1yN84hy2shb0POJ80FWrfGNY0cxO9f4v+/sG7qcBvAtVWUA1IdzY/8EYUmOVhoKJVdJjNd3AZcnxOjA=="
},
"electron-to-chromium": {
"version": "1.3.380",
@@ -14021,14 +14097,14 @@
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
},
"source-map-explorer": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/source-map-explorer/-/source-map-explorer-2.4.1.tgz",
"integrity": "sha512-aj4C9RzwFUFxmLn27RN4xWgaqRfaTiDjpyg6tOKPsj2muf6gwV7z202M/S/yDNhh7H4t5iYT38BwmM/+2/AoNw==",
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/source-map-explorer/-/source-map-explorer-2.4.2.tgz",
"integrity": "sha512-3ECQLffCFV8QgrTqcmddLkWL4/aQs6ljYfgWCLselo5QtizOfOeUCKnS4rFn7MIrdeZLM6TZrseOtsrWZhWKoQ==",
"requires": {
"btoa": "^1.2.1",
"chalk": "^3.0.0",
"convert-source-map": "^1.7.0",
"ejs": "^3.0.1",
"ejs": "^3.0.2",
"escape-html": "^1.0.3",
"glob": "^7.1.6",
"gzip-size": "^5.1.1",
@@ -14165,9 +14241,9 @@
}
},
"yargs-parser": {
"version": "18.1.1",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.1.tgz",
"integrity": "sha512-KRHEsOM16IX7XuLnMOqImcPNbLVXMNHYAoFc3BKR8Ortl5gzDbtXvvEoGx9imk5E+X1VeNKNlcHr8B8vi+7ipA==",
"version": "18.1.2",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
"integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
"requires": {
"camelcase": "^5.0.0",
"decamelize": "^1.2.0"

10
frontend-react/package.json
View File

@@ -11,14 +11,14 @@
"@rehooks/local-storage": "^2.3.0",
"@sendou/react-sketch": "^0.5.2",
"@testing-library/jest-dom": "^5.3.0",
"@testing-library/react": "^10.0.1",
"@testing-library/react": "^10.0.2",
"@testing-library/user-event": "^10.0.1",
"@types/jest": "^25.1.4",
"@types/reach__router": "^1.3.1",
"@types/react": "^16.9.27",
"@types/reach__router": "^1.3.2",
"@types/react": "^16.9.31",
"@types/react-color": "^3.0.1",
"@types/react-datepicker": "^2.11.0",
"@types/react-dom": "^16.9.5",
"@types/react-dom": "^16.9.6",
"@types/react-infinite-scroller": "^1.2.1",
"@types/react-paginate": "^6.2.1",
"@types/react-select": "^3.0.11",
@@ -42,7 +42,7 @@
"react-select": "^3.1.0",
"react-super-responsive-table": "^5.1.1",
"react-tweet-embed": "^1.2.2",
"source-map-explorer": "^2.4.1",
"source-map-explorer": "^2.4.2",
"typescript": "^3.8.3",
"use-query-params": "^0.6.0"
},

4
frontend-react/src/components/builds/GearImage.tsx
View File

@@ -16,7 +16,7 @@ const GearImage: React.FC<GearImageProps> = ({
}) => {
if (!englishName && renderNullIfNoName) return null
if (!englishName) return <Box />
const wh = mini ? "32px" : "128px"
const wh = "32px"
return (
<img
alt={englishName}
@@ -24,7 +24,7 @@ const GearImage: React.FC<GearImageProps> = ({
mini ? "-icon" : ""
}/${english_internal[englishName]}.png`}
title={englishName}
style={{ width: wh, height: wh }}
style={mini ? { width: wh, height: wh } : undefined}
/>
)
}

6
frontend-react/src/components/builds/Gears.tsx
View File

@@ -13,13 +13,13 @@ const Gears: React.FC<GearsProps> = ({ build }) => {
}
return (
<Box asFlex justifyContent="center">
<Box w={build.headgearItem ? "85px" : undefined} mx="2px">
<Box w={build.headgearItem ? "85px" : undefined} h="85px" mx="2px">
<GearImage englishName={build.headgearItem} renderNullIfNoName />
</Box>
<Box w={build.clothingItem ? "85px" : undefined} mx="2px">
<Box w={build.clothingItem ? "85px" : undefined} h="85px" mx="2px">
<GearImage englishName={build.clothingItem} renderNullIfNoName />
</Box>
<Box w={build.shoesItem ? "85px" : undefined} mx="2px">
<Box w={build.shoesItem ? "85px" : undefined} h="85px" mx="2px">
<GearImage englishName={build.shoesItem} renderNullIfNoName />
</Box>
</Box>

5
frontend-react/src/components/common/SplatnetIcon.tsx
View File

@@ -167,6 +167,11 @@ const SplatnetIcon: React.FC<SplatnetIconProps> = ({ iconFor }) => {
const style = {
width: "35px",
height: "auto",
zIndex: 2,
borderRadius: "50%",
background: "#000",
backgroundSize: "125%",
userSelect: "none",
"--main-bg-color": themeColorHex,
} as React.CSSProperties
const Component = weaponToSvg[iconFor]

3
frontend-react/src/components/common/SplatoonIcon.css
View File

@@ -1,5 +1,6 @@
:root {
--main-bg-color: blue;
--white-or-black: white;
}
.kill-icon-svg .bg1,
@@ -8,7 +9,7 @@
}
.kill-icon-svg .white,
.killed-icon-svg .white {
fill: #fff;
fill: var(--white-or-black);
}
.special-icon0-svg .bg1 {
fill: var(--main-bg-color);

4
frontend-react/src/components/common/WeaponImage.tsx
View File

@@ -11,13 +11,13 @@ interface WeaponImageProps {
const WeaponImage: React.FC<WeaponImageProps> = ({ englishName, size }) => {
const dictToUse: any = size === "MEDIUM" ? wpnMedium : wpnSmall
const wh = size === "MEDIUM" ? "128px" : "32px"
const wh = "32px"
return (
<img
src={dictToUse[english_internal[englishName]]}
alt={englishName}
title={englishName}
style={{ width: wh, height: wh }}
style={size === "SMALL" ? { width: wh, height: wh } : undefined}
/>
)
}

8
frontend-react/src/components/plusdraftcup/DraftCupDetails.tsx
View File

@@ -84,6 +84,9 @@ const DetailedMapCard: React.FC<DetailedMapCardProps> = ({
MyThemeContext
)
const minutes = Math.floor(mapDetails.duration / 60)
const seconds = mapDetails.duration - minutes * 60
return (
<Flex
rounded="lg"
@@ -109,6 +112,9 @@ const DetailedMapCard: React.FC<DetailedMapCardProps> = ({
color={themeColorWithShade}
size="2em"
/>
<Box color={grayWithShade}>{`${minutes}:${
seconds > 9 ? "" : "0"
}${seconds}`}</Box>
</Flex>
{[mapDetails.winners, mapDetails.losers].map((teamInfo, index) => {
return (
@@ -309,7 +315,7 @@ const DraftCupDetails: React.FC<RouteComponentProps & DraftCupDetailsProps> = ({
<title>{tournament.name} | sendou.ink</title>
</Helmet>
<Box mb="1em">
<Link to="/plus/draft">
<Link to="/draft">
<Button outlined icon={FaLongArrowAltLeft}>
Back to Draft Cup home
</Button>

6
package-lock.json generated
View File

@@ -1637,9 +1637,9 @@
}
},
"mongoose": {
"version": "5.9.6",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.6.tgz",
"integrity": "sha512-EfFGO2QUoenf/4eFeF5y2R8aBLKHtqwrMk1pVGgl3OyNWufP5XLLPIuihP006YqR1+6xM1YsBzGpgBjMZkINGA==",
"version": "5.9.7",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.7.tgz",
"integrity": "sha512-WJOBh9WMvivqBK8my9HFtSzSySKdUxJPNGAwswEakAasWUcPXJl3yHMtZ4ngGnKbwTT9KnAr75xamlt/PouR9w==",
"requires": {
"bson": "~1.1.1",
"kareem": "2.3.1",

2
package.json
View File

@@ -25,7 +25,7 @@
"express-session": "^1.17.0",
"graphql": "^14.6.0",
"lodash": "^4.17.15",
"mongoose": "^5.9.6",
"mongoose": "^5.9.7",
"mongoose-unique-validator": "^2.0.3",
"node-fetch": "^2.6.0",
"passport": "^0.4.1",