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

fixes

Browse Source
This commit is contained in:
cyber-dream 2024-01-28 09:36:25 +03:00
parent 7dcbc4c907
commit f39b26a4ff
7 changed files with 8 additions and 4105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Callback/img/Logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 142 KiB

BIN
Callback/img/bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.7 MiB

6
Callback/index.html
View File

@ -16,7 +16,7 @@
}
body {
background-image: url(img/bg.png);
background-image: url(../../skirda/skirdaGoBackend/authskirda/templates/callback/img/bg.png);
background-repeat:no-repeat;
background-size: cover;
background-position: center center;
@ -150,7 +150,7 @@
<div id="loginSkirdaAuthorizationWindow" style="display: none;">
<div id="settingsAboutCurrentContent" class="Centered">
<div id="settingsAboutCurrentHeadline">
<img id="settingsAboutLogo" src="img/Logo.png">
<img id="settingsAboutLogo" src="../../skirda/skirdaGoBackend/authskirda/templates/callback/img/Logo.png">
<span id="settingsAboutTitle">Авторизация через Discord</span>
</div>
<div id="settingsAboutCurrentVersion">
@ -166,7 +166,7 @@
<div id="loginSkirdaAuthorizationWindow" >
<div id="settingsAboutCurrentContent" class="Centered">
<div id="settingsAboutCurrentHeadline">
<img id="settingsAboutLogo" src="img/Logo.png">
<img id="settingsAboutLogo" src="../../skirda/skirdaGoBackend/authskirda/templates/callback/img/Logo.png">
<span id="settingsAboutTitle">Авторизация через Discord</span>
</div>
<div id="settingsAboutCurrentVersion" class="Centered">

4096
Callback/launcher.css
View File

File diff suppressed because it is too large Load Diff

7
app/assets/js/scripts/loginSkirdaDiscord.js
View File

@ -2,8 +2,8 @@
// const fs = require('fs')
// const {addSkirdaAccount} = require('configmanager')
// const auth_api_url = 'http://192.168.88.10:8083'
const auth_api_url = 'http://localhost:8083'
// const auth_api_url = 'http://skirda-auth.brzezinski.ru'
// const auth_api_url = 'http://localhost:8083'
const auth_api_url = 'http://skirda-auth.brzezinski.ru'
function uuidv4() {
return '10000000-1000-4000-8000-100000000000'.replace(/[018]/g, c =>
@ -90,8 +90,7 @@ class SkirdaDiscordAuth{
* @return {Response}
* */
static async _poll(requestId){
const resp = await fetch(`${auth_api_url}/v1/auth/discord/periodicPolling?installId=${SkirdaDiscordAuth.temp_installId}&requestId=${requestId}`)
return resp
return await fetch(`${auth_api_url}/v1/auth/discord/periodicPolling?installId=${SkirdaDiscordAuth.temp_installId}&requestId=${requestId}`)
}
static _sleepSetTimeout_ctrl

2
app/dynmap.ejs
View File

@ -19,5 +19,5 @@
<div id="iframecontainer">
<iframe id="dynmapiframe" src="https://minemap.gregbrzezinski.com" frameborder="0"></iframe>
</div>
<script src="./assets/js/scripts/dynmap.js"></script>
<!-- <script src="./assets/js/scripts/dynmap.js"></script>-->
</div>

2
app/landing.ejs
View File

@ -113,7 +113,7 @@
<div id="iframecontainer">
<iframe id="dynmapiframe" src="https://mc.westeroscraft.com/#" frameborder="0"></iframe>
</div>
<script src="./assets/js/scripts/dynmap.js"></script>
<!-- <script src="./assets/js/scripts/dynmap.js"></script>-->
</div>
<!-- <div id="newsContent" article="-1" style="display: none;">-->
<!-- <div id="newsStatusContainer">-->