Login finished, Game jam functions next.

This commit is contained in:
Minik Gaarde Lambrecht 2021-04-07 01:54:42 +02:00
parent 45164d2c63
commit ee32bf4e5a
13 changed files with 334 additions and 142 deletions

3
.gitignore vendored
View File

@ -19,6 +19,7 @@
.idea/**/dynamic.xml .idea/**/dynamic.xml
.idea/**/uiDesigner.xml .idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml .idea/**/dbnavigator.xml
config/database.json
# Gradle # Gradle
.idea/**/gradle.xml .idea/**/gradle.xml
@ -113,3 +114,5 @@ composer.phar
/Test/ /Test/
/.vs/ /.vs/
*.sqlite *.sqlite
Backend/test.php

View File

@ -1,8 +0,0 @@
<?php
use Backend\Models\AdminUser;
require_once ('Database/databaseMigration.php');
AdminUser::firstOrCreate([
'user_name' => '', 'password' => password_hash('',PASSWORD_DEFAULT)
]);

View File

@ -3,7 +3,7 @@
<head> <head>
<!-- Default page settings --> <!-- Default page settings -->
<title>GameJam Adminpanel</title> <title>Admin Panel</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="../Images/UFO.png" /> <link rel="shortcut icon" href="../Images/UFO.png" />
@ -18,54 +18,76 @@
<!-- CSS end --> <!-- CSS end -->
<!-- Header scripts --> <!-- Header scripts -->
<script src="https://kit.fontawesome.com/57b6c8b971.js" crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
<script src="../Javascript/swipe.js"></script> <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.6.0/dist/umd/popper.min.js" integrity="sha384-KsvD1yqQ1/1+IA7gi3P0tyJcT3vR+NdBTt13hSJ2lnve8agRGXTTyNaBYmCR/Nwi" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.6.0/dist/umd/popper.min.js" integrity="sha384-KsvD1yqQ1/1+IA7gi3P0tyJcT3vR+NdBTt13hSJ2lnve8agRGXTTyNaBYmCR/Nwi" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/js/bootstrap.min.js" integrity="sha384-nsg8ua9HAw1y0W1btsyWgBklPnCUAFLuTMS2G72MMONqmOymq585AcH49TLBQObG" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/js/bootstrap.min.js" integrity="sha384-nsg8ua9HAw1y0W1btsyWgBklPnCUAFLuTMS2G72MMONqmOymq585AcH49TLBQObG" crossorigin="anonymous"></script>
<!-- Header scripts end --> <!-- Header scripts end -->
</head> </head>
<body> <body>
<div class="HeaderPanel">
<div class="HeaderLeft"> <div class="HeaderPanel">
<a href="../Index.html"> <div class="HeaderLeft">
<i class="fas fa-arrow-left"></i> <a style="display: inline-block;" href="../Index.html">
</a> <i class="fas fa-arrow-left"></i>
<h6> </a>
Admin panel
</h6>
</div>
</div> </div>
<div class="HeaderTitle">
<h2 style="margin-bottom: 0px">
Admin Panel
</h2>
</div>
</div>
<!--Opret game jam--> <!--Opret game jam-->
<br /> <br />
<br /> <br />
<h3>Administration</h3> <h3>Administration</h3>
<h5>Opret Game Jam</h5> <h5>Opret Game Jam</h5>
<div> <div>
<form id="createGameJam"> <form id="createGameJam" method="POST">
<label for="nameOfGameJam">Indtast navn på Game Jam:</label> <label for="nameOfGameJam">Indtast navn på Game Jam:</label>
<input type="text" name="nameOfGameJam" id="nameOfGameJam"> <input type="text" name="newGameJam" id="nameOfGameJam">
<br /> <br />
<label for="startDate">Start dato:</label> <label for="startDate">Start dato:</label>
<input type="date" name="startDate" id="startDate"> <input type="date" name="startDate" id="startDate">
<br /> <br />
<label for="endDate">Slut dato:</label> <label for="endDate">Slut dato:</label>
<input type="date" name="endDate" id="endDate"> <input type="date" name="endDate" id="endDate">
<br /> <br />
<label for="startTime">Start tidspunkt:</label> <label for="startTime">Start tidspunkt:</label>
<input type="time" name="startTime" id="startTime"> <input type="time" name="startTime" id="startTime" min="00:00" max="24:00" value="00:00" pattern="[0-9]{2}:[0-9]{2}">
<br /> <br />
<label for="endDate">Slut tidspunkt:</label> <label for="endDate">Slut tidspunkt:</label>
<input type="time" name="endTime" id="endTime"> <input type="time" name="endTime" id="endTime" min="00:00" max="24:00" value="00:00" pattern="[0-9]{2}:[0-9]{2}">
<br /> <br />
<label for="keyWord">Emne / Keywords (Ikke obligatorisk):</label>
<input type="text" name="keyWord" id="keyWord">
<br />
<p>Indsæt en beskrivelse af Gam jammet</p> <p>Indsæt en beskrivelse af Gam jammet</p>
<div class="form-floating"> <div class="form-floating">
<textarea class="form-control" name="description" id="description" placeholder="Leave a comment here" id="floatingTextarea2" style="height: 100px"></textarea> <textarea class="form-control" name="description" id="description" placeholder="Leave a comment here" id="floatingTextarea2" style="height: 100px"></textarea>
<label for="floatingTextarea2">Beskrivelse</label> <label for="floatingTextarea2">Beskrivelse</label>
</div> </div>
<button type="button" name="indsend" id="indsend">Indsend</button>
<input type="submit" name="newGameJam" id="indsend" value="Indsend">
<button type="button" id="testTime">Test</button>
</form> </form>
</div> </div>
<!--Opret game jam slut--> <!--Opret game jam slut-->
@ -73,6 +95,7 @@
<!-- Body scripts --> <!-- Body scripts -->
<script src="../Javascript/minibar.min.js"></script> <script src="../Javascript/minibar.min.js"></script>
<script src="../Javascript/AddEvent.js"></script> <script src="../Javascript/AddEvent.js"></script>
<script src="../Javascript/AddGameJam.js"></script>
<!-- Body scripts end --> <!-- Body scripts end -->
</body> </body>

