Merge remote-tracking branch 'origin/main' into main
This commit is contained in:
Minik Gaarde Lambrecht
+46
-11
@@ -1,5 +1,5 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<html lang="da-DK">
|
||||
|
||||
<head>
|
||||
<!-- Default page settings -->
|
||||
@@ -19,10 +19,10 @@
|
||||
<!-- 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="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/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>
|
||||
|
||||
@@ -72,23 +72,27 @@
|
||||
</ul>
|
||||
</div>
|
||||
</li>
|
||||
<li class="nav-item" id="AdminPanelLI" style="display: none;">
|
||||
<a class="nav-link NavLink" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" href="#admin">
|
||||
Administration
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a type="button" class="nav-link NavLink" data-bs-toggle="modal" data-bs-target="#RulesModal">
|
||||
Regler
|
||||
</a>
|
||||
</li>
|
||||
</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;">
|
||||
Login
|
||||
</a>
|
||||
<a id="NavUser" type="button" class="nav-link LoginButton" style="display: none;">
|
||||
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
@@ -111,6 +115,11 @@
|
||||
<i class="fas fa-user-plus"></i> Registrer
|
||||
</button>
|
||||
</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;">
|
||||
<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>
|
||||
@@ -128,6 +137,11 @@
|
||||
|
||||
<input id="loginUsername" type="text" name="groupName" placeholder="Gruppe navn">
|
||||
<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">
|
||||
</form>
|
||||
</div>
|
||||
@@ -184,6 +198,22 @@
|
||||
<input id="RegisterBtn" type="submit" name="regGroup" value="Registrer">
|
||||
</form>
|
||||
</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>
|
||||
@@ -365,6 +395,7 @@
|
||||
<!-- Information slut -->
|
||||
|
||||
<hr class="GradientDivider" />
|
||||
|
||||
<!--Kalender-->
|
||||
<section id="events">
|
||||
<h3>Events</h3>
|
||||
@@ -388,9 +419,12 @@
|
||||
<div>Lør</div>
|
||||
<div>Søn</div>
|
||||
</div>
|
||||
<div class="days"></div>
|
||||
<div id="days" class="days"></div>
|
||||
</div>
|
||||
</div>
|
||||
<button id="test">
|
||||
test
|
||||
</button>
|
||||
<!--Pop up-->
|
||||
<div class="modal" tabindex="-1" id="popup">
|
||||
<div class="modal-dialog modal-dialog-centered">
|
||||
@@ -647,6 +681,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>
|
||||
<!-- Body scripts end -->
|
||||
</body>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user