Housekeeping (#53)

* remove debug log * move billetbank bulk entries into the appropriate sections * move chevron.png to proper folder * non breaking npm fixes * unused file cleanup * logo .png --> .svg * prettier malding over a space * why does svg need to be jsx friendly? * re add logo.png for readme * are you happy, prettier?
7Cav · Sep 24, 2023 · 15277e0 · 15277e0
1 parent 19dce78
commit 15277e0
Show file tree

Hide file tree

Showing 16 changed files with 1,330 additions and 2,056 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<p align="center"><img src="./client/src/style/themes/7cav/logo-m.png"></p>
+<p align="center"><img src="./client/src/style/themes/7cav/logo.png"></p>
 
 ## Overview
 [![Server ADR Deployment](https://github.com/7Cav/adr/actions/workflows/server_adr_push.yml/badge.svg)](https://github.com/7Cav/adr/actions/workflows/server_adr_push.yml)

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/src/App.css b/client/src/App.css
@@ -215,7 +215,7 @@ a:hover {
 }
 
 .Collapsible__trigger:after {
-  content: url("./style/themes/Chevron.png");
+  content: url("./style/themes/7cav/Chevron.png");
   position: absolute;
   right: 0px;
   top: 0px;

diff --git a/client/src/App.js b/client/src/App.js
@@ -5,6 +5,7 @@ import lists from "./modules/Generic/BilletBank";
 import ErrorMessage from "./errorMessage";
 import Statistics from "./modules/Generic/Statistics";
 import CombinedFunction from "./modules/Generic/CombinedFunction";
+import Logo from "./style/themes/7cav/logo";
 
 const CLIENT_TOKEN = process.env.REACT_APP_CLIENT_TOKEN;
 const combatApiUrl = process.env.REACT_APP_COMBAT_API_URL;
@@ -91,12 +92,11 @@ function MilpacRequest() {
               <div className="p-nav-scroller">
                 <div className="p-nav-logo">
                   <a href="https://7cav.us">
-                    <img
-                      className="p-nav-png"
-                      src={require("./style/themes/7cav/logo-m.png")}
+                    <Logo
+                      className="p-nav-svg"
                       alt="ADR Logo"
                       title="Return to the main website"
-                      width=""
+                      width="17em"
                       height=""
                     />
                   </a>

diff --git a/client/src/credentials/example_token.js b/client/src/credentials/example_token.js
diff --git a/client/src/modules/Generic/BilletBank.js b/client/src/modules/Generic/BilletBank.js
@@ -15,6 +15,11 @@ const regiCommand = [
   "743",
 ];
 
+const regi = {
+  positionIds: [regiCommand],
+  positionTitles: ["Command Staff"],
+};
+
 //1-7
 
 const oneSevenCommand = ["178", "179", "180", "530"];
@@ -174,6 +179,16 @@ const charlie1 = [
   "344",
 ];
 
+const oneSeven = {
+  positionIds: [oneSevenCommand, alpha1, bravo1, charlie1],
+  positionTitles: [
+    "1-7 Headquarters",
+    "Alpha Company",
+    "Bravo Troop",
+    "Charlie Company",
+  ],
+};
+
 //2-7
 
 const twoSevenCommand = ["182", "183", "184"];
@@ -325,6 +340,16 @@ const charlie2 = [
   "479",
 ];
 
+const twoSeven = {
+  positionIds: [twoSevenCommand, alpha2, bravo2, charlie2],
+  positionTitles: [
+    "2-7 Headquarters",
+    "Alpha Company",
+    "Bravo Company",
+    "Charlie Company",
+  ],
+};
+
 //ACD
 
 const acdCommand = ["552", "627", "645", "11"];
@@ -478,6 +503,29 @@ const echo3 = [];
 const starterPlatoon = ["759"];
 const futureC = ["753"];
 
+const acd = {
+  positionIds: [
+    acdCommand,
+    alpha3,
+    bravo3,
+    charlie3,
+    delta3,
+    echo3,
+    starterPlatoon,
+    futureC,
+  ],
+  positionTitles: [
+    "ACD Headquarters",
+    "Alpha Company",
+    "Bravo Company",
+    "Charlie Company",
+    "Delta Company",
+    "Echo Company",
+    "Star Citizen Starter Platoon",
+    "Future Concepts Center",
+  ],
+};
+
 //IMO
 
 const imoCommand = ["5", "9"];
@@ -509,6 +557,16 @@ const s1 = [
 const s6 = ["50", "51", "52", "53", "54", "55", "56", "57", "58", "59"];
 const wag = ["39", "40", "41", "42", "43", "44", "45", "46", "47", "48"];
 
+const imo = {
+  positionIds: [imoCommand, s1, s6, wag],
+  positionTitles: [
+    "Information Management Command",
+    "S1 - Administration",
+    "S6 - Information Management",
+    "Wiki Administration Group",
+  ],
+};
+
 //ROO
 
 const rooCommand = ["4", "60"];
@@ -545,13 +603,33 @@ const s5 = [
   "741",
 ];
 
+const roo = {
+  positionIds: [rooCommand, rrd, rtc, s5],
+  positionTitles: [
+    "Recruitment Oversight Command",
+    "Regimental Recruiting Department",
+    "Recruit Training Command",
+    "S5 - Public Relations",
+  ],
+};
+
 //SecOps
 
 const secOpsCommand = ["2", "62"]; //Interesting case for Kleinmen, will need to be renamed to a new billetID if he ever leaves
 const jag = ["584"];
 const mp = ["168", "169", "170", "171", "172", "173"];
 const s2 = ["161", "162", "163", "164", "165", "166"];
 
+const secOps = {
+  positionIds: [secOpsCommand, jag, mp, s2],
+  positionTitles: [
+    "Security Operations Command",
+    "Judge Advocate General Corps",
+    "Military Police",
+    "S2 - Intelligence and Security",
+  ],
+};
+
 //Support
 
 const s3 = [
@@ -652,84 +730,6 @@ const s7 = [
 const ld = ["126", "127", "128", "129", "130", "131", "132", "539"];
 const spd = ["175", "176"];
 
-//Bulk Billets for export
-
-const regi = {
-  positionIds: [regiCommand],
-  positionTitles: ["Command Staff"],
-};
-const oneSeven = {
-  positionIds: [oneSevenCommand, alpha1, bravo1, charlie1],
-  positionTitles: [
-    "1-7 Headquarters",
-    "Alpha Company",
-    "Bravo Troop",
-    "Charlie Company",
-  ],
-};
-const twoSeven = {
-  positionIds: [twoSevenCommand, alpha2, bravo2, charlie2],
-  positionTitles: [
-    "2-7 Headquarters",
-    "Alpha Company",
-    "Bravo Company",
-    "Charlie Company",
-  ],
-};
-
-const acd = {
-  positionIds: [
-    acdCommand,
-    alpha3,
-    bravo3,
-    charlie3,
-    delta3,
-    echo3,
-    starterPlatoon,
-    futureC,
-  ],
-  positionTitles: [
-    "ACD Headquarters",
-    "Alpha Company",
-    "Bravo Company",
-    "Charlie Company",
-    "Delta Company",
-    "Echo Company",
-    "Star Citizen Starter Platoon",
-    "Future Concepts Center",
-  ],
-};
-
-const imo = {
-  positionIds: [imoCommand, s1, s6, wag],
-  positionTitles: [
-    "Information Management Command",
-    "S1 - Administration",
-    "S6 - Information Management",
-    "Wiki Administration Group",
-  ],
-};
-
-const secOps = {
-  positionIds: [secOpsCommand, jag, mp, s2],
-  positionTitles: [
-    "Security Operations Command",
-    "Judge Advocate General Corps",
-    "Military Police",
-    "S2 - Intelligence and Security",
-  ],
-};
-
-const roo = {
-  positionIds: [rooCommand, rrd, rtc, s5],
-  positionTitles: [
-    "Recruitment Oversight Command",
-    "Regimental Recruiting Department",
-    "Recruit Training Command",
-    "S5 - Public Relations",
-  ],
-};
-
 const supportDepartments = {
   positionIds: [spd, s3, s7, ld],
   positionTitles: [
@@ -740,7 +740,8 @@ const supportDepartments = {
   ],
 };
 
-// Overall export
+// Overall export Object
+
 const billetBankObject = {
   regi: regi,
   oneSeven: oneSeven,

diff --git a/client/src/modules/Generic/BilletListJul2023.txt b/client/src/modules/Generic/BilletListJul2023.txt
@@ -1,3 +1,6 @@
+The Billet List is a list of all (known) billets within the 7th Cavalry Regiment. However, there are no mechanisms in place to automatically update this document.
+As such, if there are new billets added to the website, this document should be updated as well as BilletBank.js.
+
 ********************************** CHANGE LOG *********************************************************
 Strider.R - 07-26-23 - Added S3 DCS, S3 SQUAD, S7 SQUAD, D/ACD, 2/A/ACD, S5 SOCIAL MEDIA