View File

@ -86,13 +86,13 @@
Opret admin bruger: Opret admin bruger:
</h1> </h1>
<p> <p>
<input name="dbUsername" class="form-control" placeholder="Brugernavn"> <input name="AdminUsername" class="form-control" placeholder="Brugernavn">
</p> </p>
<p> <p>
<input id="adminPassword" type="password" class="form-control" placeholder="Password"> <input id="adminPassword" type="password" class="form-control" placeholder="Password">
</p> </p>
<p> <p>
<input id="adminConfirmPassword" type="password" name="dbPassword" class="form-control" placeholder="Gentag password"> <input id="adminConfirmPassword" type="password" name="AdminPassword" class="form-control" placeholder="Gentag password">
</p> </p>
</div> </div>
@ -105,7 +105,7 @@
<a type="button" style="float:right;" id="nextBtn" onclick="nextPrev(1)"> <a type="button" style="float:right;" id="nextBtn" onclick="nextPrev(1)">
<i class="fas fa-arrow-right"></i> <i class="fas fa-arrow-right"></i>
</a> </a>
<input id="submitBtn" type="submit" style="float:right;" name="regGroup" value="Opret Siden" onclick="nextPrev(1)"> <input id="submitBtn" type="submit" style="float:right;" name="dbSetup" value="Opret Siden" onclick="nextPrev(1)">
</div> </div>
</div> </div>

