Skip to content

Commit

Permalink
🐛 #147 make dev server usable
Browse files Browse the repository at this point in the history
  • Loading branch information
@JAGFx
JAGFx committed Nov 27, 2022
1 parent fafd7e2 commit 178752e
Show file tree
Hide file tree
Showing 14 changed files with 227 additions and 2,945 deletions.
2 changes: 1 addition & 1 deletion bin/server
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh

docker run -it --rm -v "$(pwd):/usr/app" -w "/usr/app" -p "3000:3000" -u node node:16-alpine $@
docker run -it --rm -v "$(pwd):/usr/app" -p "3000:3000" unicorn/ets2-dashboard-skin/node:latest $@
66 changes: 66 additions & 0 deletions lib/jagfx/server/src/config/config.ats.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"unit_weight" : "kg",
"unit_length" : "m",
"unit_degrees" : "C",
"unit_consumption" : "lpkm",
"unit_volume" : "l",
"unit_pressure" : "psi",
"unit_speed" : "kph",
"unit_currency" : "USD",
"jagfx_elements_right_oilTemperature" : "true",
"jagfx_elements_right_brakesTemperature" : "true",
"jagfx_elements_right_brakesAirPressure" : "true",
"jagfx_elements_right_fuel" : "true",
"jagfx_elements_right_fuelConsumption" : "true",
"jagfx_elements_right_cruiseControl" : "true",
"jagfx_elements_right_waterTemperature" : "true",
"jagfx_elements_right_batteryVoltage" : "false",
"jagfx_elements_mid_top_retarder" : "true",
"jagfx_elements_mid_top_parkingBrake" : "true",
"jagfx_elements_mid_top_beamHigh" : "true",
"jagfx_elements_mid_top_beamLow" : "true",
"jagfx_elements_mid_top_beacon" : "false",
"jagfx_elements_mid_bottom_rpm" : "true",
"jagfx_elements_mid_bottom_fuel" : "true",
"jagfx_elements_mid_bottom_speedLimit" : "true",
"jagfx_elements_right_restStop" : "false",
"jagfx_elements_mid_bottom_blinker_turn" : "true",
"events_truck.refuel" : true,
"events_truck.damage" : true,
"events_truck.park" : true,
"events_truck.engine" : true,
"events_truck.electric" : true,
"events_truck.emergency" : true,
"events_truck.warning" : true,
"events_truck.cruise-control-decrease" : true,
"events_truck.cruise-control-increase" : true,
"events_truck.cruise-control" : true,
"events_trailers.damage" : true,
"events_trailers.coupling" : true,
"events_navigation.speed-limit" : true,
"events_job.started" : true,
"events_job.finished" : true,
"events_job.delivered" : true,
"events_job.cancelled" : true,
"events_game.refuel-payed" : true,
"events_game.train" : true,
"events_game.ferry" : true,
"events_game.tollgate" : true,
"events_game.fine" : true,
"events_game.pause" : true,
"maps_elements_eta" : true,
"maps_elements_speedAndGear" : true,
"maps_elements_mapControls" : true,
"maps_elements_speedLimit" : true,
"maps_elements_rotateWithPlayer" : true,
"maps_map_type" : "vanilla",
"maps_map_tilesRemotePath" : "https://raw.githubusercontent.com/TwinDragon/SCS_Map_Tiles/master/",
"maps_map_activeMap" : null,
"maps_map_navigationRemaining" : "remaining_date",
"maps_map_tilesVersion" : "latest",
"jagfx_elements_right_map" : false,
"maps_map_tilesRemoteUseCustom" : false,
"maps_map_tilesRemoteCustomPath" : null,
"maps_general_debug" : false,
"scania_default_menu": null
}
66 changes: 66 additions & 0 deletions lib/jagfx/server/src/config/config.ets2.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"unit_weight" : "kg",
"unit_length" : "m",
"unit_degrees" : "C",
"unit_consumption" : "lpkm",
"unit_volume" : "l",
"unit_pressure" : "psi",
"unit_speed" : "kph",
"unit_currency" : "EUR",
"jagfx_elements_right_oilTemperature" : "true",
"jagfx_elements_right_brakesTemperature" : "true",
"jagfx_elements_right_brakesAirPressure" : "true",
"jagfx_elements_right_fuel" : "true",
"jagfx_elements_right_fuelConsumption" : "true",
"jagfx_elements_right_cruiseControl" : "true",
"jagfx_elements_right_waterTemperature" : "true",
"jagfx_elements_right_batteryVoltage" : "false",
"jagfx_elements_mid_top_retarder" : "true",
"jagfx_elements_mid_top_parkingBrake" : "true",
"jagfx_elements_mid_top_beamHigh" : "true",
"jagfx_elements_mid_top_beamLow" : "true",
"jagfx_elements_mid_top_beacon" : "false",
"jagfx_elements_mid_bottom_rpm" : "true",
"jagfx_elements_mid_bottom_fuel" : "true",
"jagfx_elements_mid_bottom_speedLimit" : "true",
"jagfx_elements_right_restStop" : "false",
"jagfx_elements_mid_bottom_blinker_turn" : "true",
"events_truck.refuel" : true,
"events_truck.damage" : true,
"events_truck.park" : true,
"events_truck.engine" : true,
"events_truck.electric" : true,
"events_truck.emergency" : true,
"events_truck.warning" : true,
"events_truck.cruise-control-decrease" : true,
"events_truck.cruise-control-increase" : true,
"events_truck.cruise-control" : true,
"events_trailers.damage" : true,
"events_trailers.coupling" : true,
"events_navigation.speed-limit" : true,
"events_job.started" : true,
"events_job.finished" : true,
"events_job.delivered" : true,
"events_job.cancelled" : true,
"events_game.refuel-payed" : true,
"events_game.train" : true,
"events_game.ferry" : true,
"events_game.tollgate" : true,
"events_game.fine" : true,
"events_game.pause" : true,
"maps_elements_eta" : true,
"maps_elements_speedAndGear" : true,
"maps_elements_mapControls" : true,
"maps_elements_speedLimit" : true,
"maps_elements_rotateWithPlayer" : true,
"maps_map_type" : "vanilla",
"maps_map_tilesRemotePath" : "https://raw.githubusercontent.com/TwinDragon/SCS_Map_Tiles/master/",
"maps_map_activeMap" : null,
"maps_map_navigationRemaining" : "remaining_date",
"maps_map_tilesVersion" : "latest",
"jagfx_elements_right_map" : false,
"maps_map_tilesRemoteUseCustom" : false,
"maps_map_tilesRemoteCustomPath" : null,
"maps_general_debug" : false,
"scania_default_menu": null
}
9 changes: 9 additions & 0 deletions lib/jagfx/server/src/config/config.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"general_refresh_rate" : 100,
"general_skin_on_load" : "JAGFx",
"general_h-shift-layout" : "h-shifter",
"general_skin_locale" : "en-EN",
"general_job_remaining" : "remaining_date",
"general_port": 3000,
"general_damage_accurate": "damage-diagnostic"
}
7 changes: 4 additions & 3 deletions lib/jagfx/server/src/user-preference/transformer.ts
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { UserPreferenceCollection } from 'ets2-dashboard-core/src/configuration/user-preference/user-preference.type';
import { UserPreferenceCollection } from 'ets2-dashboard-core/src/configuration/user-preference/user-preference.type.js';

