weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0

Browse Source
This commit is contained in:
dpassoni 2023-03-07 12:59:32 +01:00
commit 2d50e53ab8
14 changed files with 158 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
client/public/stylesheets/olympus.css
View File

@ -98,19 +98,20 @@ button[disabled="disabled"] {
}
.ol-select:not( .ol-select-image ) > .ol-select-value {
align-items: center;
background-color: var( --background-grey );
border-radius: var( --border-radius-sm );
justify-content: center;
padding:1em;
width:100%;
}
.ol-select:not( .ol-select-image ) > .ol-select-value:before {
content: "[ ]";
.ol-select:not( .ol-select-image ) > .ol-select-value svg {
margin-right: 10px;
}
.ol-select:not( .ol-select-image ) > .ol-select-value:after {
content: "[V]";
content: url( "/themes/olympus/images/chevron-down.svg" );
margin-left:10px;
}
@ -423,4 +424,35 @@ nav.ol-panel > :last-child {
#unit-info-panel {
display: flex;
flex-direction: column;
}
#visibility-control {
align-items: center;
}
#visibility-control button {
border:none;
height:32px;
width:32px;
}
#visibility-control-aircraft {
background-image: var( --visibility-control-aircraft-visible-url );
}
#visibility-control-ground {
background-image: var( --visibility-control-ground-visible-url );
}
#visibility-control-sam {
background-image: var( --visibility-control-sam-visible-url );
}
#visibility-control-naval {
background-image: var( --visibility-control-naval-visible-url );
}
#visibility-control-threat {
background-image: var( --visibility-control-threat-visible-url );
}

3
client/public/themes/olympus/images/chevron-down.svg Normal file
View File

@ -0,0 +1,3 @@
<svg width="14" height="8" viewBox="0 0 14 8" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6.37109 7.37891C6.69922 7.73438 7.27344 7.73438 7.60156 7.37891L12.8516 2.12891C13.207 1.80078 13.207 1.22656 12.8516 0.898438C12.5234 0.542969 11.9492 0.542969 11.6211 0.898438L7 5.51953L2.35156 0.898438C2.02344 0.542969 1.44922 0.542969 1.12109 0.898438C0.765625 1.22656 0.765625 1.80078 1.12109 2.12891L6.37109 7.37891Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 450 B

4
client/public/themes/olympus/images/visibility_aircraft_hidden.svg Normal file
View File

@ -0,0 +1,4 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M21.3047 14C22.2344 14 23.875 14.793 23.875 15.75C23.875 16.7344 22.2344 17.5 21.3047 17.5H18.1055L15.3711 22.3125C15.207 22.5859 14.9062 22.75 14.6055 22.75H13.0742C12.7734 22.75 12.5547 22.4766 12.6367 22.2031L13.9766 17.5H11.1875L9.98438 19.0859C9.90234 19.1953 9.79297 19.25 9.65625 19.25H8.50781C8.28906 19.25 8.125 19.0859 8.125 18.8672C8.125 18.8398 8.125 18.8125 8.125 18.7852L9 15.75L8.125 12.7422C8.125 12.7148 8.125 12.6875 8.125 12.6328C8.125 12.4414 8.28906 12.25 8.50781 12.25H9.65625C9.79297 12.25 9.90234 12.332 9.98438 12.4414L11.1875 14H13.9766L12.6367 9.32422C12.5547 9.05078 12.7734 8.75 13.0742 8.75H14.6055C14.9062 8.75 15.207 8.94141 15.3711 9.21484L18.1055 14H21.3047Z" fill="white"/>
<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 892 B

5
client/public/themes/olympus/images/visibility_aircraft_visible.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" fill="white"/>
<path d="M21.3047 14C22.2344 14 23.875 14.793 23.875 15.75C23.875 16.7344 22.2344 17.5 21.3047 17.5H18.1055L15.3711 22.3125C15.207 22.5859 14.9062 22.75 14.6055 22.75H13.0742C12.7734 22.75 12.5547 22.4766 12.6367 22.2031L13.9766 17.5H11.1875L9.98438 19.0859C9.90234 19.1953 9.79297 19.25 9.65625 19.25H8.50781C8.28906 19.25 8.125 19.0859 8.125 18.8672C8.125 18.8398 8.125 18.8125 8.125 18.7852L9 15.75L8.125 12.7422C8.125 12.7148 8.125 12.6875 8.125 12.6328C8.125 12.4414 8.28906 12.25 8.50781 12.25H9.65625C9.79297 12.25 9.90234 12.332 9.98438 12.4414L11.1875 14H13.9766L12.6367 9.32422C12.5547 9.05078 12.7734 8.75 13.0742 8.75H14.6055C14.9062 8.75 15.207 8.94141 15.3711 9.21484L18.1055 14H21.3047Z" fill="#202831"/>
<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 963 B

