Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
RundelhausCode 2021-03-25 14:26:17 +01:00
commit bb10c8577c
3 changed files with 35 additions and 52 deletions

View File

@ -392,9 +392,7 @@
<div id="days" class="days"></div> <div id="days" class="days"></div>
</div> </div>
</div> </div>
<button id="test">
test
</button>
<!--Pop up--> <!--Pop up-->
<div class="modal" tabindex="-1" id="popup"> <div class="modal" tabindex="-1" id="popup">
<div class="modal-dialog modal-dialog-centered"> <div class="modal-dialog modal-dialog-centered">
@ -631,22 +629,6 @@
<!-- Administation --> <!-- Administation -->
<section id="admin"> <section id="admin">
<h3>Administration</h3> <h3>Administration</h3>
<button id="TestCookie">
Click Me
</button>
<form id="createGameJam">
<label for="nameOfGameJam">Indtast navn på Game Jam:</label>
<input type="text" name="nameOfGameJam" id="nameOfGameJam" >
<br />
<input type="date" name="startDate" id="startDate">Start dato
<input type="date" name="endDate" id="endDate">Slut dato
<br />
<input type="time" name="startTime" id="startTime">Start tid
<input type="time" name="endTime" id="endTime">Slut tid
<br />
<input type="text" name="description" id="description"/>
<button type="button" name="indsend" id="indsend">Indsend</button>
</form>
</section> </section>
<!-- Administation slut --> <!-- Administation slut -->

View File

@ -66,7 +66,7 @@ const renderCalendar = () => {
days += `<div class="today" onClick="clickdate()">${i}</div>`; days += `<div class="today" onClick="clickdate()">${i}</div>`;
} else { } else {
days += `<div class="today" ><span id="testEvent2"onClick="clickdate()"></span>${i}</div>`; days += `<div><span id="testEvent2"onClick="clickdate()"></span>${i}</div>`;
} }
} }
@ -114,29 +114,3 @@ var myModal = document.getElementById('popup')
myModal.addEventListener('shown.bs.modal', function() { myModal.addEventListener('shown.bs.modal', function() {
myInput.focus() myInput.focus()
}) })
//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() {
}
//Admin
/*
$(document).ready(function () {
$('#description').keyup(function () {
$(this).attr('size', $(this).val().length)
});
});
*/

View File

@ -808,19 +808,46 @@ image_gruppenavn{
/*Adminside*/ /*Adminside*/
#nameOfGameJam {
#startTime {
border-radius: 10px;
color: #474747;
background-color: rgba(255, 255, 255, .55);
border: double;
filter: invert(90%);
} }
#endTime {
border-radius: 10px;
color: #474747;
background-color: rgba(255, 255, 255, .55);
border: double;
filter: invert(90%);
}
#startDate { #startDate {
border-radius: 10px;
color: #474747;
background-color: rgba(255, 255, 255, .55);
border: double;
filter: invert(90%);
} }
#endDate{
#endDate {
border-radius: 10px;
/*color: rgb(18, 18, 18);*/
color: #474747;
background-color: rgba(255, 255, 255, .55);
border: double;
filter: invert(90%);
} }
#startTime{
#nameOfGameJam {
background-color: rgb(18, 18, 18);
color: rgba(255, 255, 255, .55);
border-radius: 15px;
border: double;
} }
#endTime{
} }
#description { #description {