Skip to content
This repository was archived by the owner on May 28, 2023. It is now read-only.

Commit 052e635

Browse files
MotorTruck1221MotorTruck1221
authored
Merge pull request #57 from Ruby-Network/main
Main --> Dev
2 parents 6e7767c + e870cea commit 052e635

File tree

5 files changed

+87
-57
lines changed

5 files changed

+87
-57
lines changed

‎docker/docker-compose-build.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: "3"
2+
services:
3+
ruby:
4+
image: ruby:latest
5+
build: .
6+
container_name: ruby
7+
restart: unless-stopped
8+
ports:
9+
# DO NOT CHANGE 8080!
10+
- your port here:8080
11+
#ADVANCED ITEMS BELOW
12+
# - ${PORT}:8080
13+
#env_file:
14+
# - .env.docker
15+
#environment:
16+
# - URL=${URL}
17+
#networks:
18+
# default:
19+
# external:
20+
# name: default_net

‎index.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,20 @@ dotenv.config();
1717
//getting environment vars
1818
const numCPUs = process.env.CPUS || os.cpus().length;
1919
let key = process.env.KEY || 'unlock';
20-
let url = process.env.URL || 'rubynetwork.tech';
20+
let uri = process.env.URL || 'rubynetwork.tech';
21+
if (uri.includes('http')) {
22+
uri = uri.replace('http://', '');
23+
}
24+
if (uri.includes('https')) {
25+
uri = uri.replace('https://', '')
26+
}
2127
let user = process.env.USERNAME || 'ruby';
2228
let pass = process.env.PASSWORD || 'ruby';
2329
let disableKEY = process.env.KEYDISABLE || 'false';
2430
let educationWebsite = fs.readFileSync(join(__dirname, 'education/index.html'));
2531
let loadingPage = fs.readFileSync(join(__dirname, 'education/load.html'));
2632
const blacklisted: string[] = [];
33+
console.log(uri)
2734
const disableyt: string[] = [];
2835
fs.readFile(join(__dirname, 'blocklists/ADS.txt'), (err, data) => {
2936
if (err) {
@@ -83,7 +90,7 @@ if (numCPUs > 0 && cluster.isPrimary) {
8390
return;
8491
}
8592
//@ts-ignore
86-
} else if (req.headers.host === url) {
93+
} else if (req.headers.host === uri) {
8794
app(req, res);
8895
} else if (
8996
url.search === `?${key}` &&

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
"@astrojs/node": "^5.1.0",
2323
"@astrojs/partytown": "^1.1.1",
2424
"@astrojs/prefetch": "^0.2.1",
25-
"@astrojs/react": "^2.1.0",
25+
"@astrojs/react": "^2.1.1",
2626
"@astrojs/tailwind": "^3.1.1",
2727
"@fortawesome/fontawesome-svg-core": "^6.2.1",
2828
"@fortawesome/free-brands-svg-icons": "^6.2.1",
2929
"@fortawesome/free-solid-svg-icons": "^6.2.1",
3030
"@fortawesome/react-fontawesome": "^0.2.0",
31-
"@titaniumnetwork-dev/ultraviolet": "^1.0.8",
31+
"@titaniumnetwork-dev/ultraviolet": "^1.0.11",
3232
"@tomphttp/bare-server-node": "^1.2.5",
33-
"astro": "^2.1.7",
34-
"astro-robots-txt": "^0.4.0",
33+
"astro": "^2.1.9",
34+
"astro-robots-txt": "^0.4.1",
3535
"dotenv": "^16.0.3",
3636
"express": "^4.18.2",
3737
"framer-motion": "^10.9.1",
@@ -50,7 +50,7 @@
5050
"@types/express": "^4.17.13",
5151
"@types/http-auth": "^4.1.1",
5252
"@types/node": "^18.15.10",
53-
"@types/react": "^18.0.29",
53+
"@types/react": "^18.0.32",
5454
"@types/react-dom": "^18.0.6"
5555
}
5656
}

‎src/pages/games/index.astro‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,30 @@ import '../../styles/globals.css';
2222
placeholder="Search For A Game..."
2323
class="search-input"
2424
/>
25-
</div>
26-
<select class="search-select" onchange="category_games(this.value)">
27-
<option value="">All</option>
28-
<option value="arcade">Arcade</option>
29-
<option value="platformer">Platformer</option>
30-
<option value="static">Static</option>
31-
<option value="racing">Racing</option>
32-
<option value="flash">Flash</option>
33-
<option value="adventure">Adventure</option>
34-
<option value="multiplayer">Multiplayer</option>
35-
<option value="retro">Retro</option>
36-
<option value="emulation">Emulation</option>
37-
<option value="sports">Sports</option>
38-
<option value="strategy">Strategy</option>
39-
<option value="shooter">Shooter</option>
40-
<option value="proxied">Proxied</option>
41-
</select>
25+
<select class="search-select" onchange="category_games(this.value)">
26+
<option value="">All</option>
27+
<option value="arcade">Arcade</option>
28+
<option value="platformer">Platformer</option>
29+
<option value="static">Static</option>
30+
<option value="racing">Racing</option>
31+
<option value="flash">Flash</option>
32+
<option value="adventure">Adventure</option>
33+
<option value="multiplayer">Multiplayer</option>
34+
<option value="retro">Retro</option>
35+
<option value="emulation">Emulation</option>
36+
<option value="sports">Sports</option>
37+
<option value="strategy">Strategy</option>
38+
<option value="shooter">Shooter</option>
39+
<option value="proxied">Proxied</option>
40+
</select>
41+
</div>
42+
<div class="games" id="games"></div>
43+
<script src="/js/games.js" type="module" is:inline></script>
44+
<script src="/js/searchGames.js" is:inline></script>
45+
<div class="games" id="games"></div>
46+
<script src="/js/games.js" type="module" is:inline></script>
47+
<script src="/js/searchGames.js" is:inline></script>
4248
</body>
43-
<div class="games" id="games"></div>
44-
<script src="/js/games.js" type="module" is:inline></script>
45-
<script src="/js/searchGames.js" is:inline></script>
4649

4750
<style is:global>
4851
.get-started-div {

‎yarn.lock‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@
8888
dependencies:
8989
prismjs "^1.28.0"
9090

91-
"@astrojs/react@^2.1.0":
92-
version "2.1.0"
93-
resolved "https://registry.yarnpkg.com/@astrojs/react/-/react-2.1.0.tgz#6b913baefa0d2a717bf5ff3d96ab299c7b0e4708"
94-
integrity sha512-AzopsCVjsHlX1oVkgLusDRngnpJfoi03kj6c8p/K6+i/PQ3ZnVwRmJl7IgFBC2YJSbexyNxK2BmLvwkjGvQaCA==
91+
"@astrojs/react@^2.1.1":
92+
version "2.1.1"
93+
resolved "https://registry.yarnpkg.com/@astrojs/react/-/react-2.1.1.tgz#33337d7dde99229a35ffea8cdac819975ca93d93"
94+
integrity sha512-nIcDFnn5H4FKGoSBYXZr95RIQvpcTNRcVV1hvUQifO0F5hQsgb0PVyk6TG4JWxiPGY4Jt4MVQb5JaaDQHlHu4w==
9595
dependencies:
9696
"@babel/core" ">=7.0.0-0 <8.0.0"
9797
"@babel/plugin-transform-react-jsx" "^7.17.12"
@@ -640,10 +640,10 @@
640640
dependencies:
641641
tsm "^2.1.4"
642642

643-
"@titaniumnetwork-dev/ultraviolet@^1.0.8":
644-
version "1.0.10"
645-
resolved "https://registry.yarnpkg.com/@titaniumnetwork-dev/ultraviolet/-/ultraviolet-1.0.10.tgz#515474b2be346574575fe155ad0f7ff82608b852"
646-
integrity sha512-y5Hv92jQUvwmcEMIeFuImuD5CmI7b0MQGL7qkFcEZxETxlwy+jveLaHpF1UWgtGJS50GSnj9GCJWZWp/W6IwEQ==
643+
"@titaniumnetwork-dev/ultraviolet@^1.0.11":
644+
version "1.0.11"
645+
resolved "https://registry.yarnpkg.com/@titaniumnetwork-dev/ultraviolet/-/ultraviolet-1.0.11.tgz#3d80c6af376107f5da2a4742401006b12552bd97"
646+
integrity sha512-FJtZw/xQubrgk8pJLs5wx9k6okCGZPR7FXWXTiL5wOiCvjqgDQCmHBTb7M5eYqnQil05tbaz92+16Ki/7rRWIw==
647647
dependencies:
648648
"@tomphttp/bare-client" "^1.1.2-beta.3"
649649
css-tree "^2.0.4"
@@ -852,10 +852,10 @@
852852
dependencies:
853853
"@types/react" "*"
854854

855-
"@types/react@*", "@types/react@^18.0.29":
856-
version "18.0.29"
857-
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.29.tgz#4cead505172c0020c5b51940199e31fc6ff2f63a"
858-
integrity sha512-wXHktgUABxplw1+UnljseDq4+uztQyp2tlWZRIxHlpchsCFqiYkvaDS8JR7eKOQm8wziTH/el5qL7D6gYNkYcw==
855+
"@types/react@*", "@types/react@^18.0.32":
856+
version "18.0.32"
857+
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.32.tgz#5e88b2af6833251d54ec7fe86d393224499f41d5"
858+
integrity sha512-gYGXdtPQ9Cj0w2Fwqg5/ak6BcK3Z15YgjSqtyDizWUfx7mQ8drs0NBUzRRsAdoFVTO8kJ8L2TL8Skm7OFPnLUw==
859859
dependencies:
860860
"@types/prop-types" "*"
861861
"@types/scheduler" "*"
@@ -1025,21 +1025,21 @@ array-iterate@^2.0.0:
10251025
resolved "https://registry.yarnpkg.com/array-iterate/-/array-iterate-2.0.1.tgz#6efd43f8295b3fee06251d3d62ead4bd9805dd24"
10261026
integrity sha512-I1jXZMjAgCMmxT4qxXfPXa6SthSoE8h6gkSI9BGGNv8mP8G/v0blc+qFnZu6K42vTOiuME596QaLO0TP3Lk0xg==
10271027

1028-
astro-robots-txt@^0.4.0:
1029-
version "0.4.0"
1030-
resolved "https://registry.yarnpkg.com/astro-robots-txt/-/astro-robots-txt-0.4.0.tgz#144aa8f466c5d60da4bbbae4e89fa2c8f488a46b"
1031-
integrity sha512-tzZUnSXNC5gtSaLvF/LGC0A6cxt7lW5J0tuuQfM84/Vj2/dIdsvxHUp1JI1APhdpwP6TvH05aJnJFnGHn/pZlQ==
1028+
astro-robots-txt@^0.4.1:
1029+
version "0.4.1"
1030+
resolved "https://registry.yarnpkg.com/astro-robots-txt/-/astro-robots-txt-0.4.1.tgz#07fba6a49501dc0cb776036c929a56cf24c72eca"
1031+
integrity sha512-YujWFocCHcOA+sDlaiqVsUH7eeHDOn9WrtsyT7KPW3JOHn1dZB1KwoshsPGTJiZ0PeeAqPcHOz+M9xjzc/tjsQ==
10321032
dependencies:
10331033
"@proload/core" "^0.3.3"
10341034
"@proload/plugin-tsm" "^0.2.1"
1035-
deepmerge "^4.3.0"
1035+
deepmerge "^4.3.1"
10361036
valid-filename "^4.0.0"
1037-
zod "^3.20.6"
1037+
zod "^3.21.4"
10381038

1039-
astro@^2.1.7:
1040-
version "2.1.7"
1041-
resolved "https://registry.yarnpkg.com/astro/-/astro-2.1.7.tgz#d28f1b3529595c75bdc73c58b1a5f89aeb8f70fa"
1042-
integrity sha512-Eaq8/mJTx+kbghfW5ZEJ8rKiEduo03Rn6R/fp/gJGpBSRm/0FiVxVsrpq5SV4kUPrttEi1zMEnEc2GP6JWfXeg==
1039+
astro@^2.1.9:
1040+
version "2.1.9"
1041+
resolved "https://registry.yarnpkg.com/astro/-/astro-2.1.9.tgz#d47fcfc5c83b2f91a63fee4705fb90421069b2be"
1042+
integrity sha512-UkbG0lgue1b/t4yMI+AkAGEfdOwcPS2RUYQ/QIurtKjP6W5gtKQveRTBuHH7iwiBziH+z8Ecc5/OAALoXSvMlQ==
10431043
dependencies:
10441044
"@astrojs/compiler" "^1.3.0"
10451045
"@astrojs/language-server" "^0.28.3"
@@ -1473,10 +1473,10 @@ deepmerge-ts@^4.2.2:
14731473
resolved "https://registry.yarnpkg.com/deepmerge-ts/-/deepmerge-ts-4.3.0.tgz#432aff3cd09f947e36cdb3772a43960bf45327fe"
14741474
integrity sha512-if3ZYdkD2dClhnXR5reKtG98cwyaRT1NeugQoAPTTfsOpV9kqyeiBF9Qa5RHjemb3KzD5ulqygv6ED3t5j9eJw==
14751475

1476-
deepmerge@^4.2.2, deepmerge@^4.3.0:
1477-
version "4.3.0"
1478-
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.0.tgz#65491893ec47756d44719ae520e0e2609233b59b"
1479-
integrity sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==
1476+
deepmerge@^4.2.2, deepmerge@^4.3.1:
1477+
version "4.3.1"
1478+
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
1479+
integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
14801480

14811481
defaults@^1.0.3:
14821482
version "1.0.4"
@@ -4381,10 +4381,10 @@ yocto-queue@^0.1.0:
43814381
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
43824382
integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
43834383

4384-
zod@^3.17.3, zod@^3.20.6:
4385-
version "3.21.1"
4386-
resolved "https://registry.yarnpkg.com/zod/-/zod-3.21.1.tgz#ac5bb7cf68876281ebd02f95ac4bb9a080370282"
4387-
integrity sha512-+dTu2m6gmCbO9Ahm4ZBDapx2O6ZY9QSPXst2WXjcznPMwf2YNpn3RevLx4KkZp1OPW/ouFcoBtBzFz/LeY69oA==
4384+
zod@^3.17.3, zod@^3.21.4:
4385+
version "3.21.4"
4386+
resolved "https://registry.yarnpkg.com/zod/-/zod-3.21.4.tgz#10882231d992519f0a10b5dd58a38c9dabbb64db"
4387+
integrity sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==
43884388

43894389
zwitch@^2.0.0, zwitch@^2.0.4:
43904390
version "2.0.4"

0 commit comments

Comments
 (0)