Skirda/SkirdaElectronLauncher
4
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge branch 'offline-mode' of https://git.brzezinski.ru/Skirda/SkirdaElectronLauncher into offline-mode

Browse Source
This commit is contained in:
cyber-dream 2024-01-27 11:24:48 +03:00
commit 7dcbc4c907
11 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/css/launcher.css
View File

@ -4093,4 +4093,12 @@ input:checked + .toggleSwitchSlider:before {
#loginSkirdaAuthorizationRetryButton:active {
background: rgb(0 0 0 / 91%);
border: 1px solid rgb(83 83 83 / 42%);
}
#loginOptionSkirdaFIDO:hover {
text-shadow: none;
}
#loginOptionSkirdaFIDO:focus {
text-shadow: none;
}

BIN
app/assets/images/backgrounds/0.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 160 KiB

After

Width:  |  Height:  |  Size: 206 KiB

BIN
app/assets/images/backgrounds/1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 181 KiB

After

Width:  |  Height:  |  Size: 3.2 MiB

BIN
app/assets/images/backgrounds/2.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 502 KiB

After

Width:  |  Height:  |  Size: 1.5 MiB

BIN
app/assets/images/backgrounds/3.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 3.7 MiB

BIN
app/assets/images/backgrounds/4.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 268 KiB

After

Width:  |  Height:  |  Size: 245 KiB

BIN
app/assets/images/backgrounds/5.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 456 KiB

After

Width:  |  Height:  |  Size: 565 KiB

BIN
app/assets/images/backgrounds/6.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 MiB

After

Width:  |  Height:  |  Size: 365 KiB

BIN
app/assets/images/backgrounds/7.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 MiB

After

Width:  |  Height:  |  Size: 92 KiB

27
app/loginOptions.ejs
View File

