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

Updatefix

This commit is contained in:
Minik Gaarde Lambrecht 2021-03-26 08:49:03 +01:00
parent 7dd06804eb
commit c69708447c
3 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Frontend/Html/AdminPage.html
View File

@ -27,22 +27,6 @@
</head> </head>
<body> <body>
<<<<<<< Updated upstream
<div class="btn-group" role="group" aria-label="Basic example">
<button type="button" class="btn btn-primary">Left</button>
<button type="button" class="btn btn-primary">Middle</button>
<button type="button" class="btn btn-primary">Right</button>
</div>
<div class="HeaderPanel">
<div class="HeaderLeft">
<a href="../Index.html">
<i class="fas fa-arrow-left"></i>
</a>
<h6>
Admin panel
</h6>
=======
<div class="HeaderPanel"> <div class="HeaderPanel">
<div class="HeaderLeft"> <div class="HeaderLeft">
<a href="../Index.html"> <a href="../Index.html">
@ -52,7 +36,6 @@
Admin panel Admin panel
</h6> </h6>
</div> </div>
>>>>>>> Stashed changes
</div> </div>
<!--Opret game jam--> <!--Opret game jam-->

12
Frontend/Index.html
View File

@ -82,7 +82,6 @@
</a> </a>
</li> </li>
</ul> </ul>
<<<<<<< Updated upstream
<a id="AdminPanel" type="button" class="nav-link RightNavButton" style="display: none;"> <a id="AdminPanel" type="button" class="nav-link RightNavButton" style="display: none;">
Admin Panel Admin Panel
</a> </a>
@ -93,11 +92,6 @@
<a id="UserLogout" type="button" class="nav-link RightNavButton" style="display: none;"> <a id="UserLogout" type="button" class="nav-link RightNavButton" style="display: none;">
Logout Logout
</a> </a>
=======
<a type="button" class="nav-link LoginButton" data-bs-toggle="modal" data-bs-target="#LoginModal">
Login
</a>
>>>>>>> Stashed changes
</div> </div>
</div> </div>
</nav> </nav>
@ -134,18 +128,12 @@
<h1 class="text-muted"> <h1 class="text-muted">
Team Login Team Login
</h1> </h1>
<<<<<<< Updated upstream
<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">
<input id="LoginBtn" type="submit" name="login" value="Login"> <input id="LoginBtn" type="submit" name="login" value="Login">
<input id="AdminLoginBtn" type="submit" name="aLogin" value="Login som admin"> <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> </form>
</div> </div>
<div class="tab-pane fade" id="Registrer" role="tabpanel" aria-labelledby="RegistrerTab"> <div class="tab-pane fade" id="Registrer" role="tabpanel" aria-labelledby="RegistrerTab">

19
Frontend/Javascript/qweData.js
View File

@ -1,19 +0,0 @@
$(window).on("load", function(){
dataFetch();
});
function dataFetch(){
$.ajax({
type: "GET",
url: "/Game-Jaming/Backend/controllers/GameJam/GetGameJam.php",
success: function(result){
console.log(result[0].name);
}
});
}
//console.log(result.name); ?gameJamId=1
//console.log(result[0].name); uden ?gameJamId=1