update
This commit is contained in:
IdaTiegel99
parent
47b0e2c33d
commit
7dd06804eb
|
|
@ -1,4 +1,4 @@
|
|||
<!DOCTYPE html>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
|
|
@ -27,6 +27,7 @@
|
|||
</head>
|
||||
|
||||
<body>
|
||||
<<<<<<< Updated upstream
|
||||
|
||||
<div class="btn-group" role="group" aria-label="Basic example">
|
||||
<button type="button" class="btn btn-primary">Left</button>
|
||||
|
|
@ -41,11 +42,54 @@
|
|||
<h6>
|
||||
Admin panel
|
||||
</h6>
|
||||
=======
|
||||
<div class="HeaderPanel">
|
||||
<div class="HeaderLeft">
|
||||
<a href="../Index.html">
|
||||
<i class="fas fa-arrow-left"></i>
|
||||
</a>
|
||||
<h6>
|
||||
Admin panel
|
||||
</h6>
|
||||
</div>
|
||||
>>>>>>> Stashed changes
|
||||
</div>
|
||||
|
||||
<!--Opret game jam-->
|
||||
<br />
|
||||
<br />
|
||||
<h3>Administration</h3>
|
||||
<h5>Opret Game Jam</h5>
|
||||
<div>
|
||||
<form id="createGameJam">
|
||||
<label for="nameOfGameJam">Indtast navn på Game Jam:</label>
|
||||
<input type="text" name="nameOfGameJam" id="nameOfGameJam">
|
||||
<br />
|
||||
<label for="startDate">Start dato:</label>
|
||||
<input type="date" name="startDate" id="startDate">
|
||||
<br />
|
||||
<label for="endDate">Slut dato:</label>
|
||||
<input type="date" name="endDate" id="endDate">
|
||||
<br />
|
||||
<label for="startTime">Start tidspunkt:</label>
|
||||
<input type="time" name="startTime" id="startTime">
|
||||
<br />
|
||||
<label for="endDate">Slut tidspunkt:</label>
|
||||
<input type="time" name="endTime" id="endTime">
|
||||
<br />
|
||||
<p>Indsæt en beskrivelse af Gam jammet</p>
|
||||
<div class="form-floating">
|
||||
<textarea class="form-control" name="description" id="description" placeholder="Leave a comment here" id="floatingTextarea2" style="height: 100px"></textarea>
|
||||
<label for="floatingTextarea2">Beskrivelse</label>
|
||||
</div>
|
||||
<button type="button" name="indsend" id="indsend">Indsend</button>
|
||||
</form>
|
||||
</div>
|
||||
<!--Opret game jam slut-->
|
||||
|
||||
<!-- Body scripts -->
|
||||
<script src="../Javascript/minibar.min.js"></script>
|
||||
<script src="../Javascript/AddEvent.js"></script>
|
||||
<!-- Body scripts end -->
|
||||
</body>
|
||||
|
||||
|
|
|
|||
|
|
@ -17,13 +17,11 @@
|
|||
<!-- CSS end -->
|
||||
|
||||
<!-- Header scripts -->
|
||||
<script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></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="Javascript/swipe.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/bootstrap@5.0.0-beta2/dist/js/bootstrap.min.js" integrity="sha384-nsg8ua9HAw1y0W1btsyWgBklPnCUAFLuTMS2G72MMONqmOymq585AcH49TLBQObG" crossorigin="anonymous"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
|
||||
<!-- Header scripts end -->
|
||||
</head>
|
||||
|
||||
|
|
@ -84,6 +82,7 @@
|
|||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
<<<<<<< Updated upstream
|
||||
<a id="AdminPanel" type="button" class="nav-link RightNavButton" style="display: none;">
|
||||
Admin Panel
|
||||
</a>
|
||||
|
|
@ -94,6 +93,11 @@
|
|||
<a id="UserLogout" type="button" class="nav-link RightNavButton" style="display: none;">
|
||||
Logout
|
||||
</a>
|
||||
=======
|
||||
<a type="button" class="nav-link LoginButton" data-bs-toggle="modal" data-bs-target="#LoginModal">
|
||||
Login
|
||||
</a>
|
||||
>>>>>>> Stashed changes
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
|
@ -126,69 +130,62 @@
|
|||
<div class="modal-body">
|
||||
<div class="tab-content" id="ModalLoginTabContent">
|
||||
<div class="tab-pane fade show active" id="Login" role="tabpanel" aria-labelledby="LoginTab">
|
||||
<form id="LoginForm" method="POST" class="box">
|
||||
<form class="box">
|
||||
<h1 class="text-muted">
|
||||
Team Login
|
||||
</h1>
|
||||
<<<<<<< Updated upstream
|
||||
|
||||
<input id="loginUsername" type="text" name="groupName" placeholder="Gruppe navn">
|
||||
<input id="loginPassword" type="password" name="password" placeholder="Password">
|
||||
|
||||
<input id="LoginBtn" type="submit" name="login" value="Login">
|
||||
<input id="AdminLoginBtn" type="submit" name="aLogin" value="Login som admin">
|
||||
=======
|
||||
<input type="text" name="" placeholder="Gruppe navn">
|
||||
<input type="password" name="" placeholder="Password">
|
||||
<input type="submit" name="" value="Login" href="#">
|
||||
>>>>>>> Stashed changes
|
||||
</form>
|
||||
</div>
|
||||
<div class="tab-pane fade" id="Registrer" role="tabpanel" aria-labelledby="RegistrerTab">
|
||||
<form id="RegisterForm" method="POST" class="box">
|
||||
<form class="box">
|
||||
<h1 class="text-muted">
|
||||
Team Registrering
|
||||
</h1>
|
||||
<input id="username" type="text" name="groupName" placeholder="Unikt gruppe navn">
|
||||
<input id="pass1" type="password" class="" placeholder="Password">
|
||||
<input id="pass2" type="password" class="" name="password" placeholder="Gentag Password">
|
||||
<select id="GameJamSelect" class="form-select" aria-label="Default select example">
|
||||
|
||||
</select>
|
||||
|
||||
<input type="hidden" name="groupAmount" id="groupAmount">
|
||||
<input type="hidden" name="gameJamId" id="gameJamId">
|
||||
<div id="NUD" class="btn-group" role="group" aria-label="Basic example">
|
||||
<button id="NUDMinus" type="button" class="btn btn-primary">
|
||||
<i class="fas fa-minus"></i>
|
||||
</button>
|
||||
<button disabled id="NUDDisplay" type="button" class="btn btn-primary">
|
||||
Antal medlemmer
|
||||
</button>
|
||||
<button id="NUDPlus" type="button" class="btn btn-primary">
|
||||
<i class="fas fa-plus"></i>
|
||||
</button>
|
||||
<input id="username" type="text" name="" placeholder="Gruppe navn">
|
||||
<input id="pass1" type="password" class="" name="" placeholder="Password">
|
||||
<input id="pass2" type="password" name="" placeholder="Gentag Password">
|
||||
<div class="form-check" style="display: table; margin: auto;">
|
||||
<input class="form-check-input" type="checkbox" value="" id="flexCheckDefault">
|
||||
<label class="form-check-label" for="flexCheckDefault">
|
||||
Jeg accepterer Vilkår og betingelser
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div id="pass_info">
|
||||
<h5>Passsword skal opfylde følgende krav :</h5>
|
||||
<ul>
|
||||
<li id="letter" class="invalid">
|
||||
Mindst 1 <strong>lille bogstave</strong>
|
||||
Mindst 1 <strong>bogstave
|
||||
</strong>
|
||||
</li>
|
||||
<li id="capital" class="invalid">
|
||||
Mindst 1 <strong>stort bogstave</strong>
|
||||
Mindst 1 <strong>stort bogstave
|
||||
</strong>
|
||||
</li>
|
||||
<li id="number" class="invalid">
|
||||
Mindst 1 <strong>tal</strong>
|
||||
Mindst 1 <strong>tal
|
||||
</strong>
|
||||
</li>
|
||||
<li id="special" class="invalid">
|
||||
Mindst 1 <strong>special tegn</strong>
|
||||
</li>
|
||||
<li id="min-length" class="invalid">
|
||||
Mindst <strong>8 tegn langt</strong>
|
||||
</li>
|
||||
<li id="max-length" class="invalid">
|
||||
Maksimalt <strong>255 tegn langt</strong>
|
||||
<li id="length" class="invalid">
|
||||
Mindst <strong>8 tegn langt
|
||||
</strong>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<input id="RegisterBtn" type="submit" name="regGroup" value="Registrer">
|
||||
<input type="submit" name="" value="Registrer" href="#">
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -395,10 +392,9 @@
|
|||
<div>Lør</div>
|
||||
<div>Søn</div>
|
||||
</div>
|
||||
<div id="days" class="days"></div>
|
||||
<div class="days"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--Pop up-->
|
||||
<div class="modal" tabindex="-1" id="popup">
|
||||
<div class="modal-dialog modal-dialog-centered">
|
||||
|
|
@ -626,18 +622,15 @@
|
|||
<!-- Lodtrækning -->
|
||||
<section id="lod">
|
||||
<h3>Lodtrækning</h3>
|
||||
<p></p>
|
||||
|
||||
<div id="chart"></div>
|
||||
<div id="question"><h1></h1></div>
|
||||
|
||||
</section>
|
||||
<!-- Lodtrækning slut -->
|
||||
|
||||
<hr class="GradientDivider" />
|
||||
|
||||
<!-- Administation -->
|
||||
<section id="admin">
|
||||
<h3>Administration</h3>
|
||||
</section>
|
||||
<!-- Administation slut -->
|
||||
|
||||
<a href="javascript:" id="return-to-top">
|
||||
<i class="fas fa-chevron-up"></i>
|
||||
</a>
|
||||
|
|
@ -657,7 +650,7 @@
|
|||
<script src="Javascript/Kalender.js"></script>
|
||||
<script src="Javascript/minibar.min.js"></script>
|
||||
<script src="Javascript/HeaderFunctionality.js"></script>
|
||||
<script src="Javascript/LoginFunctionality.js"></script>
|
||||
<script src="Javascript/Lodtrækning.js"></script>
|
||||
<!-- Body scripts end -->
|
||||
</body>
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
// Admin add event
|
||||
$("#indsend").click(function () {
|
||||
let startDate = $("#startDate").val();
|
||||
let endDate = $("#endDate").val();
|
||||
let startTime = $("#startTime").val();
|
||||
let endTime = $("#endTime").val();
|
||||
console.log(`startDate ${startDate} \n
|
||||
endDate ${endDate} \n
|
||||
startTime ${startTime} \n
|
||||
endTime ${endTime}`);
|
||||
})
|
||||
|
||||
function addEvent() {
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -66,7 +66,7 @@ const renderCalendar = () => {
|
|||
days += `<div class="today" onClick="clickdate()">${i}</div>`;
|
||||
|
||||
} else {
|
||||
days += `<div><span id="testEvent2"onClick="clickdate()"></span>${i}</div>`;
|
||||
days += `<div onClick="clickdate()">${i}</div>`;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -74,14 +74,6 @@ const renderCalendar = () => {
|
|||
days += `<div class="next-date" onClick="clickdate()">${j}</div>`;
|
||||
monthDays.innerHTML = days;
|
||||
}
|
||||
// 2021, 3, 28, 11, 30
|
||||
$('#test').click(function() {
|
||||
let newDate = new Date();
|
||||
|
||||
newDate.setDate(28);
|
||||
|
||||
console.log(newDate);
|
||||
});
|
||||
};
|
||||
|
||||
document.querySelector(".prev").addEventListener("click", () => {
|
||||
|
|
@ -113,4 +105,4 @@ var myModal = document.getElementById('popup')
|
|||
|
||||
myModal.addEventListener('shown.bs.modal', function() {
|
||||
myInput.focus()
|
||||
})
|
||||
})
|
||||
|
|
@ -1,3 +1,6 @@
|
|||
body{
|
||||
text-align: center;
|
||||
}
|
||||
.HeaderPanel {
|
||||
position: fixed;
|
||||
overflow: hidden;
|
||||
|
|
@ -23,4 +26,74 @@
|
|||
|
||||
.HeaderLeft {
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
|
||||
/*Create game jam*/
|
||||
|
||||
#createGameJam{
|
||||
justify-content: center;
|
||||
display: grid;
|
||||
}
|
||||
#createGameJam input{
|
||||
display: block;
|
||||
position: center;
|
||||
|
||||
}
|
||||
|
||||
#startTime {
|
||||
border-radius: 15px;
|
||||
color: #474747;
|
||||
background-color: rgba(255, 255, 255, .55);
|
||||
border: double;
|
||||
filter: invert(90%);
|
||||
}
|
||||
|
||||
#endTime {
|
||||
border-radius: 15px;
|
||||
color: #474747;
|
||||
background-color: rgba(255, 255, 255, .55);
|
||||
border: double;
|
||||
filter: invert(90%);
|
||||
}
|
||||
|
||||
#startDate {
|
||||
border-radius: 15px;
|
||||
color: #474747;
|
||||
background-color: rgba(255, 255, 255, .55);
|
||||
border: double;
|
||||
filter: invert(90%);
|
||||
}
|
||||
|
||||
#endDate {
|
||||
border-radius: 15px;
|
||||
color: #474747;
|
||||
background-color: rgba(255, 255, 255, .55);
|
||||
border: double;
|
||||
filter: invert(90%);
|
||||
}
|
||||
|
||||
#nameOfGameJam {
|
||||
background-color: rgb(18, 18, 18);
|
||||
color: rgba(255, 255, 255, .55);
|
||||
border-radius: 15px;
|
||||
border: double;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#description {
|
||||
background-color: rgb(18, 18, 18);
|
||||
color: rgba(255, 255, 255, .55);
|
||||
border-radius: 15px;
|
||||
border: double;
|
||||
width:400px;
|
||||
height:250px;
|
||||
}
|
||||
|
||||
#indsend {
|
||||
border-radius: 15px;
|
||||
color: rgba(255, 255, 255, .55);
|
||||
background-color: rgb(18, 18, 18);
|
||||
border: double;
|
||||
}
|
||||
/*Create Game Jam end*/
|
||||
|
|
@ -338,7 +338,6 @@ a:hover {
|
|||
}
|
||||
|
||||
.navbar-brand {
|
||||
margin-left: 1rem;
|
||||
padding-top: 0;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
|
@ -360,12 +359,8 @@ a:hover {
|
|||
background-color: rgb(18, 18, 18);
|
||||
}
|
||||
|
||||
.box #username,
|
||||
.box #loginUsername,
|
||||
.box #pass1,
|
||||
.box #pass2,
|
||||
.box #loginPassword,
|
||||
.box #GameJamSelect {
|
||||
.box input[type="text"],
|
||||
.box input[type="password"] {
|
||||
border: 0;
|
||||
background: none;
|
||||
display: block;
|
||||
|
|
@ -380,73 +375,6 @@ a:hover {
|
|||
transition: 0.25s;
|
||||
}
|
||||
|
||||
.box .btn-group, .btn-group-vertical {
|
||||
position: relative;
|
||||
display: block;
|
||||
text-align: center;
|
||||
width: 250px;
|
||||
margin: 20px auto;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.box #NUDMinus {
|
||||
color: rgba(255, 255, 255, .55);
|
||||
background-color: transparent;
|
||||
border: none;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.box #NUDMinus:focus {
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.box #NUDMinus:focus-visible {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.box #NUDDisplay {
|
||||
color: rgba(255, 255, 255, .55);
|
||||
background-color: transparent;
|
||||
border: none;
|
||||
cursor: text;
|
||||
width: 65%;
|
||||
}
|
||||
|
||||
.box #NUDDisplay:focus {
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.box #NUDDisplay:focus-visible {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.box #NUDPlus {
|
||||
color: rgba(255, 255, 255, .55);
|
||||
background-color: transparent;
|
||||
border: none;
|
||||
float: right;
|
||||
}
|
||||
|
||||
.box #NUDPlus:focus {
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.box #NUDPlus:focus-visible {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.box #GameJamSelect:focus {
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.box #GameJamSelect:hover {
|
||||
color: rgba(255, 255, 255, .75);
|
||||
}
|
||||
|
||||
.box #GameJamSelect ul {
|
||||
background-color: red;
|
||||
}
|
||||
|
||||
.text-muted {
|
||||
margin-bottom: 5vh;
|
||||
color: rgba(255, 255, 255, .55) !important;
|
||||
|
|
@ -458,19 +386,14 @@ a:hover {
|
|||
font-weight: 500;
|
||||
}
|
||||
|
||||
.box #username:focus,
|
||||
.box #loginUsername:focus,
|
||||
.box #pass1:focus,
|
||||
.box #pass2:focus,
|
||||
.box #loginPassword:focus {
|
||||
.box input[type="text"]:focus,
|
||||
.box input[type="password"]:focus {
|
||||
width: 300px;
|
||||
|
||||
}
|
||||
|
||||
.box #username:hover,
|
||||
.box #loginUsername:hover,
|
||||
.box #pass1:hover,
|
||||
.box #pass2:hover,
|
||||
.box #loginPassword:hover {
|
||||
.box input[type="text"]:hover,
|
||||
.box input[type="password"]:hover {
|
||||
color: rgba(255, 255, 255, .75);
|
||||
}
|
||||
|
||||
|
|
@ -767,22 +690,7 @@ image_gruppenavn{
|
|||
background-color: #01579b;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.hasEvent {
|
||||
background-color: red;
|
||||
}
|
||||
/*Kalender slut*/
|
||||
/*Event*/
|
||||
#testEvent2 {
|
||||
position: absolute;
|
||||
width: 220px;
|
||||
height: 10px;
|
||||
position: absolute;
|
||||
background: red;
|
||||
border-radius: 10px;
|
||||
display: none;
|
||||
}
|
||||
/*Event slut*/
|
||||
|
||||
#return-to-top {
|
||||
position: fixed;
|
||||
|
|
@ -824,8 +732,4 @@ image_gruppenavn{
|
|||
#return-to-top:hover i {
|
||||
color: rgba(255, 255, 255, .55);;
|
||||
top: 5px;
|
||||
}
|
||||
|
||||
/*Lodtrækning*/
|
||||
|
||||
/*Lodtrækning slut*/
|
||||
}
|
||||
Loading…
Reference in New Issue