12
client/public/themes/olympus/images/visibility_ground_hidden.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 8.0 KiB

13
client/public/themes/olympus/images/visibility_ground_visible.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

4
client/public/themes/olympus/images/visibility_naval_hidden.svg Normal file
View File

@ -0,0 +1,4 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.375 9.625C13.375 9.16016 13.7578 8.75 14.25 8.75H17.75C18.2148 8.75 18.625 9.16016 18.625 9.625V10.5H19.9375C20.6484 10.5 21.25 11.1016 21.25 11.8125V15.3125L22.4531 15.7227C23.082 15.9414 23.2461 16.7617 22.7539 17.1992L19.9922 19.7422C19.5547 19.9883 19.0625 20.1523 18.625 20.1523C18.0781 20.1523 17.5039 19.9336 16.9844 19.6055C16.3828 19.168 15.5898 19.168 14.9883 19.6055C14.5234 19.9062 13.9492 20.1523 13.3477 20.1523C12.9102 20.1523 12.418 19.9883 11.9805 19.7422L9.21875 17.1992C8.72656 16.7617 8.89062 15.9414 9.51953 15.7227L10.75 15.3125V11.8125C10.75 11.1016 11.3242 10.5 12.0625 10.5H13.375V9.625ZM12.5 14.7383L15.4258 13.7539C15.7812 13.6445 16.1914 13.6445 16.5469 13.7539L19.5 14.7383V12.25H12.5V14.7383ZM16.4922 20.2891C17.1211 20.7266 17.8594 21 18.625 21C19.3359 21 20.1289 20.7266 20.7305 20.2891C21.0586 20.0703 21.4961 20.0977 21.7969 20.3438C22.207 20.6719 22.6992 20.918 23.1914 21.0273C23.6562 21.1367 23.957 21.6016 23.8477 22.0938C23.7383 22.5586 23.2461 22.8594 22.7812 22.75C22.125 22.5859 21.5508 22.2852 21.1953 22.0664C20.4023 22.4766 19.5273 22.75 18.625 22.75C17.75 22.75 16.957 22.5039 16.4102 22.2578C16.2461 22.1758 16.1094 22.0938 16 22.0391C15.8633 22.0938 15.7266 22.1758 15.5625 22.2578C15.0156 22.5039 14.2227 22.75 13.375 22.75C12.4727 22.75 11.5703 22.4766 10.7773 22.0664C10.4219 22.2852 9.84766 22.5859 9.19141 22.75C8.72656 22.8594 8.23438 22.5586 8.125 22.0938C8.01562 21.6289 8.31641 21.1367 8.78125 21.0273C9.27344 20.918 9.79297 20.6719 10.1758 20.3438C10.4766 20.0977 10.9141 20.0703 11.2422 20.2891C11.8438 20.7266 12.6367 21 13.375 21C14.1133 21 14.8789 20.7266 15.4805 20.2891C15.7812 20.0703 16.1914 20.0703 16.4922 20.2891Z" fill="white"/>
<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

