From 7eb221f73b849204c1b88265cfd4c72a6d18b69a Mon Sep 17 00:00:00 2001 From: "Will C aka \"Big Bercin" <97210222+Vercin-G@users.noreply.github.com> Date: Tue, 26 Sep 2023 16:43:56 -0600 Subject: [PATCH] Bugfix and more housekeeping (#55) * rename CF + remove app.js bloat + a bonus string fix for the ACD entry * shorten billetBankGroup + supportDepartments strings * format AdrListEntry.js --- client/src/App.js | 72 +++---------------- .../{CombinedFunction.js => AdrListEntry.js} | 14 ++-- client/src/modules/Generic/BilletBank.js | 6 +- 3 files changed, 22 insertions(+), 70 deletions(-) rename client/src/modules/Generic/{CombinedFunction.js => AdrListEntry.js} (54%) diff --git a/client/src/App.js b/client/src/App.js index 241f642..6edcd99 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -4,7 +4,7 @@ import Collapsible from "react-collapsible"; import lists from "./modules/Generic/BilletBank"; import ErrorMessage from "./errorMessage"; import Statistics from "./modules/Generic/Statistics"; -import CombinedFunction from "./modules/Generic/CombinedFunction"; +import AdrListEntry from "./modules/Generic/AdrListEntry"; import Logo from "./style/themes/7cav/logo"; const CLIENT_TOKEN = process.env.REACT_APP_CLIENT_TOKEN; @@ -141,67 +141,15 @@ function MilpacRequest() { ) : ( <>
- - - - - - - - + {/*note: BbGroup = billetBankGroup*/} + + + + + + + +
@@ -23,4 +27,4 @@ function CombinedFunction(props) { ); } -export default CombinedFunction; +export default AdrListEntry; diff --git a/client/src/modules/Generic/BilletBank.js b/client/src/modules/Generic/BilletBank.js index d85982e..4b9a2bc 100644 --- a/client/src/modules/Generic/BilletBank.js +++ b/client/src/modules/Generic/BilletBank.js @@ -527,7 +527,7 @@ const acd = { "Star Citizen Starter Platoon", "Future Concepts Center", ], - collapsibleTitle: "First Battalion", + collapsibleTitle: "Auxillary Combat Division", }; //IMO @@ -737,7 +737,7 @@ const s7 = [ const ld = ["126", "127", "128", "129", "130", "131", "132", "539"]; const spd = ["175", "176"]; -const supportDepartments = { +const support = { positionIds: [spd, s3, s7, ld], positionTitles: [ "Special Projects Division", @@ -758,7 +758,7 @@ const billetBankObject = { imo: imo, secOps: secOps, roo: roo, - supportDepartments: supportDepartments, + support: support, }; //keeping a shortlist of individual exports open so that it doesnt break the Statistics section.