@ -3,7 +3,8 @@
<div class="loginOptionsMainContent">
<h2><%- lang('loginOptions.loginOptionsTitle') %></h2>
<div class="loginOptionActions">
<div class="loginOptionButtonContainer">
<!-- Отключенные авторизации -->
<div class="loginOptionButtonContainer" style="display: none;">
<button id="loginOptionMicrosoft" class="loginOptionButton">
<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 23 23">
<path fill="#f35325" d="M1 1h10v10H1z" />
@ -14,7 +15,7 @@
<span><%- lang('loginOptions.loginWithMicrosoft') %></span>
</button>
</div>
<div class="loginOptionButtonContainer">
<div class="loginOptionButtonContainer" style="display: none;">
<button id="loginOptionMojang" class="loginOptionButton">
<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 9.677 9.667">
<path d="M-26.332-12.098h2.715c-1.357.18-2.574 1.23-2.715 2.633z" fill="#fff" />
@ -24,7 +25,7 @@
<span><%- lang('loginOptions.loginWithMojang') %></span>
</button>
</div>
<div class="loginOptionButtonContainer">
<div class="loginOptionButtonContainer" style="display: none;">
<button id="loginOptionOffline" class="loginOptionButton">
<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 9.677 9.667">
<path d="M-26.332-12.098h2.715c-1.357.18-2.574 1.23-2.715 2.633z" fill="#fff" />
@ -35,15 +36,23 @@
<span>Offline</span>
</button>
</div>
<!-- Авторизация через Discord -->
<div class="loginOptionButtonContainer">
<button id="loginOptionSkirdaDiscord" class="loginOptionButton">
<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 9.677 9.667">
<path d="M-26.332-12.098h2.715c-1.357.18-2.574 1.23-2.715 2.633z" fill="#fff" />
<path d="M2.598.022h7.07L9.665 7c-.003 1.334-1.113 2.46-2.402 2.654H0V2.542C.134 1.2 1.3.195 2.598.022z" fill="#db2331" />
<path d="M1.54 2.844c.314-.76 1.31-.46 1.954-.528.785-.083 1.503.272 2.1.758l.164-.9c.327.345.587.756.964 1.052.28.254.655-.342.86-.013.42.864.408 1.86.54 2.795l-.788-.373C6.9 4.17 5.126 3.052 3.656 3.685c-1.294.592-1.156 2.65.06 3.255 1.354.703 2.953.51 4.405.292-.07.42-.34.87-.834.816l-4.95.002c-.5.055-.886-.413-.838-.89l.04-4.315z" fill="#fff" />
<svg width="22" height="22" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2 11.6C2 8.23969 2 6.55953 2.65396 5.27606C3.2292 4.14708 4.14708 3.2292 5.27606 2.65396C6.55953 2 8.23969 2 11.6 2H20.4C23.7603 2 25.4405 2 26.7239 2.65396C27.8529 3.2292 28.7708 4.14708 29.346 5.27606C30 6.55953 30 8.23969 30 11.6V20.4C30 23.7603 30 25.4405 29.346 26.7239C28.7708 27.8529 27.8529 28.7708 26.7239 29.346C25.4405 30 23.7603 30 20.4 30H11.6C8.23969 30 6.55953 30 5.27606 29.346C4.14708 28.7708 3.2292 27.8529 2.65396 26.7239C2 25.4405 2 23.7603 2 20.4V11.6Z" fill="white"/>
<path d="M23.6361 9.33998C22.212 8.71399 20.6892 8.25903 19.0973 8C18.9018 8.33209 18.6734 8.77875 18.5159 9.13408C16.8236 8.89498 15.1469 8.89498 13.4857 9.13408C13.3283 8.77875 13.0946 8.33209 12.8974 8C11.3037 8.25903 9.77927 8.71565 8.35518 9.3433C5.48276 13.4213 4.70409 17.3981 5.09342 21.3184C6.99856 22.6551 8.84487 23.467 10.66 23.9983C11.1082 23.4189 11.5079 22.8029 11.8523 22.1536C11.1964 21.9195 10.5683 21.6306 9.9748 21.2951C10.1323 21.1856 10.2863 21.071 10.4351 20.9531C14.0551 22.5438 17.9881 22.5438 21.5649 20.9531C21.7154 21.071 21.8694 21.1856 22.0251 21.2951C21.4299 21.6322 20.8 21.9211 20.1442 22.1553C20.4885 22.8029 20.8865 23.4205 21.3364 24C23.1533 23.4687 25.0013 22.6567 26.9065 21.3184C27.3633 16.7738 26.1261 12.8335 23.6361 9.33998ZM12.3454 18.9075C11.2587 18.9075 10.3676 17.9543 10.3676 16.7937C10.3676 15.6331 11.2397 14.6783 12.3454 14.6783C13.4511 14.6783 14.3422 15.6314 14.3232 16.7937C14.325 17.9543 13.4511 18.9075 12.3454 18.9075ZM19.6545 18.9075C18.5678 18.9075 17.6767 17.9543 17.6767 16.7937C17.6767 15.6331 18.5488 14.6783 19.6545 14.6783C20.7602 14.6783 21.6514 15.6314 21.6323 16.7937C21.6323 17.9543 20.7602 18.9075 19.6545 18.9075Z" fill="#5865F2"/>
</svg>
<!-- <span><%- lang('loginOptions.loginWithMojang') %></span> -->
<span>Skirda Discord</span>
<span>Дискорд</span>
</button>
</div>
<!-- Авторизация через FIDO (неактивна) -->
<div class="loginOptionButtonContainer">
<button id="loginOptionSkirdaFIDO" class="loginOptionButton" style="color: gray; background: rgb(0 0 0 / 0%);cursor: not-allowed;">
<svg width="22" height="22" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 32 32" viewBox="0 0 32 32" id="fidoalliance"><path fill="#FFF9DD" d="M26,32H6c-3.314,0-6-2.686-6-6V6c0-3.314,2.686-6,6-6h20c3.314,0,6,2.686,6,6v20C32,29.314,29.314,32,26,32z"></path><path fill="#FFD200" d="M21.845 14.904c-1.37 0-2.268.874-2.268 2.247 0 1.373.95 2.182 2.19 2.182 1.134 0 2.233-.707 2.233-2.26C23.999 15.8 23.137 14.904 21.845 14.904zM21.802 18.388L21.802 18.388c-.567-.001-.87-.542-.87-1.272 0-.622.246-1.264.87-1.264.594 0 .841.636.841 1.258C22.643 17.882 22.314 18.388 21.802 18.388zM8.817 19.235h1.31v-3.256h.817v-.962h-.817v-.51c-.001-.014-.001-.029-.001-.045 0-.168.06-.321.159-.441l-.001.001-.001.001c.014-.015.027-.029.042-.041l.001-.001.001-.001c0 0 .282-.279.947-.095h.001l.324-1.087c-.072-.025-.159-.049-.25-.067l-.012-.002-.013-.002c-.167-.039-.359-.063-.556-.063-.003 0-.006 0-.01 0 0 0 0 0-.001 0-.001 0-.002 0-.004 0-.251 0-.494.038-.724.106-.092.027-.171.06-.247.099-.173.088-.321.195-.45.321-.341.333-.514.785-.514 1.342v.481H8v.963h.817V19.235z"></path><path fill="#FFD200" d="M10.019,12.775l-0.018,0.005c0.009-0.003,0.02-0.004,0.029-0.007c0.003-0.001,0.004-0.002,0.007-0.003L10.019,12.775z"></path><polygon fill="#FFD200" points="9.778 12.874 9.771 12.877 9.783 12.872 9.786 12.87"></polygon><path fill="#FFE777" d="M13.352,14.426c0.408,0,0.739-0.329,0.74-0.736v-0.001c0-0.407-0.331-0.737-0.74-0.737c-0.408,0-0.74,0.33-0.74,0.737C12.612,14.095,12.944,14.426,13.352,14.426z"></path><polygon fill="#FFE777" points="11.37 15.98 12.698 15.98 12.698 19.236 13.178 19.236 13.178 17.386 13.525 17.386 13.525 19.236 14.009 19.236 14.009 15.017 11.37 15.017"></polygon><path fill="#FFD200" d="M16.496,14.904c-1.015,0-1.907,0.832-1.899,2.255c0,1.315,0.805,2.175,1.813,2.175c0.543,0,1.064-0.245,1.319-0.707l0.08,0.607h1.138v-6.188h-1.318l0.001,2.336h-0.015C17.418,15.098,17.026,14.904,16.496,14.904z M17.629,17.354c0,0.104-0.008,0.206-0.022,0.306c-0.075,0.361-0.391,0.627-0.77,0.627h-0.009c-0.543,0-0.899-0.448-0.899-1.17c0-0.664,0.304-1.201,0.906-1.201c0.413,0,0.697,0.297,0.776,0.643c0.01,0.061,0.016,0.132,0.016,0.204l-0.001,0.036L17.629,17.354z"></path></svg>
<span>FIDO (сейчас недоступно)</span>
</button>
</div>
</div>