View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="da-DK">
<head> <head>
<!-- Default page settings --> <!-- Default page settings -->
@ -19,7 +19,6 @@
<!-- Header scripts --> <!-- Header scripts -->
<script src="https://kit.fontawesome.com/57b6c8b971.js" crossorigin="anonymous"></script> <script src="https://kit.fontawesome.com/57b6c8b971.js" crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
<script src="Javascript/swipe.js"></script>
<script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.6.0/dist/umd/popper.min.js" integrity="sha384-KsvD1yqQ1/1+IA7gi3P0tyJcT3vR+NdBTt13hSJ2lnve8agRGXTTyNaBYmCR/Nwi" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.6.0/dist/umd/popper.min.js" integrity="sha384-KsvD1yqQ1/1+IA7gi3P0tyJcT3vR+NdBTt13hSJ2lnve8agRGXTTyNaBYmCR/Nwi" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/js/bootstrap.min.js" integrity="sha384-nsg8ua9HAw1y0W1btsyWgBklPnCUAFLuTMS2G72MMONqmOymq585AcH49TLBQObG" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/js/bootstrap.min.js" integrity="sha384-nsg8ua9HAw1y0W1btsyWgBklPnCUAFLuTMS2G72MMONqmOymq585AcH49TLBQObG" crossorigin="anonymous"></script>
@ -73,23 +72,27 @@
</ul> </ul>
</div> </div>
</li> </li>
<li class="nav-item">
<a class="nav-link NavLink" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" href="#admin">
Administration
</a>
</li>
<li class="nav-item"> <li class="nav-item">
<a type="button" class="nav-link NavLink" data-bs-toggle="modal" data-bs-target="#RulesModal"> <a type="button" class="nav-link NavLink" data-bs-toggle="modal" data-bs-target="#RulesModal">
Regler Regler
</a> </a>
</li> </li>
</ul> </ul>
<a id="NavUser" type="button" class="nav-link" style="display: none; cursor: default; color: rgba(255, 255, 255, .55);">
</a>
<a id="AdminPanel" type="button" class="nav-link LoginButton" href="/Frontend/Html/AdminPage.html" style="display: none;">
Admin Panel
</a>
<a id="NavLogout" type="button" class="nav-link LoginButton" style="display: none;">
Logout
</a>
<a id="NavLogin" type="button" class="nav-link LoginButton" data-bs-toggle="modal" data-bs-target="#LoginModal" style="display: block;"> <a id="NavLogin" type="button" class="nav-link LoginButton" data-bs-toggle="modal" data-bs-target="#LoginModal" style="display: block;">
Login Login
</a> </a>
<a id="NavUser" type="button" class="nav-link LoginButton" style="display: none;">
</a>
</div> </div>
</div> </div>
</nav> </nav>
@ -112,6 +115,11 @@
<i class="fas fa-user-plus"></i> Registrer <i class="fas fa-user-plus"></i> Registrer
</button> </button>
</li> </li>
<li class="nav-item" role="presentation">
<button class="nav-link" id="AdminLoginTab" data-bs-toggle="tab" data-bs-target="#AdminLogin" type="button" role="tab" aria-controls="AdminLogin" aria-selected="false">
<i class="fas fa-user-secret"></i> Admin Login
</button>
</li>
<li style="width: 32px; height: 42px; right: 0; position: absolute;"> <li style="width: 32px; height: 42px; right: 0; position: absolute;">
<button style="padding: 25% !important; border: none; background-color: transparent;" type="button" data-bs-dismiss="modal" aria-label="Close"> <button style="padding: 25% !important; border: none; background-color: transparent;" type="button" data-bs-dismiss="modal" aria-label="Close">
<i class="fas fa-times CloseIcon"></i> <i class="fas fa-times CloseIcon"></i>
@ -129,6 +137,11 @@
<input id="loginUsername" type="text" name="groupName" placeholder="Gruppe navn"> <input id="loginUsername" type="text" name="groupName" placeholder="Gruppe navn">
<input id="loginPassword" type="password" name="password" placeholder="Password"> <input id="loginPassword" type="password" name="password" placeholder="Password">
<p id="ErrorText" style="text-align: center; color: red; display: none;">
Wrong Username Or Password!
</p>
<input id="LoginBtn" type="submit" name="login" value="Login"> <input id="LoginBtn" type="submit" name="login" value="Login">
</form> </form>
</div> </div>
@ -185,6 +198,22 @@
<input id="RegisterBtn" type="submit" name="regGroup" value="Registrer"> <input id="RegisterBtn" type="submit" name="regGroup" value="Registrer">
</form> </form>
</div> </div>
<div class="tab-pane fade" id="AdminLogin" role="tabpanel" aria-labelledby="AdminLoginTab">
<form id="AdminLoginForm" method="POST" class="box">
<h1 class="text-muted">
Admin Login
</h1>
<input id="adminUsername" type="text" name="userName" placeholder="Brugernavn">
<input id="adminPassword" type="password" name="password" placeholder="Password">
<p id="AdminErrorText" style="text-align: center; color: red; display: none;">
Wrong Username Or Password!
</p>
<input id="AdminLoginBtn" type="submit" name="aLogin" value="Login">
</form>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -366,6 +395,7 @@
<!-- Information slut --> <!-- Information slut -->
<hr class="GradientDivider" /> <hr class="GradientDivider" />
<!--Kalender--> <!--Kalender-->
<section id="events"> <section id="events">
<h3>Events</h3> <h3>Events</h3>
@ -651,7 +681,6 @@
<script src="Javascript/minibar.min.js"></script> <script src="Javascript/minibar.min.js"></script>
<script src="Javascript/HeaderFunctionality.js"></script> <script src="Javascript/HeaderFunctionality.js"></script>
<script src="Javascript/LoginFunctionality.js"></script> <script src="Javascript/LoginFunctionality.js"></script>
<script src="Javascript/Lodtrækning.js"></script>
<!-- Body scripts end --> <!-- Body scripts end -->
</body> </body>

