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

Compare commits

base: Game-jam-Devs/Game-Jaming:new_database
Branches Tags
Game-jam-Devs/Game-Jaming:main Game-jam-Devs/Game-Jaming:new_database
...
compare: Game-jam-Devs/Game-Jaming:a59fcdca3050c2699bc919259a47c96652f861b4
Branches Tags
Game-jam-Devs/Game-Jaming:main Game-jam-Devs/Game-Jaming:new_database

10 Commits
new_database ... a59fcdca30

Author SHA1 Message Date
Jacob Søfeldt a59fcdca30 Merge branch 'main' of https://gitea.itskp-odense.dk/Game-jam-Devs/Game-Jaming 2021-04-21 10:51:32 +02:00
Jacob Søfeldt 3ca45e6453 minder admin side fix 2021-04-21 10:51:18 +02:00
jona345e 23a98a23cf Merge remote-tracking branch 'origin/main' into main 2021-04-21 10:27:06 +02:00
jona345e 48b9f532a4 registration controllers update 2021-04-21 10:26:04 +02:00
Jacob Søfeldt ebeb93e5fa Backdrop and logind fix 2021-04-21 09:03:40 +02:00
Jacob Søfeldt 995cec56b1 Update 2021-04-20 14:48:16 +02:00
Ida Tiegel 9dda1a4336 Update 2021-04-20 14:01:33 +02:00
jona345e 15262c9cc6 test 2021-04-20 08:54:31 +02:00
jona345e 47094283cb test 2021-04-20 08:51:48 +02:00
RundelhausCode ae719b9d68 Merge pull request #1 from RundelhausCode/new_database 
new database
 2021-04-19 12:28:17 +02:00
