From 23c7ae7aaba99eaaeded817a48632794cc40e55a Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 2 Apr 2019 18:18:53 +1100 Subject: [PATCH] nginx change --- {html-client => client}/.babelrc | 0 client/.eslintrc.js | 30 +- {html-client => client}/assets/normalize.css | 0 {html-client => client}/assets/skeleton.css | 0 client/cryps.css | 452 +++++++++++++++++- client/index.html | 32 +- client/index.js | 0 client/package.json | 19 +- {html-client => client}/src/actions.jsx | 0 .../src/components/body.component.jsx | 0 .../src/components/constants.jsx | 0 .../src/components/cryp.list.component.jsx | 0 .../src/components/cryp.list.container.jsx | 0 .../src/components/cryp.spawn.button.jsx | 0 .../src/components/cryp.spawn.container.js | 0 .../src/components/game.component.jsx | 0 .../src/components/game.container.jsx | 0 .../src/components/header.component.jsx | 0 .../src/components/info.component.jsx | 0 .../src/components/info.container.jsx | 0 .../src/components/instance.component.jsx | 0 .../src/components/instance.container.jsx | 0 .../components/instance.list.component.jsx | 0 .../components/instance.list.container.jsx | 0 .../src/components/login.component.jsx | 0 .../src/components/login.container.jsx | 0 .../src/components/molecule.jsx | 0 .../src/components/particles.config.js | 0 .../src/components/saw.component.jsx | 0 .../src/components/vbox.component.jsx | 0 .../src/components/vbox.container.jsx | 0 {html-client => client}/src/events.jsx | 0 {html-client => client}/src/keyboard.jsx | 0 {html-client => client}/src/main.jsx | 0 {html-client => client}/src/reducers.jsx | 0 {html-client => client}/src/socket.jsx | 0 {html-client => client}/src/utils.jsx | 0 html-client/cryps.css | 438 ----------------- {html-client => phaser-client}/.eslintrc.js | 30 +- {html-client => phaser-client}/.gitignore | 0 .../assets/alakazam-f.png | Bin {client => phaser-client}/assets/alphabet.jpg | Bin .../assets/aztec.atlas.json | 0 .../assets/aztec.clean.png | Bin {client => phaser-client}/assets/aztec.jpg | Bin {client => phaser-client}/assets/c1.svg | 0 {client => phaser-client}/assets/c2.svg | 0 {client => phaser-client}/assets/c3.svg | 0 .../assets/fonts/noway-regular-webfont.eot | Bin .../assets/fonts/noway-regular-webfont.svg | 0 .../assets/fonts/noway-regular-webfont.ttf | Bin .../assets/fonts/noway-regular-webfont.woff | Bin .../assets/fonts/noway-regular-webfont.woff2 | Bin {client => phaser-client}/assets/glyphs.jpg | Bin {client => phaser-client}/assets/magmar.png | Bin phaser-client/cryps.css | 24 + {html-client => phaser-client}/index.html | 32 +- {html-client => phaser-client}/index.js | 0 {client => phaser-client}/lib/fizzy-noise.js | 0 {client => phaser-client}/lib/fizzy-text.js | 0 {html-client => phaser-client}/package.json | 19 +- {client => phaser-client}/src/events.js | 0 {client => phaser-client}/src/main.js | 0 .../src/scenes/avatar.js | 0 .../src/scenes/background.js | 0 .../src/scenes/combat.animations.js | 0 .../src/scenes/combat.cryps.js | 0 .../src/scenes/combat.hitbox.js | 0 .../src/scenes/combat.js | 0 .../src/scenes/combat.log.js | 0 .../src/scenes/combat.render.resolutions.js | 0 .../src/scenes/combat.skills.js | 0 .../src/scenes/constants.js | 0 {client => phaser-client}/src/scenes/cryps.js | 0 .../src/scenes/elements/box.js | 0 .../src/scenes/elements/combat.statbar.js | 0 .../src/scenes/elements/item.js | 0 .../src/scenes/elements/outline.rotate.js | 0 .../src/scenes/game.list.js | 0 .../src/scenes/header.js | 0 .../src/scenes/home.cryps.js | 0 .../src/scenes/home.instances.js | 0 {client => phaser-client}/src/scenes/home.js | 0 .../src/scenes/home.navigation.js | 0 .../src/scenes/home.news.js | 0 .../src/scenes/home.rankings.js | 0 .../src/scenes/home.shop.js | 0 .../src/scenes/item.info.js | 0 .../src/scenes/item.list.js | 0 .../src/scenes/menu.cryps.list.js | 0 {client => phaser-client}/src/scenes/menu.js | 0 .../src/scenes/menu.navigation.js | 0 .../src/scenes/statsheet.js | 0 .../src/scenes/zone.controls.js | 0 .../src/scenes/zone.node.js | 0 {client => phaser-client}/src/scenes/zones.js | 0 {client => phaser-client}/src/socket.js | 0 {client => phaser-client}/src/tutorial.js | 0 {client => phaser-client}/src/utils.js | 0 99 files changed, 538 insertions(+), 538 deletions(-) rename {html-client => client}/.babelrc (100%) rename {html-client => client}/assets/normalize.css (100%) rename {html-client => client}/assets/skeleton.css (100%) mode change 100644 => 100755 client/index.js rename {html-client => client}/src/actions.jsx (100%) rename {html-client => client}/src/components/body.component.jsx (100%) rename {html-client => client}/src/components/constants.jsx (100%) rename {html-client => client}/src/components/cryp.list.component.jsx (100%) rename {html-client => client}/src/components/cryp.list.container.jsx (100%) rename {html-client => client}/src/components/cryp.spawn.button.jsx (100%) rename {html-client => client}/src/components/cryp.spawn.container.js (100%) rename {html-client => client}/src/components/game.component.jsx (100%) rename {html-client => client}/src/components/game.container.jsx (100%) rename {html-client => client}/src/components/header.component.jsx (100%) rename {html-client => client}/src/components/info.component.jsx (100%) rename {html-client => client}/src/components/info.container.jsx (100%) rename {html-client => client}/src/components/instance.component.jsx (100%) rename {html-client => client}/src/components/instance.container.jsx (100%) rename {html-client => client}/src/components/instance.list.component.jsx (100%) rename {html-client => client}/src/components/instance.list.container.jsx (100%) rename {html-client => client}/src/components/login.component.jsx (100%) rename {html-client => client}/src/components/login.container.jsx (100%) rename {html-client => client}/src/components/molecule.jsx (100%) rename {html-client => client}/src/components/particles.config.js (100%) rename {html-client => client}/src/components/saw.component.jsx (100%) rename {html-client => client}/src/components/vbox.component.jsx (100%) rename {html-client => client}/src/components/vbox.container.jsx (100%) rename {html-client => client}/src/events.jsx (100%) rename {html-client => client}/src/keyboard.jsx (100%) rename {html-client => client}/src/main.jsx (100%) rename {html-client => client}/src/reducers.jsx (100%) rename {html-client => client}/src/socket.jsx (100%) rename {html-client => client}/src/utils.jsx (100%) delete mode 100644 html-client/cryps.css rename {html-client => phaser-client}/.eslintrc.js (99%) rename {html-client => phaser-client}/.gitignore (100%) rename {client => phaser-client}/assets/alakazam-f.png (100%) rename {client => phaser-client}/assets/alphabet.jpg (100%) rename {client => phaser-client}/assets/aztec.atlas.json (100%) rename {client => phaser-client}/assets/aztec.clean.png (100%) rename {client => phaser-client}/assets/aztec.jpg (100%) rename {client => phaser-client}/assets/c1.svg (100%) rename {client => phaser-client}/assets/c2.svg (100%) rename {client => phaser-client}/assets/c3.svg (100%) rename {client => phaser-client}/assets/fonts/noway-regular-webfont.eot (100%) rename {client => phaser-client}/assets/fonts/noway-regular-webfont.svg (100%) rename {client => phaser-client}/assets/fonts/noway-regular-webfont.ttf (100%) rename {client => phaser-client}/assets/fonts/noway-regular-webfont.woff (100%) rename {client => phaser-client}/assets/fonts/noway-regular-webfont.woff2 (100%) rename {client => phaser-client}/assets/glyphs.jpg (100%) rename {client => phaser-client}/assets/magmar.png (100%) create mode 100644 phaser-client/cryps.css rename {html-client => phaser-client}/index.html (65%) rename {html-client => phaser-client}/index.js (100%) mode change 100755 => 100644 rename {client => phaser-client}/lib/fizzy-noise.js (100%) rename {client => phaser-client}/lib/fizzy-text.js (100%) rename {html-client => phaser-client}/package.json (55%) rename {client => phaser-client}/src/events.js (100%) rename {client => phaser-client}/src/main.js (100%) rename {client => phaser-client}/src/scenes/avatar.js (100%) rename {client => phaser-client}/src/scenes/background.js (100%) rename {client => phaser-client}/src/scenes/combat.animations.js (100%) rename {client => phaser-client}/src/scenes/combat.cryps.js (100%) rename {client => phaser-client}/src/scenes/combat.hitbox.js (100%) rename {client => phaser-client}/src/scenes/combat.js (100%) rename {client => phaser-client}/src/scenes/combat.log.js (100%) rename {client => phaser-client}/src/scenes/combat.render.resolutions.js (100%) rename {client => phaser-client}/src/scenes/combat.skills.js (100%) rename {client => phaser-client}/src/scenes/constants.js (100%) rename {client => phaser-client}/src/scenes/cryps.js (100%) rename {client => phaser-client}/src/scenes/elements/box.js (100%) rename {client => phaser-client}/src/scenes/elements/combat.statbar.js (100%) rename {client => phaser-client}/src/scenes/elements/item.js (100%) rename {client => phaser-client}/src/scenes/elements/outline.rotate.js (100%) rename {client => phaser-client}/src/scenes/game.list.js (100%) rename {client => phaser-client}/src/scenes/header.js (100%) rename {client => phaser-client}/src/scenes/home.cryps.js (100%) rename {client => phaser-client}/src/scenes/home.instances.js (100%) rename {client => phaser-client}/src/scenes/home.js (100%) rename {client => phaser-client}/src/scenes/home.navigation.js (100%) rename {client => phaser-client}/src/scenes/home.news.js (100%) rename {client => phaser-client}/src/scenes/home.rankings.js (100%) rename {client => phaser-client}/src/scenes/home.shop.js (100%) rename {client => phaser-client}/src/scenes/item.info.js (100%) rename {client => phaser-client}/src/scenes/item.list.js (100%) rename {client => phaser-client}/src/scenes/menu.cryps.list.js (100%) rename {client => phaser-client}/src/scenes/menu.js (100%) rename {client => phaser-client}/src/scenes/menu.navigation.js (100%) rename {client => phaser-client}/src/scenes/statsheet.js (100%) rename {client => phaser-client}/src/scenes/zone.controls.js (100%) rename {client => phaser-client}/src/scenes/zone.node.js (100%) rename {client => phaser-client}/src/scenes/zones.js (100%) rename {client => phaser-client}/src/socket.js (100%) rename {client => phaser-client}/src/tutorial.js (100%) rename {client => phaser-client}/src/utils.js (100%) diff --git a/html-client/.babelrc b/client/.babelrc similarity index 100% rename from html-client/.babelrc rename to client/.babelrc diff --git a/client/.eslintrc.js b/client/.eslintrc.js index 2bb5ed38..b7b57ee7 100755 --- a/client/.eslintrc.js +++ b/client/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = { - // extends: [ - // 'plugin:react/recommended', - // ], + extends: [ + 'plugin:react/recommended', + ], env: { browser: true, node: true @@ -14,10 +14,10 @@ module.exports = { 'import' ], settings: { - // react: { - // pragma: "preact", - // version: "15.0", - // }, + react: { + pragma: "preact", + version: "15.0", + }, 'import/resolver': { node: { extensions: ['.mjs', '.js', '.jsx', '.json'] @@ -55,12 +55,12 @@ module.exports = { 'key-spacing': ['error'], // for preact - // "react/react-in-jsx-scope": [0], - // "react/jsx-indent": [2, 4], - // "react/jsx-uses-react": 1, - // "react/jsx-uses-vars": 1, - // "react/prefer-stateless-function": 1, - // "react/prop-types": 0, + "react/react-in-jsx-scope": [0], + "react/jsx-indent": [2, 4], + "react/jsx-uses-react": 1, + "react/jsx-uses-vars": 1, + "react/prefer-stateless-function": 1, + "react/prop-types": 0, // airbnb copypasta // enforces getter/setter pairs in objects @@ -539,7 +539,7 @@ module.exports = { // require parens in arrow function arguments // https://eslint.org/docs/rules/arrow-parens 'arrow-parens': ['error', 'as-needed', { - requireForBlockBody: true, + requireForBlockBody: false, }], // require space before/after arrow function's arrow @@ -927,7 +927,7 @@ module.exports = { // specify the maximum length of a line in your program // https://eslint.org/docs/rules/max-len - 'max-len': ['error', 120, 2, { + 'max-len': ['error', 100, 2, { ignoreUrls: true, ignoreComments: false, ignoreRegExpLiterals: true, diff --git a/html-client/assets/normalize.css b/client/assets/normalize.css similarity index 100% rename from html-client/assets/normalize.css rename to client/assets/normalize.css diff --git a/html-client/assets/skeleton.css b/client/assets/skeleton.css similarity index 100% rename from html-client/assets/skeleton.css rename to client/assets/skeleton.css diff --git a/client/cryps.css b/client/cryps.css index b0020329..23bb53c9 100644 --- a/client/cryps.css +++ b/client/cryps.css @@ -1,24 +1,438 @@ -/*@font-face { - font-family: 'nowayregular'; - src: url('./assets/fonts/noway-regular-webfont.eot'); - src: url('./assets/fonts/noway-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('./assets/fonts/noway-regular-webfont.woff2') format('woff2'), - url('./assets/fonts/noway-regular-webfont.woff') format('woff'), - url('./assets/fonts/noway-regular-webfont.ttf') format('truetype'), - url('./assets/fonts/noway-regular-webfont.svg#nowayregular') format('svg'); - font-weight: normal; - font-style: normal; -} +/* + GLOBAL */ -body { - background-color: #181818; + +html, body, .cryps { + width: 100%; + height: 100%; + margin: 0; + + background-color: #000000; + font-family: 'Jura'; + color: whitesmoke; + font-size: 16pt; + user-select: none; + + /* this is the sweet nectar to keep it full page*/ + max-height: 100%; + overflow: hidden; } -canvas{ - display:block; +html { + box-sizing: border-box; margin: 0; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); + padding: 0; + height: 100%; +} + +*, *:before, *:after { + box-sizing: inherit; +} + + +/* main container */ +.cryps { + padding: 0 2em; + display: flex; + flex-flow: column; + position: fixed; +} + +main { + display: flex; + flex-flow: row wrap; + flex: 1 1 90%; + + padding-top: 1em; + + align-content: flex-start; + justify-content: flex-start; + align-items: flex-start; + +} + +button, input { + font-family: 'Jura'; + height: auto; + color: whitesmoke; + border-width: 2px; + border-color: whitesmoke; + border-radius: 0; + letter-spacing: 0.25em; + box-sizing: border-box; + + /*the transitions */ + transition-property: all; + transition-duration: 0.5s; + transition-delay: 0; + transition-timing-function: ease; +} + +button:hover, button:focus { + /*colour necesary to bash skellington*/ + color: whitesmoke; + border-color: whitesmoke; +} + +button.right[disabled]:hover, button.left[disabled]:hover { + box-shadow: none; +} + +button.right:hover, button.right:focus { + box-shadow: inset -0.5em 0 0 0 whitesmoke; +} + +button.left:hover, button.left:focus { + box-shadow: inset 0.5em 0 0 0 whitesmoke; +} + +/* + MENU +*/ +header { + display: flex; + flex-flow: row; + flex: 1; +} + +.header-title { + flex: 1; + font-size: 2em; + letter-spacing: 0.05em; +} + +.header-username { + letter-spacing: 0.25em; + font-size: 2em; + display: inline; +} + +.header-status { + text-align: right; +} + +.header-status svg { + margin-left: 1em; + height: 1em; + background-color: black; +} + +.login { + display: inline; + margin-right: 0; +} + +.ping-path { + fill: none; + stroke-width: 4px; + stroke-dasharray: 121, 242; + animation: saw 2s infinite linear; +} + +@keyframes saw { + 0% { + stroke-dashoffset: 363; + } + 100% { + stroke-dashoffset: 0; + } +} + +.menu-cryps { + display: flex; + flex-flow: row wrap; + + flex: 0 0 50%; +} + +.menu-cryp-ctr { + flex: 0 0 33%; + flex-flow: column; + + text-align: center; + display: flex; +} + +.menu-cryp { + height: 100%; + margin: 0.5em; + box-sizing: border-box; + border: 1px solid black; + + transition-property: border; + transition-duration: 0.5s; + transition-delay: 0; + transition-timing-function: ease; +} + +.menu-cryp h2 { + font-size: 2em; +} + +.menu-instance-list { + flex: 0 0 50%; + flex-flow: row wrap; + + display: flex; + align-content: flex-start; + height: 100%; +} + +.menu-instance-btn { + box-sizing: border-box; + flex: 1 0 20%; + font-size: 150%; + /*min-width: 20%;*/ + border-width: 2px; + padding: 0.5em; + margin: 0.5em; +} + +.menu-instance-btn.full { + flex: 1 0 100%; +} + +/* + INSTANCE +*/ + + +.instance { + display: flex; + flex-flow: row wrap; + align-content: flex-start; +} + +.instance-hdr { + display: flex; + flex-flow: row; + + flex: 0 0 100%; + margin-bottom: 1em; +} + +.instance-info { + flex: 0 0 50%; +} + +.instance .spacer { + flex-grow: 1 +} + +.menu-btn { + flex: 1 0 25%; +} + +.ready-btn { + flex: 1 0 50%; +} + +.ready-btn:hover { + transition-property: all; + transition-duration: 2s; + transition-timing-function: ease; + color: forestgreen; + border-color: forestgreen; + /*box-shadow: inset -0.5em 0 0 0 forestgreen;*/ +} + +.instance-ui-btn { + font-size: 100%; + padding: 0; + margin: 0; +} + +.vbox { + flex: 1 1 25%; + + display: flex; + flex-flow: row wrap; + align-content: flex-start; +} + +.vbox-hdr { + display: flex; + align-items: flex-end; + + flex: 1 0 100%; +} + +.vbox-hdr div:first-child { + flex-grow: 1; +} + +.vbox-hdr .bits { + font-size: 2em; + line-height: 1em; +} + +.vbox-btn { + flex: 1 0 100%; + margin: 0; + padding: 0 0.5em; + background-color: whitesmoke; + color: black; +} + +.vbox-btn:hover { + color: black; +} + +.vbox-table { + table-layout: fixed; + width: 100%; +} + +.vbox-table td { + border: 1px solid whitesmoke; + padding: 0.2em; + text-align: center; + height: 40px; + cursor: pointer; + text-transform: uppercase; +} + +.spacer { + flex: 1 0 25%; +} + +.cryp-list { + flex: 1 1 25%; + + display: flex; + flex-flow: column; + height: 95%; + padding: 0 2em 0 2em; +} + +/* CRYP BOX */ +.cryp-box { + flex: 1 1 100%; + + display: flex; + flex-flow: column; + border: 1px solid whitesmoke; + margin-bottom: 1em; + justify-content: center; +} + +.cryp-box-top { + display: flex; + flex: 1 1 80%; + width: 100%; + justify-content: center; + align-items: stretch; +} + +.cryp-box .particle { + position: fixed; + z-index: -10; +} + +.cryp-box figure { + margin: 0; + flex: 0 0 50%; + text-align: center; + box-sizing: border-box; + display: flex; + flex-flow: column; +} + +.cryp-box .stats { + flex: 0 0 20%; + width: 100%; + display: flex; + border-top: 1px solid whitesmoke; +} + +.cryp-box .stats figure { + flex: 1 1 0; + border: 0; + align-items: center; + padding: 0.25em 0; +} + +.cryp-box .stats figcaption { + font-size: 75%; +} + + +.cryp-box .stats svg { + height: 1.5em; + stroke-width: 2px; +} + +.cryp-box .skills { + display: flex; + flex-flow: row wrap; + flex: 1 1 50%; +} + +.cryp-skill-btn { + flex: 1 1 100%; + font-size: 16pt; + border-width: 1px; + padding: 0; + margin: 0; + border-bottom-width: 0px; + border-left-width: 1px; + border-right-width: 0px; +} + +.cryp-skill-btn:first-child { + border-top-width: 0; +} + + +/* GAME */ +.game-back-btn { + flex: 0 0 20%; +} + +.cryp-skill-btn[disabled] { + color: #333333; + font-size: 14pt; +} + +.cryp-box.ko { + animation: none; + opacity: 0.5; +} + +.team-player { + display: flex; + flex: 1 0 20%; + height: 90%; + padding: 0; +} + +.team-opponent { + display: flex; + flex: 1 0 20%; + height: 90%; + padding: 0; +} + +.logs { + padding-left: 2em; + display: flex; + flex-flow: row wrap; + flex: 0 0 20%; +} + +.selected-skills { + flex: 1 1 25%; + + display: flex; + flex-flow: column; + height: 95%; + padding: 0 2em 0 2em; + justify-content: center; +} + +.stack-line { + display: flex; + align-items: center; + padding-left: 2em; + flex: 1; } \ No newline at end of file diff --git a/client/index.html b/client/index.html index b8ab05d5..0fb46f04 100644 --- a/client/index.html +++ b/client/index.html @@ -1,16 +1,18 @@ - - - - cryps.gg - mnml pvp atbs - - - - - - - - - - - + + + + cryps.gg - mnml pvp atbs + + + + + + + + + + + + + \ No newline at end of file diff --git a/client/index.js b/client/index.js old mode 100644 new mode 100755 diff --git a/client/package.json b/client/package.json index f84c4f2b..2911f2fa 100644 --- a/client/package.json +++ b/client/package.json @@ -4,30 +4,37 @@ "description": "", "main": "index.js", "scripts": { - "start": "parcel index.html --port 40080 --no-hmr --no-source-maps", - "build": "rm -rf dist && parcel build --no-source-maps index.html", - "lint": "eslint --fix src/", + "start": "parcel index.html --port 40080 --no-source-maps", + "build": "rm -rf dist && parcel build index.html", + "lint": "eslint --fix --ext .jsx src/", "test": "echo \"Error: no test specified\" && exit 1" }, "author": "", "license": "UNLICENSED", "dependencies": { - "async": "^2.6.1", "borc": "^2.0.3", + "bulma-toast": "^1.2.0", "docco": "^0.7.0", "izitoast": "^1.4.0", "jdenticon": "^2.1.0", "key": "^0.1.11", "keymaster": "^1.6.2", "lodash": "^4.17.11", - "parcel": "^1.11.0", - "phaser": "^3.16.1", + "parcel": "^1.12.3", + "particles.js": "^2.0.0", + "phaser": "^3.15.1", + "preact": "^8.3.1", + "preact-redux": "^2.0.3", "redux": "^4.0.0" }, "devDependencies": { + "babel-core": "^6.26.3", + "babel-preset-es2015": "^6.24.1", + "babel-preset-react": "^6.24.1", "eslint": "^5.6.0", "eslint-config-airbnb-base": "^13.1.0", "eslint-plugin-import": "^2.14.0", + "eslint-plugin-react": "^7.11.1", "jest": "^18.0.0" } } diff --git a/html-client/src/actions.jsx b/client/src/actions.jsx similarity index 100% rename from html-client/src/actions.jsx rename to client/src/actions.jsx diff --git a/html-client/src/components/body.component.jsx b/client/src/components/body.component.jsx similarity index 100% rename from html-client/src/components/body.component.jsx rename to client/src/components/body.component.jsx diff --git a/html-client/src/components/constants.jsx b/client/src/components/constants.jsx similarity index 100% rename from html-client/src/components/constants.jsx rename to client/src/components/constants.jsx diff --git a/html-client/src/components/cryp.list.component.jsx b/client/src/components/cryp.list.component.jsx similarity index 100% rename from html-client/src/components/cryp.list.component.jsx rename to client/src/components/cryp.list.component.jsx diff --git a/html-client/src/components/cryp.list.container.jsx b/client/src/components/cryp.list.container.jsx similarity index 100% rename from html-client/src/components/cryp.list.container.jsx rename to client/src/components/cryp.list.container.jsx diff --git a/html-client/src/components/cryp.spawn.button.jsx b/client/src/components/cryp.spawn.button.jsx similarity index 100% rename from html-client/src/components/cryp.spawn.button.jsx rename to client/src/components/cryp.spawn.button.jsx diff --git a/html-client/src/components/cryp.spawn.container.js b/client/src/components/cryp.spawn.container.js similarity index 100% rename from html-client/src/components/cryp.spawn.container.js rename to client/src/components/cryp.spawn.container.js diff --git a/html-client/src/components/game.component.jsx b/client/src/components/game.component.jsx similarity index 100% rename from html-client/src/components/game.component.jsx rename to client/src/components/game.component.jsx diff --git a/html-client/src/components/game.container.jsx b/client/src/components/game.container.jsx similarity index 100% rename from html-client/src/components/game.container.jsx rename to client/src/components/game.container.jsx diff --git a/html-client/src/components/header.component.jsx b/client/src/components/header.component.jsx similarity index 100% rename from html-client/src/components/header.component.jsx rename to client/src/components/header.component.jsx diff --git a/html-client/src/components/info.component.jsx b/client/src/components/info.component.jsx similarity index 100% rename from html-client/src/components/info.component.jsx rename to client/src/components/info.component.jsx diff --git a/html-client/src/components/info.container.jsx b/client/src/components/info.container.jsx similarity index 100% rename from html-client/src/components/info.container.jsx rename to client/src/components/info.container.jsx diff --git a/html-client/src/components/instance.component.jsx b/client/src/components/instance.component.jsx similarity index 100% rename from html-client/src/components/instance.component.jsx rename to client/src/components/instance.component.jsx diff --git a/html-client/src/components/instance.container.jsx b/client/src/components/instance.container.jsx similarity index 100% rename from html-client/src/components/instance.container.jsx rename to client/src/components/instance.container.jsx diff --git a/html-client/src/components/instance.list.component.jsx b/client/src/components/instance.list.component.jsx similarity index 100% rename from html-client/src/components/instance.list.component.jsx rename to client/src/components/instance.list.component.jsx diff --git a/html-client/src/components/instance.list.container.jsx b/client/src/components/instance.list.container.jsx similarity index 100% rename from html-client/src/components/instance.list.container.jsx rename to client/src/components/instance.list.container.jsx diff --git a/html-client/src/components/login.component.jsx b/client/src/components/login.component.jsx similarity index 100% rename from html-client/src/components/login.component.jsx rename to client/src/components/login.component.jsx diff --git a/html-client/src/components/login.container.jsx b/client/src/components/login.container.jsx similarity index 100% rename from html-client/src/components/login.container.jsx rename to client/src/components/login.container.jsx diff --git a/html-client/src/components/molecule.jsx b/client/src/components/molecule.jsx similarity index 100% rename from html-client/src/components/molecule.jsx rename to client/src/components/molecule.jsx diff --git a/html-client/src/components/particles.config.js b/client/src/components/particles.config.js similarity index 100% rename from html-client/src/components/particles.config.js rename to client/src/components/particles.config.js diff --git a/html-client/src/components/saw.component.jsx b/client/src/components/saw.component.jsx similarity index 100% rename from html-client/src/components/saw.component.jsx rename to client/src/components/saw.component.jsx diff --git a/html-client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx similarity index 100% rename from html-client/src/components/vbox.component.jsx rename to client/src/components/vbox.component.jsx diff --git a/html-client/src/components/vbox.container.jsx b/client/src/components/vbox.container.jsx similarity index 100% rename from html-client/src/components/vbox.container.jsx rename to client/src/components/vbox.container.jsx diff --git a/html-client/src/events.jsx b/client/src/events.jsx similarity index 100% rename from html-client/src/events.jsx rename to client/src/events.jsx diff --git a/html-client/src/keyboard.jsx b/client/src/keyboard.jsx similarity index 100% rename from html-client/src/keyboard.jsx rename to client/src/keyboard.jsx diff --git a/html-client/src/main.jsx b/client/src/main.jsx similarity index 100% rename from html-client/src/main.jsx rename to client/src/main.jsx diff --git a/html-client/src/reducers.jsx b/client/src/reducers.jsx similarity index 100% rename from html-client/src/reducers.jsx rename to client/src/reducers.jsx diff --git a/html-client/src/socket.jsx b/client/src/socket.jsx similarity index 100% rename from html-client/src/socket.jsx rename to client/src/socket.jsx diff --git a/html-client/src/utils.jsx b/client/src/utils.jsx similarity index 100% rename from html-client/src/utils.jsx rename to client/src/utils.jsx diff --git a/html-client/cryps.css b/html-client/cryps.css deleted file mode 100644 index 23bb53c9..00000000 --- a/html-client/cryps.css +++ /dev/null @@ -1,438 +0,0 @@ -/* - GLOBAL -*/ - -html, body, .cryps { - width: 100%; - height: 100%; - margin: 0; - - background-color: #000000; - font-family: 'Jura'; - color: whitesmoke; - font-size: 16pt; - user-select: none; - - /* this is the sweet nectar to keep it full page*/ - max-height: 100%; - overflow: hidden; -} - -html { - box-sizing: border-box; - margin: 0; - padding: 0; - height: 100%; -} - -*, *:before, *:after { - box-sizing: inherit; -} - - -/* main container */ -.cryps { - padding: 0 2em; - display: flex; - flex-flow: column; - position: fixed; -} - -main { - display: flex; - flex-flow: row wrap; - flex: 1 1 90%; - - padding-top: 1em; - - align-content: flex-start; - justify-content: flex-start; - align-items: flex-start; - -} - -button, input { - font-family: 'Jura'; - height: auto; - color: whitesmoke; - border-width: 2px; - border-color: whitesmoke; - border-radius: 0; - letter-spacing: 0.25em; - box-sizing: border-box; - - /*the transitions */ - transition-property: all; - transition-duration: 0.5s; - transition-delay: 0; - transition-timing-function: ease; -} - -button:hover, button:focus { - /*colour necesary to bash skellington*/ - color: whitesmoke; - border-color: whitesmoke; -} - -button.right[disabled]:hover, button.left[disabled]:hover { - box-shadow: none; -} - -button.right:hover, button.right:focus { - box-shadow: inset -0.5em 0 0 0 whitesmoke; -} - -button.left:hover, button.left:focus { - box-shadow: inset 0.5em 0 0 0 whitesmoke; -} - -/* - MENU -*/ -header { - display: flex; - flex-flow: row; - flex: 1; -} - -.header-title { - flex: 1; - font-size: 2em; - letter-spacing: 0.05em; -} - -.header-username { - letter-spacing: 0.25em; - font-size: 2em; - display: inline; -} - -.header-status { - text-align: right; -} - -.header-status svg { - margin-left: 1em; - height: 1em; - background-color: black; -} - -.login { - display: inline; - margin-right: 0; -} - -.ping-path { - fill: none; - stroke-width: 4px; - stroke-dasharray: 121, 242; - animation: saw 2s infinite linear; -} - -@keyframes saw { - 0% { - stroke-dashoffset: 363; - } - 100% { - stroke-dashoffset: 0; - } -} - -.menu-cryps { - display: flex; - flex-flow: row wrap; - - flex: 0 0 50%; -} - -.menu-cryp-ctr { - flex: 0 0 33%; - flex-flow: column; - - text-align: center; - display: flex; -} - -.menu-cryp { - height: 100%; - margin: 0.5em; - box-sizing: border-box; - border: 1px solid black; - - transition-property: border; - transition-duration: 0.5s; - transition-delay: 0; - transition-timing-function: ease; -} - -.menu-cryp h2 { - font-size: 2em; -} - -.menu-instance-list { - flex: 0 0 50%; - flex-flow: row wrap; - - display: flex; - align-content: flex-start; - height: 100%; -} - -.menu-instance-btn { - box-sizing: border-box; - flex: 1 0 20%; - font-size: 150%; - /*min-width: 20%;*/ - border-width: 2px; - padding: 0.5em; - margin: 0.5em; -} - -.menu-instance-btn.full { - flex: 1 0 100%; -} - -/* - INSTANCE -*/ - - -.instance { - display: flex; - flex-flow: row wrap; - align-content: flex-start; -} - -.instance-hdr { - display: flex; - flex-flow: row; - - flex: 0 0 100%; - margin-bottom: 1em; -} - -.instance-info { - flex: 0 0 50%; -} - -.instance .spacer { - flex-grow: 1 -} - -.menu-btn { - flex: 1 0 25%; -} - -.ready-btn { - flex: 1 0 50%; -} - -.ready-btn:hover { - transition-property: all; - transition-duration: 2s; - transition-timing-function: ease; - color: forestgreen; - border-color: forestgreen; - /*box-shadow: inset -0.5em 0 0 0 forestgreen;*/ -} - -.instance-ui-btn { - font-size: 100%; - padding: 0; - margin: 0; -} - -.vbox { - flex: 1 1 25%; - - display: flex; - flex-flow: row wrap; - align-content: flex-start; -} - -.vbox-hdr { - display: flex; - align-items: flex-end; - - flex: 1 0 100%; -} - -.vbox-hdr div:first-child { - flex-grow: 1; -} - -.vbox-hdr .bits { - font-size: 2em; - line-height: 1em; -} - -.vbox-btn { - flex: 1 0 100%; - margin: 0; - padding: 0 0.5em; - background-color: whitesmoke; - color: black; -} - -.vbox-btn:hover { - color: black; -} - -.vbox-table { - table-layout: fixed; - width: 100%; -} - -.vbox-table td { - border: 1px solid whitesmoke; - padding: 0.2em; - text-align: center; - height: 40px; - cursor: pointer; - text-transform: uppercase; -} - -.spacer { - flex: 1 0 25%; -} - -.cryp-list { - flex: 1 1 25%; - - display: flex; - flex-flow: column; - height: 95%; - padding: 0 2em 0 2em; -} - -/* CRYP BOX */ -.cryp-box { - flex: 1 1 100%; - - display: flex; - flex-flow: column; - border: 1px solid whitesmoke; - margin-bottom: 1em; - justify-content: center; -} - -.cryp-box-top { - display: flex; - flex: 1 1 80%; - width: 100%; - justify-content: center; - align-items: stretch; -} - -.cryp-box .particle { - position: fixed; - z-index: -10; -} - -.cryp-box figure { - margin: 0; - flex: 0 0 50%; - text-align: center; - box-sizing: border-box; - display: flex; - flex-flow: column; -} - -.cryp-box .stats { - flex: 0 0 20%; - width: 100%; - display: flex; - border-top: 1px solid whitesmoke; -} - -.cryp-box .stats figure { - flex: 1 1 0; - border: 0; - align-items: center; - padding: 0.25em 0; -} - -.cryp-box .stats figcaption { - font-size: 75%; -} - - -.cryp-box .stats svg { - height: 1.5em; - stroke-width: 2px; -} - -.cryp-box .skills { - display: flex; - flex-flow: row wrap; - flex: 1 1 50%; -} - -.cryp-skill-btn { - flex: 1 1 100%; - font-size: 16pt; - border-width: 1px; - padding: 0; - margin: 0; - border-bottom-width: 0px; - border-left-width: 1px; - border-right-width: 0px; -} - -.cryp-skill-btn:first-child { - border-top-width: 0; -} - - -/* GAME */ -.game-back-btn { - flex: 0 0 20%; -} - -.cryp-skill-btn[disabled] { - color: #333333; - font-size: 14pt; -} - -.cryp-box.ko { - animation: none; - opacity: 0.5; -} - -.team-player { - display: flex; - flex: 1 0 20%; - height: 90%; - padding: 0; -} - -.team-opponent { - display: flex; - flex: 1 0 20%; - height: 90%; - padding: 0; -} - -.logs { - padding-left: 2em; - display: flex; - flex-flow: row wrap; - flex: 0 0 20%; -} - -.selected-skills { - flex: 1 1 25%; - - display: flex; - flex-flow: column; - height: 95%; - padding: 0 2em 0 2em; - justify-content: center; -} - -.stack-line { - display: flex; - align-items: center; - padding-left: 2em; - flex: 1; -} \ No newline at end of file diff --git a/html-client/.eslintrc.js b/phaser-client/.eslintrc.js similarity index 99% rename from html-client/.eslintrc.js rename to phaser-client/.eslintrc.js index b7b57ee7..2bb5ed38 100755 --- a/html-client/.eslintrc.js +++ b/phaser-client/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = { - extends: [ - 'plugin:react/recommended', - ], + // extends: [ + // 'plugin:react/recommended', + // ], env: { browser: true, node: true @@ -14,10 +14,10 @@ module.exports = { 'import' ], settings: { - react: { - pragma: "preact", - version: "15.0", - }, + // react: { + // pragma: "preact", + // version: "15.0", + // }, 'import/resolver': { node: { extensions: ['.mjs', '.js', '.jsx', '.json'] @@ -55,12 +55,12 @@ module.exports = { 'key-spacing': ['error'], // for preact - "react/react-in-jsx-scope": [0], - "react/jsx-indent": [2, 4], - "react/jsx-uses-react": 1, - "react/jsx-uses-vars": 1, - "react/prefer-stateless-function": 1, - "react/prop-types": 0, + // "react/react-in-jsx-scope": [0], + // "react/jsx-indent": [2, 4], + // "react/jsx-uses-react": 1, + // "react/jsx-uses-vars": 1, + // "react/prefer-stateless-function": 1, + // "react/prop-types": 0, // airbnb copypasta // enforces getter/setter pairs in objects @@ -539,7 +539,7 @@ module.exports = { // require parens in arrow function arguments // https://eslint.org/docs/rules/arrow-parens 'arrow-parens': ['error', 'as-needed', { - requireForBlockBody: false, + requireForBlockBody: true, }], // require space before/after arrow function's arrow @@ -927,7 +927,7 @@ module.exports = { // specify the maximum length of a line in your program // https://eslint.org/docs/rules/max-len - 'max-len': ['error', 100, 2, { + 'max-len': ['error', 120, 2, { ignoreUrls: true, ignoreComments: false, ignoreRegExpLiterals: true, diff --git a/html-client/.gitignore b/phaser-client/.gitignore similarity index 100% rename from html-client/.gitignore rename to phaser-client/.gitignore diff --git a/client/assets/alakazam-f.png b/phaser-client/assets/alakazam-f.png similarity index 100% rename from client/assets/alakazam-f.png rename to phaser-client/assets/alakazam-f.png diff --git a/client/assets/alphabet.jpg b/phaser-client/assets/alphabet.jpg similarity index 100% rename from client/assets/alphabet.jpg rename to phaser-client/assets/alphabet.jpg diff --git a/client/assets/aztec.atlas.json b/phaser-client/assets/aztec.atlas.json similarity index 100% rename from client/assets/aztec.atlas.json rename to phaser-client/assets/aztec.atlas.json diff --git a/client/assets/aztec.clean.png b/phaser-client/assets/aztec.clean.png similarity index 100% rename from client/assets/aztec.clean.png rename to phaser-client/assets/aztec.clean.png diff --git a/client/assets/aztec.jpg b/phaser-client/assets/aztec.jpg similarity index 100% rename from client/assets/aztec.jpg rename to phaser-client/assets/aztec.jpg diff --git a/client/assets/c1.svg b/phaser-client/assets/c1.svg similarity index 100% rename from client/assets/c1.svg rename to phaser-client/assets/c1.svg diff --git a/client/assets/c2.svg b/phaser-client/assets/c2.svg similarity index 100% rename from client/assets/c2.svg rename to phaser-client/assets/c2.svg diff --git a/client/assets/c3.svg b/phaser-client/assets/c3.svg similarity index 100% rename from client/assets/c3.svg rename to phaser-client/assets/c3.svg diff --git a/client/assets/fonts/noway-regular-webfont.eot b/phaser-client/assets/fonts/noway-regular-webfont.eot similarity index 100% rename from client/assets/fonts/noway-regular-webfont.eot rename to phaser-client/assets/fonts/noway-regular-webfont.eot diff --git a/client/assets/fonts/noway-regular-webfont.svg b/phaser-client/assets/fonts/noway-regular-webfont.svg similarity index 100% rename from client/assets/fonts/noway-regular-webfont.svg rename to phaser-client/assets/fonts/noway-regular-webfont.svg diff --git a/client/assets/fonts/noway-regular-webfont.ttf b/phaser-client/assets/fonts/noway-regular-webfont.ttf similarity index 100% rename from client/assets/fonts/noway-regular-webfont.ttf rename to phaser-client/assets/fonts/noway-regular-webfont.ttf diff --git a/client/assets/fonts/noway-regular-webfont.woff b/phaser-client/assets/fonts/noway-regular-webfont.woff similarity index 100% rename from client/assets/fonts/noway-regular-webfont.woff rename to phaser-client/assets/fonts/noway-regular-webfont.woff diff --git a/client/assets/fonts/noway-regular-webfont.woff2 b/phaser-client/assets/fonts/noway-regular-webfont.woff2 similarity index 100% rename from client/assets/fonts/noway-regular-webfont.woff2 rename to phaser-client/assets/fonts/noway-regular-webfont.woff2 diff --git a/client/assets/glyphs.jpg b/phaser-client/assets/glyphs.jpg similarity index 100% rename from client/assets/glyphs.jpg rename to phaser-client/assets/glyphs.jpg diff --git a/client/assets/magmar.png b/phaser-client/assets/magmar.png similarity index 100% rename from client/assets/magmar.png rename to phaser-client/assets/magmar.png diff --git a/phaser-client/cryps.css b/phaser-client/cryps.css new file mode 100644 index 00000000..b0020329 --- /dev/null +++ b/phaser-client/cryps.css @@ -0,0 +1,24 @@ +/*@font-face { + font-family: 'nowayregular'; + src: url('./assets/fonts/noway-regular-webfont.eot'); + src: url('./assets/fonts/noway-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('./assets/fonts/noway-regular-webfont.woff2') format('woff2'), + url('./assets/fonts/noway-regular-webfont.woff') format('woff'), + url('./assets/fonts/noway-regular-webfont.ttf') format('truetype'), + url('./assets/fonts/noway-regular-webfont.svg#nowayregular') format('svg'); + font-weight: normal; + font-style: normal; +} +*/ +body { + background-color: #181818; +} + +canvas{ + display:block; + margin: 0; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} \ No newline at end of file diff --git a/html-client/index.html b/phaser-client/index.html similarity index 65% rename from html-client/index.html rename to phaser-client/index.html index 0fb46f04..b8ab05d5 100644 --- a/html-client/index.html +++ b/phaser-client/index.html @@ -1,18 +1,16 @@ - - - - cryps.gg - mnml pvp atbs - - - - - - - - - - - - - + + + + cryps.gg - mnml pvp atbs + + + + + + + + + + + \ No newline at end of file diff --git a/html-client/index.js b/phaser-client/index.js old mode 100755 new mode 100644 similarity index 100% rename from html-client/index.js rename to phaser-client/index.js diff --git a/client/lib/fizzy-noise.js b/phaser-client/lib/fizzy-noise.js similarity index 100% rename from client/lib/fizzy-noise.js rename to phaser-client/lib/fizzy-noise.js diff --git a/client/lib/fizzy-text.js b/phaser-client/lib/fizzy-text.js similarity index 100% rename from client/lib/fizzy-text.js rename to phaser-client/lib/fizzy-text.js diff --git a/html-client/package.json b/phaser-client/package.json similarity index 55% rename from html-client/package.json rename to phaser-client/package.json index 2911f2fa..f84c4f2b 100644 --- a/html-client/package.json +++ b/phaser-client/package.json @@ -4,37 +4,30 @@ "description": "", "main": "index.js", "scripts": { - "start": "parcel index.html --port 40080 --no-source-maps", - "build": "rm -rf dist && parcel build index.html", - "lint": "eslint --fix --ext .jsx src/", + "start": "parcel index.html --port 40080 --no-hmr --no-source-maps", + "build": "rm -rf dist && parcel build --no-source-maps index.html", + "lint": "eslint --fix src/", "test": "echo \"Error: no test specified\" && exit 1" }, "author": "", "license": "UNLICENSED", "dependencies": { + "async": "^2.6.1", "borc": "^2.0.3", - "bulma-toast": "^1.2.0", "docco": "^0.7.0", "izitoast": "^1.4.0", "jdenticon": "^2.1.0", "key": "^0.1.11", "keymaster": "^1.6.2", "lodash": "^4.17.11", - "parcel": "^1.12.3", - "particles.js": "^2.0.0", - "phaser": "^3.15.1", - "preact": "^8.3.1", - "preact-redux": "^2.0.3", + "parcel": "^1.11.0", + "phaser": "^3.16.1", "redux": "^4.0.0" }, "devDependencies": { - "babel-core": "^6.26.3", - "babel-preset-es2015": "^6.24.1", - "babel-preset-react": "^6.24.1", "eslint": "^5.6.0", "eslint-config-airbnb-base": "^13.1.0", "eslint-plugin-import": "^2.14.0", - "eslint-plugin-react": "^7.11.1", "jest": "^18.0.0" } } diff --git a/client/src/events.js b/phaser-client/src/events.js similarity index 100% rename from client/src/events.js rename to phaser-client/src/events.js diff --git a/client/src/main.js b/phaser-client/src/main.js similarity index 100% rename from client/src/main.js rename to phaser-client/src/main.js diff --git a/client/src/scenes/avatar.js b/phaser-client/src/scenes/avatar.js similarity index 100% rename from client/src/scenes/avatar.js rename to phaser-client/src/scenes/avatar.js diff --git a/client/src/scenes/background.js b/phaser-client/src/scenes/background.js similarity index 100% rename from client/src/scenes/background.js rename to phaser-client/src/scenes/background.js diff --git a/client/src/scenes/combat.animations.js b/phaser-client/src/scenes/combat.animations.js similarity index 100% rename from client/src/scenes/combat.animations.js rename to phaser-client/src/scenes/combat.animations.js diff --git a/client/src/scenes/combat.cryps.js b/phaser-client/src/scenes/combat.cryps.js similarity index 100% rename from client/src/scenes/combat.cryps.js rename to phaser-client/src/scenes/combat.cryps.js diff --git a/client/src/scenes/combat.hitbox.js b/phaser-client/src/scenes/combat.hitbox.js similarity index 100% rename from client/src/scenes/combat.hitbox.js rename to phaser-client/src/scenes/combat.hitbox.js diff --git a/client/src/scenes/combat.js b/phaser-client/src/scenes/combat.js similarity index 100% rename from client/src/scenes/combat.js rename to phaser-client/src/scenes/combat.js diff --git a/client/src/scenes/combat.log.js b/phaser-client/src/scenes/combat.log.js similarity index 100% rename from client/src/scenes/combat.log.js rename to phaser-client/src/scenes/combat.log.js diff --git a/client/src/scenes/combat.render.resolutions.js b/phaser-client/src/scenes/combat.render.resolutions.js similarity index 100% rename from client/src/scenes/combat.render.resolutions.js rename to phaser-client/src/scenes/combat.render.resolutions.js diff --git a/client/src/scenes/combat.skills.js b/phaser-client/src/scenes/combat.skills.js similarity index 100% rename from client/src/scenes/combat.skills.js rename to phaser-client/src/scenes/combat.skills.js diff --git a/client/src/scenes/constants.js b/phaser-client/src/scenes/constants.js similarity index 100% rename from client/src/scenes/constants.js rename to phaser-client/src/scenes/constants.js diff --git a/client/src/scenes/cryps.js b/phaser-client/src/scenes/cryps.js similarity index 100% rename from client/src/scenes/cryps.js rename to phaser-client/src/scenes/cryps.js diff --git a/client/src/scenes/elements/box.js b/phaser-client/src/scenes/elements/box.js similarity index 100% rename from client/src/scenes/elements/box.js rename to phaser-client/src/scenes/elements/box.js diff --git a/client/src/scenes/elements/combat.statbar.js b/phaser-client/src/scenes/elements/combat.statbar.js similarity index 100% rename from client/src/scenes/elements/combat.statbar.js rename to phaser-client/src/scenes/elements/combat.statbar.js diff --git a/client/src/scenes/elements/item.js b/phaser-client/src/scenes/elements/item.js similarity index 100% rename from client/src/scenes/elements/item.js rename to phaser-client/src/scenes/elements/item.js diff --git a/client/src/scenes/elements/outline.rotate.js b/phaser-client/src/scenes/elements/outline.rotate.js similarity index 100% rename from client/src/scenes/elements/outline.rotate.js rename to phaser-client/src/scenes/elements/outline.rotate.js diff --git a/client/src/scenes/game.list.js b/phaser-client/src/scenes/game.list.js similarity index 100% rename from client/src/scenes/game.list.js rename to phaser-client/src/scenes/game.list.js diff --git a/client/src/scenes/header.js b/phaser-client/src/scenes/header.js similarity index 100% rename from client/src/scenes/header.js rename to phaser-client/src/scenes/header.js diff --git a/client/src/scenes/home.cryps.js b/phaser-client/src/scenes/home.cryps.js similarity index 100% rename from client/src/scenes/home.cryps.js rename to phaser-client/src/scenes/home.cryps.js diff --git a/client/src/scenes/home.instances.js b/phaser-client/src/scenes/home.instances.js similarity index 100% rename from client/src/scenes/home.instances.js rename to phaser-client/src/scenes/home.instances.js diff --git a/client/src/scenes/home.js b/phaser-client/src/scenes/home.js similarity index 100% rename from client/src/scenes/home.js rename to phaser-client/src/scenes/home.js diff --git a/client/src/scenes/home.navigation.js b/phaser-client/src/scenes/home.navigation.js similarity index 100% rename from client/src/scenes/home.navigation.js rename to phaser-client/src/scenes/home.navigation.js diff --git a/client/src/scenes/home.news.js b/phaser-client/src/scenes/home.news.js similarity index 100% rename from client/src/scenes/home.news.js rename to phaser-client/src/scenes/home.news.js diff --git a/client/src/scenes/home.rankings.js b/phaser-client/src/scenes/home.rankings.js similarity index 100% rename from client/src/scenes/home.rankings.js rename to phaser-client/src/scenes/home.rankings.js diff --git a/client/src/scenes/home.shop.js b/phaser-client/src/scenes/home.shop.js similarity index 100% rename from client/src/scenes/home.shop.js rename to phaser-client/src/scenes/home.shop.js diff --git a/client/src/scenes/item.info.js b/phaser-client/src/scenes/item.info.js similarity index 100% rename from client/src/scenes/item.info.js rename to phaser-client/src/scenes/item.info.js diff --git a/client/src/scenes/item.list.js b/phaser-client/src/scenes/item.list.js similarity index 100% rename from client/src/scenes/item.list.js rename to phaser-client/src/scenes/item.list.js diff --git a/client/src/scenes/menu.cryps.list.js b/phaser-client/src/scenes/menu.cryps.list.js similarity index 100% rename from client/src/scenes/menu.cryps.list.js rename to phaser-client/src/scenes/menu.cryps.list.js diff --git a/client/src/scenes/menu.js b/phaser-client/src/scenes/menu.js similarity index 100% rename from client/src/scenes/menu.js rename to phaser-client/src/scenes/menu.js diff --git a/client/src/scenes/menu.navigation.js b/phaser-client/src/scenes/menu.navigation.js similarity index 100% rename from client/src/scenes/menu.navigation.js rename to phaser-client/src/scenes/menu.navigation.js diff --git a/client/src/scenes/statsheet.js b/phaser-client/src/scenes/statsheet.js similarity index 100% rename from client/src/scenes/statsheet.js rename to phaser-client/src/scenes/statsheet.js diff --git a/client/src/scenes/zone.controls.js b/phaser-client/src/scenes/zone.controls.js similarity index 100% rename from client/src/scenes/zone.controls.js rename to phaser-client/src/scenes/zone.controls.js diff --git a/client/src/scenes/zone.node.js b/phaser-client/src/scenes/zone.node.js similarity index 100% rename from client/src/scenes/zone.node.js rename to phaser-client/src/scenes/zone.node.js diff --git a/client/src/scenes/zones.js b/phaser-client/src/scenes/zones.js similarity index 100% rename from client/src/scenes/zones.js rename to phaser-client/src/scenes/zones.js diff --git a/client/src/socket.js b/phaser-client/src/socket.js similarity index 100% rename from client/src/socket.js rename to phaser-client/src/socket.js diff --git a/client/src/tutorial.js b/phaser-client/src/tutorial.js similarity index 100% rename from client/src/tutorial.js rename to phaser-client/src/tutorial.js diff --git a/client/src/utils.js b/phaser-client/src/utils.js similarity index 100% rename from client/src/utils.js rename to phaser-client/src/utils.js