View File

@ -1,17 +1,7 @@
// Admin add event $(document).ready(function() {
$("#indsend").click(function () { $("#testTime").click(function () {
let startDate = $("#startDate").val(); let startTime = $("#startTime").val();
let endDate = $("#endDate").val(); let endTime = $("#endTime").val();
let startTime = $("#startTime").val(); console.log(`startTime: ${startTime} \n endTime: ${endTime}`);
let endTime = $("#endTime").val(); });
console.log(`startDate ${startDate} \n });
endDate ${endDate} \n
startTime ${startTime} \n
endTime ${endTime}`);
})
function addEvent() {
}

View File

@ -0,0 +1,32 @@
$(document).ready(function() {
$('#createGameJam').submit(function(e) {
let URL = 'https://ptsv2.com/t/tzztn-1616799712/post';
let form = $('#createGameJam')[0];
let formData = new FormData(form);
let id = $('#indsend').attr('name');
let value = $('#indsend').val();
let startTime = $("#startTime").text();
let endTime = $("#endTime").text();
formData.append(id, value);
formData.set('startTime', startTime);
formData.append('endTime', endTime);
axios.post(URL, formData, {
header: 'multipart/form-data'
}).then(res => {
if (res.status === 200)
{
console.log('New Game Jam Created!');
}
}).catch(error => {
console.log(error.response);
});
e.preventDefault();
});
});

View File