18 changed files with 2311 additions and 1696 deletions
Expand all files Collapse all files
.gitignore
+1
View File
@@ -116,3 +116,4 @@ composer.phar
*.sqlite
Backend/test.php
config/database.json
Backend/Controllers/Admin/Admin.php
+1
View File
@@ -19,4 +19,5 @@ function makeAdminLogin(string $userName)
'path' => '/'
]);
}
//test
Backend/Controllers/Polls/GetVote.php
+17 -1
View File
@@ -1,13 +1,29 @@
<?php
use Backend\Models\GameData;
use Backend\Models\Vote;
use \Backend\Models\Registration;
require_once "../../../bootstrap.php";
require_once "../Group/Group.php";
if (isLogin()) {
$gameDate = GameData::find($_GET[]);
if(!$gameDate){
http_response_code(400);
echo json_encode(["message" => "game data not found"]);
exit();
}
$reg = Registration::where("game_data_id", $gameDate->id)->first();
$group = groupViaToken($_SESSION['token']);
if($reg->group_id !== $group->id){
http_response_code(401);
echo json_encode(["message" => "group not own game data"]);
}
header('Content-Type: application/json;charset=UTF-8');
echo json_encode(array('data' => Vote::where('group_id', groupViaToken($_SESSION['token'])->id)->get()->jsonSerialize()));
echo json_encode(array('data' => Vote::where('game_data_id',$gameDate->id)->get()->jsonSerialize()));
} else {
http_response_code(401);
Backend/Controllers/Registration/NewRegistration.php
+31
View File
@@ -1 +1,32 @@
<?php
require_once "../../../bootstrap.php";
require_once "../Group/Group.php";
use Backend\Models\Registration;
if(isLogin()){
if(isset($_POST['newReg'])){
$group = groupViaToken($_SESSION['token']);
$gameJam = \Backend\Models\GameJam::find($_POST["gameJamId"]);
if(Registration::where("group_id", $group->id)->where("game_jam_id", $gameJam->id)->count() === 0){
$reg = new Registration();
$reg->group_amount = $_POST["groupAmount"];
$reg->group()->associate($group);
$reg->gameJam()->associate($gameJam);
if($reg->save()){
http_response_code(201);
}else{
http_response_code(500);
}
}else {
http_response_code(400);
echo json_encode(["message" => "already registered"]);
}
}else {
http_response_code(400);
}
}else{
http_response_code(401);
echo json_encode(["message" => "is not login"]);
}
Backend/Controllers/Registration/UpdateRegistration.php
+26
View File
@@ -1 +1,27 @@
<?php
require_once "../../../bootstrap.php";
require_once "../Group/Group.php";
use Backend\Models\Registration;
if(isLogin()){
if(isset($_POST['updateReg'])){
if($reg = Registration::where("group_id", $_POST["groupId"])->where("game_jam_id", $_POST["gameJamId"])->first()){
$reg->group_amount = $_POST["groupAmount"];
if($reg->save()){
http_response_code(200);
}else{
http_response_code(500);
}
}else{
http_response_code(400);
echo json_encode(["message" => "registration does not exits"]);
}
}else{
http_response_code(400);
}
}else{
http_response_code(401);
echo json_encode(["message" => "is not login"]);
}
Frontend/Html/AdminPage.html
+97 -27
View File
@@ -1,46 +1,70 @@
<!DOCTYPE html>
<html lang="en">
<head>
<!-- Default page settings -->
<title>Admin Panel</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="shortcut icon" href="../Images/UFO.png" />
<!-- Default page settings end -->
<!-- CSS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/css/bootstrap.min.css" integrity="sha384-BmbxuPwQa2lc/FVzBcNJ7UAyJxM6wuqIj61tLrc4wSX0szH/Ev+nYRRuWlolflfl" crossorigin="anonymous">
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/css/bootstrap.min.css"
integrity="sha384-BmbxuPwQa2lc/FVzBcNJ7UAyJxM6wuqIj61tLrc4wSX0szH/Ev+nYRRuWlolflfl"
crossorigin="anonymous"
/>
<link rel="stylesheet" href="../Styles/Index.css" />
<link rel="stylesheet" href="../Styles/AdminPage.css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/overlayscrollbars/1.13.1/css/OverlayScrollbars.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css" integrity="sha512-HK5fgLBL+xu6dm/Ii3z4xhlSUyZgTT9tuc/hSrtw6uzJOvgRr2a9jyxxT1ely+B+xFAmJKVSTbpM/CuL7qxO8w==" crossorigin="anonymous" />
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css"
/>
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/overlayscrollbars/1.13.1/css/OverlayScrollbars.css"
/>
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css"
integrity="sha512-HK5fgLBL+xu6dm/Ii3z4xhlSUyZgTT9tuc/hSrtw6uzJOvgRr2a9jyxxT1ely+B+xFAmJKVSTbpM/CuL7qxO8w=="
crossorigin="anonymous"
/>
<!-- CSS end -->
<!-- Header scripts -->
<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" 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="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/moment@2.29.1/moment.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/inputmask@5.0.5/dist/jquery.inputmask.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/overlayscrollbars/1.13.1/js/jquery.overlayScrollbars.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/@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>
<!-- Header scripts end -->
</head>
<body>
<div class="HeaderPanel" id="header">
<div class="HeaderLeft">
<a style="display: inline-block;" href="../Index.html">
<a style="display: inline-block" href="../Index.html">
<i class="fas fa-arrow-left"></i>
</a>
</div>
<div class="HeaderTitle">
<h2 style="margin-bottom: 0px">
Admin Panel
</h2>
<h2 style="margin-bottom: 0px">Admin Panel</h2>
</div>
</div>
@@ -57,7 +81,14 @@
<input type="text" name="newGameJam" id="nameOfGameJam"> -->
<div class="FormField">
<input type="text" class="FormFieldInput" placeholder="Gamejam title" name="newGameJam" id="GamejamTitle" required>
<input
type="text"
class="FormFieldInput"
placeholder="Gamejam title"
name="newGameJam"
id="GamejamTitle"
required
/>
<label for="GamejamTitle" class="FormFieldLabel">
Gamejam title
</label>
@@ -65,37 +96,77 @@
<div class="FormField">
<div id="Dates">
<input type="date" class="FormFieldInput" placeholder="mm/dd/yyyy" name="startDate" id="startDate" required>
<input
type="date"
class="FormFieldInput"
placeholder="mm/dd/yyyy"
name="startDate"
id="startDate"
required
/>
<label for="startDate" class="FormFieldLabel" id="startDateLabel">
Start dato
</label>
<input type="date" class="FormFieldInput" placeholder="mm/dd/yyyy" name="endDate" id="endDate" required>
<input
type="date"
class="FormFieldInput"
placeholder="mm/dd/yyyy"
name="endDate"
id="endDate"
required
/>
<label for="endDate" class="FormFieldLabel" id="endDateLabel">
Slut dato
</label>
</div>
<div class="Times">
<input type="text" class="FormFieldInput" placeholder="hh:mm" name="startTime" id="startTime" required>
<label for="startTime" class="FormFieldLabel" id="startTimeLabel">
Start tidspunkt
Start
</label>
<input
type="text"
class="FormFieldInput"
placeholder="hh:mm"
name="startTime"
id="startTime"
required
/>
<input type="text" class="FormFieldInput" placeholder="hh:mm" name="endTime" id="endTime" required>
<input
type="text"
class="FormFieldInput"
placeholder="hh:mm"
name="endTime"
id="endTime"
required
/>
</div>
</div>
<div class="FormField">
<input type="text" class="FormFieldInput" placeholder="Emne / Keywords (Ikke obligatorisk)" name="keyWord" id="keyWord" required>
<input
type="text"
class="FormFieldInput"
placeholder="Emne / Keywords (Ikke obligatorisk)"
name="keyWord"
id="keyWord"
required
/>
<label for="keyWord" class="FormFieldLabel" id="keyWordLabel">
Emne / Keywords (Ikke obligatorisk)
</label>
</div>
<div class="FormField">
<textarea class="FormFieldInput" placeholder="Beskrivelse" name="description" id="Beskrivelse" required></textarea>
<textarea
class="FormFieldInput"
placeholder="Beskrivelse"
name="description"
id="Beskrivelse"
required
></textarea>
<label for="keyWord" class="FormFieldLabel" id="keyWordLabel">
Beskrivelse
</label>
@@ -106,16 +177,15 @@
<label for="floatingTextarea2">Beskrivelse</label>
</div> -->
<input type="submit" name="newGameJam" id="indsend" value="Indsend">
<input type="submit" name="newGameJam" id="indsend" value="Indsend" />
</form>
</div>
<!-- Opret game jam slut -->
<!-- Body scripts -->
<script src="../Javascript/OverlayScrollbar.js"></script>
<script src="../Javascript/AddEvent.js"></script>
<!--<script src="../Javascript/AddEvent.js"></script>-->
<script src="../Javascript/AddGameJam.js"></script>
<!-- Body scripts end -->
</body>
</html>
Frontend/Html/ShowCase.html
+11 -10
View File
@@ -28,7 +28,9 @@
<div>
<div class="row">
<div class="col-sm" id="description">
Beskrivelse
<b>Beskrivelse</b><br />
Yoooooooo my name is gert,
I love flowers.... HA what?
<br />
<button id="isWebBased">Play game online</button>
<button id="gameFil">Download game</button>
@@ -38,19 +40,18 @@
</div>
</div>
</div>
<div id="suggestions">
<p>Hej dkjhhnsd hid hgndnf ghnd df</p>
</div>
<hr class="GradientDivider" />
<p>Måske vil du prøve...</p>
<div class="jcarousel-wrapper">
<div class="jcarousel" data-jcarousel="true">
<ul style="left: 0px; top: 0px;">
<li style="width: 200px;"><img src="../Images/spil.jpg" alt="Image 1"></li>
<li style="width: 200px;"><img src="../Images/spil.jpg" alt="Image 2"></li>
<li style="width: 200px;"><img src="../Images/spil.jpg" alt="Image 3"></li>
<li style="width: 200px;"><img src="../Images/spil.jpg" alt="Image 4"></li>
<li style="width: 200px;"><img src="../Images/spil.jpg" alt="Image 5"></li>
<li style="width: 200px;"><img src="../Images/spil.jpg" alt="Image 6"></li>
<li style="width: 200px;"><a href="#link"><img src="../Images/spil.jpg" alt="Image 1"></a></li>
<li style="width: 200px;"><a href="#link"><img src="../Images/spil.jpg" alt="Image 2"></a></li>
<li style="width: 200px;"><a href="#link"><img src="../Images/spil.jpg" alt="Image 3"></a></li>
<li style="width: 200px;"><a href="#link"><img src="../Images/spil.jpg" alt="Image 4"></a></li>
<li style="width: 200px;"><a href="#link"><img src="../Images/spil.jpg" alt="Image 5"></a></li>
<li style="width: 200px;"><a href="#link"><img src="../Images/spil.jpg" alt="Image 6"></a></li>
</ul>
</div>
Frontend/Html/newPage.html
+85
View File
@@ -0,0 +1,85 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" href="../Images/UFO.png" />
<title>GameJam</title>
<link
rel="stylesheet"
href="../../vendor/twbs/bootstrap/dist/css/bootstrap.min.css"
/>
<script src="../../vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<script
src="https://code.jquery.com/jquery-3.6.0.min.js"
integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4="
crossorigin="anonymous"
></script>
<script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
</head>
<body>
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<div class="container-fluid">
<a class="navbar-brand" href="#"
><img src="../Images/UFO.png" alt="" width="32" height="32" />
</a>
<button
class="navbar-toggler"
type="button"
data-bs-toggle="collapse"
data-bs-target="#navbarNav"
aria-controls="navbarNav"
aria-expanded="false"
aria-label="Toggle navigation"
>
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="#">Hjem</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Information</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Events</a>
</li>
<li class="nav-item dropdown">
<a
class="nav-link dropdown-toggle"
href="#"
id="navbarDropdownMenuLink"
role="button"
data-bs-toggle="dropdown"
aria-expanded="false"
>
Toggle Dropdown
</a>
<ul
class="dropdown-menu-dark"
aria-labelledby="navbarDropdownMenuLink"
>
<li>
<a class="dropdown-item" href="#">Spil</a>
</li>
<li>
<a class="dropdown-item" href="#">Upload fil</a>
</li>
<li>
<a class="dropdown-item" href="#">Stem</a>
</li>
<li>
<a class="dropdown-item" href="#">Lodtrækning</a>
</li>
</ul>
</li>
</ul>
</div>
</div>
</nav>
</body>
</html>
Frontend/Index.html
+588 -154
View File
File diff suppressed because it is too large Load Diff
Frontend/Javascript/AddGameJam.js
+17 -14
View File
@@ -1,29 +1,32 @@
$(document).ready(function () {
axios.defaults.baseURL = "http://localhost/Game-Jaming";
$('#createGameJam').submit(function(e) {
let URL = 'https://ptsv2.com/t/tzztn-1616799712/post';
$("#createGameJam").submit(function (e) {
let URL = "/Backend/Controllers/GameJam/NewGameJam.php";
let form = $('#createGameJam')[0];
let form = $("#createGameJam")[0];
let formData = new FormData(form);
let id = $('#indsend').attr('name');
let value = $('#indsend').val();
let id = $("#indsend").attr("name");
let value = $("#indsend").val();
let startTime = $("#startTime").text();
let endTime = $("#endTime").text();
formData.append(id, value);
formData.set('startTime', startTime);
formData.append('endTime', endTime);
formData.set("startTime", startTime);
formData.append("endTime", endTime);
axios.post(URL, formData, {
header: 'multipart/form-data'
}).then(res => {
if (res.status === 200)
{
console.log('New Game Jam Created!');
axios
.post(URL, formData, {
header: "multipart/form-data",
})
.then((res) => {
if (res.status === 200) {
console.log("New Game Jam Created!");
}
}).catch(error => {
})
.catch((error) => {
console.log(error.response);
});
Frontend/Javascript/Kalender.js
+2 -5
View File
@@ -42,7 +42,7 @@ const renderCalendar = () => {
"December",
];
document.querySelector(".date h1").innerHTML = months[date.getMonth()];
document.querySelector(".date h1").innerHTML = months[date.getMonth()] + " " + date.getFullYear();
document.querySelector(".date p").innerHTML = new Date().toLocaleDateString('da-DK', {
weekday: 'long',
@@ -58,10 +58,7 @@ const renderCalendar = () => {
}
for (let i = 1; i <= lastDay; i++) {
if (
i === new Date().getDate() &&
date.getMonth() === new Date().getMonth()
) {
if (i === new Date().getDate() && date.getMonth() === new Date().getMonth() && date.getFullYear() === new Date().getFullYear()) {
days += `<div class="today" onClick="clickdate()">${i}</div>`;
Frontend/Javascript/LoginFunctionality.js
+140 -170
View File
@@ -1,44 +1,46 @@
$(document).ready(function () {
// Register Start
axios.defaults.baseURL = "http://localhost/Game-Jaming";
let selectedGameJam;
let isAdminLoggedIn = false;
let displayValue = 0;
let arr = [
{"id": "-1", "Gamejam": "Vælg aktivt GameJam"}
];
let arr = [{ id: "-1", Gamejam: "Vælg aktivt GameJam" }];
if (getCookie('userName') != null)
{
if (getCookie("userName") != null) {
isAdminLoggedIn = true;
SwitchNavInfo(true, true);
}
else if (getCookie('groupName') != null)
{
} else if (getCookie("groupName") != null) {
isAdminLoggedIn = false;
SwitchNavInfo(true);
}
// Populate select with options from the database
axios.get('/Backend/Controllers/GameJam/GetGameJam.php')
axios
.get("/Backend/Controllers/GameJam/GetGameJam.php")
.then(function (res) {
let resArr = res.data.data;
for(let i = 0; i < res.data.data.length; i++)
{
for (let i = 0; i < res.data.data.length; i++) {
arr.push({
id: resArr[i].id,
Gamejam: resArr[i].name
Gamejam: resArr[i].name,
});
}
$.each(arr, function (i, data) {
if (i === 0)
{
$('#GameJamSelect').append('<option disabled selected value="' + data.id + '">' + data.Gamejam + '</option>');
}
else
{
$('#GameJamSelect').append('<option value="' + data.id + '">' + data.Gamejam + '</option>');
if (i === 0) {
$("#GameJamSelect").append(
'<option disabled selected value="' +
data.id +
'">' +
data.Gamejam +
"</option>"
);
} else {
$("#GameJamSelect").append(
'<option value="' + data.id + '">' + data.Gamejam + "</option>"
);
}
});
})
@@ -47,127 +49,110 @@ $(document).ready(function () {
});
// Remove invalidInput if selected option has been changed
$('#GameJamSelect').change(function() {
selectedGameJam = $('#GameJamSelect').children("option:selected").val();
$("#GameJamSelect").change(function () {
selectedGameJam = $("#GameJamSelect").children("option:selected").val();
if (selectedGameJam >= 1)
{
$('#GameJamSelect').removeClass('invalidInput');
if (selectedGameJam >= 1) {
$("#GameJamSelect").removeClass("invalidInput");
}
});
// Remove invalidInput if change in group name has been detected
$('#username').on('input', function() {
if ($(this).hasClass('invalidInput'))
{
$(this).removeClass('invalidInput');
$("#username").on("input", function () {
if ($(this).hasClass("invalidInput")) {
$(this).removeClass("invalidInput");
}
})
});
GetGroupNames().then(function (res) {
let resArr = res.data;
let groupNameTaken = false;
$('#RegisterBtn').click(function() {
let groupName = $('#username').val();
$("#RegisterBtn").click(function () {
let groupName = $("#username").val();
for(let i = 0; i < resArr.length; i++)
{
if (resArr[i].group_name.toUpperCase() === groupName.toUpperCase())
{
for (let i = 0; i < resArr.length; i++) {
if (resArr[i].group_name.toUpperCase() === groupName.toUpperCase()) {
groupNameTaken = true;
break;
}
else
{
} else {
groupNameTaken = false;
}
}
});
// Check data before submitting
$('#RegisterForm').submit(function(e) {
if(!selectedGameJam >= 1)
{
$('#GameJamSelect').addClass('invalidInput');
$("#RegisterForm").submit(function (e) {
if (!selectedGameJam >= 1) {
$("#GameJamSelect").addClass("invalidInput");
e.preventDefault();
return false;
}
else
{
$('#gameJamId').val($('#GameJamSelect option:selected').val());
} else {
$("#gameJamId").val($("#GameJamSelect option:selected").val());
}
if($('#pass1').val().length === 0)
{
$('#pass1').addClass('invalidInput');
if ($("#pass1").val().length === 0) {
$("#pass1").addClass("invalidInput");
e.preventDefault();
return;
}
if($('#pass2').val().length === 0)
{
$('#pass2').addClass('invalidInput');
if ($("#pass2").val().length === 0) {
$("#pass2").addClass("invalidInput");
e.preventDefault();
return;
}
if($('#username').val().length === 0)
{
$('#username').addClass('invalidInput');
if ($("#username").val().length === 0) {
$("#username").addClass("invalidInput");
e.preventDefault();
return;
}
if($('#pass1').hasClass('invalidInput'))
{
if ($("#pass1").hasClass("invalidInput")) {
e.preventDefault();
return;
}
if($('#pass2').hasClass('invalidInput'))
{
if ($("#pass2").hasClass("invalidInput")) {
e.preventDefault();
return;
}
if(!$.isNumeric($('#NUDDisplay').text()))
{
$('#NUDDisplay').text('Ugyldigt antal!');
$('#NUDDisplay').css({"color": "red"});
if (!$.isNumeric($("#NUDDisplay").text())) {
$("#NUDDisplay").text("Ugyldigt antal!");
$("#NUDDisplay").css({ color: "red" });
e.preventDefault();
}
else
{
$('#groupAmount').val($('#NUDDisplay').text());
} else {
$("#groupAmount").val($("#NUDDisplay").text());
}
if (groupNameTaken)
{
$('#username').addClass('invalidInput');
if (groupNameTaken) {
$("#username").addClass("invalidInput");
e.preventDefault();
return;
}
let URL = "/Backend/Controllers/Group/SigningUp.php";
let form = $('#RegisterForm')[0];
let form = $("#RegisterForm")[0];
let formData = new FormData(form);
let id = $('#RegisterBtn').attr('name');
let value = $('#RegisterBtn').val();
let id = $("#RegisterBtn").attr("name");
let value = $("#RegisterBtn").val();
formData.append(id, value);
axios.post(URL, formData, {
header: 'multipart/form-data'
}).then(res => {
if (res.status === 201)
{
axios
.post(URL, formData, {
header: "multipart/form-data",
})
.then((res) => {
if (res.status === 201) {
SwitchNavInfo(true);
}
}).catch(error => {
})
.catch((error) => {
console.log(error.response);
});
@@ -175,36 +160,29 @@ $(document).ready(function () {
});
});
$('#NUDPlus').click(function() {
if($('#NUDDisplay').css('color') === 'rgb(255, 0, 0)')
{
$('#NUDDisplay').css({'color': 'rgba(255, 255, 255, .55)'});
$("#NUDPlus").click(function () {
if ($("#NUDDisplay").css("color") === "rgb(255, 0, 0)") {
$("#NUDDisplay").css({ color: "rgba(255, 255, 255, .55)" });
}
displayValue++;
$('#NUDDisplay').text(displayValue);
$("#NUDDisplay").text(displayValue);
});
$('#NUDMinus').click(function() {
if (displayValue <= 0)
{
$("#NUDMinus").click(function () {
if (displayValue <= 0) {
return;
}
else if(displayValue <= 1)
{
$('#NUDDisplay').text(1);
}
else
{
} else if (displayValue <= 1) {
$("#NUDDisplay").text(1);
} else {
displayValue--;
$('#NUDDisplay').text(displayValue);
$("#NUDDisplay").text(displayValue);
}
});
async function GetGroupNames() {
const res = await axios.get('/Backend/Controllers/Group/GetGroup.php');
const res = await axios.get("/Backend/Controllers/Group/GetGroup.php");
return res.data;
}
@@ -212,34 +190,33 @@ $(document).ready(function () {
// Register end
// Login start
$('#LoginForm').submit(function(e) {
$("#LoginForm").submit(function (e) {
let URL = "/Backend/Controllers/Group/Login.php";
let form = $('#LoginForm')[0];
let form = $("#LoginForm")[0];
let formData = new FormData(form);
let id = $('#LoginBtn').attr('name');
let value = $('#LoginBtn').val();
let id = $("#LoginBtn").attr("name");
let value = $("#LoginBtn").val();
formData.append(id, value);
axios.post(URL, formData, {
header: 'multipart/form-data'
}).then(res => {
if (res.status === 200)
{
axios
.post(URL, formData, {
header: "multipart/form-data",
})
.then((res) => {
if (res.status === 200) {
isAdminLoggedIn = false;
SwitchNavInfo(true);
}
}).catch(error => {
if (error.response.status === 401)
{
$('#loginUsername').css({'border-color':'red'});
$('#loginPassword').css({'border-color':'red'});
$('#ErrorText').css({'display':'block'});
}
else
{
})
.catch((error) => {
if (error.response.status === 401) {
$("#loginUsername").css({ "border-color": "red" });
$("#loginPassword").css({ "border-color": "red" });
$("#ErrorText").css({ display: "block" });
} else {
console.log(error.response);
}
});
@@ -247,34 +224,33 @@ $(document).ready(function () {
e.preventDefault();
});
$('#AdminLoginForm').submit(function(e) {
$("#AdminLoginForm").submit(function (e) {
let URL = "/Backend/Controllers/Admin/AdminLogin.php";
let form = $('#AdminLoginForm')[0];
let form = $("#AdminLoginForm")[0];
let formData = new FormData(form);
let id = $('#AdminLoginBtn').attr('name');
let value = $('#AdminLoginBtn').val();
let id = $("#AdminLoginBtn").attr("name");
let value = $("#AdminLoginBtn").val();
formData.append(id, value);
axios.post(URL, formData, {
header: 'multipart/form-data'
}).then(res => {
if (res.status === 200)
{
axios
.post(URL, formData, {
header: "multipart/form-data",
})
.then((res) => {
if (res.status === 200) {
isAdminLoggedIn = true;
SwitchNavInfo(true, true);
}
}).catch(error => {
if (error.response.status === 401)
{
$('#adminUsername').css({'border-color':'red'});
$('#adminPassword').css({'border-color':'red'});
$('#AdminErrorText').css({'display':'block'});
}
else
{
})
.catch((error) => {
if (error.response.status === 401) {
$("#adminUsername").css({ "border-color": "red" });
$("#adminPassword").css({ "border-color": "red" });
$("#AdminErrorText").css({ display: "block" });
} else {
console.log(error.response);
}
});
@@ -283,44 +259,36 @@ $(document).ready(function () {
});
function SwitchNavInfo(isLoggedIn, isAdmin) {
if (isLoggedIn)
{
$('#NavUser').css({'display':'block'});
$('#NavUser').text(`Welcome, ${isAdmin ? getCookie('userName') : getCookie('groupName')}!`);
if (isLoggedIn) {
$("#NavUser").css({ display: "block" });
$("#NavUser").text(
`Welcome, ${isAdmin ? getCookie("userName") : getCookie("groupName")}!`
);
$('#NavLogin').css({'display':'none'});
$('#NavLogout').css({'display':'block'});
$("#NavLogin").css({ display: "none" });
$("#NavLogout").css({ display: "block" });
$('#LoginModal').modal('hide');
}
else
{
$('#NavUser').css({'display':'none'});
$('#NavUser').text(``);
$("#LoginModal").modal("hide");
} else {
$("#NavUser").css({ display: "none" });
$("#NavUser").text(``);
$('#NavLogin').css({'display':'block'});
$('#NavLogout').css({'display':'none'});
$("#NavLogin").css({ display: "block" });
$("#NavLogout").css({ display: "none" });
}
if (isAdmin === undefined)
{
return
}
else
{
if (isAdmin)
{
if (isLoggedIn)
{
$('#AdminPanel').css({'display':'block'});
if (isAdmin === undefined) {
return;
} else {
if (isAdmin) {
if (isLoggedIn) {
$("#AdminPanel").css({ display: "block" });
console.log('Logged In As Admin!');
}
else
{
$('#AdminPanel').css({'display':'none'});
console.log("Logged In As Admin!");
} else {
$("#AdminPanel").css({ display: "none" });
console.log('Logged Out As Admin!');
console.log("Logged Out As Admin!");
}
}
}
@@ -328,14 +296,16 @@ $(document).ready(function () {
// Login end
// Logout start
$('#NavLogout').click(function() {
axios.get('/Backend/Controllers/Group/Logout.php').then(res => {
if (res.status == 200)
{
$("#NavLogout").click(function () {
axios
.get("/Backend/Controllers/Group/Logout.php")
.then((res) => {
if (res.status == 200) {
SwitchNavInfo(false, isAdminLoggedIn);
isAdminLoggedIn = false;
}
}).catch(error => {
})
.catch((error) => {
console.log(error.response);
});
});
Frontend/Styles/Index.css
+64 -59
View File
@@ -1,6 +1,6 @@
body,
html {
color: rgba(255, 255, 255, .55);
color: rgba(255, 255, 255, 0.55);
font-family: Arial, Helvetica, sans-serif;
margin: 0;
padding: 0;
@@ -24,11 +24,11 @@ section {
}
a {
color: rgba(255, 255, 255, .75);
color: rgba(255, 255, 255, 0.75);
}
a:hover {
color: rgba(255, 255, 255, .75);
color: rgba(255, 255, 255, 0.75);
}
#content {
@@ -58,7 +58,13 @@ a:hover {
padding-top: 0px;
}
.container, .container-fluid, .container-lg, .container-md, .container-sm, .container-xl, .container-xxl {
.container,
.container-fluid,
.container-lg,
.container-md,
.container-sm,
.container-xl,
.container-xxl {
padding-right: 0;
padding-left: 0;
}
@@ -111,7 +117,7 @@ a:hover {
}
.row.content {
height: 450px
height: 450px;
}
.CenterDiv {
@@ -119,11 +125,11 @@ a:hover {
}
.LoginButton {
color: rgba(255, 255, 255, .55);
color: rgba(255, 255, 255, 0.55);
}
.LoginButton:hover {
color: rgba(255, 255, 255, .75);
color: rgba(255, 255, 255, 0.75);
}
.dropdown-menu {
@@ -131,11 +137,11 @@ a:hover {
}
.dropdown-menu .dropdown-item {
color: rgba(255, 255, 255, .50) !important;
color: rgba(255, 255, 255, 0.5) !important;
}
.dropdown-menu .dropdown-item:hover {
color: rgba(255, 255, 255, .75) !important;
color: rgba(255, 255, 255, 0.75) !important;
background-color: transparent !important;
}
@@ -143,7 +149,7 @@ a:hover {
padding: 0;
border-bottom: 0;
background-color: rgb(18, 18, 18);
color: rgba(255, 255, 255, .75);
color: rgba(255, 255, 255, 0.75);
}
#RulesModal .modal-header {
@@ -154,7 +160,7 @@ a:hover {
#RulesModal .modal-header h1 {
font-weight: bolder;
color: rgba(255, 255, 255, .75);
color: rgba(255, 255, 255, 0.75);
}
#RulesModal .modal-dialog-scrollable .modal-content {
@@ -175,12 +181,12 @@ a:hover {
#ModalRulesTabContent li p {
font: 16px/1.5 Helvetica, sans-serif;
padding-left: 60px;
color: rgba(255, 255, 255, .55);
color: rgba(255, 255, 255, 0.55);
}
#ModalRulesTabContent span {
position: absolute;
color: rgba(255, 255, 255, .75);
color: rgba(255, 255, 255, 0.75);
}
#pass_info {
@@ -191,7 +197,7 @@ a:hover {
width: 250px;
padding: 15px;
background: rgb(254, 254, 254);
font-size: .875em;
font-size: 0.875em;
border-radius: 5px;
box-shadow: 0 1px 3px rgb(204, 204, 204);
border: 1px solid rgb(221, 221, 221);
@@ -210,7 +216,8 @@ a:hover {
display: block;
}
#pass_info ul, li {
#pass_info ul,
li {
margin: 0;
padding: 0;
list-style-type: none;
@@ -234,7 +241,7 @@ a:hover {
.invalid::before {
font-family: "FontAwesome";
content: '\f00d';
content: "\f00d";
}
.valid {
@@ -247,10 +254,9 @@ a:hover {
border-color: rgb(80, 219, 52) !important;
}
.valid::before {
font-family: "FontAwesome";
content: '\f00c';
content: "\f00c";
}
.RulesModal .modal-header {
@@ -265,16 +271,13 @@ a:hover {
.modal-content {
background-color: rgb(18, 18, 18);
box-shadow: rgba(0, 0, 0, 0.07) 0px 1px 2px,
rgba(0, 0, 0, 0.07) 0px 2px 4px,
rgba(0, 0, 0, 0.07) 0px 4px 8px,
rgba(0, 0, 0, 0.07) 0px 8px 16px,
rgba(0, 0, 0, 0.07) 0px 16px 32px,
rgba(0, 0, 0, 0.07) 0px 32px 64px;
box-shadow: rgba(0, 0, 0, 0.07) 0px 1px 2px, rgba(0, 0, 0, 0.07) 0px 2px 4px,
rgba(0, 0, 0, 0.07) 0px 4px 8px, rgba(0, 0, 0, 0.07) 0px 8px 16px,
rgba(0, 0, 0, 0.07) 0px 16px 32px, rgba(0, 0, 0, 0.07) 0px 32px 64px;
}
.modal-backdrop {
z-index: 1;
z-index: -1;
}
.nav-tabs {
@@ -283,19 +286,19 @@ a:hover {
.nav-tabs .nav-item.show .nav-link,
.nav-tabs .nav-link.active {
color: rgba(255, 255, 255, .75);
color: rgba(255, 255, 255, 0.75);
background-color: rgb(37, 37, 37);
border-color: rgb(80, 80, 80);
}
.nav-tabs .nav-link {
color: rgba(255, 255, 255, .55);
color: rgba(255, 255, 255, 0.55);
}
.nav-tabs .nav-link:focus,
.nav-tabs .nav-link:hover {
border-color: rgb(80, 80, 80);
color: rgba(255, 255, 255, .75);
color: rgba(255, 255, 255, 0.75);
}
.FullWidthModalTabs {
@@ -318,11 +321,11 @@ a:hover {
width: 16px;
height: 16px;
background-color: transparent;
color: rgba(255, 255, 255, .55);
color: rgba(255, 255, 255, 0.55);
}
.CloseIcon:hover {
color: rgba(255, 255, 255, .75);
color: rgba(255, 255, 255, 0.75);
}
.btn-close:hover {
@@ -353,7 +356,7 @@ a:hover {
}
.box #NUDMinus {
color: rgba(255, 255, 255, .55);
color: rgba(255, 255, 255, 0.55);
background-color: transparent;
border: none;
float: left;
@@ -368,7 +371,7 @@ a:hover {
}
.box #NUDDisplay {
color: rgba(255, 255, 255, .55);
color: rgba(255, 255, 255, 0.55);
background-color: transparent;
border: none;
cursor: text;
@@ -384,7 +387,7 @@ a:hover {
}
.box #NUDPlus {
color: rgba(255, 255, 255, .55);
color: rgba(255, 255, 255, 0.55);
background-color: transparent;
border: none;
float: right;
@@ -403,14 +406,13 @@ a:hover {
}
.box #GameJamSelect:hover {
color: rgba(255, 255, 255, .75);
color: rgba(255, 255, 255, 0.75);
}
.box #GameJamSelect ul {
background-color: red;
}
.box {
background-color: rgb(18, 18, 18);
}
@@ -432,12 +434,13 @@ a:hover {
padding: 10px 10px;
width: 250px;
outline: none;
color: rgba(255, 255, 255, .55);
color: rgba(255, 255, 255, 0.55);
border-radius: 24px;
transition: 0.25s;
}
.box .btn-group, .btn-group-vertical {
.box .btn-group,
.btn-group-vertical {
position: relative;
display: block;
text-align: center;
@@ -447,7 +450,7 @@ a:hover {
}
.box #NUDMinus {
color: rgba(255, 255, 255, .55);
color: rgba(255, 255, 255, 0.55);
background-color: transparent;
border: none;
float: left;
@@ -462,7 +465,7 @@ a:hover {
}
.box #NUDDisplay {
color: rgba(255, 255, 255, .55);
color: rgba(255, 255, 255, 0.55);
background-color: transparent;
border: none;
cursor: text;
@@ -478,7 +481,7 @@ a:hover {
}
.box #NUDPlus {
color: rgba(255, 255, 255, .55);
color: rgba(255, 255, 255, 0.55);
background-color: transparent;
border: none;
float: right;
@@ -497,7 +500,7 @@ a:hover {
}
.box #GameJamSelect:hover {
color: rgba(255, 255, 255, .75);
color: rgba(255, 255, 255, 0.75);
}
.box #GameJamSelect ul {
@@ -506,7 +509,7 @@ a:hover {
.text-muted {
margin-bottom: 5vh;
color: rgba(255, 255, 255, .55) !important;
color: rgba(255, 255, 255, 0.55) !important;
}
.box h1 {
@@ -532,7 +535,7 @@ a:hover {
.box #pass2:hover,
.box #loginPassword:hover,
.box #adminPassword:hover {
color: rgba(255, 255, 255, .75);
color: rgba(255, 255, 255, 0.75);
}
.box input[type="submit"] {
@@ -544,7 +547,7 @@ a:hover {
border: 2px solid rgb(46, 204, 113);
padding: 14px 40px;
outline: none;
color: rgba(255, 255, 255, .55);
color: rgba(255, 255, 255, 0.55);
border-radius: 24px;
transition: 0.25s;
cursor: pointer;
@@ -552,7 +555,7 @@ a:hover {
.box input[type="submit"]:hover {
background: rgb(46, 204, 113);
color: rgba(255, 255, 255, .75);
color: rgba(255, 255, 255, 0.75);
}
.carousel-item img {
@@ -561,7 +564,7 @@ a:hover {
@media only screen and (min-width: 1280px) {
.CustomRow {
display: none
display: none;
}
.SmallScreenDouImages {
@@ -620,7 +623,6 @@ a:hover {
transition: opacity 0.25s;
}
.image_overlay > * {
transform: translateY(20px);
transition: transform 0.25s;
@@ -644,7 +646,7 @@ image_gruppenavn{
/*Kategori spil*/
.Collapsible {
background-color: rgb(18, 18, 18);
color: rgba(255, 255, 255, .55);
color: rgba(255, 255, 255, 0.55);
cursor: pointer;
padding: 18px;
width: 100%;
@@ -655,7 +657,6 @@ image_gruppenavn{
width: 33.333%;
}
.CollapsibleContent {
padding: 0 18px;
display: none;
@@ -686,8 +687,8 @@ image_gruppenavn{
top: 0;
width: 100%;
z-index: 100;
transition: all .3s ease;
box-shadow: 0 1px 25px rgba(0,0,0, .1);
transition: all 0.3s ease;
box-shadow: 0 1px 25px rgba(0, 0, 0, 0.1);
}
#header.hide {
@@ -700,7 +701,14 @@ image_gruppenavn{
border: none;
height: 3px !important;
background: rgb(0, 113, 185) !important;
background: linear-gradient(to right, rgb(18, 18, 18), rgb(0, 113, 185), rgb(38, 171, 255), rgb(0, 113, 185), rgb(18, 18, 18)) !important;
background: linear-gradient(
to right,
rgb(18, 18, 18),
rgb(0, 113, 185),
rgb(38, 171, 255),
rgb(0, 113, 185),
rgb(18, 18, 18)
) !important;
opacity: 1;
}
@@ -712,7 +720,6 @@ image_gruppenavn{
display: flex;
justify-content: center;
align-items: center;
}
.calendar {
@@ -721,7 +728,6 @@ image_gruppenavn{
background-color: rgb(34, 34, 39);
box-shadow: 0 0.5rem 3rem rgba(0, 0, 0, 0.4);
border-radius: 20px;
}
.month {
@@ -736,7 +742,6 @@ image_gruppenavn{
text-shadow: 0 0.3rem 0.5rem rgba(0, 0, 0, 0.5);
border-top-left-radius: 20px;
border-top-right-radius: 20px;
}
.month i {
@@ -814,7 +819,7 @@ image_gruppenavn{
}
.hasEvent {
background-color: red;;
background-color: red;
}
/*Kalender slut*/
@@ -822,7 +827,7 @@ image_gruppenavn{
position: fixed;
bottom: 20px;
right: 20px;
background: rgba(73, 122, 255, .8);
background: rgba(73, 122, 255, 0.8);
width: 50px;
height: 50px;
display: block;
@@ -843,7 +848,7 @@ image_gruppenavn{
}
#return-to-top i {
color: rgba(255, 255, 255, .75);;
color: rgba(255, 255, 255, 0.75);
margin: 0;
position: relative;
font-size: 30px;
@@ -856,7 +861,7 @@ image_gruppenavn{
}
#return-to-top:hover i {
color: rgba(255, 255, 255, .55);;
color: rgba(255, 255, 255, 0.55);
top: 5px;
}
Frontend/Styles/ShowCase.css
+39 -125
View File
@@ -16,35 +16,51 @@ html {
margin-bottom: 10px;
}
#suggestions {
justify-content: center;
background-color: blue;
margin-top: 20px;
}
#isWebBased {
border-radius: 15px;
border: 0;
background: none;
display: block;
margin: 20px auto;
text-align: center;
border: 2px solid rgb(52, 152, 219);
padding: 10px 10px;
outline: none;
color: rgba(255, 255, 255, .55);
background-color: rgb(18, 18, 18);
border: double;
height: 30px;
font-weight: bold;
margin: 8px;
border-radius: 24px;
transition: 0.25s;
position: static;
bottom: 45vh;
display: inline;
left: 27vw;
}
#gameFil {
border-radius: 15px;
border: 0;
background: none;
display: block;
margin: 20px auto;
text-align: center;
border: 2px solid rgb(52, 152, 219);
padding: 10px 10px;
outline: none;
color: rgba(255, 255, 255, .55);
background-color: rgb(18, 18, 18);
border: double;
height: 30px;
font-weight: bold;
margin: 8px;
border-radius: 24px;
transition: 0.25s;
position: static;
bottom: 45vh;
display: inline;
}
#thumbnailFile {
max-width: 100%;
max-height: 100%;
}
#thumbnailFile img{
width: 100%;
height:100%;
}
#description {
@@ -60,114 +76,12 @@ html {
margin: 20px !important;
}
.jcarousel-wrapper {
margin: 20px auto;
position: relative;
/*border: 10px solid #fff;*/
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
-webkit-box-shadow: 0 0 2px #999;
-moz-box-shadow: 0 0 2px #999;
box-shadow: 0 0 2px #999;
}
/** Carousel **/
.jcarousel {
position: relative;
overflow: hidden;
width: 100%;
}
.jcarousel ul {
width: 10000em;
position: relative;
list-style: none;
margin: 0;
padding: 0;
}
.jcarousel li {
width: 100%;
float: left;
border: 1px solid #fff;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.jcarousel img {
.GradientDivider {
margin: 16px 0 16px 0;
display: block;
max-width: 100%;
height: auto !important;
}
/** Carousel Controls **/
.jcarousel-control-prev,
.jcarousel-control-next {
position: absolute;
top: 50%;
margin-top: -15px;
width: 30px;
height: 30px;
text-align: center;
background: #4E443C;
color: #fff;
text-decoration: none;
text-shadow: 0 0 1px #000;
font: 24px/27px Arial, sans-serif;
-webkit-border-radius: 30px;
-moz-border-radius: 30px;
border-radius: 30px;
-webkit-box-shadow: 0 0 4px #F0EFE7;
-moz-box-shadow: 0 0 4px #F0EFE7;
box-shadow: 0 0 4px #F0EFE7;
}
.jcarousel-control-prev {
left: 15px;
}
.jcarousel-control-next {
right: 15px;
}
/** Carousel Pagination **/
.jcarousel-pagination {
position: absolute;
bottom: -40px;
left: 50%;
-webkit-transform: translate(-50%, 0);
-ms-transform: translate(-50%, 0);
transform: translate(-50%, 0);
margin: 0;
}
.jcarousel-pagination a {
text-decoration: none;
display: inline-block;
font-size: 11px;
height: 10px;
width: 10px;
line-height: 10px;
background: #fff;
color: #4E443C;
border-radius: 10px;
text-indent: -9999px;
margin-right: 7px;
-webkit-box-shadow: 0 0 2px #4E443C;
-moz-box-shadow: 0 0 2px #4E443C;
box-shadow: 0 0 2px #4E443C;
}
.jcarousel-pagination a.active {
background: #4E443C;
color: #fff;
border: none;
height: 3px !important;
background: rgb(0, 113, 185) !important;
background: linear-gradient(to right, rgb(18, 18, 18), rgb(0, 113, 185), rgb(38, 171, 255), rgb(0, 113, 185), rgb(18, 18, 18)) !important;
opacity: 1;
-webkit-box-shadow: 0 0 2px #F0EFE7;
-moz-box-shadow: 0 0 2px #F0EFE7;
box-shadow: 0 0 2px #F0EFE7;
}
Frontend/Styles/jcarousel.responsive.css
+2 -2
View File
@@ -7,7 +7,7 @@
border-radius: 5px;
-webkit-box-shadow: 0 0 2px #999;
-moz-box-shadow: 0 0 2px #999;
box-shadow: 0 0 2px #999;
box-shadow: none !important;
}
/** Carousel **/
@@ -29,7 +29,7 @@
.jcarousel li {
width: 200px;
float: left;
border: 1px solid #fff;
/* border: 1px solid #fff;*/
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
composer.json
+3 -1
View File
@@ -3,7 +3,9 @@
"illuminate/database": "^8.30",
"ext-mysqli": "*",
"ext-sqlite3": "*",
"ext-fileinfo": "*"
"ext-fileinfo": "*",
"ext-json": "*",
"twbs/bootstrap": "5.0.0-beta3"
},
"autoload": {
"classmap": [
composer.lock
Generated
+95 -36
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "f7278c3dc731961ed65f3f31bf2b49f0",
"content-hash": "e0289598393b91834d5fbd72b92a029a",
"packages": [
{
"name": "doctrine/inflector",
@@ -103,16 +103,16 @@
},
{
"name": "illuminate/collections",
"version": "v8.36.0",
"version": "v8.38.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/collections.git",
"reference": "591e31015a8b0731708c54411cb52d50a00b2bc3"
"reference": "21690cd5591f2d42d792e5e4a687f9beba829f1d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/collections/zipball/591e31015a8b0731708c54411cb52d50a00b2bc3",
"reference": "591e31015a8b0731708c54411cb52d50a00b2bc3",
"url": "https://api.github.com/repos/illuminate/collections/zipball/21690cd5591f2d42d792e5e4a687f9beba829f1d",
"reference": "21690cd5591f2d42d792e5e4a687f9beba829f1d",
"shasum": ""
},
"require": {
@@ -153,11 +153,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2021-04-01T13:26:52+00:00"
"time": "2021-04-14T11:48:08+00:00"
},
{
"name": "illuminate/container",
"version": "v8.36.0",
"version": "v8.38.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/container.git",
@@ -208,7 +208,7 @@
},
{
"name": "illuminate/contracts",
"version": "v8.36.0",
"version": "v8.38.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
@@ -256,16 +256,16 @@
},
{
"name": "illuminate/database",
"version": "v8.36.0",
"version": "v8.38.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/database.git",
"reference": "09a2d38e27f930a5d9b7ef3514b650a3dc4cdd55"
"reference": "03c0525b693587f877f4d80dcc55597528c98fc0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/database/zipball/09a2d38e27f930a5d9b7ef3514b650a3dc4cdd55",
"reference": "09a2d38e27f930a5d9b7ef3514b650a3dc4cdd55",
"url": "https://api.github.com/repos/illuminate/database/zipball/03c0525b693587f877f4d80dcc55597528c98fc0",
"reference": "03c0525b693587f877f4d80dcc55597528c98fc0",
"shasum": ""
},
"require": {
@@ -320,11 +320,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2021-04-06T13:40:22+00:00"
"time": "2021-04-17T17:53:05+00:00"
},
{
"name": "illuminate/macroable",
"version": "v8.36.0",
"version": "v8.38.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/macroable.git",
@@ -370,16 +370,16 @@
},
{
"name": "illuminate/support",
"version": "v8.36.0",
"version": "v8.38.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
"reference": "26aa01648f348df7b7988ee911cdf98bcaae8ea1"
"reference": "735391f31e145aad4f7aff3d9736ef70452dd1fe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/26aa01648f348df7b7988ee911cdf98bcaae8ea1",
"reference": "26aa01648f348df7b7988ee911cdf98bcaae8ea1",
"url": "https://api.github.com/repos/illuminate/support/zipball/735391f31e145aad4f7aff3d9736ef70452dd1fe",
"reference": "735391f31e145aad4f7aff3d9736ef70452dd1fe",
"shasum": ""
},
"require": {
@@ -434,7 +434,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2021-04-06T13:05:53+00:00"
"time": "2021-04-15T11:51:39+00:00"
},
{
"name": "nesbot/carbon",
@@ -1213,21 +1213,21 @@
},
{
"name": "symfony/service-contracts",
"version": "v2.2.0",
"version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1"
"reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1",
"reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
"reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"psr/container": "^1.0"
"psr/container": "^1.1"
},
"suggest": {
"symfony/service-implementation": ""
@@ -1235,7 +1235,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.2-dev"
"dev-main": "2.4-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -1272,7 +1272,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/service-contracts/tree/master"
"source": "https://github.com/symfony/service-contracts/tree/v2.4.0"
},
"funding": [
{
@@ -1288,7 +1288,7 @@
"type": "tidelift"
}
],
"time": "2020-09-07T11:33:47+00:00"
"time": "2021-04-01T10:43:52+00:00"
},
{
"name": "symfony/string",
@@ -1468,16 +1468,16 @@
},
{
"name": "symfony/translation-contracts",
"version": "v2.3.0",
"version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
"reference": "e2eaa60b558f26a4b0354e1bbb25636efaaad105"
"reference": "95c812666f3e91db75385749fe219c5e494c7f95"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/e2eaa60b558f26a4b0354e1bbb25636efaaad105",
"reference": "e2eaa60b558f26a4b0354e1bbb25636efaaad105",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/95c812666f3e91db75385749fe219c5e494c7f95",
"reference": "95c812666f3e91db75385749fe219c5e494c7f95",
"shasum": ""
},
"require": {
@@ -1489,7 +1489,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.3-dev"
"dev-main": "2.4-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -1526,7 +1526,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/translation-contracts/tree/v2.3.0"
"source": "https://github.com/symfony/translation-contracts/tree/v2.4.0"
},
"funding": [
{
@@ -1542,7 +1542,63 @@
"type": "tidelift"
}
],
"time": "2020-09-28T13:05:58+00:00"
"time": "2021-03-23T23:28:01+00:00"
},
{
"name": "twbs/bootstrap",
"version": "v5.0.0-beta3",
"source": {
"type": "git",
"url": "https://github.com/twbs/bootstrap.git",
"reference": "220139a89ffc3864bbb6e1b35471667318eadc1f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twbs/bootstrap/zipball/220139a89ffc3864bbb6e1b35471667318eadc1f",
"reference": "220139a89ffc3864bbb6e1b35471667318eadc1f",
"shasum": ""
},
"replace": {
"twitter/bootstrap": "self.version"
},
"type": "library",
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Mark Otto",
"email": "markdotto@gmail.com"
},
{
"name": "Jacob Thornton",
"email": "jacobthornton@gmail.com"
}
],
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"homepage": "https://getbootstrap.com/",
"keywords": [
"JS",
"css",
"framework",
"front-end",
"mobile-first",
"responsive",
"sass",
"web"
],
"support": {
"issues": "https://github.com/twbs/bootstrap/issues",
"source": "https://github.com/twbs/bootstrap/tree/v5.0.0-beta3"
},
"funding": [
{
"url": "https://opencollective.com/bootstrap",
"type": "open_collective"
}
],
"time": "2021-03-23T16:26:54+00:00"
},
{
"name": "voku/portable-ascii",
@@ -1622,13 +1678,16 @@
"packages-dev": [],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": [],
"stability-flags": {
"twbs/bootstrap": 10
},
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
"ext-mysqli": "*",
"ext-sqlite3": "*",
"ext-fileinfo": "*"
"ext-fileinfo": "*",
"ext-json": "*"
},
"platform-dev": [],
"plugin-api-version": "2.0.0"
config/database.json
+1 -1
View File
@@ -3,5 +3,5 @@
"host": "localhost",
"database": "testdb",
"username": "root",
"password":"V#_xWL6_"
"password": ""
}