From e821cb11a60cf537029aa2f4ceff2046006fe08f Mon Sep 17 00:00:00 2001 From: Vercin-G <97210222+Vercin-G@users.noreply.github.com> Date: Tue, 26 Sep 2023 13:48:38 -0600 Subject: [PATCH 1/3] rename CF + remove app.js bloat + a bonus string fix for the ACD entry --- client/src/App.js | 69 +++---------------- .../{CombinedFunction.js => AdrListEntry.js} | 15 ++-- client/src/modules/Generic/BilletBank.js | 2 +- 3 files changed, 20 insertions(+), 66 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..a123b65 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,65 +141,14 @@ function MilpacRequest() { ) : ( <>
- - - - - - - - + + + + + + +
diff --git a/client/src/modules/Generic/CombinedFunction.js b/client/src/modules/Generic/AdrListEntry.js similarity index 54% rename from client/src/modules/Generic/CombinedFunction.js rename to client/src/modules/Generic/AdrListEntry.js index 4f608f3..8ceccaa 100644 --- a/client/src/modules/Generic/CombinedFunction.js +++ b/client/src/modules/Generic/AdrListEntry.js @@ -1,12 +1,17 @@ import React from "react"; import Collapsible from "react-collapsible"; import MilpacParse from "./MilpacParse.js"; +import lists from "./BilletBank.js"; + +function AdrListEntry(props) { + + let billetBankObject = lists.billetBankObject; + let selector = props.billetBankGroup; -function CombinedFunction(props) { return (
@@ -23,4 +28,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..3c44102 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 From a7a1e3436f5183fa42be6379a4bff43648951971 Mon Sep 17 00:00:00 2001 From: Vercin-G <97210222+Vercin-G@users.noreply.github.com> Date: Tue, 26 Sep 2023 13:59:35 -0600 Subject: [PATCH 2/3] shorten billetBankGroup + supportDepartments strings --- client/src/App.js | 19 +++++++++---------- client/src/modules/Generic/BilletBank.js | 4 ++-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/client/src/App.js b/client/src/App.js index a123b65..6edcd99 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -141,16 +141,15 @@ function MilpacRequest() { ) : ( <>
- - - - - - - - + {/*note: BbGroup = billetBankGroup*/} + + + + + + + +
Date: Tue, 26 Sep 2023 14:01:24 -0600 Subject: [PATCH 3/3] format AdrListEntry.js --- client/src/modules/Generic/AdrListEntry.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/modules/Generic/AdrListEntry.js b/client/src/modules/Generic/AdrListEntry.js index 8ceccaa..7513133 100644 --- a/client/src/modules/Generic/AdrListEntry.js +++ b/client/src/modules/Generic/AdrListEntry.js @@ -4,7 +4,6 @@ import MilpacParse from "./MilpacParse.js"; import lists from "./BilletBank.js"; function AdrListEntry(props) { - let billetBankObject = lists.billetBankObject; let selector = props.billetBankGroup;