이성주 / WhoAreYou

Go to a project
Toggle navigation Toggle navigation pinning
김동근
6032f4ae 1 parent 2b84cdc7

first Commit

Inline Side-by-side
Showing 8 changed files with 381 additions and 130 deletions
1 const getCardId=require('./getCardId') 1 const getCardId=require('./getCardId')
2 const puppeteer=require('puppeteer') 2 const puppeteer=require('puppeteer')
3 +const request = require('request')
3 const cheerio=require('cheerio') 4 const cheerio=require('cheerio')
4 const fs=require('fs') 5 const fs=require('fs')
5 const ejs=require('ejs') 6 const ejs=require('ejs')
...@@ -36,13 +37,21 @@ exports.GetResult=(req,res)=>{ ...@@ -36,13 +37,21 @@ exports.GetResult=(req,res)=>{
36 for(let i=1;i<cardIds.length ;i++){ 37 for(let i=1;i<cardIds.length ;i++){
37 idInQuery+= '%2C'+cardIds[i].cardId 38 idInQuery+= '%2C'+cardIds[i].cardId
38 } 39 }
40 + //var url = 'https://hsreplay.net/decks/#timeRange=LAST_30_DAYS&includedCards=' + idInQuery
41 +
42 + /*request(url, function(err, res, html){
43 + if(!err){
44 + return cheerio.load(html)
45 + }
46 + })*/
39 return new Promise((resolve,reject)=>{ 47 return new Promise((resolve,reject)=>{
40 const asyncFunc=async ()=>{ 48 const asyncFunc=async ()=>{
41 const browser=await puppeteer.launch() 49 const browser=await puppeteer.launch()
42 try{ 50 try{
43 const page=await browser.newPage() 51 const page=await browser.newPage()
44 await page.setViewport({width:1366,height:768}) 52 await page.setViewport({width:1366,height:768})
45 - await page.goto(`https://hsreplay.net/decks/#timeRange=LAST_30_DAYS&includedCards=${idInQuery}`,{waitUntil: 'networkidle2'}) 53 + //idInQuery = '180%2C48886%2C904%2C461'
54 + await page.goto(`https://hsreplay.net/decks/#timeRange=LAST_30_DAYS&includedCards=${idInQuery}`,{waitUntil: 'load'})
46 const content=await page.content() 55 const content=await page.content()
47 browser.close() 56 browser.close()
48 return content 57 return content
...@@ -60,7 +69,7 @@ exports.GetResult=(req,res)=>{ ...@@ -60,7 +69,7 @@ exports.GetResult=(req,res)=>{
60 const GetDeckHref=(content)=>{ 69 const GetDeckHref=(content)=>{
61 return new Promise((resolve,reject)=>{ 70 return new Promise((resolve,reject)=>{
62 const $=cheerio.load(content) 71 const $=cheerio.load(content)
63 - let deck=$('#decks-container > div > main > div.deck-list > ul > li:nth-child(2)').find('a') 72 + let deck=$('#decks-container > main > div.deck-list-wrapper > section > ul > li:nth-child(2) > a')
64 const deckHref=$(deck).attr('href') 73 const deckHref=$(deck).attr('href')
65 console.log(deckHref) 74 console.log(deckHref)
66 resolve(deckHref) 75 resolve(deckHref)
......
...@@ -7,7 +7,8 @@ const charset=require('charset') ...@@ -7,7 +7,8 @@ const charset=require('charset')
7 exports.Crawl=(deckCode)=>{ 7 exports.Crawl=(deckCode)=>{
8 return new Promise((resolve,reject)=>{ 8 return new Promise((resolve,reject)=>{
9 request({ 9 request({
10 - url:`https://deck.codes/${deckCode}`, 10 + //url:`https://deck.codes/${deckCode}`,
11 + url:`https://hs.protolambda.com//${deckCode}`,
11 encoding:null, 12 encoding:null,
12 method:'GET', 13 method:'GET',
13 timeout:10000, 14 timeout:10000,
......
...@@ -5,7 +5,7 @@ const pool=mysql.createPool({ ...@@ -5,7 +5,7 @@ const pool=mysql.createPool({
5 host:process.env.DB_HOST, 5 host:process.env.DB_HOST,
6 user:process.env.DB_USER, 6 user:process.env.DB_USER,
7 password:process.env.DB_PASSWORD, 7 password:process.env.DB_PASSWORD,
8 - database:'WhoAreYou', 8 + database:'dapenda',
9 port:process.env.DB_PORT 9 port:process.env.DB_PORT
10 }) 10 })
11 11
......
...@@ -10,12 +10,27 @@ ...@@ -10,12 +10,27 @@
10 "integrity": "sha512-8xZEYckCbUVgK8Eg7lf5Iy4COKJ5uXlnIOnePN0WUwSQggy9tolM+tDJf7wMOnT/JT/W9xDYIaYggt3mRV2O5w==" 10 "integrity": "sha512-8xZEYckCbUVgK8Eg7lf5Iy4COKJ5uXlnIOnePN0WUwSQggy9tolM+tDJf7wMOnT/JT/W9xDYIaYggt3mRV2O5w=="
11 }, 11 },
12 "accepts": { 12 "accepts": {
13 - "version": "1.3.5", 13 + "version": "1.3.7",
14 - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", 14 + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
15 - "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", 15 + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
16 "requires": { 16 "requires": {
17 - "mime-types": "~2.1.18", 17 + "mime-types": "~2.1.24",
18 - "negotiator": "0.6.1" 18 + "negotiator": "0.6.2"
19 + },
20 + "dependencies": {
21 + "mime-db": {
22 + "version": "1.40.0",
23 + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
24 + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
25 + },
26 + "mime-types": {
27 + "version": "2.1.24",
28 + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
29 + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
30 + "requires": {
31 + "mime-db": "1.40.0"
32 + }
33 + }
19 } 34 }
20 }, 35 },
21 "agent-base": { 36 "agent-base": {
...@@ -27,9 +42,9 @@ ...@@ -27,9 +42,9 @@
27 } 42 }
28 }, 43 },
29 "ajv": { 44 "ajv": {
30 - "version": "6.6.0", 45 + "version": "6.10.0",
31 - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.0.tgz", 46 + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
32 - "integrity": "sha512-ZCIMdm75ps9usdeb0GQL9rKOUlTtS0p0vU2nQVXgRIu6Yb00G9GY7AvbVLwTQ5Po4JDKIwJlT5nwggoRDrDVAw==", 47 + "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
33 "requires": { 48 "requires": {
34 "fast-deep-equal": "^2.0.1", 49 "fast-deep-equal": "^2.0.1",
35 "fast-json-stable-stringify": "^2.0.0", 50 "fast-json-stable-stringify": "^2.0.0",
...@@ -102,9 +117,9 @@ ...@@ -102,9 +117,9 @@
102 } 117 }
103 }, 118 },
104 "bignumber.js": { 119 "bignumber.js": {
105 - "version": "4.1.0", 120 + "version": "7.2.1",
106 - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz", 121 + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz",
107 - "integrity": "sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==" 122 + "integrity": "sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ=="
108 }, 123 },
109 "bluebird": { 124 "bluebird": {
110 "version": "3.5.3", 125 "version": "3.5.3",
...@@ -186,9 +201,9 @@ ...@@ -186,9 +201,9 @@
186 } 201 }
187 }, 202 },
188 "combined-stream": { 203 "combined-stream": {
189 - "version": "1.0.7", 204 + "version": "1.0.8",
190 - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", 205 + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
191 - "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", 206 + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
192 "requires": { 207 "requires": {
193 "delayed-stream": "~1.0.0" 208 "delayed-stream": "~1.0.0"
194 } 209 }
...@@ -226,9 +241,12 @@ ...@@ -226,9 +241,12 @@
226 } 241 }
227 }, 242 },
228 "content-disposition": { 243 "content-disposition": {
229 - "version": "0.5.2", 244 + "version": "0.5.3",
230 - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", 245 + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
231 - "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=" 246 + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
247 + "requires": {
248 + "safe-buffer": "5.1.2"
249 + }
232 }, 250 },
233 "content-type": { 251 "content-type": {
234 "version": "1.0.4", 252 "version": "1.0.4",
...@@ -341,9 +359,9 @@ ...@@ -341,9 +359,9 @@
341 } 359 }
342 }, 360 },
343 "dotenv": { 361 "dotenv": {
344 - "version": "6.1.0", 362 + "version": "6.2.0",
345 - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.1.0.tgz", 363 + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
346 - "integrity": "sha512-/veDn2ztgRlB7gKmE3i9f6CmDIyXAy6d5nBq+whO9SLX+Zs1sXEgFLPi+aSuWqUuusMfbi84fT8j34fs1HaYUw==" 364 + "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w=="
347 }, 365 },
348 "ecc-jsbn": { 366 "ecc-jsbn": {
349 "version": "0.1.2", 367 "version": "0.1.2",
...@@ -375,9 +393,9 @@ ...@@ -375,9 +393,9 @@
375 "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" 393 "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
376 }, 394 },
377 "es6-promise": { 395 "es6-promise": {
378 - "version": "4.2.5", 396 + "version": "4.2.6",
379 - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz", 397 + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
380 - "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==" 398 + "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q=="
381 }, 399 },
382 "es6-promisify": { 400 "es6-promisify": {
383 "version": "5.0.0", 401 "version": "5.0.0",
...@@ -398,46 +416,128 @@ ...@@ -398,46 +416,128 @@
398 "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" 416 "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
399 }, 417 },
400 "express": { 418 "express": {
401 - "version": "4.16.4", 419 + "version": "4.17.0",
402 - "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz", 420 + "resolved": "https://registry.npmjs.org/express/-/express-4.17.0.tgz",
403 - "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==", 421 + "integrity": "sha512-1Z7/t3Z5ZnBG252gKUPyItc4xdeaA0X934ca2ewckAsVsw9EG71i++ZHZPYnus8g/s5Bty8IMpSVEuRkmwwPRQ==",
404 "requires": { 422 "requires": {
405 - "accepts": "~1.3.5", 423 + "accepts": "~1.3.7",
406 "array-flatten": "1.1.1", 424 "array-flatten": "1.1.1",
407 - "body-parser": "1.18.3", 425 + "body-parser": "1.19.0",
408 - "content-disposition": "0.5.2", 426 + "content-disposition": "0.5.3",
409 "content-type": "~1.0.4", 427 "content-type": "~1.0.4",
410 - "cookie": "0.3.1", 428 + "cookie": "0.4.0",
411 "cookie-signature": "1.0.6", 429 "cookie-signature": "1.0.6",
412 "debug": "2.6.9", 430 "debug": "2.6.9",
413 "depd": "~1.1.2", 431 "depd": "~1.1.2",
414 "encodeurl": "~1.0.2", 432 "encodeurl": "~1.0.2",
415 "escape-html": "~1.0.3", 433 "escape-html": "~1.0.3",
416 "etag": "~1.8.1", 434 "etag": "~1.8.1",
417 - "finalhandler": "1.1.1", 435 + "finalhandler": "~1.1.2",
418 "fresh": "0.5.2", 436 "fresh": "0.5.2",
419 "merge-descriptors": "1.0.1", 437 "merge-descriptors": "1.0.1",
420 "methods": "~1.1.2", 438 "methods": "~1.1.2",
421 "on-finished": "~2.3.0", 439 "on-finished": "~2.3.0",
422 - "parseurl": "~1.3.2", 440 + "parseurl": "~1.3.3",
423 "path-to-regexp": "0.1.7", 441 "path-to-regexp": "0.1.7",
424 - "proxy-addr": "~2.0.4", 442 + "proxy-addr": "~2.0.5",
425 - "qs": "6.5.2", 443 + "qs": "6.7.0",
426 - "range-parser": "~1.2.0", 444 + "range-parser": "~1.2.1",
427 "safe-buffer": "5.1.2", 445 "safe-buffer": "5.1.2",
428 - "send": "0.16.2", 446 + "send": "0.17.1",
429 - "serve-static": "1.13.2", 447 + "serve-static": "1.14.1",
430 - "setprototypeof": "1.1.0", 448 + "setprototypeof": "1.1.1",
431 - "statuses": "~1.4.0", 449 + "statuses": "~1.5.0",
432 - "type-is": "~1.6.16", 450 + "type-is": "~1.6.18",
433 "utils-merge": "1.0.1", 451 "utils-merge": "1.0.1",
434 "vary": "~1.1.2" 452 "vary": "~1.1.2"
435 }, 453 },
436 "dependencies": { 454 "dependencies": {
437 - "statuses": { 455 + "body-parser": {
438 - "version": "1.4.0", 456 + "version": "1.19.0",
439 - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", 457 + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
440 - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" 458 + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
459 + "requires": {
460 + "bytes": "3.1.0",
461 + "content-type": "~1.0.4",
462 + "debug": "2.6.9",
463 + "depd": "~1.1.2",
464 + "http-errors": "1.7.2",
465 + "iconv-lite": "0.4.24",
466 + "on-finished": "~2.3.0",
467 + "qs": "6.7.0",
468 + "raw-body": "2.4.0",
469 + "type-is": "~1.6.17"
470 + }
471 + },
472 + "bytes": {
473 + "version": "3.1.0",
474 + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
475 + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
476 + },
477 + "cookie": {
478 + "version": "0.4.0",
479 + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
480 + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
481 + },
482 + "http-errors": {
483 + "version": "1.7.2",
484 + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
485 + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
486 + "requires": {
487 + "depd": "~1.1.2",
488 + "inherits": "2.0.3",
489 + "setprototypeof": "1.1.1",
490 + "statuses": ">= 1.5.0 < 2",
491 + "toidentifier": "1.0.0"
492 + }
493 + },
494 + "mime-db": {
495 + "version": "1.40.0",
496 + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
497 + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
498 + },
499 + "mime-types": {
500 + "version": "2.1.24",
501 + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
502 + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
503 + "requires": {
504 + "mime-db": "1.40.0"
505 + }
506 + },
507 + "parseurl": {
508 + "version": "1.3.3",
509 + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
510 + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
511 + },
512 + "qs": {
513 + "version": "6.7.0",
514 + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
515 + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
516 + },
517 + "raw-body": {
518 + "version": "2.4.0",
519 + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
520 + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
521 + "requires": {
522 + "bytes": "3.1.0",
523 + "http-errors": "1.7.2",
524 + "iconv-lite": "0.4.24",
525 + "unpipe": "1.0.0"
526 + }
527 + },
528 + "setprototypeof": {
529 + "version": "1.1.1",
530 + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
531 + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
532 + },
533 + "type-is": {
534 + "version": "1.6.18",
535 + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
536 + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
537 + "requires": {
538 + "media-typer": "0.3.0",
539 + "mime-types": "~2.1.24"
540 + }
441 } 541 }
442 } 542 }
443 }, 543 },
...@@ -497,23 +597,23 @@ ...@@ -497,23 +597,23 @@
497 } 597 }
498 }, 598 },
499 "finalhandler": { 599 "finalhandler": {
500 - "version": "1.1.1", 600 + "version": "1.1.2",
501 - "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", 601 + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
502 - "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", 602 + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
503 "requires": { 603 "requires": {
504 "debug": "2.6.9", 604 "debug": "2.6.9",
505 "encodeurl": "~1.0.2", 605 "encodeurl": "~1.0.2",
506 "escape-html": "~1.0.3", 606 "escape-html": "~1.0.3",
507 "on-finished": "~2.3.0", 607 "on-finished": "~2.3.0",
508 - "parseurl": "~1.3.2", 608 + "parseurl": "~1.3.3",
509 - "statuses": "~1.4.0", 609 + "statuses": "~1.5.0",
510 "unpipe": "~1.0.0" 610 "unpipe": "~1.0.0"
511 }, 611 },
512 "dependencies": { 612 "dependencies": {
513 - "statuses": { 613 + "parseurl": {
514 - "version": "1.4.0", 614 + "version": "1.3.3",
515 - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", 615 + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
516 - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" 616 + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
517 } 617 }
518 } 618 }
519 }, 619 },
...@@ -561,9 +661,9 @@ ...@@ -561,9 +661,9 @@
561 } 661 }
562 }, 662 },
563 "glob": { 663 "glob": {
564 - "version": "7.1.3", 664 + "version": "7.1.4",
565 - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", 665 + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
566 - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", 666 + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
567 "requires": { 667 "requires": {
568 "fs.realpath": "^1.0.0", 668 "fs.realpath": "^1.0.0",
569 "inflight": "^1.0.4", 669 "inflight": "^1.0.4",
...@@ -675,9 +775,9 @@ ...@@ -675,9 +775,9 @@
675 "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" 775 "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
676 }, 776 },
677 "ipaddr.js": { 777 "ipaddr.js": {
678 - "version": "1.8.0", 778 + "version": "1.9.0",
679 - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz", 779 + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
680 - "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=" 780 + "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
681 }, 781 },
682 "is-typedarray": { 782 "is-typedarray": {
683 "version": "1.0.0", 783 "version": "1.0.0",
...@@ -694,6 +794,11 @@ ...@@ -694,6 +794,11 @@
694 "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", 794 "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
695 "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" 795 "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
696 }, 796 },
797 + "jquery": {
798 + "version": "3.4.1",
799 + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
800 + "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
801 + },
697 "jsbn": { 802 "jsbn": {
698 "version": "0.1.1", 803 "version": "0.1.1",
699 "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", 804 "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
...@@ -746,9 +851,9 @@ ...@@ -746,9 +851,9 @@
746 "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" 851 "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
747 }, 852 },
748 "mime": { 853 "mime": {
749 - "version": "1.4.1", 854 + "version": "1.6.0",
750 - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", 855 + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
751 - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==" 856 + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
752 }, 857 },
753 "mime-db": { 858 "mime-db": {
754 "version": "1.37.0", 859 "version": "1.37.0",
...@@ -802,11 +907,11 @@ ...@@ -802,11 +907,11 @@
802 "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" 907 "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
803 }, 908 },
804 "mysql": { 909 "mysql": {
805 - "version": "2.16.0", 910 + "version": "2.17.1",
806 - "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.16.0.tgz", 911 + "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.17.1.tgz",
807 - "integrity": "sha512-dPbN2LHonQp7D5ja5DJXNbCLe/HRdu+f3v61aguzNRQIrmZLOeRoymBYyeThrR6ug+FqzDL95Gc9maqZUJS+Gw==", 912 + "integrity": "sha512-7vMqHQ673SAk5C8fOzTG2LpPcf3bNt0oL3sFpxPEEFp1mdlDcrLK0On7z8ZYKaaHrHwNcQ/MTUz7/oobZ2OyyA==",
808 "requires": { 913 "requires": {
809 - "bignumber.js": "4.1.0", 914 + "bignumber.js": "7.2.1",
810 "readable-stream": "2.3.6", 915 "readable-stream": "2.3.6",
811 "safe-buffer": "5.1.2", 916 "safe-buffer": "5.1.2",
812 "sqlstring": "2.3.1" 917 "sqlstring": "2.3.1"
...@@ -834,9 +939,9 @@ ...@@ -834,9 +939,9 @@
834 "integrity": "sha512-uZZJdCg8rQTNhKz9oudGZGIbO+BVxTytoWgM9xZtbUkDcDdGG9sfFNbLjC01j/oGnyRR56Oa/Xr0X6nV9rq3vw==" 939 "integrity": "sha512-uZZJdCg8rQTNhKz9oudGZGIbO+BVxTytoWgM9xZtbUkDcDdGG9sfFNbLjC01j/oGnyRR56Oa/Xr0X6nV9rq3vw=="
835 }, 940 },
836 "negotiator": { 941 "negotiator": {
837 - "version": "0.6.1", 942 + "version": "0.6.2",
838 - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", 943 + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
839 - "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=" 944 + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
840 }, 945 },
841 "nth-check": { 946 "nth-check": {
842 "version": "1.0.2", 947 "version": "1.0.2",
...@@ -930,12 +1035,12 @@ ...@@ -930,12 +1035,12 @@
930 "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" 1035 "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
931 }, 1036 },
932 "proxy-addr": { 1037 "proxy-addr": {
933 - "version": "2.0.4", 1038 + "version": "2.0.5",
934 - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz", 1039 + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
935 - "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==", 1040 + "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
936 "requires": { 1041 "requires": {
937 "forwarded": "~0.1.2", 1042 "forwarded": "~0.1.2",
938 - "ipaddr.js": "1.8.0" 1043 + "ipaddr.js": "1.9.0"
939 } 1044 }
940 }, 1045 },
941 "proxy-from-env": { 1046 "proxy-from-env": {
...@@ -954,9 +1059,9 @@ ...@@ -954,9 +1059,9 @@
954 "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" 1059 "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
955 }, 1060 },
956 "puppeteer": { 1061 "puppeteer": {
957 - "version": "1.11.0", 1062 + "version": "1.17.0",
958 - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.11.0.tgz", 1063 + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.17.0.tgz",
959 - "integrity": "sha512-iG4iMOHixc2EpzqRV+pv7o3GgmU2dNYEMkvKwSaQO/vMZURakwSOn/EYJ6OIRFYOque1qorzIBvrytPIQB3YzQ==", 1064 + "integrity": "sha512-3EXZSximCzxuVKpIHtyec8Wm2dWZn1fc5tQi34qWfiUgubEVYHjUvr0GOJojqf3mifI6oyKnCdrGxaOI+lWReA==",
960 "requires": { 1065 "requires": {
961 "debug": "^4.1.0", 1066 "debug": "^4.1.0",
962 "extract-zip": "^1.6.6", 1067 "extract-zip": "^1.6.6",
...@@ -969,17 +1074,17 @@ ...@@ -969,17 +1074,17 @@
969 }, 1074 },
970 "dependencies": { 1075 "dependencies": {
971 "debug": { 1076 "debug": {
972 - "version": "4.1.0", 1077 + "version": "4.1.1",
973 - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz", 1078 + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
974 - "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==", 1079 + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
975 "requires": { 1080 "requires": {
976 "ms": "^2.1.1" 1081 "ms": "^2.1.1"
977 } 1082 }
978 }, 1083 },
979 "mime": { 1084 "mime": {
980 - "version": "2.4.0", 1085 + "version": "2.4.3",
981 - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz", 1086 + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz",
982 - "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==" 1087 + "integrity": "sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="
983 }, 1088 },
984 "ms": { 1089 "ms": {
985 "version": "2.1.1", 1090 "version": "2.1.1",
...@@ -999,9 +1104,9 @@ ...@@ -999,9 +1104,9 @@
999 "integrity": "sha1-T2ih3Arli9P7lYSMMDJNt11kNgs=" 1104 "integrity": "sha1-T2ih3Arli9P7lYSMMDJNt11kNgs="
1000 }, 1105 },
1001 "range-parser": { 1106 "range-parser": {
1002 - "version": "1.2.0", 1107 + "version": "1.2.1",
1003 - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", 1108 + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
1004 - "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" 1109 + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
1005 }, 1110 },
1006 "raw-body": { 1111 "raw-body": {
1007 "version": "2.3.3", 1112 "version": "2.3.3",
...@@ -1081,11 +1186,11 @@ ...@@ -1081,11 +1186,11 @@
1081 } 1186 }
1082 }, 1187 },
1083 "rimraf": { 1188 "rimraf": {
1084 - "version": "2.6.2", 1189 + "version": "2.6.3",
1085 - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", 1190 + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
1086 - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", 1191 + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
1087 "requires": { 1192 "requires": {
1088 - "glob": "^7.0.5" 1193 + "glob": "^7.1.3"
1089 } 1194 }
1090 }, 1195 },
1091 "safe-buffer": { 1196 "safe-buffer": {
...@@ -1099,9 +1204,9 @@ ...@@ -1099,9 +1204,9 @@
1099 "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" 1204 "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
1100 }, 1205 },
1101 "send": { 1206 "send": {
1102 - "version": "0.16.2", 1207 + "version": "0.17.1",
1103 - "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", 1208 + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
1104 - "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", 1209 + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
1105 "requires": { 1210 "requires": {
1106 "debug": "2.6.9", 1211 "debug": "2.6.9",
1107 "depd": "~1.1.2", 1212 "depd": "~1.1.2",
...@@ -1110,30 +1215,54 @@ ...@@ -1110,30 +1215,54 @@
1110 "escape-html": "~1.0.3", 1215 "escape-html": "~1.0.3",
1111 "etag": "~1.8.1", 1216 "etag": "~1.8.1",
1112 "fresh": "0.5.2", 1217 "fresh": "0.5.2",
1113 - "http-errors": "~1.6.2", 1218 + "http-errors": "~1.7.2",
1114 - "mime": "1.4.1", 1219 + "mime": "1.6.0",
1115 - "ms": "2.0.0", 1220 + "ms": "2.1.1",
1116 "on-finished": "~2.3.0", 1221 "on-finished": "~2.3.0",
1117 - "range-parser": "~1.2.0", 1222 + "range-parser": "~1.2.1",
1118 - "statuses": "~1.4.0" 1223 + "statuses": "~1.5.0"
1119 }, 1224 },
1120 "dependencies": { 1225 "dependencies": {
1121 - "statuses": { 1226 + "http-errors": {
1122 - "version": "1.4.0", 1227 + "version": "1.7.2",
1123 - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", 1228 + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
1124 - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" 1229 + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
1230 + "requires": {
1231 + "depd": "~1.1.2",
1232 + "inherits": "2.0.3",
1233 + "setprototypeof": "1.1.1",
1234 + "statuses": ">= 1.5.0 < 2",
1235 + "toidentifier": "1.0.0"
1236 + }
1237 + },
1238 + "ms": {
1239 + "version": "2.1.1",
1240 + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
1241 + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
1242 + },
1243 + "setprototypeof": {
1244 + "version": "1.1.1",
1245 + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
1246 + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
1125 } 1247 }
1126 } 1248 }
1127 }, 1249 },
1128 "serve-static": { 1250 "serve-static": {
1129 - "version": "1.13.2", 1251 + "version": "1.14.1",
1130 - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", 1252 + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
1131 - "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", 1253 + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
1132 "requires": { 1254 "requires": {
1133 "encodeurl": "~1.0.2", 1255 "encodeurl": "~1.0.2",
1134 "escape-html": "~1.0.3", 1256 "escape-html": "~1.0.3",
1135 - "parseurl": "~1.3.2", 1257 + "parseurl": "~1.3.3",
1136 - "send": "0.16.2" 1258 + "send": "0.17.1"
1259 + },
1260 + "dependencies": {
1261 + "parseurl": {
1262 + "version": "1.3.3",
1263 + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
1264 + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
1265 + }
1137 } 1266 }
1138 }, 1267 },
1139 "setprototypeof": { 1268 "setprototypeof": {
...@@ -1147,9 +1276,9 @@ ...@@ -1147,9 +1276,9 @@
1147 "integrity": "sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A=" 1276 "integrity": "sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A="
1148 }, 1277 },
1149 "sshpk": { 1278 "sshpk": {
1150 - "version": "1.15.2", 1279 + "version": "1.16.1",
1151 - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz", 1280 + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
1152 - "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==", 1281 + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
1153 "requires": { 1282 "requires": {
1154 "asn1": "~0.2.3", 1283 "asn1": "~0.2.3",
1155 "assert-plus": "^1.0.0", 1284 "assert-plus": "^1.0.0",
...@@ -1180,6 +1309,11 @@ ...@@ -1180,6 +1309,11 @@
1180 "safe-buffer": "~5.1.0" 1309 "safe-buffer": "~5.1.0"
1181 } 1310 }
1182 }, 1311 },
1312 + "toidentifier": {
1313 + "version": "1.0.0",
1314 + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
1315 + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
1316 + },
1183 "tough-cookie": { 1317 "tough-cookie": {
1184 "version": "2.4.3", 1318 "version": "2.4.3",
1185 "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", 1319 "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
...@@ -1288,9 +1422,9 @@ ...@@ -1288,9 +1422,9 @@
1288 "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" 1422 "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
1289 }, 1423 },
1290 "ws": { 1424 "ws": {
1291 - "version": "6.1.2", 1425 + "version": "6.2.1",
1292 - "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.2.tgz", 1426 + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
1293 - "integrity": "sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==", 1427 + "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
1294 "requires": { 1428 "requires": {
1295 "async-limiter": "~1.0.0" 1429 "async-limiter": "~1.0.0"
1296 } 1430 }
......
...@@ -17,17 +17,18 @@ ...@@ -17,17 +17,18 @@
17 "body-parser": "^1.18.3", 17 "body-parser": "^1.18.3",
18 "charset": "^1.0.1", 18 "charset": "^1.0.1",
19 "cheerio": "^1.0.0-rc.2", 19 "cheerio": "^1.0.0-rc.2",
20 - "dotenv": "^6.1.0", 20 + "dotenv": "^6.2.0",
21 "ejs": "^2.6.1", 21 "ejs": "^2.6.1",
22 - "express": "^4.16.4", 22 + "express": "^4.17.0",
23 "express-session": "^1.15.6", 23 "express-session": "^1.15.6",
24 "fs": "0.0.1-security", 24 "fs": "0.0.1-security",
25 "iconv-lite": "^0.4.24", 25 "iconv-lite": "^0.4.24",
26 + "jquery": "^3.4.1",
26 "morgan": "^1.9.1", 27 "morgan": "^1.9.1",
27 - "mysql": "^2.16.0", 28 + "mysql": "^2.17.1",
28 "mysql-apostrophe": "^1.0.8", 29 "mysql-apostrophe": "^1.0.8",
29 "path": "^0.12.7", 30 "path": "^0.12.7",
30 - "puppeteer": "^1.11.0", 31 + "puppeteer": "^1.17.0",
31 "request": "^2.88.0", 32 "request": "^2.88.0",
32 "request-promise": "^4.2.2" 33 "request-promise": "^4.2.2"
33 } 34 }
......
...@@ -87,17 +87,17 @@ ...@@ -87,17 +87,17 @@
87 <br> 87 <br>
88 <div class="row" style="text-align: center;"> 88 <div class="row" style="text-align: center;">
89 <div class="col-md-4"> 89 <div class="col-md-4">
90 - <img src="https://d1u5p3l4wpay3k.cloudfront.net/hearthstone_gamepedia/c/c5/Garrosh_Hellscream%28635%29.png?version=bab934001bb784a94c59a47823d535a7" style="width:150px;height:200px;"/> 90 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/c/c5/Garrosh_Hellscream%28635%29.png?version=1b614ad5340f67612d99542b05168969" style="width:200px;height:250px;"/>
91 <br> 91 <br>
92 <input type="radio" name="checkOpponent" value="WARRIOR"/>전사 92 <input type="radio" name="checkOpponent" value="WARRIOR"/>전사
93 </div> 93 </div>
94 <div class="col-md-4"> 94 <div class="col-md-4">
95 - <img src="https://d1u5p3l4wpay3k.cloudfront.net/hearthstone_gamepedia/4/4b/Thrall%28319%29.png?version=adcee55715548b949a7d973c2fddbd95" style="width:150px;height:200px;"/> 95 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/4/4b/Thrall%28319%29.png?version=d0a09d4b1a9973cf5d3853798915d1ac" style="width:200px;height:250px;"/>
96 <br> 96 <br>
97 <input type="radio" name="checkOpponent" value="SHAMAN"/>주술사 97 <input type="radio" name="checkOpponent" value="SHAMAN"/>주술사
98 </div> 98 </div>
99 <div class="col-md-4"> 99 <div class="col-md-4">
100 - <img src="https://d1u5p3l4wpay3k.cloudfront.net/hearthstone_gamepedia/a/a4/Valeera_Sanguinar%282%29.png?version=84a816910b223169eb14cc93c20437b2" style="width:150px;height:200px;"/> 100 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/a/a4/Valeera_Sanguinar%282%29.png?version=8e1f8248cfd10cd0780944f5adae3c88" style="width:200px;height:250px;"/>
101 <br> 101 <br>
102 <input type="radio" name="checkOpponent" value="ROGUE"/>도적 102 <input type="radio" name="checkOpponent" value="ROGUE"/>도적
103 </div> 103 </div>
...@@ -107,17 +107,17 @@ ...@@ -107,17 +107,17 @@
107 <br> 107 <br>
108 <div class="row" style="text-align: center;"> 108 <div class="row" style="text-align: center;">
109 <div class="col-md-4"> 109 <div class="col-md-4">
110 - <img src="https://d1u5p3l4wpay3k.cloudfront.net/hearthstone_gamepedia/4/4d/Uther_Lightbringer%28257%29.png?version=b45ade5ac3fdd2579160fe5d7b7c1b20" style="width:150px;height:200px;"/> 110 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/4/4d/Uther_Lightbringer%28257%29.png?version=6dfe616bf25bb33225417253ae47a6d8" style="width:200px;height:250px;"/>
111 <br> 111 <br>
112 <input type="radio" name="checkOpponent" value="PALADIN"/>성기사 112 <input type="radio" name="checkOpponent" value="PALADIN"/>성기사
113 </div> 113 </div>
114 <div class="col-md-4"> 114 <div class="col-md-4">
115 - <img src="https://d1u5p3l4wpay3k.cloudfront.net/hearthstone_gamepedia/a/a0/Rexxar%28484%29.png?version=c21b57837db15d20cc814f2bf45682b6" style="width:150px;height:200px;"/> 115 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/a/a0/Rexxar%28484%29.png?version=f018fc6e46b383cc12aefb4b51a66206" style="width:200px;height:250px;"/>
116 <br> 116 <br>
117 <input type="radio" name="checkOpponent" value="HUNTER"/>사냥꾼 117 <input type="radio" name="checkOpponent" value="HUNTER"/>사냥꾼
118 </div> 118 </div>
119 <div class="col-md-4"> 119 <div class="col-md-4">
120 - <img src="https://d1u5p3l4wpay3k.cloudfront.net/hearthstone_gamepedia/f/fa/Malfurion_Stormrage%28621%29.png?version=b3f5a40e33f33d32995f3becbdd7aa94" style="width:150px;height:200px;"/> 120 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/f/fa/Malfurion_Stormrage%28621%29.png?version=77c0505d00ce8f853911fe2926f85271" style="width:200px;height:250px;"/>
121 <br> 121 <br>
122 <input type="radio" name="checkOpponent" value="DRUID"/>드루이드 122 <input type="radio" name="checkOpponent" value="DRUID"/>드루이드
123 </div> 123 </div>
...@@ -127,17 +127,17 @@ ...@@ -127,17 +127,17 @@
127 <br> 127 <br>
128 <div class="row" style="text-align: center;"> 128 <div class="row" style="text-align: center;">
129 <div class="col-md-4"> 129 <div class="col-md-4">
130 - <img src="https://d1u5p3l4wpay3k.cloudfront.net/hearthstone_gamepedia/0/0a/Gul%27dan%28618%29.png?version=90f421585c6f2d493ba94e259a76190e" style="width:150px;height:200px;"/> 130 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/0/0a/Gul%27dan%28618%29.png?version=cdc516499d50f4887dc32d5a57674c2d" style="width:200px;height:250px;"/>
131 <br> 131 <br>
132 <input type="radio" name="checkOpponent" value="WARLOCK"/>흑마법사 132 <input type="radio" name="checkOpponent" value="WARLOCK"/>흑마법사
133 </div> 133 </div>
134 <div class="col-md-4"> 134 <div class="col-md-4">
135 - <img src="https://d1u5p3l4wpay3k.cloudfront.net/hearthstone_gamepedia/3/3c/Jaina_Proudmoore%28320%29.png?version=75868a59a53f90bce829edeb66126b73" style="width:150px;height:200px;"/> 135 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/3/3c/Jaina_Proudmoore%28320%29.png?version=3b2fe59be9088a51fc77e579e4faa8ce" style="width:200px;height:250px;"/>
136 <br> 136 <br>
137 <input type="radio" name="checkOpponent" value="MAGE"/>마법사 137 <input type="radio" name="checkOpponent" value="MAGE"/>마법사
138 </div> 138 </div>
139 <div class="col-md-4"> 139 <div class="col-md-4">
140 - <img src="https://d1u5p3l4wpay3k.cloudfront.net/hearthstone_gamepedia/8/80/Anduin_Wrynn%28110%29.png?version=ba8ecc39b3fdd4a2ede72e046c434454" style="width:150px;height:200px;"/> 140 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/8/80/Anduin_Wrynn%28110%29.png?version=0bac7e0db29ce55f333afe972a0afdb0" style="width:200px;height:250px;"/>
141 <br> 141 <br>
142 <input type="radio" name="checkOpponent" value="PRIEST"/>사제 142 <input type="radio" name="checkOpponent" value="PRIEST"/>사제
143 </div> 143 </div>
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
89 </div> 89 </div>
90 90
91 <!-- jQuery (부트스트랩의 자바스크립트 플러그인을 위해 필요합니다) --> 91 <!-- jQuery (부트스트랩의 자바스크립트 플러그인을 위해 필요합니다) -->
92 - <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script> 92 + <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
93 <!-- 모든 컴파일된 플러그인을 포함합니다 (아래), 원하지 않는다면 필요한 각각의 파일을 포함하세요 --> 93 <!-- 모든 컴파일된 플러그인을 포함합니다 (아래), 원하지 않는다면 필요한 각각의 파일을 포함하세요 -->
94 <script src="../../static/bootstrap-3.3.2-dist/js/bootstrap.min.js"></script> 94 <script src="../../static/bootstrap-3.3.2-dist/js/bootstrap.min.js"></script>
95 </body> 95 </body>
......
1 +-- MySQL dump 10.13 Distrib 8.0.13, for Win64 (x86_64)
2 +--
3 +-- Host: localhost Database: whoareyou
4 +-- ------------------------------------------------------
5 +-- Server version 8.0.13
6 +
7 +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
8 +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
9 +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
10 + SET NAMES utf8mb4 ;
11 +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
12 +/*!40103 SET TIME_ZONE='+00:00' */;
13 +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
14 +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
15 +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
16 +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
17 +
18 +--
19 +-- Table structure for table `card`
20 +--
21 +
22 +DROP TABLE IF EXISTS `card`;
23 +/*!40101 SET @saved_cs_client = @@character_set_client */;
24 + SET character_set_client = utf8mb4 ;
25 +CREATE TABLE `card` (
26 + `id` int(11) NOT NULL AUTO_INCREMENT,
27 + `deckId` int(11) DEFAULT NULL,
28 + `cardId` int(64) DEFAULT NULL,
29 + `cardCost` int(11) DEFAULT NULL,
30 + `cardName` varchar(45) DEFAULT NULL,
31 + `cardNum` int(11) DEFAULT NULL,
32 + PRIMARY KEY (`id`)
33 +) ENGINE=InnoDB AUTO_INCREMENT=677 DEFAULT CHARSET=utf8;
34 +/*!40101 SET character_set_client = @saved_cs_client */;
35 +
36 +--
37 +-- Dumping data for table `card`
38 +--
39 +
40 +LOCK TABLES `card` WRITE;
41 +/*!40000 ALTER TABLE `card` DISABLE KEYS */;
42 +INSERT INTO `card` VALUES (626,124,70,1,'Blessing of Might',2),(627,124,41323,1,'Fire Fly',2),(628,124,48982,1,'Glow-Tron',2),(629,124,41912,1,'Lost in the Jungle',2),(630,124,48886,1,'Mecharoo',2),(631,124,42467,1,'Righteous Protector',2),(632,124,679,3,'Divine Favor',2),(633,124,1401,3,'Raid Leader',2),(634,124,45782,3,'Unidentified Maul',2),(635,124,46461,3,'Void Ripper',2),(636,124,45265,5,'Fungalmancer',2),(637,124,559,5,'Leeroy Jenkins',1),(638,124,45877,5,'Level Up!',2),(639,124,43515,7,'Corridor Creeper',2),(640,124,41859,7,'Vinecleaver',2),(641,124,48158,9,'Baku the Mooneater',1),(642,125,70,1,'Blessing of Might',2),(643,125,41323,1,'Fire Fly',2),(644,125,48982,1,'Glow-Tron',2),(645,125,41912,1,'Lost in the Jungle',2),(646,125,48886,1,'Mecharoo',2),(647,125,42467,1,'Righteous Protector',2),(648,125,679,3,'Divine Favor',2),(649,125,1401,3,'Raid Leader',2),(650,125,45782,3,'Unidentified Maul',2),(651,125,46461,3,'Void Ripper',2),(652,125,45265,5,'Fungalmancer',2),(653,125,559,5,'Leeroy Jenkins',1),(654,125,45877,5,'Level Up!',2),(655,125,43515,7,'Corridor Creeper',2),(656,125,41859,7,'Vinecleaver',2),(657,125,48158,9,'Baku the Mooneater',1),(658,126,180,0,'Backstab',2),(659,126,365,0,'Shadowstep',2),(660,126,268,1,'Cold Blood',2),(661,126,41323,1,'Fire Fly',2),(662,126,45340,2,'Prince Keleseth',1),(663,126,306,3,'Edwin VanCleef',1),(664,126,41683,3,'Gluttonous Ooze',1),(665,126,47014,3,'Hench-Clan Thug',2),(666,126,1117,3,'SI:7 Agent',2),(667,126,41418,3,'Tar Creeper',1),(668,126,45531,4,'Elven Minstrel',2),(669,126,43228,4,'Fal\'dorei Strider',2),(670,126,42395,4,'Saronite Chain Gang',2),(671,126,49972,4,'Spirit of the Shark',1),(672,126,45265,5,'Fungalmancer',2),(673,126,559,5,'Leeroy Jenkins',1),(674,126,48487,5,'Myra\'s Unstable Element',1),(675,126,41217,5,'Vilespine Slayer',2),(676,126,49184,5,'Zilliax',1);
43 +/*!40000 ALTER TABLE `card` ENABLE KEYS */;
44 +UNLOCK TABLES;
45 +
46 +--
47 +-- Table structure for table `deck`
48 +--
49 +
50 +DROP TABLE IF EXISTS `deck`;
51 +/*!40101 SET @saved_cs_client = @@character_set_client */;
52 + SET character_set_client = utf8mb4 ;
53 +CREATE TABLE `deck` (
54 + `id` int(11) NOT NULL AUTO_INCREMENT,
55 + `deckOwner` varchar(45) DEFAULT NULL,
56 + `deckTitle` varchar(45) DEFAULT NULL,
57 + `deckCode` varchar(500) DEFAULT NULL,
58 + PRIMARY KEY (`id`)
59 +) ENGINE=InnoDB AUTO_INCREMENT=127 DEFAULT CHARSET=utf8;
60 +/*!40101 SET character_set_client = @saved_cs_client */;
61 +
62 +--
63 +-- Dumping data for table `deck`
64 +--
65 +
66 +LOCK TABLES `deck` WRITE;
67 +/*!40000 ALTER TABLE `deck` DISABLE KEYS */;
68 +INSERT INTO `deck` VALUES (124,'test','홀수 성기사','AAECAZ8FAq8EnvgCDkbrwgLW/gK4xwL2/QLjywKnBfkK1uUC/eoC0eECteYC+9MCg8cCAA=='),(125,'oss','홀수 성기사','AAECAZ8FAq8EnvgCDkbrwgLW/gK4xwL2/QLjywKnBfkK1uUC/eoC0eECteYC+9MCg8cCAA=='),(126,'oss','켈레서스 템포 토적','AAECAaIHCJziArIC08UCysMCtIYDrwTn+gKggAMLtAHtAowC68ICpu8C3Qjb4wLc0QKbywLR4QKBwgIA');
69 +/*!40000 ALTER TABLE `deck` ENABLE KEYS */;
70 +UNLOCK TABLES;
71 +
72 +--
73 +-- Table structure for table `user`
74 +--
75 +
76 +DROP TABLE IF EXISTS `user`;
77 +/*!40101 SET @saved_cs_client = @@character_set_client */;
78 + SET character_set_client = utf8mb4 ;
79 +CREATE TABLE `user` (
80 + `id` int(11) NOT NULL AUTO_INCREMENT,
81 + `userId` varchar(45) DEFAULT NULL,
82 + `password` longtext,
83 + PRIMARY KEY (`id`)
84 +) ENGINE=InnoDB AUTO_INCREMENT=28 DEFAULT CHARSET=utf8;
85 +/*!40101 SET character_set_client = @saved_cs_client */;
86 +
87 +--
88 +-- Dumping data for table `user`
89 +--
90 +
91 +LOCK TABLES `user` WRITE;
92 +/*!40000 ALTER TABLE `user` DISABLE KEYS */;
93 +INSERT INTO `user` VALUES (26,'test','$2a$10$l6IgaLy13XZ7gu3prxvwF.zFH5kfkZVw2AQ6eSZgIeyPjVL3w1fr.'),(27,'oss','$2a$10$79hOQPJMKrTaLo.wk72uReH3SdR2wj4NV2DmWROHZ05uUxgmsP28K');
94 +/*!40000 ALTER TABLE `user` ENABLE KEYS */;
95 +UNLOCK TABLES;
96 +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
97 +
98 +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
99 +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
100 +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
101 +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
102 +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
103 +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
104 +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
105 +
106 +-- Dump completed on 2019-05-24 18:28:39