Merge pull request #507 from saltysimulations/efb

feat: efb

.github/workflows/dev.yml

@@ -17,6 +17,8 @@ jobs:
       INSTALLER_PRE_RELEASE_ID: 64499039
       INSTALLER_PRE_RELEASE_TAG: vinstaller
       BUILD_DIR_NAME: vdev
+      CLIENT_ID: ${{ secrets.NG_CLIENT_ID }}
+      CLIENT_SECRET: ${{ secrets.NG_CLIENT_SECRET }}
     steps:
       - name: Checkout source
         uses: actions/checkout@v2

.github/workflows/pr.yml

@@ -14,6 +14,8 @@ jobs:
       SALTY_PRODUCTION_BUILD: 1
       ZIP_NAME: salty-747.zip
       BUILD_DIR_NAME: zip-build
+      CLIENT_ID: ${{ secrets.NG_CLIENT_ID }}
+      CLIENT_SECRET: ${{ secrets.NG_CLIENT_SECRET }}
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
@@ -33,7 +35,7 @@ jobs:
         run: |
           mkdir ./${{ env.BUILD_DIR_NAME }}
           zip -r ./${{ env.BUILD_DIR_NAME }}/${{ env.ZIP_NAME }} ./salty-747/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: salty-747
           path: ${{ env.BUILD_DIR_NAME }}/${{ env.ZIP_NAME }}

.gitignore

@@ -5,7 +5,7 @@ node_modules/
 salty-747/manifest.json
 salty-747/layout.json
 salty-747/html_ui/Pages/Salty/fpm
-salty-747/html_ui/Pages/VCockpit/Instruments/74s/*
+salty-747/html_ui/Pages/VCockpit/Instruments/b74s/efb
 !salty-747/html_ui/Pages/VCockpit/Instruments/74s/PFD
 salty-747/html_ui/Pages/VCockpit/Instruments/74s/PFD/*.css
 salty-747/html_ui/Pages/VCockpit/Instruments/74s/PFD/*.js
@@ -20,4 +20,5 @@ src/sounds/.cache/
 .idea/
 msfs-avionics-mirror/src/garminsdk
 msfs-avionics-mirror/src/workingtitle-instruments-g1000
-msfs-avionics-mirror/src/sdk/build
+msfs-avionics-mirror/src/sdk/build
+.env

package.json

@@ -4,58 +4,54 @@
     "description": "An open-source modification for the default MSFS 747-8, aiming to improve the lacking features and realism of the default aircraft.",
     "scripts": {
         "build:layout": "node scripts/build.js",
-        "build:instruments": "rollup -c src/instruments/rollup.config.js",
-        "build:pfd": "rollup -c src/instruments/src/PFD/rollup.config.js",
-        "build:fpm": "cd src/modules && tsc --module commonjs && rollup -c rollup.config.ts",
+        "build:instruments": "mach build -c src/instruments/mach.config.js",
         "build:models": "node src/models/build.js",
-        "build:msfs-sdk": "cd msfs-avionics-mirror/src/sdk && npm i && npm run build",
-        "build": "npm run build:msfs-sdk && npm run build:pfd && npm run build:instruments && npm run build:fpm && npm run build:models && npm run build:layout",
+        "build": "npm run build:instruments && npm run build:models && npm run build:layout",
         "fragment": "node scripts/fragment.js",
-        "dev": "rollup -wc src/instruments/rollup.config.js",
-        "dev-pfd": "rollup -wc src/instruments/src/PFD/rollup.config.js"
+        "dev": "mach watch -c src/instruments/mach.config.js"
     },
     "author": "Salty Simulations",
     "license": "GPL-3.0-or-later",
     "devDependencies": {
-        "@babel/core": "^7.15.5",
-        "@babel/plugin-proposal-class-properties": "^7.14.5",
-        "@babel/plugin-transform-runtime": "^7.15.0",
-        "@babel/preset-env": "^7.15.6",
-        "@babel/preset-react": "^7.14.5",
-        "@babel/preset-typescript": "^7.15.0",
         "@flybywiresim/fragmenter": "^0.7.0",
-        "@flybywiresim/rollup-plugin-msfs": "^0.3.1",
-        "@rollup/plugin-babel": "^5.3.0",
-        "@rollup/plugin-commonjs": "^20.0.0",
-        "@rollup/plugin-image": "^2.1.1",
-        "@rollup/plugin-node-resolve": "^13.3.0",
-        "@rollup/plugin-replace": "^3.0.0",
-        "@rollup/plugin-typescript": "^8.3.2",
+        "@microsoft/msfs-sdk": "^0.8.0",
+        "@microsoft/msfs-types": "^1.14.6",
+        "@types/leaflet": "^1.7.7",
         "@types/react": "^17.0.26",
         "@types/react-dom": "^17.0.9",
+        "@types/styled-components": "^5.1.19",
+        "@types/uuid": "^9.0.1",
         "@typescript-eslint/eslint-plugin": "^4.14.0",
         "@typescript-eslint/parser": "^4.14.0",
+        "dotenv": "^16.0.3",
         "eslint": "^7.18.0",
-        "msfssdk": "file:msfs-avionics-mirror/src/sdk/build",
-        "rollup": "^2.75.6",
-        "rollup-plugin-commonjs": "^10.1.0",
-        "rollup-plugin-copy": "^3.3.0",
-        "rollup-plugin-import-css": "^3.0.3",
-        "rollup-plugin-json": "^4.0.0",
-        "rollup-plugin-node-resolve": "^5.2.0",
-        "rollup-plugin-postcss": "^4.0.1",
-        "rollup-plugin-scss": "^3.0.0",
-        "rollup-plugin-sourcemaps": "^0.6.3",
-        "rollup-plugin-ts-paths-resolve": "^1.7.1",
-        "rollup-plugin-typescript2": "^0.31.2",
-        "tailwindcss": "^2.2.16",
-        "typescript": "^4.1.3"
+        "typescript": "^4.1.3",
+        "@synaptic-simulations/mach": "^1.0.3",
+        "esbuild-plugin-inline-image": "0.0.9",
+        "esbuild-sass-plugin": "^3.0.0",
+        "esbuild-style-plugin": "^1.6.3"
     },
     "dependencies": {
-        "react": "^17.0.2",
-        "react-dom": "^17.0.2",
+        "@navigraph/leaflet": "^2.0.1",
+        "@ninjomcs/metar-taf-parser-msfs": "^9.0.4",
+        "byte-data": "^19.0.1",
+        "core-js": "^3.38.1",
+        "framer-motion": "^11.9.0",
+        "leaflet": "^1.7.1",
+        "navigraph": "^1.2.36",
+        "qrcode.react": "^3.1.0",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
+        "react-icons": "^5.3.0",
+        "react-indiana-drag-scroll": "^2.2.0",
+        "react-leaflet": "^3.2.2",
         "react-msfs": "^0.2.0",
+        "react-range": "^1.10.0",
+        "react-router-dom": "^6.2.1",
+        "react-spinners": "^0.13.8",
+        "react-zoom-pan-pinch": "^3.0.6",
         "sass": "^1.42.1",
-        "byte-data": "^19.0.1"
+        "styled-components": "^5.3.3",
+        "uuid": "^9.0.0"
     }
 }