25
app/settings.ejs
View File

@ -22,13 +22,16 @@
</div>
</div>
</div>
<div id="settingsContainerRight">
<div id="settingsTabAccount" class="settingsTab">
<div class="settingsTabHeader">
<span class="settingsTabHeaderText"><%- lang('settings.tabAccountHeaderText') %></span>
<span class="settingsTabHeaderDesc"><%- lang('settings.tabAccountHeaderDesc') %></span>
</div>
<div class="settingsAuthAccountTypeContainer">
<!-- Авторизация через Microsoft, удаляем? -->
<div class="settingsAuthAccountTypeContainer" style="display: none;">
<div class="settingsAuthAccountTypeHeader">
<div class="settingsAuthAccountTypeHeaderLeft">
<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 23 23">
@ -45,11 +48,10 @@
</div>
<div class="settingsCurrentAccounts" id="settingsCurrentMicrosoftAccounts">
<!-- Microsoft auth accounts populated here. -->
</div>
</div>
<div class="settingsAuthAccountTypeContainer">
<div class="settingsAuthAccountTypeContainer" style="display: none;">
<div class="settingsAuthAccountTypeHeader">
<div class="settingsAuthAccountTypeHeaderLeft">
<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 9.677 9.667">
@ -65,11 +67,10 @@
</div>
<div class="settingsCurrentAccounts" id="settingsCurrentMojangAccounts">
<!-- Mojang auth accounts populated here. -->
</div>
</div>
<div class="settingsAuthAccountTypeContainer">
<div class="settingsAuthAccountTypeContainer" style="display: none;">
<div class="settingsAuthAccountTypeHeader">
<div class="settingsAuthAccountTypeHeaderLeft">
<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 9.677 9.667">
@ -92,13 +93,11 @@
<div class="settingsAuthAccountTypeContainer">
<div class="settingsAuthAccountTypeHeader">
<div class="settingsAuthAccountTypeHeaderLeft">
<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 9.677 9.667">
<path d="M-26.332-12.098h2.715c-1.357.18-2.574 1.23-2.715 2.633z" fill="#fff" />
<path d="M2.598.022h7.07L9.665 7c-.003 1.334-1.113 2.46-2.402 2.654H0V2.542C.134 1.2 1.3.195 2.598.022z" fill="#db2331" />
<path d="M1.54 2.844c.314-.76 1.31-.46 1.954-.528.785-.083 1.503.272 2.1.758l.164-.9c.327.345.587.756.964 1.052.28.254.655-.342.86-.013.42.864.408 1.86.54 2.795l-.788-.373C6.9 4.17 5.126 3.052 3.656 3.685c-1.294.592-1.156 2.65.06 3.255 1.354.703 2.953.51 4.405.292-.07.42-.34.87-.834.816l-4.95.002c-.5.055-.886-.413-.838-.89l.04-4.315z" fill="#fff" />
<svg width="22" height="22" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2 11.6C2 8.23969 2 6.55953 2.65396 5.27606C3.2292 4.14708 4.14708 3.2292 5.27606 2.65396C6.55953 2 8.23969 2 11.6 2H20.4C23.7603 2 25.4405 2 26.7239 2.65396C27.8529 3.2292 28.7708 4.14708 29.346 5.27606C30 6.55953 30 8.23969 30 11.6V20.4C30 23.7603 30 25.4405 29.346 26.7239C28.7708 27.8529 27.8529 28.7708 26.7239 29.346C25.4405 30 23.7603 30 20.4 30H11.6C8.23969 30 6.55953 30 5.27606 29.346C4.14708 28.7708 3.2292 27.8529 2.65396 26.7239C2 25.4405 2 23.7603 2 20.4V11.6Z" fill="white"/>
<path d="M23.6361 9.33998C22.212 8.71399 20.6892 8.25903 19.0973 8C18.9018 8.33209 18.6734 8.77875 18.5159 9.13408C16.8236 8.89498 15.1469 8.89498 13.4857 9.13408C13.3283 8.77875 13.0946 8.33209 12.8974 8C11.3037 8.25903 9.77927 8.71565 8.35518 9.3433C5.48276 13.4213 4.70409 17.3981 5.09342 21.3184C6.99856 22.6551 8.84487 23.467 10.66 23.9983C11.1082 23.4189 11.5079 22.8029 11.8523 22.1536C11.1964 21.9195 10.5683 21.6306 9.9748 21.2951C10.1323 21.1856 10.2863 21.071 10.4351 20.9531C14.0551 22.5438 17.9881 22.5438 21.5649 20.9531C21.7154 21.071 21.8694 21.1856 22.0251 21.2951C21.4299 21.6322 20.8 21.9211 20.1442 22.1553C20.4885 22.8029 20.8865 23.4205 21.3364 24C23.1533 23.4687 25.0013 22.6567 26.9065 21.3184C27.3633 16.7738 26.1261 12.8335 23.6361 9.33998ZM12.3454 18.9075C11.2587 18.9075 10.3676 17.9543 10.3676 16.7937C10.3676 15.6331 11.2397 14.6783 12.3454 14.6783C13.4511 14.6783 14.3422 15.6314 14.3232 16.7937C14.325 17.9543 13.4511 18.9075 12.3454 18.9075ZM19.6545 18.9075C18.5678 18.9075 17.6767 17.9543 17.6767 16.7937C17.6767 15.6331 18.5488 14.6783 19.6545 14.6783C20.7602 14.6783 21.6514 15.6314 21.6323 16.7937C21.6323 17.9543 20.7602 18.9075 19.6545 18.9075Z" fill="#5865F2"/>
</svg>
<!-- <span><%- lang('settings.skirdaAccount') %></span>-->
<span>Skirda</span>
<span><%- lang('settings.skirdaAccount') %>
</div>
<div class="settingsAuthAccountTypeHeaderRight">
<button class="settingsAddAuthAccount" id="settingsAddSkirdaDiscord">Skirda Discord Account</button>
@ -106,10 +105,12 @@
</div>
<div class="settingsCurrentAccounts" id="settingsCurrentSkirdaAccounts">
<!-- Mojang auth accounts populated here. -->
<!-- Skirda auth accounts populated here. -->
</div>
</div>
</div>
<div id="settingsTabMinecraft" class="settingsTab" style="display: none;">
<div class="settingsTabHeader">
<span class="settingsTabHeaderText"><%- lang('settings.minecraftTabHeaderText') %></span>