@ -1,19 +1,28 @@
$(document).ready(function () { $(document).ready(function () {
// Register Start // Register Start
let selectedGameJam; let selectedGameJam;
let MemberSize = $('#NUDDisplay').text(); let isAdminLoggedIn = false;
let displayValue = 0; let displayValue = 0;
let arr = [ let arr = [
{"id": "-1", "Gamejam": "Vælg aktivt GameJam"} {"id": "-1", "Gamejam": "Vælg aktivt GameJam"}
]; ];
if (getCookie('userName') != null)
{
isAdminLoggedIn = true;
SwitchNavInfo(true, true);
}
else if (getCookie('groupName') != null)
{
isAdminLoggedIn = false;
SwitchNavInfo(true);
}
// Populate select with options from the database // Populate select with options from the database
axios.get('/Backend/Controllers/GameJam/GetGameJam.php') axios.get('/Backend/Controllers/GameJam/GetGameJam.php')
.then(function(res) { .then(function(res) {
let resArr = res.data; let resArr = res.data;
//console.log(res.data.data);
for(let i = 0; i < res.data.data.length; i++) for(let i = 0; i < res.data.data.length; i++)
{ {
arr.push({ arr.push({
@ -33,8 +42,8 @@ $(document).ready(function () {
} }
}); });
}) })
.catch(function(err) { .catch(function(error) {
console.log(err); console.log(error.response);
}); });
// Remove invalidInput if selected option has been changed // Remove invalidInput if selected option has been changed
@ -154,9 +163,12 @@ $(document).ready(function () {
axios.post(URL, formData, { axios.post(URL, formData, {
header: 'multipart/form-data' header: 'multipart/form-data'
}).then(res => { }).then(res => {
console.log(res); if (res.status === 201)
{
SwitchNavInfo(true);
}
}).catch(error => { }).catch(error => {
console.log(error); console.log(error.response);
}); });
e.preventDefault(); e.preventDefault();
@ -211,19 +223,141 @@ $(document).ready(function () {
formData.append(id, value); formData.append(id, value);
axios.post(URL, formData, {
header: 'multipart/form-data'
}).then(res => {
if (res.status === 200)
{
isAdminLoggedIn = false;
SwitchNavInfo(true);
}
}).catch(error => {
if (error.response.status === 401)
{
$('#loginUsername').css({'border-color':'red'});
$('#loginPassword').css({'border-color':'red'});
$('#ErrorText').css({'display':'block'});
}
else
{
console.log(error.response);
}
});
e.preventDefault();
});
$('#AdminLoginForm').submit(function(e) {
let URL = "/Backend/Controllers/Admin/AdminLogin.php";
let form = $('#AdminLoginForm')[0];
let formData = new FormData(form);
let id = $('#AdminLoginBtn').attr('name');
let value = $('#AdminLoginBtn').val();
formData.append(id, value);
axios.post(URL, formData, { axios.post(URL, formData, {
header: 'multipart/form-data' header: 'multipart/form-data'
}).then(res => { }).then(res => {
if (res.status === 200) if (res.status === 200)
{ {
console.log('Logged in'); isAdminLoggedIn = true;
SwitchNavInfo(true, true);
} }
}).catch(error => { }).catch(error => {
console.log(error); if (error.response.status === 401)
{
$('#adminUsername').css({'border-color':'red'});
$('#adminPassword').css({'border-color':'red'});
$('#AdminErrorText').css({'display':'block'});
}
else
{
console.log(error.response);
}
}); });
e.preventDefault(); e.preventDefault();
}) });
function SwitchNavInfo(isLoggedIn, isAdmin) {
if (isLoggedIn)
{
$('#NavUser').css({'display':'block'});
$('#NavUser').text(`Welcome, ${isAdmin ? getCookie('userName') : getCookie('groupName')}!`);
$('#NavLogin').css({'display':'none'});
$('#NavLogout').css({'display':'block'});
$('#LoginModal').modal('hide');
}
else
{
$('#NavUser').css({'display':'none'});
$('#NavUser').text(``);
$('#NavLogin').css({'display':'block'});
$('#NavLogout').css({'display':'none'});
}
if (isAdmin === undefined)
{
return
}
else
{
if (isAdmin)
{
if (isLoggedIn)
{
$('#AdminPanel').css({'display':'block'});
console.log('Logged In As Admin!');
}
else
{
$('#AdminPanel').css({'display':'none'});
console.log('Logged Out As Admin!');
}
}
}
}
// Login end // Login end
// Logout start
$('#NavLogout').click(function() {
axios.get('/Backend/Controllers/Group/Logout.php').then(res => {
if (res.status == 200)
{
SwitchNavInfo(false, isAdminLoggedIn);
isAdminLoggedIn = false;
}
}).catch(error => {
console.log(error.response);
});
});
// Logout end
function getCookie(name) {
// Split cookie string and get all individual name=value pairs in an array
var cookieArr = document.cookie.split(";");
// Loop through the array elements
for(var i = 0; i < cookieArr.length; i++) {
var cookiePair = cookieArr[i].split("=");
/* Removing whitespace at the beginning of the cookie name
and compare it with the given string */
if(name == cookiePair[0].trim()) {
// Decode the cookie value and return
return decodeURIComponent(cookiePair[1]);
}
}
// Return null if not found
return null;
}
}); });

View File

@ -134,45 +134,25 @@ $('#adminConfirmPassword').on('change keyup paste', function() {
}); });
$('#regForm').submit(function(e) { $('#regForm').submit(function(e) {
e.preventDefault();
$('#DBType').val($('#dbSelect option:selected').val()); $('#DBType').val($('#dbSelect option:selected').val());
let form = $('#regForm')[0]; let form = $('#regForm')[0];
console.log(form);
let formData = new FormData(form); let formData = new FormData(form);
console.log(formData);
let id = $('#submitBtn').attr('name'); let id = $('#submitBtn').attr('name');
let value = $('#submitBtn').val(); let value = $('#submitBtn').val();
formData.append(id, value); formData.append(id, value);
console.log(form); axios.post('https://ptsv2.com/t/tzztn-1616799712/post', formData, {
console.log(formData); header: 'multipart/form-data'
}).then(res => {
console.log(res)
$.ajax({ }).catch(error => {
url : 'https://ptsv2.com/t/tzztn-1616799712/post', console.log(error.response);
type: 'POST',
data : formData,
processData: false,
contentType: false,
crossDomain: true,
success:function(data, textStatus, jqXHR) {
console.log(textStatus);
console.log(data)
},
error: function(jqXHR, textStatus, errorThrown) {
console.log(textStatus);
console.log(jqXHR);
console.log(errorThrown);
}
}); });
// axios.post(', formData, {
// header: 'multipart/form-data'
// }).then(res => {
// console.log(`data: ${res}`)
// }).catch(error => {
// console.log(error);
// });
e.preventDefault(); e.preventDefault();
}); });

