diff --git a/.gitignore b/.gitignore index 5fc2cce9..823f78cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,10 @@ reference/ # config file +# legacy resurviv-config.json +# new +survev-config.json # env file .env diff --git a/HOSTING.md b/HOSTING.md index 879969c2..ad7441a6 100644 --- a/HOSTING.md +++ b/HOSTING.md @@ -1,8 +1,8 @@ -# Hosting your own Resurviv server -Looking to host your own Resurviv server to mess around or play against friends? This is the place for you. +# Hosting your own survev server +Looking to host your own survev server to mess around or play against friends? This is the place for you. ## Prerequisites -Before diving into the setup instructions, make sure you have the correct tools for the job. Hosting a dedicated Resurviv server requires two things: +Before diving into the setup instructions, make sure you have the correct tools for the job. Hosting a dedicated survev server requires two things: * SSH access to a VPS (or some other form of dedicated hosting) * The ability to open ports on said machine @@ -42,7 +42,7 @@ For security reasons, you cannot view your password as you type it. Type in the If you see a notice notifying you of the machine you have just logged into, congratulations! You have succesfully SSH'd into your server. ### Dependencies -[Resurviv](https://github.com/leia-uwu/resurviv.git) requires a few dependencies: +[Survev](https://github.com/leia-uwu/survev.git) requires a few dependencies: * [Git](https://git-scm.com) * [NGINX](https://nginx.org) * [Node.js](https://nodejs.org) @@ -73,8 +73,8 @@ npm i -g pnpm Next, move into `/opt`, clone the repository and traverse into it: ```sh cd /opt -git clone https://github.com/leia-uwu/resurviv.git -cd resurviv +git clone https://github.com/leia-uwu/survev.git +cd survev ``` Install the necessary dependencies: @@ -94,7 +94,7 @@ openssl rand -base64 32 Configure server: ```sh -nano resurviv-config.json +nano survev-config.json ``` And populate it with the following content: ```json @@ -129,17 +129,17 @@ Example config file: { "apiKey": "j0wo7RY0pYgD6W2mEy2wLa7VE4olUPD1r2hZma8FU6o=", "gameServer": { - "apiServerUrl": "https://resurviv.io" + "apiServerUrl": "https://survev.io" }, "regions": { "na": { "https": true, - "address": "na.resurviv.io:8001", + "address": "na.survev.io:8001", "l10n": "index-north-america" }, "eu": { "https": true, - "address": "eu.resurviv.io:8001", + "address": "eu.survev.io:8001", "l10n": "index-europe" } }, @@ -162,7 +162,7 @@ If you are only hosting a game server you can skip this. Make sure the build directory has the proper permissions: ```sh -sudo chown -R www-data:www-data /opt/resurviv/client/dist +sudo chown -R www-data:www-data /opt/survev/client/dist ``` First, remove the default file: @@ -173,7 +173,7 @@ sudo rm /etc/nginx/sites-available/default Create a new file: ```sh -nano /etc/nginx/sites-available/resurviv.conf +nano /etc/nginx/sites-available/survev.conf ``` And populate it with the following content: @@ -186,7 +186,7 @@ server { # Client build location / { - root /opt/resurviv/client/dist; + root /opt/survev/client/dist; } # API server @@ -225,7 +225,7 @@ Save the file using `Ctrl + X`, and press `Y` to confirm the file name. To enable the configuration: ```sh -sudo ln -s /etc/nginx/sites-available/resurviv.conf /etc/nginx/sites-enabled/resurviv.conf +sudo ln -s /etc/nginx/sites-available/survev.conf /etc/nginx/sites-enabled/survev.conf sudo systemctl restart nginx ``` @@ -236,17 +236,17 @@ which will ensure our application starts at boot and won't terminate if we end o If you are only hosting a game server, skip the API server part. ```sh -sudo nano /etc/systemd/system/resurviv-game.service +sudo nano /etc/systemd/system/survev-game.service ``` And populate it with the following content: ```ini [Unit] -Description=Resurviv dedicated game server. +Description=survev dedicated game server. [Service] Type=simple -WorkingDirectory=/opt/resurviv/server +WorkingDirectory=/opt/survev/server ExecStart=/usr/bin/pnpm start:game Restart=on-failure @@ -258,23 +258,23 @@ Save the file using `Ctrl + X`, and press `Y` to confirm the file name. Enable the unit: ```sh -sudo systemctl enable --now resurviv-game +sudo systemctl enable --now survev-game ``` Now do the same for the API server if applicable: ```sh -sudo nano /etc/systemd/system/resurviv-api.service +sudo nano /etc/systemd/system/survev-api.service ``` And populate it with the following content: ```ini [Unit] -Description=Resurviv dedicated API server. +Description=survev dedicated API server. [Service] Type=simple -WorkingDirectory=/opt/resurviv/server +WorkingDirectory=/opt/survev/server ExecStart=/usr/bin/pnpm start:api Restart=on-failure @@ -285,7 +285,7 @@ Save the file using `Ctrl + X`, and press `Y` to confirm the file name. Enable the unit: ```sh -sudo systemctl enable --now resurviv-api +sudo systemctl enable --now survev-api ``` If you've done everything correctly, you should be able to access the server at `http://youriphere` (ex: `http://1.1.1.1`). diff --git a/README.md b/README.md index 659994ee..0f1df8d0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Open sourced surviv.io -Resurviv.io is an open source recreation of a hit web game "surviv.io" that has been permanently shut down. +Survev.io is an open source recreation of a hit web game "surviv.io" that has been permanently shut down. Our goal is to immortalize it by getting the recreation as close as possible to the last canonical version of the game. diff --git a/client/css/app.css b/client/css/app.css index 87aaea3e..356c4ca0 100644 --- a/client/css/app.css +++ b/client/css/app.css @@ -1,5 +1,3 @@ -@import url(font.css); - :root { --side-pad: 12px; } @@ -308,10 +306,9 @@ a:active { background-color: rgba(0, 0, 0, 0.5); border-radius: 5px; box-sizing: border-box; - height: 323px; + height: 250px; margin-right: 30px; width: 300px; - overflow-y: auto; } @media (max-width: 850px), @@ -319,16 +316,63 @@ a:active { (max-width: 900px) and (min-resolution: 3dppx) { #ad-block-left { margin-right: 18px; - height: 230px; + height: 165px; width: 200px; } } .ad-block-med-rect { - padding: 20px; - overflow-y: auto; + height: 250px; + width: 300px +} + +@media(max-width: 850px),(max-width:900px) and (-webkit-min-device-pixel-ratio:3),(max-width:900px) and (min-resolution:3dppx) { + .ad-block-med-rect { + position:absolute; + -webkit-transform: scale(.67); + transform: scale(.67); + -webkit-transform-origin: left top; + transform-origin: left top + } +} + +.surviv-shirts { + background-position: center; + background-repeat: no-repeat; + background-size: cover; + display: block; + height: 250px; + width: 300px +} + +.surviv-shirts a { + height: 250px; + position: absolute; + width: 300px +} + +.surviv-shirts { + background-image: url(/img/discord-promo.png) +} + +/* +.adblock-plea { + display: none; + height: 250px; + width: 300px } +.adblock-plea span { + color: gold; + display: block; + font-size: 24px; + font-weight: 700; + line-height: 28px; + padding: 64px 24px; + text-align: center +} +*/ + .ui-stats-adblock { background-color: rgba(0, 0, 0, 0.5); display: none; @@ -6659,6 +6703,10 @@ input [type="image"]:focus { transform: translateX(-50%); } + .ad-block-med-rect { + transform: scale(.92); + } + #team-menu { position: absolute; width: 275px; diff --git a/client/css/font.css b/client/css/font.css deleted file mode 100644 index 0a5020d9..00000000 --- a/client/css/font.css +++ /dev/null @@ -1,15 +0,0 @@ -@font-face { - font-family: 'Roboto Condensed'; - font-style: normal; - font-display: swap; - font-weight: 400; - src: url(/fonts/roboto-condensed-latin-400-normal.woff2) format('woff2'); -} - -@font-face { - font-family: 'Roboto Condensed'; - font-style: normal; - font-display: swap; - font-weight: 700; - src: url(/fonts/roboto-condensed-latin-700-normal.woff2) format('woff2'); -} diff --git a/client/index.html b/client/index.html index 2381745e..8f8d6eca 100644 --- a/client/index.html +++ b/client/index.html @@ -5,6 +5,12 @@ survev.io - 2d battle royale game + + + + + + @@ -12,13 +18,13 @@ - + - + - - + + @@ -773,24 +779,32 @@

Account

- --> +