Urgent correction of version v1.0.0-beta.14 due to crash issues when acting on the CDN.
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-07-12 18:13:03 +02:00
parent aaff0ed4ea
commit 44631acfc6
27 changed files with 704 additions and 534 deletions

View File

@@ -13,82 +13,162 @@
<style>
.custom-btn {
transition: transform 0.3s ease, background-color 0.3s ease, border-color 0.3s ease;
color: #007BFF;
background-color: transparent;
padding: 10px 20px;
text-decoration: none;
display: inline-block;
font-size: 16px;
margin: 4px 2px;
border-radius: 50px;
display: inline-flex;
align-items: center;
justify-content: center;
font-family: inherit;
font-weight: 500;
font-size: 17px;
padding: 0.8em 1.5em;
color: white;
background: linear-gradient(0deg, rgba(77,54,208,1) 0%, rgba(132,116,254,1) 100%);
border: none;
box-shadow: 0 0.7em 1.5em -0.5em #4d36d0be;
letter-spacing: 0.05em;
border-radius: 20em;
cursor: pointer;
box-shadow: 0 2px 5px rgba(0,0,0,0.25);
border: 2px solid #007BFF;
transition: all 0.3s ease;
position: relative;
overflow: hidden;
min-width: 150px;
min-height: 50px;
}
.custom-btn:hover {
transform: scale(1.15);
background-color: #007BFF;
color: #fff;
box-shadow: 0 0.5em 1.5em -0.5em #4d36d0be;
}
.animate {
opacity: 0;
transform: translateY(-20px);
animation: slideIn 0.4s forwards;
animation-delay: 0.2s;
.custom-btn span {
position: relative;
z-index: 1;
transition: opacity 0.3s ease;
}
@keyframes slideIn {
.custom-btn.processing {
cursor: wait;
}
.custom-btn.success {
background: linear-gradient(0deg, rgba(40,167,69,1) 0%, rgba(76,203,112,1) 100%);
box-shadow: 0 0.7em 1.5em -0.5em rgba(40,167,69,0.6);
}
.custom-btn.failure {
background: linear-gradient(0deg, rgba(220,53,69,1) 0%, rgba(255,107,114,1) 100%);
box-shadow: 0 0.7em 1.5em -0.5em rgba(220,53,69,0.6);
}
.custom-btn svg {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%) scale(0);
width: 24px;
height: 24px;
transition: transform 0.3s ease;
}
.custom-btn.success svg, .custom-btn.failure svg {
transform: translate(-50%, -50%) scale(1);
}
.checkmark__circle, .crossmark__circle {
stroke-dasharray: 166;
stroke-dashoffset: 166;
stroke-width: 2;
stroke-miterlimit: 10;
stroke: #fff;
fill: none;
animation: stroke 0.6s cubic-bezier(0.65, 0, 0.45, 1) forwards;
}
.checkmark__check, .crossmark__check {
transform-origin: 50% 50%;
stroke-dasharray: 48;
stroke-dashoffset: 48;
stroke: #fff;
stroke-width: 3;
fill: none;
animation: stroke 0.3s cubic-bezier(0.65, 0, 0.45, 1) 0.8s forwards;
}
@keyframes stroke {
100% {
opacity: 1;
transform: translateY(0);
stroke-dashoffset: 0;
}
}
@keyframes fadeOutContent {
to {
opacity: 0;
}
}
@keyframes shakeButton {
0%, 100% {
transform: translateX(0);
}
10%, 30%, 50%, 70%, 90% {
transform: translateX(-5px);
}
20%, 40%, 60%, 80% {
transform: translateX(5px);
}
}
.custom-btn.processing span, .custom-btn.success span, .custom-btn.failure span {
animation: fadeOutContent 0.3s forwards;
}
.custom-btn.failure {
animation: shakeButton 0.5s cubic-bezier(.36,.07,.19,.97) both;
}
</style>
<body class="light-mode animate">
<div class="container mt-4 animate">
<h1 class="title text-center animate">Connexion</h1>
<% if (currentUrl === '/auth/activedirectory' || (setupData[0] && setupData[0].hasOwnProperty('ldap'))) { %>
<h3 class="text-center animate">Connexion avec Active Directory</h3>
<form action="/auth/activedirectory" method="post" class="mb-4 animate">
<% if (typeof errorMessage !== 'undefined' && errorMessage) { %>
<% } %>
<div class="form-group animate">
<label for="username" class="animate">Nom d'utilisateur :</label>
<input type="text" id="username" name="username" class="form-control animate" required>
</div>
<div class="form-group animate">
<label for="password" class="animate">Mot de passe :</label>
<input type="password" id="password" name="password" class="form-control animate" required>
</div>
<button type="submit" class="btn btn-primary d-flex align-items-center justify-content-center mx-auto d-block custom-btn">
<span class="ml-2 animate">Se connecter</span>
</button>
</form>
<% } %>
<% if (typeof setupData.discord !== 'undefined') { %>
<% if (typeof setupData.ldap !== 'undefined') { %>
<h3 class="text-center animate">Ou</h3>
<div class="container mt-4 animate">
<h1 class="title text-center animate">Connexion</h1>
<% if (currentUrl === '/auth/activedirectory' || (setupData[0] && setupData[0].hasOwnProperty('ldap'))) { %>
<h3 class="text-center animate">Connexion avec Active Directory</h3>
<form id="loginForm" class="mb-4 animate">
<% if (typeof errorMessage !== 'undefined' && errorMessage) { %>
<% } %>
<button onclick="location.href='/auth/discord'" class="btn btn-primary d-flex align-items-center justify-content-center mx-auto d-block custom-btn">
<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="#ffffff" width="24" height="24">
<title>Discord</title>
<path d="M20.317 4.3698a19.7913 19.7913 0 00-4.8851-1.5152.0741.0741 0 00-.0785.0371c-.211.3753-.4447.8648-.6083 1.2495-1.8447-.2762-3.68-.2762-5.4868 0-.1636-.3933-.4058-.8742-.6177-1.2495a.077.077 0 00-.0785-.037 19.7363 19.7363 0 00-4.8852 1.515.0699.0699 0 00-.0321.0277C.5334 9.0458-.319 13.5799.0992 18.0578a.0824.0824 0 00.0312.0561c2.0528 1.5076 4.0413 2.4228 5.9929 3.0294a.0777.0777 0 00.0842-.0276c.4616-.6304.8731-1.2952 1.226-1.9942a.076.076 0 00-.0416-.1057c-.6528-.2476-1.2743-.5495-1.8722-.8923a.077.077 0 01-.0076-.1277c.1258-.0943.2517-.1923.3718-.2914a.0743.0743 0 01.0776-.0105c3.9278 1.7933 8.18 1.7933 12.0614 0a.0739.0739 0 01.0785.0095c.1202.099.246.1981.3728.2924a.077.077 0 01-.0066.1276 12.2986 12.2986 0 01-1.873.8914.0766.0766 0 00-.0407.1067c.3604.698.7719 1.3628 1.225 1.9932a.076.076 0 00.0842.0286c1.961-.6067 3.9495-1.5219 6.0023-3.0294a.077.077 0 00.0313-.0552c.5004-5.177-.8382-9.6739-3.5485-13.6604a.061.061 0 00-.0312-.0286zM8.02 15.3312c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9555-2.4189 2.157-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.9555 2.4189-2.1569 2.4189zm7.9748 0c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9554-2.4189 2.1569-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.946 2.4189-2.1568 2.4189Z"/>
</svg>
<span class="ml-2 animate">Se connecter avec Discord</span>
<div class="form-group animate">
<label for="username" class="animate">Nom d'utilisateur :</label>
<input type="text" id="username" name="username" class="form-control animate" required>
</div>
<div class="form-group animate">
<label for="password" class="animate">Mot de passe :</label>
<input type="password" id="password" name="password" class="form-control animate" required>
</div>
<button type="submit" id="loginButton" class="btn btn-primary d-flex align-items-center justify-content-center mx-auto d-block custom-btn">
<span class="ml-2 animate">Se connecter</span>
</button>
<% } %>
<br>
<div class="d-flex justify-content-center animate">
<button id="themeSwitcher" class="btn btn-warning mt-3 animate ">Changer de Thème</button>
</div>
</form>
<% } %>
<% if (Array.isArray(setupData)) { %>
<% setupData.forEach(config => { %>
<% if (config.hasOwnProperty('discord') && config.discord.enabled === 'on') { %>
<% if (config.hasOwnProperty('ldap') && config.ldap.enabled === 'on') { %>
<h3 class="text-center animate">Ou</h3>
<% } %>
<button onclick="redirectToDiscord('<%= config.discord.identifyURL %>')" class="btn btn-primary d-flex align-items-center justify-content-center mx-auto d-block custom-btn" id="discordButton">
<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="#ffffff" width="24" height="24">
<title>Discord</title>
<path d="M20.317 4.3698a19.7913 19.7913 0 00-4.8851-1.5152..."></path>
</svg>&nbsp;Se connecter avec Discord
</button>
<% } %>
<% }); %>
<% } %>
<br>
<div class="d-flex justify-content-center animate">
<button id="themeSwitcher" class="btn btn-warning mt-3 animate">Changer de Thème</button>
</div>
</div>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"></script>
@@ -114,34 +194,89 @@
});
});
var isAuthenticated = "<%= isAuthenticated %>" === "true";
var errorMessage = '<%= errorMessage %>';
document.addEventListener('DOMContentLoaded', function() {
const loginForm = document.getElementById('loginForm');
const loginButton = document.getElementById('loginButton');
if (isAuthenticated) {
Swal.fire({
position: 'top',
icon: 'success',
title: 'Authentification réussie!',
text: 'Vous allez être redirigé vers le tableau de bord.',
showConfirmButton: false,
timer: 1800,
timerProgressBar: true,
toast: true,
willClose: () => {
window.location.replace('/dpanel/dashboard');
loginForm.addEventListener('submit', function(e) {
e.preventDefault();
const username = document.getElementById('username').value;
const password = document.getElementById('password').value;
loginButton.disabled = true;
loginButton.innerHTML = '<span>Connexion en cours...</span>';
loginButton.classList.add('processing');
fetch('/auth/activedirectory', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ username, password }),
redirect: 'follow',
})
.then(response => {
console.log('Statut de la réponse:', response.status);
console.log('URL finale:', response.url);
if (response.url.includes('/dpanel/dashboard')) {
handleAuthResult(loginButton, true);
} else {
return response.text().then(text => {
console.log('Texte reçu:', text);
handleAuthResult(loginButton, false);
});
}
})
.catch(error => {
console.error('Erreur:', error);
handleAuthResult(loginButton, false);
});
});
function handleAuthResult(loginButton, isSuccess) {
loginButton.classList.remove('processing');
loginButton.classList.add(isSuccess ? 'success' : 'failure');
const iconSVG = isSuccess ? `
<svg class="checkmark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52 52" width="20" height="20">
<circle class="checkmark__circle" cx="26" cy="26" r="25" fill="none"/>
<path class="checkmark__check" fill="none" d="M14.1 27.2l7.1 7.2 16.7-16.8"/>
</svg>
` : `
<svg class="crossmark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52 52" width="20" height="20">
<circle class="crossmark__circle" cx="26" cy="26" r="25" fill="none"/>
<path class="crossmark__check" fill="none" d="M16 16 36 36 M36 16 16 36"/>
</svg>
`;
loginButton.innerHTML = iconSVG;
if (isSuccess) {
setTimeout(() => {
console.log("Redirection vers /dpanel/dashboard");
window.location.replace('/dpanel/dashboard');
}, 1000);
} else {
setTimeout(() => {
loginButton.classList.remove('failure');
loginButton.innerHTML = '<span>Se connecter</span>';
loginButton.disabled = false;
}, 1500);
}
});
} else if (errorMessage) {
Swal.fire({
position: 'top',
icon: 'error',
title: 'Erreur lors de l\'authentification!',
text: 'Merci de reessayer.',
showConfirmButton: false,
timer: 2200,
timerProgressBar: true,
toast: true,
});
}
});
function redirectToDiscord(url) {
const discordButton = document.getElementById('discordButton');
discordButton.classList.add('btn-fill');
discordButton.innerHTML = '<span>Redirection en cours...</span>';
discordButton.disabled = true;
setTimeout(() => {
window.location.href = url;
}, 1000);
}
</script>
</body>