View File

@ -22,6 +22,9 @@ body{
.HeaderTitle { .HeaderTitle {
text-align: center; text-align: center;
display: inline-block;
font-weight: bold;
margin-bottom: 0;
} }
.HeaderLeft { .HeaderLeft {
@ -29,15 +32,14 @@ body{
} }
/*Create game jam*/ /*Create game jam*/
#createGameJam{ #createGameJam{
justify-content: center; justify-content: center;
display: grid; display: grid;
} }
#createGameJam input{ #createGameJam input{
display: block; display: block;
position: center; position: center;
} }
#startTime { #startTime {
@ -72,7 +74,8 @@ body{
filter: invert(90%); filter: invert(90%);
} }
#nameOfGameJam { #nameOfGameJam,
#keyWord {
background-color: rgb(18, 18, 18); background-color: rgb(18, 18, 18);
color: rgba(255, 255, 255, .55); color: rgba(255, 255, 255, .55);
border-radius: 15px; border-radius: 15px;

View File

@ -417,9 +417,11 @@ a:hover {
.box #username, .box #username,
.box #loginUsername, .box #loginUsername,
.box #adminUsername,
.box #pass1, .box #pass1,
.box #pass2, .box #pass2,
.box #loginPassword, .box #loginPassword,
.box #adminPassword,
.box #GameJamSelect { .box #GameJamSelect {
border: 0; border: 0;
background: none; background: none;
@ -515,17 +517,21 @@ a:hover {
.box #username:focus, .box #username:focus,
.box #loginUsername:focus, .box #loginUsername:focus,
.box #adminUsername:focus,
.box #pass1:focus, .box #pass1:focus,
.box #pass2:focus, .box #pass2:focus,
.box #loginPassword:focus { .box #loginPassword:focus,
.box #adminPassword:focus {
width: 300px; width: 300px;
} }
.box #username:hover, .box #username:hover,
.box #loginUsername:hover, .box #loginUsername:hover,
.box #adminUsername:hover,
.box #pass1:hover, .box #pass1:hover,
.box #pass2:hover, .box #pass2:hover,
.box #loginPassword:hover { .box #loginPassword:hover,
.box #adminPassword:hover {
color: rgba(255, 255, 255, .75); color: rgba(255, 255, 255, .75);
} }