import { ConfigFileEntries } from '@/config/config.type';
import { ConfigFileEntries } from '@server/config/config.type';

export const toUserPreferencesCollection = (
configFileEntries: ConfigFileEntries
) => {
const collection = new UserPreferenceCollection();

Object.entries(configFileEntries).map(
([userPreferenceId, userPreferenceValue]) => {
collection.set(userPreferenceId, {
Expand All @@ -15,4 +14,6 @@ export const toUserPreferencesCollection = (
});
}
);

return collection;
};
5 changes: 3 additions & 2 deletions lib/jagfx/server/tsconfig.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"compilerOptions": {
"paths" : {
"@/*": ["./src/*"]
"@server/*": ["./src/*"]
},
"baseUrl" : ".",
"target": "ESNext",
"module": "ESNext",
"outDir": "dist",
"lib": [
"ESNext"
"ESNext",
"DOM"
],
"strict": true,
"moduleResolution": "node",
Expand Down
4 changes: 2 additions & 2 deletions makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ ci:
server\:dev\:build:
@bin/node npm run build -w servers/jagfx/dev

server\:dev\:start: server\:dev\:build
@bin/node npm run start -w servers/jagfx/dev
server\:dev\:start:
@bin/server npm run start -w servers/jagfx/dev
28 changes: 20 additions & 8 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"country-list": "^2.2.0",
"emoji-flag": "^1.1.0",
"emoji-flags": "~1.3.0",
"ets2-dashboard-core": "^0.0.1",
"ets2-dashboard-core": "file:lib/jagfx/core",
"file-saver": "^2.0.5",
"gsap": "^3.11.3",
"json-query": "^2.2.2",
Expand Down
7 changes: 7 additions & 0 deletions servers/jagfx/dev/nodemon.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"restartable": "rs",
"execMap": {
"ts": "node --loader ts-node/esm"
},
"ext": "ts,js,json"
}
Loading

0 comments on commit 178752e

Please sign in to comment.