Skip to content

Commit 1e02dbe

Browse files
thkruzthkruz
committed
Merge branch 'maneuver-detection' of https://github.com/thkruz/keeptrack.space into develop
2 parents d6ef1ae + aec73e9 commit 1e02dbe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1368
-230
lines changed

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
"src/lib/**": true,
3434
"tsconfig.json": true
3535
},
36+
"files.trimTrailingWhitespace": true,
37+
"editor.renderWhitespace": "trailing",
38+
"editor.trimAutoWhitespace": true,
3639
"[yaml]": {
3740
"editor.autoIndent": "advanced",
3841
"editor.defaultFormatter": "esbenp.prettier-vscode"

‎build/utils/generate-translation-keys.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ function findLocalesDirs(dir: string, enJsonPaths: string[] = []): string[] {
3939
for (const dirent of fs.readdirSync(dir, { withFileTypes: true })) {
4040
const fullPath = path.join(dir, dirent.name);
4141

42+
// skip ootk and its children
43+
if (fullPath.includes('ootk')) {
44+
continue;
45+
}
46+
4247
if (dirent.isDirectory()) {
4348
if (dirent.name === 'locales') {
4449
const enJsonPath = path.join(fullPath, 'en.json');

‎jest.config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default {
1717
setupFiles: ['jest-canvas-mock', '<rootDir>/test/polyfills.js', '<rootDir>/test/test-env.js', '<rootDir>/test/test-env-mocks.js'],
1818
coverageDirectory: '<rootDir>/coverage',
1919
moduleDirectories: ['node_modules', 'offline'],
20-
modulePathIgnorePatterns: ['<rootDir>/node_modules/', '<rootDir>/offline/', '<rootDir>/dist/', '<rootDir>/src/admin/'],
20+
modulePathIgnorePatterns: ['<rootDir>/node_modules/', '<rootDir>/offline/', '<rootDir>/dist/', '<rootDir>/src/admin/', '<rootDir>/src/engine/ootk/'],
2121
moduleNameMapper: {
2222
'\\.(css|less|sass|scss)$': '<rootDir>/build/mock/styleMock.js',
2323
'\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/build/mock/fileMock.js',
@@ -28,5 +28,5 @@ export default {
2828
'^@css(.*)$': '<rootDir>/public/css/$1',
2929
},
3030
coverageReporters: ['lcov', 'html', 'text'],
31-
coveragePathIgnorePatterns: ['/node_modules/', '/src/lib/external/', '/test/', '/dist/'],
31+
coveragePathIgnorePatterns: ['/node_modules/', '/src/lib/external/', '/test/', '/dist/', '/src/engine/ootk/'],
3232
};

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
"astronomy-engine": "^2.1.19",
152152
"dotenv": "^16.5.0",
153153
"draggabilly": "^3.0.0",
154-
"echarts": "^5.4.3",
154+
"echarts": "^5.6.0",
155155
"echarts-gl": "^2.0.9",
156156
"eruda": "^3.4.3",
157157
"file-saver": "^2.0.5",
@@ -171,4 +171,4 @@
171171
"volta": {
172172
"node": "25.0.0"
173173
}
174-
}
174+
}

‎public/css/style.celestrak.css‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ ul {
746746
transition: all 1s ease-in-out;
747747
transform: translateX(-100%);
748748
background: var(--color-dark-background);
749-
border-top: solid 5px var(--color-dark-border)
749+
border-top: solid 5px var(--color-dark-border);
750750
}
751751

752752
.divider {
@@ -1130,7 +1130,6 @@ input:focus {
11301130
align-items: center;
11311131
}
11321132

1133-
11341133
.bmenu-item-inner {
11351134
display: flex;
11361135
flex-direction: row;
@@ -1331,7 +1330,9 @@ input:focus {
13311330
pointer-events: none;
13321331
background: none;
13331332
z-index: 1000;
1334-
text-shadow: 0 0px 2px rgba(0, 0, 0, 1), 0 0px 2px #000;
1333+
text-shadow:
1334+
0 0px 2px rgba(0, 0, 0, 1),
1335+
0 0px 2px #000;
13351336
}
13361337

13371338
#copyright-notice {
@@ -1346,7 +1347,9 @@ input:focus {
13461347
pointer-events: none;
13471348
background: none;
13481349
z-index: 1000;
1349-
text-shadow: 0 0px 2px rgba(0, 0, 0, 1), 0 0px 2px #000;
1350+
text-shadow:
1351+
0 0px 2px rgba(0, 0, 0, 1),
1352+
0 0px 2px #000;
13501353
}
13511354

13521355
#logo-secondary {
@@ -2496,7 +2499,7 @@ button.ui-button::-moz-focus-inner {
24962499

24972500
.ui-slider-horizontal {
24982501
height: 0px;
2499-
border: 2px solid var(--color-primary) !important
2502+
border: 2px solid var(--color-primary) !important;
25002503
}
25012504

25022505
.ui-slider-horizontal .ui-slider-handle {
@@ -3780,8 +3783,6 @@ a.ui-button:active,
37803783
background-color: #323232;
37813784
}
37823785

3783-
3784-
37853786
#menu-launches,
37863787
#menu-record,
37873788
#menu-color-scheme,

‎public/css/style.css‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -708,15 +708,15 @@ ul {
708708
}
709709

710710
/** Stylize each row in the transparent overlay */
711-
#info-overlay-content>div>div {
711+
#info-overlay-content > div > div {
712712
padding: 10px;
713713
border: 1px solid rgba(255, 255, 255, 0.2);
714714
border-radius: 5px;
715715
background: rgba(0, 0, 0, 0.5);
716716
margin-bottom: 10px;
717717
}
718718

719-
#info-overlay-content>div>div>h5 {
719+
#info-overlay-content > div > div > h5 {
720720
margin: 0;
721721
}
722722

@@ -758,7 +758,7 @@ ul {
758758
transition: all 1s ease-in-out;
759759
transform: translateX(-100%);
760760
background: var(--color-dark-background);
761-
border-top: solid 5px var(--color-dark-border)
761+
border-top: solid 5px var(--color-dark-border);
762762
}
763763

764764
.divider {
@@ -779,7 +779,7 @@ input[type='checkbox'].css-checkbox {
779779
border: 0;
780780
}
781781

782-
input[type='checkbox'].css-checkbox+label.css-label {
782+
input[type='checkbox'].css-checkbox + label.css-label {
783783
padding-left: 25px;
784784
height: 20px;
785785
display: inline-block;
@@ -791,7 +791,7 @@ input[type='checkbox'].css-checkbox+label.css-label {
791791
cursor: pointer;
792792
}
793793

794-
input[type='checkbox'].css-checkbox:checked+label.css-label {
794+
input[type='checkbox'].css-checkbox:checked + label.css-label {
795795
background-position: 0px -20px;
796796
}
797797

@@ -1131,7 +1131,6 @@ input:focus {
11311131
align-items: center;
11321132
}
11331133

1134-
11351134
.bmenu-item-inner {
11361135
display: flex;
11371136
flex-direction: row;
@@ -1340,7 +1339,9 @@ input:focus {
13401339
pointer-events: none;
13411340
background: none;
13421341
z-index: 1000;
1343-
text-shadow: 0 0px 2px rgba(0, 0, 0, 1), 0 0px 2px #000;
1342+
text-shadow:
1343+
0 0px 2px rgba(0, 0, 0, 1),
1344+
0 0px 2px #000;
13441345
}
13451346

13461347
#copyright-notice {
@@ -1355,7 +1356,9 @@ input:focus {
13551356
pointer-events: none;
13561357
background: none;
13571358
z-index: 1000;
1358-
text-shadow: 0 0px 2px rgba(0, 0, 0, 1), 0 0px 2px #000;
1359+
text-shadow:
1360+
0 0px 2px rgba(0, 0, 0, 1),
1361+
0 0px 2px #000;
13591362
}
13601363

13611364
#logo-secondary {
@@ -1661,7 +1664,7 @@ input:focus {
16611664
}
16621665

16631666
.ui-timepicker-div.ui-timepicker-oneLine dl dd,
1664-
.ui-timepicker-div.ui-timepicker-oneLine dl dd>div {
1667+
.ui-timepicker-div.ui-timepicker-oneLine dl dd > div {
16651668
display: inline-block;
16661669
margin: 0;
16671670
}
@@ -1901,18 +1904,18 @@ button.ui-button::-moz-focus-inner {
19011904
display: inline-block;
19021905
}
19031906

1904-
.ui-controlgroup>.ui-controlgroup-item {
1907+
.ui-controlgroup > .ui-controlgroup-item {
19051908
float: left;
19061909
margin-left: 0;
19071910
margin-right: 0;
19081911
}
19091912

1910-
.ui-controlgroup>.ui-controlgroup-item:focus,
1911-
.ui-controlgroup>.ui-controlgroup-item.ui-visual-focus {
1913+
.ui-controlgroup > .ui-controlgroup-item:focus,
1914+
.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus {
19121915
z-index: 9999;
19131916
}
19141917

1915-
.ui-controlgroup-vertical>.ui-controlgroup-item {
1918+
.ui-controlgroup-vertical > .ui-controlgroup-item {
19161919
display: block;
19171920
float: none;
19181921
width: 100%;
@@ -1933,11 +1936,11 @@ button.ui-button::-moz-focus-inner {
19331936
font-size: 80%;
19341937
}
19351938

1936-
.ui-controlgroup-horizontal .ui-controlgroup-label+.ui-controlgroup-item {
1939+
.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item {
19371940
border-left: none;
19381941
}
19391942

1940-
.ui-controlgroup-vertical .ui-controlgroup-label+.ui-controlgroup-item {
1943+
.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item {
19411944
border-top: none;
19421945
}
19431946

@@ -2514,7 +2517,7 @@ button.ui-button::-moz-focus-inner {
25142517

25152518
.ui-slider-horizontal {
25162519
height: 0px;
2517-
border: 2px solid var(--color-primary) !important
2520+
border: 2px solid var(--color-primary) !important;
25182521
}
25192522

25202523
.ui-slider-horizontal .ui-slider-handle {
@@ -3798,8 +3801,6 @@ a.ui-button:active,
37983801
background-color: #323232;
37993802
}
38003803

3801-
3802-
38033804
#menu-launches,
38043805
#menu-record,
38053806
#menu-color-scheme,
@@ -4093,4 +4094,4 @@ nav a.sidenav-trigger i {
40934094
.map-item {
40944095
position: absolute;
40954096
z-index: 11;
4096-
}
4097+
}

0 commit comments

Comments
 (0)