This commit is contained in:
luki39 2022-03-01 18:20:19 +01:00
parent a5f44f330b
commit 17cf966b03
7 changed files with 66 additions and 13 deletions

View File

@ -2984,6 +2984,52 @@ input:checked + .toggleSwitchSlider:before {
background-size: contain; background-size: contain;
} }
/* Avatar edit overlay. */
#ouiheberg {
opacity: 0;
position: absolute;
z-index: 1;
display: flex;
justify-content: center;
align-items: center;
transition: 0.25s ease;
font-weight: bold;
letter-spacing: 2px;
background-color: rgba(0, 0, 0, 0.35);
-webkit-user-select: none;
border: none;
cursor: pointer;
width: 100%;
height: 100%;
border-radius: 50%;
}
#ouiheberg:hover,
#ouiheberg:focus {
opacity: 1;
}
#ouiheberg:active {
background-color: rgba(0, 0, 0, 0.45);
}
/* User profile avatar container. */
#test {
border-radius: 50%;
border: 2px solid #cad7e1;
box-sizing: border-box;
background: rgba(1, 2, 1, 0.5);
height: 100px;
width: 100px;
box-shadow: 0px 0px 10px 0px rgb(0, 0, 0);
overflow: hidden;
position: relative;
background-position: center;
background-repeat: no-repeat;
background-size: contain;
background-image: url("../images/ouiheberg.png");
margin-top: 50px;
}
/* Avatar edit overlay. */ /* Avatar edit overlay. */
#avatarOverlay { #avatarOverlay {
opacity: 0; opacity: 0;

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -1,5 +1,7 @@
const logger = require('./loggerutil')('%c[DiscordWrapper]', 'color: #7289da; font-weight: bold') const logger = require('./loggerutil')('%c[DiscordWrapper]', 'color: #7289da; font-weight: bold')
const t = require("../../../package.json")
let rpc = require("discord-rpc") let rpc = require("discord-rpc")
const client = new rpc.Client({ transport: 'ipc' }) const client = new rpc.Client({ transport: 'ipc' })
@ -16,7 +18,7 @@ client.on("ready", () => {
}, },
//details: "kuku", //details: "kuku",
state: "Serveur Minecraft Communautaire !", state: "Serveur Minecraft Communautaire !",
buttons: [{ label: "Discord", url: "https://discord.gg/RspuRbNn4M"}, { label: "Rejoins nous !", url: "https://github.com/luki-39/LukiEnLiveLauncher/releases/download/v2.0.3/LukiEnLiveLauncher-setup-2.0.3.exe"}], buttons: [{ label: "Discord", url: "https://discord.gg/RspuRbNn4M"}, { label: "Rejoins nous !", url: `https://github.com/luki-39/LukiEnLiveLauncher/releases/download/v${t.version}/LukiEnLiveLauncher-setup-${t.version}.exe`}],
} }
}) })

View File

@ -537,7 +537,7 @@ exports.pullRemote = function(){
return exports.pullLocal() return exports.pullLocal()
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const distroURL = 'http://45.140.164.232:1800/lukienlivelauncher/distribution.json' const distroURL = 'https://raw.githubusercontent.com/luki-39/distribution/main/distribution.json'
const opts = { const opts = {
url: distroURL, url: distroURL,
timeout: 2500 timeout: 2500

View File

@ -122,6 +122,11 @@ document.getElementById('avatarOverlay').onclick = (e) => {
}) })
} }
// Bind avatar overlay button.
document.getElementById('ouiheberg').onclick = (e) => {
}
// Bind selected account // Bind selected account
function updateSelectedAccount(authUser){ function updateSelectedAccount(authUser){
let username = 'Aucun compte sélectionné' let username = 'Aucun compte sélectionné'

View File

@ -1,13 +1,16 @@
<div id="landingContainer" style="display: none;"> <div id="landingContainer" style="display: none;">
<div id="upper"> <div id="upper">
<div id="left"> <div id="left">
<div id="image_seal_container"> <div id="test">
<img id="image_seal" src="assets/images/SealCircle.png"/> <!--<a href="https://www.ouiheberg.com/panel/aff.php?aff=326"></a>-->
<div id="updateAvailableTooltip">Mise à jour disponible</div> <button id="ouiheberg">Ouiheberg</button>
</div> </div>
</div> </div>
<div id="content"> <div id="content">
</div> </div>
<div id="right"> <div id="right">
<div id="rightContainer"> <div id="rightContainer">
<div id="user_content"> <div id="user_content">
@ -16,6 +19,7 @@
<button id="avatarOverlay">Modifier</button> <button id="avatarOverlay">Modifier</button>
</div> </div>
</div> </div>
<div id="mediaContent"> <div id="mediaContent">
<div id="internalMedia"> <div id="internalMedia">
<div class="mediaContainer" id="settingsMediaContainer"> <div class="mediaContainer" id="settingsMediaContainer">
@ -29,8 +33,8 @@
</div> </div>
<div class="mediaDivider"></div> <div class="mediaDivider"></div>
<div id="externalMedia"> <div id="externalMedia">
<!--div class="mediaContainer"> <div class="mediaContainer">
<a href="https://twitch.tv/lukienlive" class="mediaURL" id="linkURL"> <a href="https://www.ouiheberg.com/panel/aff.php?aff=326" class="mediaURL" id="linkURL">
<svg id="linkSVG" class="mediaSVG" viewBox="35.34 34.3575 70.68 68.71500"> <svg id="linkSVG" class="mediaSVG" viewBox="35.34 34.3575 70.68 68.71500">
<g> <g>
<path d="M75.37,65.51a3.85,3.85,0,0,0-1.73.42,8.22,8.22,0,0,1,.94,3.76A8.36,8.36,0,0,1,66.23,78H46.37a8.35,8.35,0,1,1,0-16.7h9.18a21.51,21.51,0,0,1,6.65-8.72H46.37a17.07,17.07,0,1,0,0,34.15H66.23A17,17,0,0,0,82.77,65.51Z"/> <path d="M75.37,65.51a3.85,3.85,0,0,0-1.73.42,8.22,8.22,0,0,1,.94,3.76A8.36,8.36,0,0,1,66.23,78H46.37a8.35,8.35,0,1,1,0-16.7h9.18a21.51,21.51,0,0,1,6.65-8.72H46.37a17.07,17.07,0,1,0,0,34.15H66.23A17,17,0,0,0,82.77,65.51Z"/>
@ -38,7 +42,7 @@
</g> </g>
</svg> </svg>
</a> </a>
</div--> </div>
<div class="mediaContainer"> <div class="mediaContainer">
<a href="https://twitch.tv/lukienlive" class="mediaURL" id="twitchURL"> <a href="https://twitch.tv/lukienlive" class="mediaURL" id="twitchURL">
<svg id="twitchSVG" class="mediaSVG" viewBox="0 0 16 16"> <svg id="twitchSVG" class="mediaSVG" viewBox="0 0 16 16">

View File

@ -1,8 +1,4 @@
<div id="welcomeContainer" style="display: none;"> <div id="welcomeContainer" style="display: none;">
<!--<div class="cloudDiv">
<div class="cloudTop"></div>
<div class="cloudBottom"></div>
</div>-->
<div id="welcomeContent"> <div id="welcomeContent">
<img id="welcomeImageSeal" src="assets/images/SealCircle.png"/> <img id="welcomeImageSeal" src="assets/images/SealCircle.png"/>
<span id="welcomeHeader">Bienvenue sur le serveur Minecraft Moddé de LukiEnLive !</span> <span id="welcomeHeader">Bienvenue sur le serveur Minecraft Moddé de LukiEnLive !</span>