diff --git a/LICENSE b/LICENSE deleted file mode 100644 index fb4e8b8..0000000 --- a/LICENSE +++ /dev/null @@ -1 +0,0 @@ -docs/solutions/hpc.png: https://www.intel.com/content/dam/www/public/us/en/images/photography-business/RWD/blue-server-room-16x9-dark.jpg.rendition.intel.web.320.180.jpg diff --git a/README.md b/README.md index 15f0e34..38f787c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,23 @@ # Peddlers of Ketran +This project consists of both the front-end and back-end game +API server. + +The front-end is launched in development mode via 'npm start'. In production, you build +it via 'npm build' and deploy the public front-end. When you run the development +mode, the default port it will bind to is 8931. + +The back-end is launched out of the 'server' directory via 'npm start' and will +bind to the default port 8930. + +If you change the default port of the REST API server, you will need to change +client/package.json's "proxy" value to reflect the new port change. + +NOTE: + +Board.js currently hard codes assetsPath and gamesPath to be absolute as the +dynamic router and resource / asset loading isn't working correctly. + ## Building ### Native @@ -74,15 +92,23 @@ npm start ``` ## Install + ```bash -sudo cp ketr.ketran /etc/logrotate.d/ -sudo cp ketr.ketran.service /etc/systemd/system/ +export BASEPATH=${PWD} +# Ensure sudo has password ready +sudo -l +envsubst BASEPATH < install/ketr.ketran | sudo tee /etc/logrotate.d/ketr.ketran +envsubst BASEPATH < install/ketr.ketran.service | sudo tee /etc/systemd/system/ketr.ketran.service sudo systemctl daemon-reload ``` Install the following into your nginx server configuration: ```nginx + location /ketr.ketran { + alias ${BASEPATH}; + } + location ~ /ketr.ketran/api/.* { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -97,9 +123,6 @@ Install the following into your nginx server configuration: proxy_pass http://localhost:8930; } - location /ketr.ketran { - alias /var/www/html/peddlers-of-ketran; - } ``` Add security tokens in ketr.ketran/config/local.json: diff --git a/.babelrc b/client/.babelrc similarity index 100% rename from .babelrc rename to client/.babelrc diff --git a/package.json b/client/package.json similarity index 96% rename from package.json rename to client/package.json index 5b9b76e..b3c1baa 100644 --- a/package.json +++ b/client/package.json @@ -2,6 +2,7 @@ "name": "peddlers-of-ketran", "version": "0.1.0", "private": true, + "proxy": "http://localhost:8930", "dependencies": { "@material-ui/core": "^4.12.3", "@material-ui/lab": "^4.0.0-alpha.60", diff --git a/assets/README.md b/client/public/assets/README.md similarity index 100% rename from assets/README.md rename to client/public/assets/README.md diff --git a/assets/down.png b/client/public/assets/down.png similarity index 100% rename from assets/down.png rename to client/public/assets/down.png diff --git a/assets/favicon-128.png b/client/public/assets/favicon-128.png similarity index 100% rename from assets/favicon-128.png rename to client/public/assets/favicon-128.png diff --git a/assets/favicon-152.png b/client/public/assets/favicon-152.png similarity index 100% rename from assets/favicon-152.png rename to client/public/assets/favicon-152.png diff --git a/assets/favicon-167.png b/client/public/assets/favicon-167.png similarity index 100% rename from assets/favicon-167.png rename to client/public/assets/favicon-167.png diff --git a/assets/favicon-180.png b/client/public/assets/favicon-180.png similarity index 100% rename from assets/favicon-180.png rename to client/public/assets/favicon-180.png diff --git a/assets/favicon-192.png b/client/public/assets/favicon-192.png similarity index 100% rename from assets/favicon-192.png rename to client/public/assets/favicon-192.png diff --git a/assets/favicon-256.png b/client/public/assets/favicon-256.png similarity index 100% rename from assets/favicon-256.png rename to client/public/assets/favicon-256.png diff --git a/assets/favicon-32.png b/client/public/assets/favicon-32.png similarity index 100% rename from assets/favicon-32.png rename to client/public/assets/favicon-32.png diff --git a/assets/gfx/borders-1.6.jpg b/client/public/assets/gfx/borders-1.6.jpg similarity index 100% rename from assets/gfx/borders-1.6.jpg rename to client/public/assets/gfx/borders-1.6.jpg diff --git a/assets/gfx/borders-1.6.png b/client/public/assets/gfx/borders-1.6.png similarity index 100% rename from assets/gfx/borders-1.6.png rename to client/public/assets/gfx/borders-1.6.png diff --git a/assets/gfx/borders-2.1.jpg b/client/public/assets/gfx/borders-2.1.jpg similarity index 100% rename from assets/gfx/borders-2.1.jpg rename to client/public/assets/gfx/borders-2.1.jpg diff --git a/assets/gfx/borders-2.1.png b/client/public/assets/gfx/borders-2.1.png similarity index 100% rename from assets/gfx/borders-2.1.png rename to client/public/assets/gfx/borders-2.1.png diff --git a/assets/gfx/borders-3.2.jpg b/client/public/assets/gfx/borders-3.2.jpg similarity index 100% rename from assets/gfx/borders-3.2.jpg rename to client/public/assets/gfx/borders-3.2.jpg diff --git a/assets/gfx/borders-3.2.png b/client/public/assets/gfx/borders-3.2.png similarity index 100% rename from assets/gfx/borders-3.2.png rename to client/public/assets/gfx/borders-3.2.png diff --git a/assets/gfx/borders-4.3.jpg b/client/public/assets/gfx/borders-4.3.jpg similarity index 100% rename from assets/gfx/borders-4.3.jpg rename to client/public/assets/gfx/borders-4.3.jpg diff --git a/assets/gfx/borders-4.3.png b/client/public/assets/gfx/borders-4.3.png similarity index 100% rename from assets/gfx/borders-4.3.png rename to client/public/assets/gfx/borders-4.3.png diff --git a/assets/gfx/borders-5.4.jpg b/client/public/assets/gfx/borders-5.4.jpg similarity index 100% rename from assets/gfx/borders-5.4.jpg rename to client/public/assets/gfx/borders-5.4.jpg diff --git a/assets/gfx/borders-5.4.png b/client/public/assets/gfx/borders-5.4.png similarity index 100% rename from assets/gfx/borders-5.4.png rename to client/public/assets/gfx/borders-5.4.png diff --git a/assets/gfx/borders-6.5.jpg b/client/public/assets/gfx/borders-6.5.jpg similarity index 100% rename from assets/gfx/borders-6.5.jpg rename to client/public/assets/gfx/borders-6.5.jpg diff --git a/assets/gfx/borders-6.5.png b/client/public/assets/gfx/borders-6.5.png similarity index 100% rename from assets/gfx/borders-6.5.png rename to client/public/assets/gfx/borders-6.5.png diff --git a/assets/gfx/card-army-1.png b/client/public/assets/gfx/card-army-1.png similarity index 100% rename from assets/gfx/card-army-1.png rename to client/public/assets/gfx/card-army-1.png diff --git a/assets/gfx/card-army-10.png b/client/public/assets/gfx/card-army-10.png similarity index 100% rename from assets/gfx/card-army-10.png rename to client/public/assets/gfx/card-army-10.png diff --git a/assets/gfx/card-army-11.png b/client/public/assets/gfx/card-army-11.png similarity index 100% rename from assets/gfx/card-army-11.png rename to client/public/assets/gfx/card-army-11.png diff --git a/assets/gfx/card-army-12.png b/client/public/assets/gfx/card-army-12.png similarity index 100% rename from assets/gfx/card-army-12.png rename to client/public/assets/gfx/card-army-12.png diff --git a/assets/gfx/card-army-13.png b/client/public/assets/gfx/card-army-13.png similarity index 100% rename from assets/gfx/card-army-13.png rename to client/public/assets/gfx/card-army-13.png diff --git a/assets/gfx/card-army-14.png b/client/public/assets/gfx/card-army-14.png similarity index 100% rename from assets/gfx/card-army-14.png rename to client/public/assets/gfx/card-army-14.png diff --git a/assets/gfx/card-army-2.png b/client/public/assets/gfx/card-army-2.png similarity index 100% rename from assets/gfx/card-army-2.png rename to client/public/assets/gfx/card-army-2.png diff --git a/assets/gfx/card-army-3.png b/client/public/assets/gfx/card-army-3.png similarity index 100% rename from assets/gfx/card-army-3.png rename to client/public/assets/gfx/card-army-3.png diff --git a/assets/gfx/card-army-4.png b/client/public/assets/gfx/card-army-4.png similarity index 100% rename from assets/gfx/card-army-4.png rename to client/public/assets/gfx/card-army-4.png diff --git a/assets/gfx/card-army-5.png b/client/public/assets/gfx/card-army-5.png similarity index 100% rename from assets/gfx/card-army-5.png rename to client/public/assets/gfx/card-army-5.png diff --git a/assets/gfx/card-army-6.png b/client/public/assets/gfx/card-army-6.png similarity index 100% rename from assets/gfx/card-army-6.png rename to client/public/assets/gfx/card-army-6.png diff --git a/assets/gfx/card-army-7.png b/client/public/assets/gfx/card-army-7.png similarity index 100% rename from assets/gfx/card-army-7.png rename to client/public/assets/gfx/card-army-7.png diff --git a/assets/gfx/card-army-8.png b/client/public/assets/gfx/card-army-8.png similarity index 100% rename from assets/gfx/card-army-8.png rename to client/public/assets/gfx/card-army-8.png diff --git a/assets/gfx/card-army-9.png b/client/public/assets/gfx/card-army-9.png similarity index 100% rename from assets/gfx/card-army-9.png rename to client/public/assets/gfx/card-army-9.png diff --git a/assets/gfx/card-brick.png b/client/public/assets/gfx/card-brick.png similarity index 100% rename from assets/gfx/card-brick.png rename to client/public/assets/gfx/card-brick.png diff --git a/assets/gfx/card-monopoly.png b/client/public/assets/gfx/card-monopoly.png similarity index 100% rename from assets/gfx/card-monopoly.png rename to client/public/assets/gfx/card-monopoly.png diff --git a/assets/gfx/card-road-1.png b/client/public/assets/gfx/card-road-1.png similarity index 100% rename from assets/gfx/card-road-1.png rename to client/public/assets/gfx/card-road-1.png diff --git a/assets/gfx/card-road-2.png b/client/public/assets/gfx/card-road-2.png similarity index 100% rename from assets/gfx/card-road-2.png rename to client/public/assets/gfx/card-road-2.png diff --git a/assets/gfx/card-sheep.png b/client/public/assets/gfx/card-sheep.png similarity index 100% rename from assets/gfx/card-sheep.png rename to client/public/assets/gfx/card-sheep.png diff --git a/assets/gfx/card-stone.png b/client/public/assets/gfx/card-stone.png similarity index 100% rename from assets/gfx/card-stone.png rename to client/public/assets/gfx/card-stone.png diff --git a/assets/gfx/card-vp-library.png b/client/public/assets/gfx/card-vp-library.png similarity index 100% rename from assets/gfx/card-vp-library.png rename to client/public/assets/gfx/card-vp-library.png diff --git a/assets/gfx/card-vp-market.png b/client/public/assets/gfx/card-vp-market.png similarity index 100% rename from assets/gfx/card-vp-market.png rename to client/public/assets/gfx/card-vp-market.png diff --git a/assets/gfx/card-vp-palace.png b/client/public/assets/gfx/card-vp-palace.png similarity index 100% rename from assets/gfx/card-vp-palace.png rename to client/public/assets/gfx/card-vp-palace.png diff --git a/assets/gfx/card-vp-university.png b/client/public/assets/gfx/card-vp-university.png similarity index 100% rename from assets/gfx/card-vp-university.png rename to client/public/assets/gfx/card-vp-university.png diff --git a/assets/gfx/card-wheat.png b/client/public/assets/gfx/card-wheat.png similarity index 100% rename from assets/gfx/card-wheat.png rename to client/public/assets/gfx/card-wheat.png diff --git a/assets/gfx/card-wood.png b/client/public/assets/gfx/card-wood.png similarity index 100% rename from assets/gfx/card-wood.png rename to client/public/assets/gfx/card-wood.png diff --git a/assets/gfx/pieces-blue.jpg b/client/public/assets/gfx/pieces-blue.jpg similarity index 100% rename from assets/gfx/pieces-blue.jpg rename to client/public/assets/gfx/pieces-blue.jpg diff --git a/assets/gfx/pieces-orange.jpg b/client/public/assets/gfx/pieces-orange.jpg similarity index 100% rename from assets/gfx/pieces-orange.jpg rename to client/public/assets/gfx/pieces-orange.jpg diff --git a/assets/gfx/pieces-red.jpg b/client/public/assets/gfx/pieces-red.jpg similarity index 100% rename from assets/gfx/pieces-red.jpg rename to client/public/assets/gfx/pieces-red.jpg diff --git a/assets/gfx/pieces-white.jpg b/client/public/assets/gfx/pieces-white.jpg similarity index 100% rename from assets/gfx/pieces-white.jpg rename to client/public/assets/gfx/pieces-white.jpg diff --git a/assets/gfx/pieces.jpg b/client/public/assets/gfx/pieces.jpg similarity index 100% rename from assets/gfx/pieces.jpg rename to client/public/assets/gfx/pieces.jpg diff --git a/assets/gfx/pip-numbers.png b/client/public/assets/gfx/pip-numbers.png similarity index 100% rename from assets/gfx/pip-numbers.png rename to client/public/assets/gfx/pip-numbers.png diff --git a/assets/gfx/pip-ships.png b/client/public/assets/gfx/pip-ships.png similarity index 100% rename from assets/gfx/pip-ships.png rename to client/public/assets/gfx/pip-ships.png diff --git a/assets/gfx/placard-blue.png b/client/public/assets/gfx/placard-blue.png similarity index 100% rename from assets/gfx/placard-blue.png rename to client/public/assets/gfx/placard-blue.png diff --git a/assets/gfx/placard-largest-army.png b/client/public/assets/gfx/placard-largest-army.png similarity index 100% rename from assets/gfx/placard-largest-army.png rename to client/public/assets/gfx/placard-largest-army.png diff --git a/assets/gfx/placard-longest-road.png b/client/public/assets/gfx/placard-longest-road.png similarity index 100% rename from assets/gfx/placard-longest-road.png rename to client/public/assets/gfx/placard-longest-road.png diff --git a/assets/gfx/placard-orange.png b/client/public/assets/gfx/placard-orange.png similarity index 100% rename from assets/gfx/placard-orange.png rename to client/public/assets/gfx/placard-orange.png diff --git a/assets/gfx/placard-red.png b/client/public/assets/gfx/placard-red.png similarity index 100% rename from assets/gfx/placard-red.png rename to client/public/assets/gfx/placard-red.png diff --git a/assets/gfx/placard-white.png b/client/public/assets/gfx/placard-white.png similarity index 100% rename from assets/gfx/placard-white.png rename to client/public/assets/gfx/placard-white.png diff --git a/assets/gfx/table.png b/client/public/assets/gfx/table.png similarity index 100% rename from assets/gfx/table.png rename to client/public/assets/gfx/table.png diff --git a/assets/gfx/tiles-brick.png b/client/public/assets/gfx/tiles-brick.png similarity index 100% rename from assets/gfx/tiles-brick.png rename to client/public/assets/gfx/tiles-brick.png diff --git a/assets/gfx/tiles-robber.png b/client/public/assets/gfx/tiles-robber.png similarity index 100% rename from assets/gfx/tiles-robber.png rename to client/public/assets/gfx/tiles-robber.png diff --git a/assets/gfx/tiles-sheep.png b/client/public/assets/gfx/tiles-sheep.png similarity index 100% rename from assets/gfx/tiles-sheep.png rename to client/public/assets/gfx/tiles-sheep.png diff --git a/assets/gfx/tiles-stone.png b/client/public/assets/gfx/tiles-stone.png similarity index 100% rename from assets/gfx/tiles-stone.png rename to client/public/assets/gfx/tiles-stone.png diff --git a/assets/gfx/tiles-wheat.png b/client/public/assets/gfx/tiles-wheat.png similarity index 100% rename from assets/gfx/tiles-wheat.png rename to client/public/assets/gfx/tiles-wheat.png diff --git a/assets/gfx/tiles-wood.png b/client/public/assets/gfx/tiles-wood.png similarity index 100% rename from assets/gfx/tiles-wood.png rename to client/public/assets/gfx/tiles-wood.png diff --git a/assets/link.png b/client/public/assets/link.png similarity index 100% rename from assets/link.png rename to client/public/assets/link.png diff --git a/assets/original/borders-1.6.jpg b/client/public/assets/original/borders-1.6.jpg similarity index 100% rename from assets/original/borders-1.6.jpg rename to client/public/assets/original/borders-1.6.jpg diff --git a/assets/original/borders-1.6.png b/client/public/assets/original/borders-1.6.png similarity index 100% rename from assets/original/borders-1.6.png rename to client/public/assets/original/borders-1.6.png diff --git a/assets/original/borders-2.1.jpg b/client/public/assets/original/borders-2.1.jpg similarity index 100% rename from assets/original/borders-2.1.jpg rename to client/public/assets/original/borders-2.1.jpg diff --git a/assets/original/borders-2.1.png b/client/public/assets/original/borders-2.1.png similarity index 100% rename from assets/original/borders-2.1.png rename to client/public/assets/original/borders-2.1.png diff --git a/assets/original/borders-3.2.jpg b/client/public/assets/original/borders-3.2.jpg similarity index 100% rename from assets/original/borders-3.2.jpg rename to client/public/assets/original/borders-3.2.jpg diff --git a/assets/original/borders-3.2.png b/client/public/assets/original/borders-3.2.png similarity index 100% rename from assets/original/borders-3.2.png rename to client/public/assets/original/borders-3.2.png diff --git a/assets/original/borders-4.3.jpg b/client/public/assets/original/borders-4.3.jpg similarity index 100% rename from assets/original/borders-4.3.jpg rename to client/public/assets/original/borders-4.3.jpg diff --git a/assets/original/borders-4.3.png b/client/public/assets/original/borders-4.3.png similarity index 100% rename from assets/original/borders-4.3.png rename to client/public/assets/original/borders-4.3.png diff --git a/assets/original/borders-5.4.jpg b/client/public/assets/original/borders-5.4.jpg similarity index 100% rename from assets/original/borders-5.4.jpg rename to client/public/assets/original/borders-5.4.jpg diff --git a/assets/original/borders-5.4.png b/client/public/assets/original/borders-5.4.png similarity index 100% rename from assets/original/borders-5.4.png rename to client/public/assets/original/borders-5.4.png diff --git a/assets/original/borders-6.5.jpg b/client/public/assets/original/borders-6.5.jpg similarity index 100% rename from assets/original/borders-6.5.jpg rename to client/public/assets/original/borders-6.5.jpg diff --git a/assets/original/borders-6.5.png b/client/public/assets/original/borders-6.5.png similarity index 100% rename from assets/original/borders-6.5.png rename to client/public/assets/original/borders-6.5.png diff --git a/assets/original/card-army-1.png b/client/public/assets/original/card-army-1.png similarity index 100% rename from assets/original/card-army-1.png rename to client/public/assets/original/card-army-1.png diff --git a/assets/original/card-army-10.png b/client/public/assets/original/card-army-10.png similarity index 100% rename from assets/original/card-army-10.png rename to client/public/assets/original/card-army-10.png diff --git a/assets/original/card-army-11.png b/client/public/assets/original/card-army-11.png similarity index 100% rename from assets/original/card-army-11.png rename to client/public/assets/original/card-army-11.png diff --git a/assets/original/card-army-12.png b/client/public/assets/original/card-army-12.png similarity index 100% rename from assets/original/card-army-12.png rename to client/public/assets/original/card-army-12.png diff --git a/assets/original/card-army-13.png b/client/public/assets/original/card-army-13.png similarity index 100% rename from assets/original/card-army-13.png rename to client/public/assets/original/card-army-13.png diff --git a/assets/original/card-army-14.png b/client/public/assets/original/card-army-14.png similarity index 100% rename from assets/original/card-army-14.png rename to client/public/assets/original/card-army-14.png diff --git a/assets/original/card-army-2.png b/client/public/assets/original/card-army-2.png similarity index 100% rename from assets/original/card-army-2.png rename to client/public/assets/original/card-army-2.png diff --git a/assets/original/card-army-3.png b/client/public/assets/original/card-army-3.png similarity index 100% rename from assets/original/card-army-3.png rename to client/public/assets/original/card-army-3.png diff --git a/assets/original/card-army-4.png b/client/public/assets/original/card-army-4.png similarity index 100% rename from assets/original/card-army-4.png rename to client/public/assets/original/card-army-4.png diff --git a/assets/original/card-army-5.png b/client/public/assets/original/card-army-5.png similarity index 100% rename from assets/original/card-army-5.png rename to client/public/assets/original/card-army-5.png diff --git a/assets/original/card-army-6.png b/client/public/assets/original/card-army-6.png similarity index 100% rename from assets/original/card-army-6.png rename to client/public/assets/original/card-army-6.png diff --git a/assets/original/card-army-7.png b/client/public/assets/original/card-army-7.png similarity index 100% rename from assets/original/card-army-7.png rename to client/public/assets/original/card-army-7.png diff --git a/assets/original/card-army-8.png b/client/public/assets/original/card-army-8.png similarity index 100% rename from assets/original/card-army-8.png rename to client/public/assets/original/card-army-8.png diff --git a/assets/original/card-army-9.png b/client/public/assets/original/card-army-9.png similarity index 100% rename from assets/original/card-army-9.png rename to client/public/assets/original/card-army-9.png diff --git a/assets/original/card-brick.png b/client/public/assets/original/card-brick.png similarity index 100% rename from assets/original/card-brick.png rename to client/public/assets/original/card-brick.png diff --git a/assets/original/card-monopoly.png b/client/public/assets/original/card-monopoly.png similarity index 100% rename from assets/original/card-monopoly.png rename to client/public/assets/original/card-monopoly.png diff --git a/assets/original/card-road-1.png b/client/public/assets/original/card-road-1.png similarity index 100% rename from assets/original/card-road-1.png rename to client/public/assets/original/card-road-1.png diff --git a/assets/original/card-road-2.png b/client/public/assets/original/card-road-2.png similarity index 100% rename from assets/original/card-road-2.png rename to client/public/assets/original/card-road-2.png diff --git a/assets/original/card-sheep.png b/client/public/assets/original/card-sheep.png similarity index 100% rename from assets/original/card-sheep.png rename to client/public/assets/original/card-sheep.png diff --git a/assets/original/card-stone.png b/client/public/assets/original/card-stone.png similarity index 100% rename from assets/original/card-stone.png rename to client/public/assets/original/card-stone.png diff --git a/assets/original/card-vp-library.png b/client/public/assets/original/card-vp-library.png similarity index 100% rename from assets/original/card-vp-library.png rename to client/public/assets/original/card-vp-library.png diff --git a/assets/original/card-vp-market.png b/client/public/assets/original/card-vp-market.png similarity index 100% rename from assets/original/card-vp-market.png rename to client/public/assets/original/card-vp-market.png diff --git a/assets/original/card-vp-palace.png b/client/public/assets/original/card-vp-palace.png similarity index 100% rename from assets/original/card-vp-palace.png rename to client/public/assets/original/card-vp-palace.png diff --git a/assets/original/card-vp-university.png b/client/public/assets/original/card-vp-university.png similarity index 100% rename from assets/original/card-vp-university.png rename to client/public/assets/original/card-vp-university.png diff --git a/assets/original/card-wheat.png b/client/public/assets/original/card-wheat.png similarity index 100% rename from assets/original/card-wheat.png rename to client/public/assets/original/card-wheat.png diff --git a/assets/original/card-wood.png b/client/public/assets/original/card-wood.png similarity index 100% rename from assets/original/card-wood.png rename to client/public/assets/original/card-wood.png diff --git a/assets/original/pieces-blue.jpg b/client/public/assets/original/pieces-blue.jpg similarity index 100% rename from assets/original/pieces-blue.jpg rename to client/public/assets/original/pieces-blue.jpg diff --git a/assets/original/pieces-orange.jpg b/client/public/assets/original/pieces-orange.jpg similarity index 100% rename from assets/original/pieces-orange.jpg rename to client/public/assets/original/pieces-orange.jpg diff --git a/assets/original/pieces-red.jpg b/client/public/assets/original/pieces-red.jpg similarity index 100% rename from assets/original/pieces-red.jpg rename to client/public/assets/original/pieces-red.jpg diff --git a/assets/original/pieces-white.jpg b/client/public/assets/original/pieces-white.jpg similarity index 100% rename from assets/original/pieces-white.jpg rename to client/public/assets/original/pieces-white.jpg diff --git a/assets/original/pieces.jpg b/client/public/assets/original/pieces.jpg similarity index 100% rename from assets/original/pieces.jpg rename to client/public/assets/original/pieces.jpg diff --git a/assets/original/pip-numbers.png b/client/public/assets/original/pip-numbers.png similarity index 100% rename from assets/original/pip-numbers.png rename to client/public/assets/original/pip-numbers.png diff --git a/assets/original/pip-ships.png b/client/public/assets/original/pip-ships.png similarity index 100% rename from assets/original/pip-ships.png rename to client/public/assets/original/pip-ships.png diff --git a/assets/original/placard-blue.png b/client/public/assets/original/placard-blue.png similarity index 100% rename from assets/original/placard-blue.png rename to client/public/assets/original/placard-blue.png diff --git a/assets/original/placard-largest-army.png b/client/public/assets/original/placard-largest-army.png similarity index 100% rename from assets/original/placard-largest-army.png rename to client/public/assets/original/placard-largest-army.png diff --git a/assets/original/placard-longest-road.png b/client/public/assets/original/placard-longest-road.png similarity index 100% rename from assets/original/placard-longest-road.png rename to client/public/assets/original/placard-longest-road.png diff --git a/assets/original/placard-orange.png b/client/public/assets/original/placard-orange.png similarity index 100% rename from assets/original/placard-orange.png rename to client/public/assets/original/placard-orange.png diff --git a/assets/original/placard-red.png b/client/public/assets/original/placard-red.png similarity index 100% rename from assets/original/placard-red.png rename to client/public/assets/original/placard-red.png diff --git a/assets/original/placard-white.png b/client/public/assets/original/placard-white.png similarity index 100% rename from assets/original/placard-white.png rename to client/public/assets/original/placard-white.png diff --git a/assets/original/table.png b/client/public/assets/original/table.png similarity index 100% rename from assets/original/table.png rename to client/public/assets/original/table.png diff --git a/assets/original/tiles-brick.png b/client/public/assets/original/tiles-brick.png similarity index 100% rename from assets/original/tiles-brick.png rename to client/public/assets/original/tiles-brick.png diff --git a/assets/original/tiles-robber.png b/client/public/assets/original/tiles-robber.png similarity index 100% rename from assets/original/tiles-robber.png rename to client/public/assets/original/tiles-robber.png diff --git a/assets/original/tiles-sheep.png b/client/public/assets/original/tiles-sheep.png similarity index 100% rename from assets/original/tiles-sheep.png rename to client/public/assets/original/tiles-sheep.png diff --git a/assets/original/tiles-stone.png b/client/public/assets/original/tiles-stone.png similarity index 100% rename from assets/original/tiles-stone.png rename to client/public/assets/original/tiles-stone.png diff --git a/assets/original/tiles-wheat.png b/client/public/assets/original/tiles-wheat.png similarity index 100% rename from assets/original/tiles-wheat.png rename to client/public/assets/original/tiles-wheat.png diff --git a/assets/original/tiles-wood.png b/client/public/assets/original/tiles-wood.png similarity index 100% rename from assets/original/tiles-wood.png rename to client/public/assets/original/tiles-wood.png diff --git a/assets/original/uncut/army.png b/client/public/assets/original/uncut/army.png similarity index 100% rename from assets/original/uncut/army.png rename to client/public/assets/original/uncut/army.png diff --git a/assets/original/uncut/borders.jpg b/client/public/assets/original/uncut/borders.jpg similarity index 100% rename from assets/original/uncut/borders.jpg rename to client/public/assets/original/uncut/borders.jpg diff --git a/assets/original/uncut/cards.jpg b/client/public/assets/original/uncut/cards.jpg similarity index 100% rename from assets/original/uncut/cards.jpg rename to client/public/assets/original/uncut/cards.jpg diff --git a/assets/original/uncut/cards.xcf b/client/public/assets/original/uncut/cards.xcf similarity index 100% rename from assets/original/uncut/cards.xcf rename to client/public/assets/original/uncut/cards.xcf diff --git a/assets/original/uncut/pips.jpg b/client/public/assets/original/uncut/pips.jpg similarity index 100% rename from assets/original/uncut/pips.jpg rename to client/public/assets/original/uncut/pips.jpg diff --git a/assets/original/uncut/placards.jpg b/client/public/assets/original/uncut/placards.jpg similarity index 100% rename from assets/original/uncut/placards.jpg rename to client/public/assets/original/uncut/placards.jpg diff --git a/assets/original/uncut/tiles.png b/client/public/assets/original/uncut/tiles.png similarity index 100% rename from assets/original/uncut/tiles.png rename to client/public/assets/original/uncut/tiles.png diff --git a/assets/solutions-all.png b/client/public/assets/solutions-all.png similarity index 100% rename from assets/solutions-all.png rename to client/public/assets/solutions-all.png diff --git a/assets/solutions-compute.png b/client/public/assets/solutions-compute.png similarity index 100% rename from assets/solutions-compute.png rename to client/public/assets/solutions-compute.png diff --git a/assets/solutions-media.png b/client/public/assets/solutions-media.png similarity index 100% rename from assets/solutions-media.png rename to client/public/assets/solutions-media.png diff --git a/assets/solutions-render.png b/client/public/assets/solutions-render.png similarity index 100% rename from assets/solutions-render.png rename to client/public/assets/solutions-render.png diff --git a/assets/up.png b/client/public/assets/up.png similarity index 100% rename from assets/up.png rename to client/public/assets/up.png diff --git a/public/favicon.ico b/client/public/favicon.ico similarity index 100% rename from public/favicon.ico rename to client/public/favicon.ico diff --git a/public/index.html b/client/public/index.html similarity index 100% rename from public/index.html rename to client/public/index.html diff --git a/public/logo192.png b/client/public/logo192.png similarity index 100% rename from public/logo192.png rename to client/public/logo192.png diff --git a/public/logo512.png b/client/public/logo512.png similarity index 100% rename from public/logo512.png rename to client/public/logo512.png diff --git a/public/manifest.json b/client/public/manifest.json similarity index 100% rename from public/manifest.json rename to client/public/manifest.json diff --git a/public/robots.txt b/client/public/robots.txt similarity index 100% rename from public/robots.txt rename to client/public/robots.txt diff --git a/src/App.css b/client/src/App.css similarity index 100% rename from src/App.css rename to client/src/App.css diff --git a/src/App.js b/client/src/App.js similarity index 50% rename from src/App.js rename to client/src/App.js index 33a415d..9f6638c 100755 --- a/src/App.js +++ b/client/src/App.js @@ -6,10 +6,12 @@ import 'core-js/features/number/is-nan'; /* App starts here */ import React from "react"; -import { BrowserRouter, Route, Routes } from "react-router-dom"; -import Button from '@material-ui/core/Button'; -import AppBar from '@material-ui/core/AppBar'; -import Toolbar from '@material-ui/core/Toolbar'; +import { + BrowserRouter as Router, + Route, + Routes +} from "react-router-dom"; + //import 'typeface-roboto'; @@ -21,24 +23,18 @@ function App() { let base = document.querySelector("base") ? document.querySelector("base").href : ""; if (base) { base = new URL(base).pathname; + } else { + base = '/'; } console.log(`Base: ${base}`); return ( - - - - - - - + - - - - - - + } path={base + 'games/:id?'}/> + } path={base}/> + + ); } diff --git a/src/App.test.js b/client/src/App.test.js similarity index 100% rename from src/App.test.js rename to client/src/App.test.js diff --git a/src/Board.css b/client/src/Board.css similarity index 100% rename from src/Board.css rename to client/src/Board.css diff --git a/src/Board.js b/client/src/Board.js similarity index 87% rename from src/Board.js rename to client/src/Board.js index a3da9d1..14a93d9 100755 --- a/src/Board.js +++ b/client/src/Board.js @@ -12,7 +12,35 @@ import { deepOrange, lightBlue, red, grey } from '@material-ui/core/colors'; import Avatar from '@material-ui/core/Avatar'; import Switch from '@material-ui/core/Switch'; import Moment from 'react-moment'; -import moment from 'moment'; +//import moment from 'moment'; + +/* Start of withRouter polyfill */ +// https://reactrouter.com/docs/en/v6/faq#what-happened-to-withrouter-i-need-it +import { + useLocation, + useNavigate, + useParams +} from "react-router-dom"; + +function withRouter(Component) { + function ComponentWithRouterProp(props) { + let location = useLocation(); + let navigate = useNavigate(); + let params = useParams(); + return ( + + ); + } + + return ComponentWithRouterProp; +} +/* end of withRouter polyfill */ + +const assetsPath = '/assets'; +const gamesPath = '/games'; const useStyles = makeStyles((theme) => ({ root: { @@ -63,7 +91,7 @@ const Tiles = (board) => { const image = new Image(), file = "tiles-" + type + ".png"; tiles.forEach((tile) => { - if (tile.type == type) { + if (tile.type === type) { tile.image = image; tile.x = 0; tile.pos = { x: 0, y: 0 }; @@ -77,7 +105,7 @@ const Tiles = (board) => { image.addEventListener("error", (event) => { alert(`Error loading ${file}`); }); - image.src = `assets/gfx/${file}`; + image.src = `${assetsPath}/gfx/${file}`; }); return tiles; @@ -94,7 +122,7 @@ const Pips = (board) => { image.addEventListener("error", (event) => { alert(`Error loading ${file}`); }); - image.src = `assets/gfx/${file}`; + image.src = `${assetsPath}/gfx/${file}`; return { image: image, @@ -112,7 +140,7 @@ const Border = (board, border) => { image.addEventListener("error", (event) => { alert(`Error loading ${file}`); }); - image.src = `assets/gfx/${file}`; + image.src = `${assetsPath}/gfx/${file}`; return border; }; @@ -125,7 +153,7 @@ const Table = (board) => { image.addEventListener("error", (event) => { alert(`Error loading ${file}`); }); - image.src = `assets/gfx/${file}`; + image.src = `${assetsPath}/gfx/${file}`; return image; }; @@ -149,22 +177,16 @@ function shuffle(array) { } class Placard extends React.Component { - constructor(props) { - super(props); - } render() { return (
+ style={{backgroundImage:`url(${assetsPath}/gfx/placard-${this.props.type}.png)`}}>
); } }; class Development extends React.Component { - constructor(props) { - super(props); - } render() { const array = []; for (let i = 0; i < this.props.count; i++) { @@ -178,7 +200,7 @@ class Development extends React.Component {
{ React.Children.map(array, i => (
+ style={{backgroundImage:`url(${assetsPath}/gfx/card-${this.props.type}${i}.png)`}}>
)) }
@@ -187,9 +209,6 @@ class Development extends React.Component { }; class Resource extends React.Component { - constructor(props) { - super(props); - } render() { const array = new Array(Number(this.props.count ? this.props.count : 0)); return ( @@ -198,7 +217,7 @@ class Resource extends React.Component {
{ React.Children.map(array, i => (
+ style={{backgroundImage:`url(${assetsPath}/gfx/card-${this.props.type}.png)`}}>
)) }
@@ -213,7 +232,7 @@ const Chat = ({ game, promoteGameState }) => { }; const chatKeyPress = (event) => { - if (event.key == "Enter") { + if (event.key === "Enter") { console.log(`Send: ${event.target.value}`); promoteGameState({ chat: { @@ -232,10 +251,10 @@ const Chat = ({ game, promoteGameState }) => { chatList.scrollTop = chatList.scrollHeight - chatList.offsetHeight; }) - const timeDelta = game.timestamp - Date.now(); + //const timeDelta = game.timestamp - Date.now(); const messages = game.chat.map((item, index) => { - const timestamp = moment(item.date - timeDelta).fromNow(); + //const timestamp = moment(item.date - timeDelta).fromNow(); return ( @@ -276,7 +295,7 @@ const Players = ({ game, promoteGameState }) => { }; const nameKeyPress = (event) => { - if (event.key == "Enter") { + if (event.key === "Enter") { console.log(`Send: ${event.target.value}`); setName(event.target.value); } @@ -303,7 +322,7 @@ const Players = ({ game, promoteGameState }) => { if (selected && game.activePlayer && name && - game.players[game.activePlayer].name != name) { + game.players[game.activePlayer].name !== name) { change.players[game.activePlayer] = { name: name } promoteGameState(change) return; @@ -311,7 +330,7 @@ const Players = ({ game, promoteGameState }) => { }); const toggleSelected = (key) => { - if (selected == key) { + if (selected === key) { setSelected(""); setName(""); } else { @@ -330,21 +349,21 @@ const Players = ({ game, promoteGameState }) => { {key} <> { /* so flex-grow works we put in a fragment */ } - { selected == key && item.name == "" && + { selected === key && item.name === "" && input && input.focus()} - disabled={(name != item.name) ? true: false} + disabled={(name !== item.name) ? true: false} label="Name" variant="outlined" autoFocus/> } - { (selected != key || item.name != "") && + { (selected !== key || item.name !== "") && } toggleSelected(key)}/> )); @@ -404,9 +423,11 @@ class Board extends React.Component { const params = {}; - if (props.match.params.id) { - console.log(`Loading game: ${props.match.params.id}`); - params.url = `api/v1/games/${props.match.params.id}`; + console.log(props.router); + + if (props.router && props.router.params.id) { + console.log(`Loading game: ${props.router.params.id}`); + params.url = `api/v1/games/${props.router.params.id}`; params.method = "GET" } else { console.log("Requesting new game."); @@ -426,15 +447,15 @@ class Board extends React.Component { if (res.status > 400) { const base = document.querySelector("base"); window.location.href = base ? base.href : "/"; - console.log(`Unable to find game ${props.match.params.id}`); - throw `Unable to find requested game ${props.match.params.id}. Starting new one.`; + console.log(`Unable to find game ${props.router.params.id}`); + throw new Error(`Unable to find requested game ${props.router.params.id}. Starting new one.`); } return res.json(); }).then((game) => { console.log (`Game ${game.id} loaded.`); - if (!props.match.params.id) { - history.push(`games/${game.id}`); + if (!props.router.params.id) { + history.push(`${gamesPath}/${game.id}`); } this.game = game; @@ -474,7 +495,7 @@ class Board extends React.Component { }).then((res) => { if (res.status > 400) { console.log(res); - throw `Unable to load state`; + throw new Error(`Unable to load state`); } return res.json(); }).then((game) => { @@ -507,7 +528,7 @@ class Board extends React.Component { }).then((res) => { if (res.status > 400) { console.error(res); - throw `Unable to change state`; + throw new Error(`Unable to change state`); } return res.json(); }).then((game) => { @@ -534,12 +555,12 @@ class Board extends React.Component { } keyUp(event) { - if (event.keyCode == 78) { /* n */ + if (event.keyCode === 78) { /* n */ this.randomize(); return; } - if (event.keyCode == 32) { /* space */ + if (event.keyCode === 32) { /* space */ this.throwDice(); return; } @@ -556,27 +577,28 @@ class Board extends React.Component { window.requestAnimationFrame(this.drawFrame); const sum = dice[0].pips + dice[1].pips; - if (sum == 7) { /* Robber! */ + if (sum === 7) { /* Robber! */ if (this.state.total > 7) { let half = Math.ceil(this.state.total * 0.5); - this.state.total -= half; + this.setState({ total: this.state.total - half}); while (half) { switch (Math.floor(Math.random() * 5)) { - case 0: if (this.state.wood) { this.state.wood--; half--; } break; - case 1: if (this.state.sheep) { this.state.sheep--; half--; } break; - case 2: if (this.state.stone) { this.state.stone--; half--; } break; - case 3: if (this.state.brick) { this.state.brick--; half--; } break; - case 4: if (this.state.wheat) { this.state.wheat--; half--; } break; + case 0: if (this.state.wood) { this.setState({ wood: this.state.wood - 1}); half--; } break; + case 1: if (this.state.sheep) { this.setState({ sheep: this.state.sheep - 1}); half--; } break; + case 2: if (this.state.stone) { this.setState({ stone: this.state.stone - 1}); half--; } break; + case 3: if (this.state.brick) { this.setState({ brick: this.state.brick - 1}); half--; } break; + case 4: + default: if (this.state.wheat) { this.setState({ wheat: this.state.wheat - 1}); half--; } break; } } } } else { this.tiles.forEach((tile) => { - if (tile.pip.roll != sum) { + if (tile.pip.roll !== sum) { return; } - this.state[tile.type]++; - this.state.total++; + this.setState({ [tile.type]: this.state[tile.type] + 1}); + this.setState({ total: this.state.total + 1 }); }); } @@ -635,7 +657,7 @@ class Board extends React.Component { closest = { tile: tile, distance: distance, - angle: (distance != 0.0) ? Math.atan2(dY, dX) : 0 + angle: (distance !== 0.0) ? Math.atan2(dY, dX) : 0 } } }); @@ -648,7 +670,7 @@ class Board extends React.Component { this.closest.settlement = null; this.closest.tradeToken = null; } else { - if (this.closest.tile != closest.tile) { + if (this.closest.tile !== closest.tile) { this.closest.tile = closest.tile; } @@ -736,7 +758,7 @@ class Board extends React.Component { ctx.translate(0, tableHeight); } } else { - const tableWidth = this.canvas.height * this.table.width / this.table.height; + //const tableWidth = this.canvas.height * this.table.width / this.table.height; ctx.drawImage(this.table, 0, 0, tableRight, this.table.height, @@ -782,7 +804,7 @@ class Board extends React.Component { ctx.strokeStyle = "rgba(255, 255, 0, 0.5)"; const roll = dice[0].pips + dice[1].pips; if (roll) this.tiles.forEach((tile) => { - if (tile.pip.roll == roll) { + if (tile.pip.roll === roll) { ctx.save(); ctx.beginPath(); ctx.arc(tile.pos.x, tile.pos.y, tileHeight * 0.5, 0, Math.PI * 2); @@ -846,19 +868,17 @@ class Board extends React.Component { } ctx.save(); - { - ctx.translate(tileWidth * -2.5, -tileWidth * 2); - ctx.rotate(Math.PI * -0.25) - - if (dice[0].pips) { - ctx.translate(-0.5 * (diceSize + diceMargin), 0); - this.drawDie(ctx, dice[0]); - } + ctx.translate(tileWidth * -2.5, -tileWidth * 2); + ctx.rotate(Math.PI * -0.25) + + if (dice[0].pips) { + ctx.translate(-0.5 * (diceSize + diceMargin), 0); + this.drawDie(ctx, dice[0]); + } - if (dice[1].pips) { - ctx.translate(diceSize + diceMargin, 0); - this.drawDie(ctx, dice[1]); - } + if (dice[1].pips) { + ctx.translate(diceSize + diceMargin, 0); + this.drawDie(ctx, dice[1]); } ctx.restore(); @@ -889,7 +909,7 @@ class Board extends React.Component { ctx.strokeStyle = "#bbb"; ctx.fillStyle = "#ddd"; /* center pip */ - if (pips == 1 || pips == 3 || pips == 5) { + if (pips === 1 || pips === 3 || pips === 5) { ctx.beginPath(); ctx.arc(0, 0, diceSize * 0.0625, 0, Math.PI * 2); ctx.fill(); @@ -897,7 +917,7 @@ class Board extends React.Component { } /* upper left pip */ - if (pips == 2 || pips == 3 || pips == 4 || pips == 5 || pips == 6) { + if (pips === 2 || pips === 3 || pips === 4 || pips === 5 || pips === 6) { ctx.beginPath(); ctx.arc(-diceSize * 0.250, -diceSize * 0.250, diceSize * 0.0625, 0, Math.PI * 2); ctx.fill(); @@ -905,7 +925,7 @@ class Board extends React.Component { } /* upper right pip */ - if (pips == 4 || pips == 5 || pips == 6) { + if (pips === 4 || pips === 5 || pips === 6) { ctx.beginPath(); ctx.arc(+diceSize * 0.250, -diceSize * 0.250, diceSize * 0.0625, 0, Math.PI * 2); ctx.fill(); @@ -913,7 +933,7 @@ class Board extends React.Component { } /* lower right pip */ - if (pips == 2 || pips == 3 || pips == 4 || pips == 5 || pips == 6) { + if (pips === 2 || pips === 3 || pips === 4 || pips === 5 || pips === 6) { ctx.beginPath(); ctx.arc(+diceSize * 0.250, +diceSize * 0.250, diceSize * 0.0625, 0, Math.PI * 2); ctx.fill(); @@ -921,7 +941,7 @@ class Board extends React.Component { } /* lower left pip */ - if (pips == 4 || pips == 5 || pips == 6) { + if (pips === 4 || pips === 5 || pips === 6) { ctx.beginPath(); ctx.arc(-diceSize * 0.250, +diceSize * 0.250, diceSize * 0.0625, 0, Math.PI * 2); ctx.fill(); @@ -929,7 +949,7 @@ class Board extends React.Component { } /* middle left and right pip */ - if (pips == 6) { + if (pips === 6) { ctx.beginPath(); ctx.arc(-diceSize * 0.250, 0, diceSize * 0.0625, 0, Math.PI * 2); ctx.fill(); @@ -982,13 +1002,13 @@ class Board extends React.Component { let angle, radius = this.radius, - index = 1, pip, roll = dice[0].pips + dice[1].pips; + index = 1, pip; //, roll = dice[0].pips + dice[1].pips; /* Outer row */ angle = 0; for (let i = 0; i < 12; i++) { angle -= Math.PI * 2. / 12.; - if (this.tiles[i].type == "robber") { + if (this.tiles[i].type === "robber") { pip = this.pips.pips[0] } else { pip = this.pips.pips[index++]; @@ -1003,7 +1023,7 @@ class Board extends React.Component { radius = this.radius * 0.5; for (let i = 12; i < 18; i++) { angle -= Math.PI * 2. / 6.; - if (this.tiles[i].type == "robber") { + if (this.tiles[i].type === "robber") { pip = this.pips.pips[0] } else { pip = this.pips.pips[index++]; @@ -1015,7 +1035,7 @@ class Board extends React.Component { /* Center */ let i = 18; - if (this.tiles[i].type == "robber") { + if (this.tiles[i].type === "robber") { pip = this.pips.pips[0] } else { pip = this.pips.pips[index++]; @@ -1122,4 +1142,4 @@ class Board extends React.Component { ); } } -export default Board; +export default withRouter(props => ); diff --git a/src/history.js b/client/src/history.js similarity index 96% rename from src/history.js rename to client/src/history.js index 648b7f6..3f0d082 100755 --- a/src/history.js +++ b/client/src/history.js @@ -3,12 +3,12 @@ import { createBrowserHistory } from 'history'; // Run our app under the /base URL. const history = createBrowserHistory({ basename: process.env.PUBLIC_URL - }), + });/*, push = history.push; history.push = (path) => { const base = new URL(document.querySelector("base") ? document.querySelector("base").href : ""); push(base.pathname + path); -}; +};*/ export default history; \ No newline at end of file diff --git a/src/index.css b/client/src/index.css similarity index 100% rename from src/index.css rename to client/src/index.css diff --git a/client/src/index.js b/client/src/index.js new file mode 100644 index 0000000..d961dbe --- /dev/null +++ b/client/src/index.js @@ -0,0 +1,21 @@ +import React from 'react'; +import ReactDOM from 'react-dom'; +import './index.css'; +import App from './App'; +import reportWebVitals from './reportWebVitals'; + +if (process.env.NODE_ENV !== 'production') { + console.log('DEVELOPMENT mode!'); +} + +ReactDOM.render( + + + , + document.getElementById('root') +); + +// If you want to start measuring performance in your app, pass a function +// to log results (for example: reportWebVitals(console.log)) +// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals +reportWebVitals(); \ No newline at end of file diff --git a/src/logo.svg b/client/src/logo.svg similarity index 100% rename from src/logo.svg rename to client/src/logo.svg diff --git a/src/reportWebVitals.js b/client/src/reportWebVitals.js similarity index 100% rename from src/reportWebVitals.js rename to client/src/reportWebVitals.js diff --git a/src/setupTests.js b/client/src/setupTests.js similarity index 100% rename from src/setupTests.js rename to client/src/setupTests.js diff --git a/webpack.common.js b/client/webpack.common.js similarity index 100% rename from webpack.common.js rename to client/webpack.common.js diff --git a/webpack.dev.js b/client/webpack.dev.js similarity index 100% rename from webpack.dev.js rename to client/webpack.dev.js diff --git a/webpack.prod.js b/client/webpack.prod.js similarity index 100% rename from webpack.prod.js rename to client/webpack.prod.js diff --git a/ketr.ketran b/install/ketr.ketran similarity index 85% rename from ketr.ketran rename to install/ketr.ketran index 007f9b6..85a45f9 100644 --- a/ketr.ketran +++ b/install/ketr.ketran @@ -1,4 +1,4 @@ -/var/log/osgc-aptly-rest.log +/var/log/ketr-ketran.log { rotate 4 weekly diff --git a/ketr.ketran.service b/install/ketr.ketran.service similarity index 84% rename from ketr.ketran.service rename to install/ketr.ketran.service index ea183fa..340ed92 100755 --- a/ketr.ketran.service +++ b/install/ketr.ketran.service @@ -5,7 +5,7 @@ After=networking.service [Service] ExecStart=/usr/bin/npm run backend -WorkingDirectory=/home/jketreno/public_html/peddlers-of-ketran +WorkingDirectory=${BASEPATH}/peddlers-of-ketran Restart=always # Restart service after 10 seconds if node service crashes RestartSec=10 diff --git a/config/.gitignore b/server/config/.gitignore similarity index 100% rename from config/.gitignore rename to server/config/.gitignore diff --git a/config/default.json b/server/config/default.json similarity index 73% rename from config/default.json rename to server/config/default.json index 9531080..93caf55 100755 --- a/config/default.json +++ b/server/config/default.json @@ -2,13 +2,13 @@ "db": { "games": { "dialect": "sqlite", - "storage": "db/games.db", + "storage": "../db/games.db", "logging" : false, "timezone": "+00:00" }, "users": { "dialect": "sqlite", - "storage": "db/users.db", + "storage": "../db/users.db", "logging" : false, "timezone": "+00:00" } @@ -17,9 +17,9 @@ "port": 8930 }, "frontendPath": "./", - "basePath": "/ketr.ketran", + "basePath": "/", "sessions": { - "db": "sessions.db", + "db": "../db/sessions.db", "store-secret": "m@g1kc00ki3z!" } } diff --git a/config/production.json b/server/config/production.json similarity index 100% rename from config/production.json rename to server/config/production.json diff --git a/server/package.json b/server/package.json new file mode 100644 index 0000000..c8a499a --- /dev/null +++ b/server/package.json @@ -0,0 +1,34 @@ +{ + "name": "peddlers-of-ketran-server", + "version": "1.0.0", + "main": "app.js", + "devDependencies": {}, + "scripts": { + "start": "NODE_CONFIG_ENV='production' node app.js" + }, + "author": "James Ketrenos ", + "license": "MIT", + "private": true, + "dependencies": { + "bluebird": "^3.5.5", + "config": "^3.1.0", + "connect-sqlite3": "^0.9.11", + "cookie-parser": "^1.4.4", + "core-js": "^3.2.1", + "express": "^4.17.1", + "express-session": "^1.17.1", + "handlebars": "^4.7.6", + "moment": "^2.24.0", + "morgan": "^1.9.1", + "node-fetch": "^2.6.0", + "node-gzip": "^1.1.2", + "nodemailer": "^6.3.0", + "sequelize": "^5.21.6", + "sqlite3": "^4.1.1", + "typeface-roboto": "0.0.75" + }, + "repository": { + "type": "git", + "url": "git@git.ketrenos.com:jketreno/peddlers-of-ketran" + } + } diff --git a/src/index.js b/src/index.js deleted file mode 100644 index 7a1ba6f..0000000 --- a/src/index.js +++ /dev/null @@ -1,50 +0,0 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import './index.css'; -import App from './App'; -import reportWebVitals from './reportWebVitals'; - -ReactDOM.render( - - - , - document.getElementById('root') -); - -// If you want to start measuring performance in your app, pass a function -// to log results (for example: reportWebVitals(console.log)) -// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals -reportWebVitals(); -/* --import React from "react"; --import { render } from "react-dom"; --import { BrowserRouter } from "react-router-dom"; --import App from "./App.js"; -+import React from 'react'; -+import ReactDOM from 'react-dom'; -+import './index.css'; -+import App from './App'; -+import reportWebVitals from './reportWebVitals'; - --if (process.env.NODE_ENV !== 'production') { -- console.log('DEVELOPMENT mode!'); --} -+ReactDOM.render( -+ -+ -+ , -+ document.getElementById('root') -+); - --render( -- -- -- , -- document.getElementById("root") --) -\ No newline at end of file -+// If you want to start measuring performance in your app, pass a function -+// to log results (for example: reportWebVitals(console.log)) -+// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals -+reportWebVitals(); -*/ \ No newline at end of file