5
client/public/themes/olympus/images/visibility_naval_visible.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" fill="white"/>
<path d="M13.375 9.625C13.375 9.16016 13.7578 8.75 14.25 8.75H17.75C18.2148 8.75 18.625 9.16016 18.625 9.625V10.5H19.9375C20.6484 10.5 21.25 11.1016 21.25 11.8125V15.3125L22.4531 15.7227C23.082 15.9414 23.2461 16.7617 22.7539 17.1992L19.9922 19.7422C19.5547 19.9883 19.0625 20.1523 18.625 20.1523C18.0781 20.1523 17.5039 19.9336 16.9844 19.6055C16.3828 19.168 15.5898 19.168 14.9883 19.6055C14.5234 19.9062 13.9492 20.1523 13.3477 20.1523C12.9102 20.1523 12.418 19.9883 11.9805 19.7422L9.21875 17.1992C8.72656 16.7617 8.89062 15.9414 9.51953 15.7227L10.75 15.3125V11.8125C10.75 11.1016 11.3242 10.5 12.0625 10.5H13.375V9.625ZM12.5 14.7383L15.4258 13.7539C15.7812 13.6445 16.1914 13.6445 16.5469 13.7539L19.5 14.7383V12.25H12.5V14.7383ZM16.4922 20.2891C17.1211 20.7266 17.8594 21 18.625 21C19.3359 21 20.1289 20.7266 20.7305 20.2891C21.0586 20.0703 21.4961 20.0977 21.7969 20.3438C22.207 20.6719 22.6992 20.918 23.1914 21.0273C23.6562 21.1367 23.957 21.6016 23.8477 22.0938C23.7383 22.5586 23.2461 22.8594 22.7812 22.75C22.125 22.5859 21.5508 22.2852 21.1953 22.0664C20.4023 22.4766 19.5273 22.75 18.625 22.75C17.75 22.75 16.957 22.5039 16.4102 22.2578C16.2461 22.1758 16.1094 22.0938 16 22.0391C15.8633 22.0938 15.7266 22.1758 15.5625 22.2578C15.0156 22.5039 14.2227 22.75 13.375 22.75C12.4727 22.75 11.5703 22.4766 10.7773 22.0664C10.4219 22.2852 9.84766 22.5859 9.19141 22.75C8.72656 22.8594 8.23438 22.5586 8.125 22.0938C8.01562 21.6289 8.31641 21.1367 8.78125 21.0273C9.27344 20.918 9.79297 20.6719 10.1758 20.3438C10.4766 20.0977 10.9141 20.0703 11.2422 20.2891C11.8438 20.7266 12.6367 21 13.375 21C14.1133 21 14.8789 20.7266 15.4805 20.2891C15.7812 20.0703 16.1914 20.0703 16.4922 20.2891Z" fill="#181E25"/>
<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

18
client/public/themes/olympus/images/visibility_sam_hidden.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 8.8 KiB

19
client/public/themes/olympus/images/visibility_sam_visible.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 8.9 KiB

4
client/public/themes/olympus/images/visibility_threat_hidden.svg Normal file
View File

@ -0,0 +1,4 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.375 15.75C13.375 14.3008 14.5234 13.125 16 13.125C17.4492 13.125 18.625 14.3008 18.625 15.75C18.625 17.1992 17.4492 18.375 16 18.375C14.5234 18.375 13.375 17.1992 13.375 15.75ZM23 15.75C23 19.6328 19.8555 22.75 16 22.75C12.1172 22.75 9 19.6328 9 15.75C9 11.8945 12.1172 8.75 16 8.75C19.8555 8.75 23 11.8945 23 15.75ZM16 10.0625C12.8555 10.0625 10.3125 12.6328 10.3125 15.75C10.3125 18.8945 12.8555 21.4375 16 21.4375C19.1172 21.4375 21.6875 18.8945 21.6875 15.75C21.6875 12.6328 19.1172 10.0625 16 10.0625Z" fill="white"/>
<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 710 B

5
client/public/themes/olympus/images/visibility_threat_visible.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" fill="white"/>
<path d="M13.375 15.75C13.375 14.3008 14.5234 13.125 16 13.125C17.4492 13.125 18.625 14.3008 18.625 15.75C18.625 17.1992 17.4492 18.375 16 18.375C14.5234 18.375 13.375 17.1992 13.375 15.75ZM23 15.75C23 19.6328 19.8555 22.75 16 22.75C12.1172 22.75 9 19.6328 9 15.75C9 11.8945 12.1172 8.75 16 8.75C19.8555 8.75 23 11.8945 23 15.75ZM16 10.0625C12.8555 10.0625 10.3125 12.6328 10.3125 15.75C10.3125 18.8945 12.8555 21.4375 16 21.4375C19.1172 21.4375 21.6875 18.8945 21.6875 15.75C21.6875 12.6328 19.1172 10.0625 16 10.0625Z" fill="#181E25"/>
<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 781 B

19
client/public/themes/olympus/olympus.css
View File

