Game-jam-Devs/Game-Jaming
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
This commit is contained in:
IdaTiegel99
2021-03-26 08:41:06 +01:00
parent 47b0e2c33d
commit 7dd06804eb
7 changed files with 184 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Frontend/Index.html
+38 -45
View File
@@ -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>