Merge pull request #24 from Ruby-Network/bugfixes

Fixes

Author: MotorTruck1221

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "dynamic"]
-	path = dynamic
-	url = https://github.com/nebulaservices/dynamic

README.md

@@ -50,7 +50,7 @@
 
 This is our third edition of [Ruby](https://github.com/ruby-network/ruby-v1). This edition primarily uses the Ruby programming language whilst also adding more features
 
-[![Ruby Network Discord](https://invidget.switchblade.xyz/rbWVGBfuwV?theme=dark)](https://discord.gg/rbWVGBfuwV)
+[![Ruby Network Discord](https://invidget.switchblade.xyz/bXJCZJZcJe?theme=dark)](https://discord.gg/bXJCZJZcJe)
 
 ## Features
 
@@ -84,17 +84,15 @@ This is our third edition of [Ruby](https://github.com/ruby-network/ruby-v1). Th
 
 - [x]   Basic Password protection for the website (you can set a password in the settings page)
 
-- [ ]  Customizable apps and games
-
-- [ ]  Partners page for all of our wonderful partners
-
 - [ ]  Apps 
 
--  [x]  History page
+- [x]  History page
+
+- [ ] Keybinds cheat sheet
 
 - [ ]  Backgrounds, using Particles.js and other libraries
 
-- [ ]  Multiple Users when self hosting in private mode
+- [x]  Multiple Users when self hosting in private mode
 
 ---
 

build.js

@@ -68,6 +68,10 @@
 set :uvPath, File.join(settings.root, 'node_modules', '@titaniumnetwork-dev', 'ultraviolet', 'dist')
 uvPath()
 
+# Dynamic "middleware"
+set :dynamicPath, File.join(settings.root, 'node_modules', '@nebula-services', 'dynamic', 'dist')
+dynamicPath()
+
 # Other routes
 get '/rubyHealth/?' do
   return "OK"

buildFiles/rhbuild.js

@@ -7,8 +7,8 @@
     "scripts": {
         "dev": "bundle exec rerun --ignore 'src/public/css/*' --signal 'TERM' -c -w 5 --no-notify -- puma",
         "start": "bundle exec puma -e production",
-        "install": "bundle install && npm run build",
-        "build": "node ./build.js",
+        "install": "bundle install",
+        "build:rh": "tsc -p ./rammerhead/tsconfig.json",
         "cli": "bundle exec ruby ./cli/cli.rb"
     },
     "engines": {
@@ -17,14 +17,15 @@
     "dependencies": {
         "@fastify/http-proxy": "^9.2.1",
         "@fastify/middie": "^8.3.0",
+        "@nebula-services/dynamic": "^0.7.2-patch.2",
         "@titaniumnetwork-dev/ultraviolet": "^2.0.0",
         "@tomphttp/bare-server-node": "^2.0.0",
         "chalk": "^5.2.0",
-        "esbuild": "^0.19.2",
         "fastify": "^4.21.0",
         "progress-estimator": "^0.3.1",
         "rammerhead": "https://github.com/Ruby-Network/rammerhead/releases/download/v1/rammerhead-2.tgz",
         "sass": "^1.62.1",
+        "typescript": "^5.3.3",
         "yaml": "^2.3.1"
     }
 }

dynamic

@@ -1,2 +1,5 @@
-# Rammerhead source files for the browser. Compiled for older browsers via [ESBuild](https://esbuild.github.io/).
+# Rammerhead source files for browser.
 
+- The `rh.ts` file is compiled to `rh.js` and the put into [src/public/js/rh](../src/public/js/rh/).
+- Build command is: `yarn build:rh`
+- The other folder [./oldJS/](./oldJS/) contains old files that were crappier versions of `rh.ts`