@ -45,6 +45,25 @@
/*** Navbar ***/
--visibility-control-aircraft-visible-url: url( "/themes/olympus/images/visibility_aircraft_visible.svg" );
--visibility-control-aircraft-hidden-url: url( "/themes/olympus/images/visibility_aircraft_hidden.svg" );
--visibility-control-ground-visible-url: url( "/themes/olympus/images/visibility_ground_visible.svg" );
--visibility-control-ground-hidden-url: url( "/themes/olympus/images/visibility_ground_hidden.svg" );
--visibility-control-sam-visible-url: url( "/themes/olympus/images/visibility_sam_visible.svg" );
--visibility-control-sam-hidden-url: url( "/themes/olympus/images/visibility_sam_hidden.svg" );
--visibility-control-naval-visible-url: url( "/themes/olympus/images/visibility_naval_visible.svg" );
--visibility-control-naval-hidden-url: url( "/themes/olympus/images/visibility_naval_hidden.svg" );
--visibility-control-threat-visible-url: url( "/themes/olympus/images/visibility_threat_visible.svg" );
--visibility-control-threat-hidden-url: url( "/themes/olympus/images/visibility_threat_hidden.svg" );
/*** Unit marker settings ***/

34
client/views/navbar.ejs
View File

@ -44,7 +44,12 @@
</div>
<div id="map-type" class="ol-select">
<div class="ol-select-value">ArcGIS Satellite</div>
<div class="ol-select-value">
<svg width="16" height="15" viewBox="0 0 16 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M11.1562 3.53125C11.1562 5.03516 9.13281 7.6875 8.25781 8.78125C8.06641 9.05469 7.65625 9.05469 7.46484 8.78125C6.58984 7.6875 4.59375 5.03516 4.59375 3.53125C4.59375 1.72656 6.04297 0.25 7.875 0.25C9.67969 0.25 11.1562 1.72656 11.1562 3.53125ZM11.375 5.74609C11.457 5.55469 11.5391 5.36328 11.6211 5.17188C11.6484 5.14453 11.6484 5.11719 11.6758 5.08984L14.8477 3.80469C15.2578 3.64062 15.75 3.94141 15.75 4.40625V11.8164C15.75 12.0898 15.5859 12.3359 15.3125 12.4453L11.375 14.0039V5.74609ZM3.74609 4.05078C3.82812 4.43359 3.9375 4.81641 4.10156 5.17188C4.18359 5.36328 4.26562 5.55469 4.375 5.74609V12.6094L0.875 14.0039C0.464844 14.168 0 13.8672 0 13.4023V5.99219C0 5.71875 0.164062 5.47266 0.410156 5.39062L3.74609 4.05078ZM8.94141 9.32812C9.32422 8.86328 9.92578 8.09766 10.5 7.22266V14.0586L5.25 12.5547V7.22266C5.79688 8.09766 6.39844 8.86328 6.78125 9.32812C7.32812 10.0391 8.39453 10.0391 8.94141 9.32812ZM7.875 4.40625C8.47656 4.40625 8.96875 3.94141 8.96875 3.3125C8.96875 2.71094 8.47656 2.21875 7.875 2.21875C7.24609 2.21875 6.78125 2.71094 6.78125 3.3125C6.78125 3.94141 7.24609 4.40625 7.875 4.40625Z" fill="white"/>
</svg>
<span>ArcGIS Satellite</span>
</div>
<div class="ol-select-options">
<div>
<button>ArcGIS Satellite</button>
@ -66,28 +71,13 @@
</div>
</div>
</div>
<div class="ol-select">
<div class="ol-select-value">Caucasus</div>
<div class="ol-select-options">
<div>
<button>Caucasus</button>
</div>
<div>
<button>Nevada</button>
</div>
<div>
<button>Syria</button>
</div>
</div>
</div>
<div class="ol-group">
<button title="Toggle planes visibility">P</button>
<button title="Toggle vehicle visibility">G</button>
<button title="Toggle SAM visibility">S</button>
<button title="Toggle navy visibility">N</button>
<button title="Toggle threat ring visibility">T</button>
<div id="visibility-control" class="ol-group">
<button id="visibility-control-aircraft" title="Toggle aircraft' visibility (a) [no function]"></button>
<button id="visibility-control-ground" title="Toggle ground units' visibility (g) [no function]"></button>
<button id="visibility-control-sam" title="Toggle SAMs' visibility (s) [no function]"></button>
<button id="visibility-control-naval" title="Toggle naval visibility (n) [no function]"></button>
<button id="visibility-control-threat" title="Toggle threat rings' visibility (t) [no function]"></button>
</div>
<div class="ol-group ol-group-checkbox">