80
composer.lock generated
View File

@ -103,16 +103,16 @@
}, },
{ {
"name": "illuminate/collections", "name": "illuminate/collections",
"version": "v8.34.0", "version": "v8.36.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/collections.git", "url": "https://github.com/illuminate/collections.git",
"reference": "e18d6e4cf03dd597bc3ecd86fefc2023d0c7a5e8" "reference": "591e31015a8b0731708c54411cb52d50a00b2bc3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/collections/zipball/e18d6e4cf03dd597bc3ecd86fefc2023d0c7a5e8", "url": "https://api.github.com/repos/illuminate/collections/zipball/591e31015a8b0731708c54411cb52d50a00b2bc3",
"reference": "e18d6e4cf03dd597bc3ecd86fefc2023d0c7a5e8", "reference": "591e31015a8b0731708c54411cb52d50a00b2bc3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -153,11 +153,11 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2021-03-19T00:05:33+00:00" "time": "2021-04-01T13:26:52+00:00"
}, },
{ {
"name": "illuminate/container", "name": "illuminate/container",
"version": "v8.34.0", "version": "v8.36.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/container.git", "url": "https://github.com/illuminate/container.git",
@ -208,16 +208,16 @@
}, },
{ {
"name": "illuminate/contracts", "name": "illuminate/contracts",
"version": "v8.34.0", "version": "v8.36.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/contracts.git", "url": "https://github.com/illuminate/contracts.git",
"reference": "121cea1d8b8772bc7fee99c71ecf0f57c1d77b3b" "reference": "5764f703ea8f74ced163125d810951cd5ef2b7e1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/121cea1d8b8772bc7fee99c71ecf0f57c1d77b3b", "url": "https://api.github.com/repos/illuminate/contracts/zipball/5764f703ea8f74ced163125d810951cd5ef2b7e1",
"reference": "121cea1d8b8772bc7fee99c71ecf0f57c1d77b3b", "reference": "5764f703ea8f74ced163125d810951cd5ef2b7e1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -252,20 +252,20 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2021-03-12T14:45:30+00:00" "time": "2021-04-01T13:09:31+00:00"
}, },
{ {
"name": "illuminate/database", "name": "illuminate/database",
"version": "v8.34.0", "version": "v8.36.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/database.git", "url": "https://github.com/illuminate/database.git",
"reference": "74a165fd07b36cc0ea3558fa391b762867af87e8" "reference": "09a2d38e27f930a5d9b7ef3514b650a3dc4cdd55"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/database/zipball/74a165fd07b36cc0ea3558fa391b762867af87e8", "url": "https://api.github.com/repos/illuminate/database/zipball/09a2d38e27f930a5d9b7ef3514b650a3dc4cdd55",
"reference": "74a165fd07b36cc0ea3558fa391b762867af87e8", "reference": "09a2d38e27f930a5d9b7ef3514b650a3dc4cdd55",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -320,11 +320,11 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2021-03-23T15:12:51+00:00" "time": "2021-04-06T13:40:22+00:00"
}, },
{ {
"name": "illuminate/macroable", "name": "illuminate/macroable",
"version": "v8.34.0", "version": "v8.36.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/macroable.git", "url": "https://github.com/illuminate/macroable.git",
@ -370,16 +370,16 @@
}, },
{ {
"name": "illuminate/support", "name": "illuminate/support",
"version": "v8.34.0", "version": "v8.36.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/support.git", "url": "https://github.com/illuminate/support.git",
"reference": "b7b27e758b68aad44558c62e7374328835895386" "reference": "26aa01648f348df7b7988ee911cdf98bcaae8ea1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/b7b27e758b68aad44558c62e7374328835895386", "url": "https://api.github.com/repos/illuminate/support/zipball/26aa01648f348df7b7988ee911cdf98bcaae8ea1",
"reference": "b7b27e758b68aad44558c62e7374328835895386", "reference": "26aa01648f348df7b7988ee911cdf98bcaae8ea1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -434,7 +434,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2021-03-21T13:37:37+00:00" "time": "2021-04-06T13:05:53+00:00"
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
@ -630,16 +630,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v5.2.5", "version": "v5.2.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "938ebbadae1b0a9c9d1ec313f87f9708609f1b79" "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/938ebbadae1b0a9c9d1ec313f87f9708609f1b79", "url": "https://api.github.com/repos/symfony/console/zipball/35f039df40a3b335ebf310f244cb242b3a83ac8d",
"reference": "938ebbadae1b0a9c9d1ec313f87f9708609f1b79", "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -707,7 +707,7 @@
"terminal" "terminal"
], ],
"support": { "support": {
"source": "https://github.com/symfony/console/tree/v5.2.5" "source": "https://github.com/symfony/console/tree/v5.2.6"
}, },
"funding": [ "funding": [
{ {
@ -723,7 +723,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-06T13:42:15+00:00" "time": "2021-03-28T09:42:18+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
@ -1292,16 +1292,16 @@
}, },
{ {
"name": "symfony/string", "name": "symfony/string",
"version": "v5.2.4", "version": "v5.2.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/string.git", "url": "https://github.com/symfony/string.git",
"reference": "4e78d7d47061fa183639927ec40d607973699609" "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/4e78d7d47061fa183639927ec40d607973699609", "url": "https://api.github.com/repos/symfony/string/zipball/ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
"reference": "4e78d7d47061fa183639927ec40d607973699609", "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1355,7 +1355,7 @@
"utf8" "utf8"
], ],
"support": { "support": {
"source": "https://github.com/symfony/string/tree/v5.2.4" "source": "https://github.com/symfony/string/tree/v5.2.6"
}, },
"funding": [ "funding": [
{ {
@ -1371,20 +1371,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-02-16T10:20:28+00:00" "time": "2021-03-17T17:12:15+00:00"
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v5.2.5", "version": "v5.2.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "0947ab1e3aabd22a6bef393874b2555d2bb976da" "reference": "2cc7f45d96db9adfcf89adf4401d9dfed509f4e1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/0947ab1e3aabd22a6bef393874b2555d2bb976da", "url": "https://api.github.com/repos/symfony/translation/zipball/2cc7f45d96db9adfcf89adf4401d9dfed509f4e1",
"reference": "0947ab1e3aabd22a6bef393874b2555d2bb976da", "reference": "2cc7f45d96db9adfcf89adf4401d9dfed509f4e1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1448,7 +1448,7 @@
"description": "Provides tools to internationalize your application", "description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/translation/tree/v5.2.5" "source": "https://github.com/symfony/translation/tree/v5.2.6"
}, },
"funding": [ "funding": [
{ {
@ -1464,7 +1464,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-06T07:59:01+00:00" "time": "2021-03-23T19:33:48+00:00"
}, },
{ {
"name": "symfony/translation-contracts", "name": "symfony/translation-contracts",

View File