From e209ed23b9e6644ee89dbcd01c815c6c7538eb67 Mon Sep 17 00:00:00 2001 From: "DESKTOP-VOCG4DO\\user" Date: Fri, 8 Jun 2018 23:20:59 +0900 Subject: [PATCH] feature/crowd-2 --- Baseball_for_Everyone | 1 + app.js | 4 + bin/www | 0 config/db.js | 2 +- package-lock.json | 112 +++++++++++----------- routes/crowd-2.js | 9 ++ routes/player-2.js | 9 ++ views/crowd-2.ejs | 216 ++++++++++++++++++++++++++++++++++++++++++ views/index.ejs | 6 +- views/player-2.ejs | 193 +++++++++++++++++++++++++++++++++++++ 10 files changed, 492 insertions(+), 60 deletions(-) create mode 160000 Baseball_for_Everyone mode change 100755 => 100644 bin/www create mode 100644 routes/crowd-2.js create mode 100644 routes/player-2.js create mode 100644 views/crowd-2.ejs create mode 100644 views/player-2.ejs diff --git a/Baseball_for_Everyone b/Baseball_for_Everyone new file mode 160000 index 0000000..222783c --- /dev/null +++ b/Baseball_for_Everyone @@ -0,0 +1 @@ +Subproject commit 222783c72b4feae4c01788cbda14b5737031f8d6 diff --git a/app.js b/app.js index ac32fe3..2d22740 100644 --- a/app.js +++ b/app.js @@ -8,6 +8,8 @@ var indexRouter = require('./routes/index'); var usersRouter = require('./routes/users'); var agent2Router = require('./routes/agent-2'); var player1Router = require('./routes/player-1'); +var player2Router = require('./routes/player-2'); +var crowd2Router = require('./routes/crowd-2'); var selectTeamRouter = require('./routes/include/select-team'); var app = express(); @@ -27,6 +29,8 @@ app.use('/', indexRouter); app.use('/users', usersRouter); app.use('/agent-2', agent2Router); app.use('/player-1', player1Router); +app.use('/player-2', player2Router); +app.use('/crowd-2', crowd2Router); //jquery app.use('/js', express.static(__dirname + '/node_modules/jquery/dist')); // redirect JS jQuery diff --git a/bin/www b/bin/www old mode 100755 new mode 100644 diff --git a/config/db.js b/config/db.js index d888eab..6e8836f 100644 --- a/config/db.js +++ b/config/db.js @@ -4,7 +4,7 @@ var pool = mysql.createPool({ connectionLimit : 10, host : 'localhost', user : 'root', - password : 'root', + password : 'wnsrlWkd1!', database : 'Baseball', waitForConnections : false }); diff --git a/package-lock.json b/package-lock.json index f205141..742b12b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", "requires": { - "mime-types": "~2.1.18", + "mime-types": "2.1.18", "negotiator": "0.6.1" } }, @@ -37,15 +37,15 @@ "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", "requires": { "bytes": "3.0.0", - "content-type": "~1.0.4", + "content-type": "1.0.4", "debug": "2.6.9", - "depd": "~1.1.1", - "http-errors": "~1.6.2", + "depd": "1.1.2", + "http-errors": "1.6.3", "iconv-lite": "0.4.19", - "on-finished": "~2.3.0", + "on-finished": "2.3.0", "qs": "6.5.1", "raw-body": "2.3.2", - "type-is": "~1.6.15" + "type-is": "1.6.16" } }, "bootstrap": { @@ -140,36 +140,36 @@ "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz", "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=", "requires": { - "accepts": "~1.3.5", + "accepts": "1.3.5", "array-flatten": "1.1.1", "body-parser": "1.18.2", "content-disposition": "0.5.2", - "content-type": "~1.0.4", + "content-type": "1.0.4", "cookie": "0.3.1", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", + "depd": "1.1.2", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", "finalhandler": "1.1.1", "fresh": "0.5.2", "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.2", + "methods": "1.1.2", + "on-finished": "2.3.0", + "parseurl": "1.3.2", "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.3", + "proxy-addr": "2.0.3", "qs": "6.5.1", - "range-parser": "~1.2.0", + "range-parser": "1.2.0", "safe-buffer": "5.1.1", "send": "0.16.2", "serve-static": "1.13.2", "setprototypeof": "1.1.0", - "statuses": "~1.4.0", - "type-is": "~1.6.16", + "statuses": "1.4.0", + "type-is": "1.6.16", "utils-merge": "1.0.1", - "vary": "~1.1.2" + "vary": "1.1.2" } }, "finalhandler": { @@ -178,12 +178,12 @@ "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.2", - "statuses": "~1.4.0", - "unpipe": "~1.0.0" + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "statuses": "1.4.0", + "unpipe": "1.0.0" } }, "forwarded": { @@ -201,10 +201,10 @@ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "requires": { - "depd": "~1.1.2", + "depd": "1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" + "statuses": "1.4.0" } }, "iconv-lite": { @@ -267,7 +267,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "requires": { - "mime-db": "~1.33.0" + "mime-db": "1.33.0" } }, "morgan": { @@ -275,11 +275,11 @@ "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz", "integrity": "sha1-0B+mxlhZt2/PMbPLU6OCGjEdgFE=", "requires": { - "basic-auth": "~2.0.0", + "basic-auth": "2.0.0", "debug": "2.6.9", - "depd": "~1.1.1", - "on-finished": "~2.3.0", - "on-headers": "~1.0.1" + "depd": "1.1.2", + "on-finished": "2.3.0", + "on-headers": "1.0.1" } }, "ms": { @@ -341,7 +341,7 @@ "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz", "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==", "requires": { - "forwarded": "~0.1.2", + "forwarded": "0.1.2", "ipaddr.js": "1.6.0" } }, @@ -379,7 +379,7 @@ "depd": "1.1.1", "inherits": "2.0.3", "setprototypeof": "1.0.3", - "statuses": ">= 1.3.1 < 2" + "statuses": "1.4.0" } }, "setprototypeof": { @@ -394,13 +394,13 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.0.3", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" } }, "safe-buffer": { @@ -414,18 +414,18 @@ "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", "requires": { "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", + "depd": "1.1.2", + "destroy": "1.0.4", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", "fresh": "0.5.2", - "http-errors": "~1.6.2", + "http-errors": "1.6.3", "mime": "1.4.1", "ms": "2.0.0", - "on-finished": "~2.3.0", - "range-parser": "~1.2.0", - "statuses": "~1.4.0" + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.4.0" } }, "serve-static": { @@ -433,9 +433,9 @@ "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.2", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "parseurl": "1.3.2", "send": "0.16.2" } }, @@ -459,7 +459,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.1" } }, "type-is": { @@ -468,7 +468,7 @@ "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", "requires": { "media-typer": "0.3.0", - "mime-types": "~2.1.18" + "mime-types": "2.1.18" } }, "unpipe": { diff --git a/routes/crowd-2.js b/routes/crowd-2.js new file mode 100644 index 0000000..93e65d8 --- /dev/null +++ b/routes/crowd-2.js @@ -0,0 +1,9 @@ +var express = require('express'); +var router = express.Router(); + +/* GET home page. */ +router.get('/', function(req, res, next) { + res.render('crownd-2', { title: 'Express' }); +}); + +module.exports = router; \ No newline at end of file diff --git a/routes/player-2.js b/routes/player-2.js new file mode 100644 index 0000000..9fb8095 --- /dev/null +++ b/routes/player-2.js @@ -0,0 +1,9 @@ +var express = require('express'); +var router = express.Router(); + +/* GET home page. */ +router.get('/', function(req, res, next) { + res.render('player-2', { title: 'Express' }); +}); + +module.exports = router; diff --git a/views/crowd-2.ejs b/views/crowd-2.ejs new file mode 100644 index 0000000..adea135 --- /dev/null +++ b/views/crowd-2.ejs @@ -0,0 +1,216 @@ + + + + + +
+ +
+ + + + + + + + + + + + +
+ <%- include('include/header-crowd.ejs') %> +
+ +
+ + +
+
+
+
    +
    • +
  • 100
    • +
  • vs
    • +
  • 100
    • +
    • +
+
+
+ +
+ +
+ + + + + + + + + + + + + + + + + +
�덊��ъ닔
data
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + +
�먯젙���ъ닔
data
+ +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + +
�덊�����
data
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + +
�먯젙������
data
+ +
+ +
+ + +
+ +
+ + + + + + + + + + + diff --git a/views/index.ejs b/views/index.ejs index b8162be..5bc12fa 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -23,17 +23,17 @@
- +
- +
- +
diff --git a/views/player-2.ejs b/views/player-2.ejs new file mode 100644 index 0000000..cf7192b --- /dev/null +++ b/views/player-2.ejs @@ -0,0 +1,193 @@ + + + + + +
+ +
+ + + + + + + + + + + + +
+ <%- include('include/header-player.ejs') %> +
+ +
+ + +
+ + + + <%- include('include/select-team.ejs') %> + +
+ +
+

txt1

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
txt2txt3txt4txt5txt6txt7txt8txt9txt10
txt11txt12txt13txt14txt15txt16txt17txt18txt19
+ +
+
+ +
+

txt20

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
txt21txt22txt23txt24txt25txt26txt27txt28txt29
txt30txt31txt32txt33txt34txt35txt36txt37txt38
+ +
+
+ + + + +
+ + + + + + + + + + +