Merge pull request #139 from rweyrauch/revert-137-main

Revert "40k: 10th tweaks and fixes"
rweyrauch · Oct 5, 2023 · eae47ed · eae47ed
2 parents a95a41a + fdd72b9
commit eae47ed
Show file tree

Hide file tree

Showing 77 changed files with 283 additions and 28,289 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,7 @@
 node_modules
 #dist
 .idea
-.vscode/settings.json
-/dist/app*
-/dist/main*
 /dist/renderer*
 /dist/roster*
+/dist/app*
+
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,8 +8,7 @@
       "type": "node",
       "request": "launch",
       "name": "Jasmine Current File",
-      "runtimeExecutable": "/usr/local/bin/npx",
-      "program": "jasmine",
+      "program": "${workspaceFolder}/node_modules/jasmine-ts/lib/index",
       "args": ["--config=./jasmine.json", "${file}"],
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen"

diff --git a/css/prettyscribe.css b/css/prettyscribe.css
@@ -234,6 +234,10 @@ label {
     padding-left: var(--notchSize);
 }
 
+.wh40k_unit_sheet > table > thead.header_row {
+    text-transform: uppercase
+}
+
 .wh40k_unit_sheet > table > thead.info_row > tr > td:first-child {
     font: bold 1em sans-serif;
     text-transform: uppercase;
@@ -250,7 +254,7 @@ label {
 
 .wh40k_unit_sheet > table > thead.unit_header {
     text-align: center;
-    text-transform: uppercase;
+    text-transform: uppercase
 }
 
 .wh40k_unit_sheet > table > thead.unit_header > tr > td:nth-child(2) {
@@ -262,8 +266,7 @@ label {
     color: white;
 }
 
-.wh40k_unit_sheet > table > thead > tr.header_row > th {
-    text-transform: uppercase;
+.wh40k_unit_sheet > table > thead.header_row > tr > th {
     white-space: nowrap;
 }
 
@@ -367,4 +370,4 @@ label {
 
 .page_break {
     break-before: page;
-}
+}
diff --git a/dist/prettyscribe.js b/dist/prettyscribe.js
diff --git a/jasmine.json b/jasmine.json
@@ -9,8 +9,7 @@
   ],
   "spec_dir": "spec",
   "spec_files": [
-    "**Spec.ts",
-    "*/**Spec.ts"
+    "**Spec.ts"
   ],
   "helpers": [
     "helpers/jasmine-typescript-helper.js"

diff --git a/spec/40k10th/Necrons10eSpec.ts b/spec/40k10th/Necrons10eSpec.ts
diff --git a/spec/40k8th/AeldariTestSpec.ts → spec/AeldariTestSpec.ts b/spec/40k8th/AeldariTestSpec.ts → spec/AeldariTestSpec.ts
@@ -1,13 +1,13 @@
-import { readZippedRosterFile } from '../helpers/readRosterFile';
-import { Create40kRoster } from "../../src/roster40k";
+import { readZippedRosterFile } from './helpers/readRosterFile';
+import { Create40kRoster } from "../src/roster40k";
 
 function mapWithKeys(keys: string[]) {
   return new Map(keys.map(e => [e, jasmine.any(String)]));
 }
 
 describe("Create40kRoster", function() {
-  it("loads test/40k8th/Aeldari Test.ros", async function() {
-    const doc = await readZippedRosterFile('test/40k8th/Aeldari Test.ros');
+  it("loads test/Aeldari Test.ros", async function() {
+    const doc = await readZippedRosterFile('test/Aeldari Test.ros');
     const roster = Create40kRoster(doc);
 
     expect(roster).toEqual(

diff --git a/spec/40k8th/BlackTemplar-TestOutputSpec.ts → spec/BlackTemplar-TestOutputSpec.ts b/spec/40k8th/BlackTemplar-TestOutputSpec.ts → spec/BlackTemplar-TestOutputSpec.ts
@@ -1,13 +1,13 @@
-import { readZippedRosterFile } from '../helpers/readRosterFile';
-import { Create40kRoster } from "../../src/roster40k";
+import { readZippedRosterFile } from './helpers/readRosterFile';
+import { Create40kRoster } from "../src/roster40k";
 
 function mapWithKeys(keys: string[]) {
   return new Map(keys.map(e => [e, jasmine.any(String)]));
 }
 
 describe("Create40kRoster", function() {
-  it("loads test/40k8th/Black Templar - Test Output.ros", async function() {
-    const doc = await readZippedRosterFile('test/40k8th/Black Templar - Test Output.ros');
+  it("loads test/Black Templar - Test Output.ros", async function() {
+    const doc = await readZippedRosterFile('test/Black Templar - Test Output.ros');
     const roster = Create40kRoster(doc);
 
     expect(roster).toEqual(

diff --git a/spec/40k8th/BlackTemplar2000Spec.ts → spec/BlackTemplar2000Spec.ts b/spec/40k8th/BlackTemplar2000Spec.ts → spec/BlackTemplar2000Spec.ts
@@ -1,13 +1,13 @@
-import { readZippedRosterFile } from '../helpers/readRosterFile';
-import { Create40kRoster } from "../../src/roster40k";
+import { readZippedRosterFile } from './helpers/readRosterFile';
+import { Create40kRoster } from "../src/roster40k";
 
 function mapWithKeys(keys: string[]) {
   return new Map(keys.map(e => [e, jasmine.any(String)]));
 }
 
 describe("Create40kRoster", function() {
-  it("loads test/40k8th/Black Templar 2000.ros", async function() {
-    const doc = await readZippedRosterFile('test/40k8th/Black Templar 2000.ros');
+  it("loads test/Black Templar 2000.ros", async function() {
+    const doc = await readZippedRosterFile('test/Black Templar 2000.ros');
     const roster = Create40kRoster(doc);
 
     expect(roster).toEqual(

diff --git a/spec/40k9th/BloodAngelstestSpec.ts → spec/BloodAngelstestSpec.ts b/spec/40k9th/BloodAngelstestSpec.ts → spec/BloodAngelstestSpec.ts
@@ -1,13 +1,13 @@
-import { readZippedRosterFile } from '../helpers/readRosterFile';
-import { Create40kRoster } from "../../src/roster40k";
+import { readZippedRosterFile } from './helpers/readRosterFile';
+import { Create40kRoster } from "../src/roster40k";
 
 function mapWithKeys(keys: string[]) {
   return new Map(keys.map(e => [e, jasmine.any(String)]));
 }
 
 describe("Create40kRoster", function() {
-  it("loads test/40k9th/BloodAngels test.ros", async function() {
-    const doc = await readZippedRosterFile('test/40k9th/BloodAngels test.ros');
+  it("loads test/BloodAngels test.ros", async function() {
+    const doc = await readZippedRosterFile('test/BloodAngels test.ros');
     const roster = Create40kRoster(doc);
 
     expect(roster).toEqual(

diff --git a/spec/40k9th/CSMTestSpec.ts → spec/CSMTestSpec.ts b/spec/40k9th/CSMTestSpec.ts → spec/CSMTestSpec.ts
@@ -1,13 +1,13 @@
-import { readZippedRosterFile } from '../helpers/readRosterFile';
-import { Create40kRoster } from "../../src/roster40k";
+import { readZippedRosterFile } from './helpers/readRosterFile';
+import { Create40kRoster } from "../src/roster40k";
 
 function mapWithKeys(keys: string[]) {
   return new Map(keys.map(e => [e, jasmine.any(String)]));
 }
 
 describe("Create40kRoster", function() {
-  it("loads test/40k9th/CSMTest.rosz", async function() {
-    const doc = await readZippedRosterFile('test/40k9th/CSMTest.rosz');
+  it("loads test/CSMTest.rosz", async function() {
+    const doc = await readZippedRosterFile('test/CSMTest.rosz');
     const roster = Create40kRoster(doc);
 
     expect(roster).toEqual(

diff --git a/spec/40k9th/ChaosKnightFavourTestSpec.ts → spec/ChaosKnightFavourTestSpec.ts b/spec/40k9th/ChaosKnightFavourTestSpec.ts → spec/ChaosKnightFavourTestSpec.ts
@@ -1,13 +1,13 @@
-import { readZippedRosterFile } from '../helpers/readRosterFile';
-import { Create40kRoster } from "../../src/roster40k";
+import { readZippedRosterFile } from './helpers/readRosterFile';
+import { Create40kRoster } from "../src/roster40k";
 
 function mapWithKeys(keys: string[]) {
   return new Map(keys.map(e => [e, jasmine.any(String)]));
 }
 
 describe("Create40kRoster", function() {
-  it("loads test/40k9th/Chaos Knight Favour Test.rosz", async function() {
-    const doc = await readZippedRosterFile('test/40k9th/Chaos Knight Favour Test.rosz');
+  it("loads test/Chaos Knight Favour Test.rosz", async function() {
+    const doc = await readZippedRosterFile('test/Chaos Knight Favour Test.rosz');
     const roster = Create40kRoster(doc);
 
     expect(roster).toEqual(

diff --git a/spec/40k8th/ChaosSMTestSpec.ts → spec/ChaosSMTestSpec.ts b/spec/40k8th/ChaosSMTestSpec.ts → spec/ChaosSMTestSpec.ts
@@ -1,13 +1,13 @@
-import { readZippedRosterFile } from '../helpers/readRosterFile';
-import { Create40kRoster } from "../../src/roster40k";
+import { readZippedRosterFile } from './helpers/readRosterFile';
+import { Create40kRoster } from "../src/roster40k";
 
 function mapWithKeys(keys: string[]) {
   return new Map(keys.map(e => [e, jasmine.any(String)]));
 }
 
 describe("Create40kRoster", function() {
-  it("loads test/40k8th/Chaos SM Test.ros", async function() {
-    const doc = await readZippedRosterFile('test/40k8th/Chaos SM Test.ros');
+  it("loads test/Chaos SM Test.ros", async function() {
+    const doc = await readZippedRosterFile('test/Chaos SM Test.ros');
     const roster = Create40kRoster(doc);
 
     expect(roster).toEqual(

diff --git a/spec/40k9th/DarkAngelsTestSpec.ts → spec/DarkAngelsTestSpec.ts b/spec/40k9th/DarkAngelsTestSpec.ts → spec/DarkAngelsTestSpec.ts
@@ -1,13 +1,13 @@
-import { readZippedRosterFile } from '../helpers/readRosterFile';
-import { Create40kRoster } from "../../src/roster40k";
+import { readZippedRosterFile } from './helpers/readRosterFile';
+import { Create40kRoster } from "../src/roster40k";
 
 function mapWithKeys(keys: string[]) {
   return new Map(keys.map(e => [e, jasmine.any(String)]));
 }
 
 describe("Create40kRoster", function() {
-  it("loads test/40k9th/DarkAngelsTest.rosz", async function() {
-    const doc = await readZippedRosterFile('test/40k9th/DarkAngelsTest.rosz');
+  it("loads test/DarkAngelsTest.rosz", async function() {
+    const doc = await readZippedRosterFile('test/DarkAngelsTest.rosz');
     const roster = Create40kRoster(doc);
 
     expect(roster).toEqual(