Compare commits

..

13 Commits

Author SHA1 Message Date
Ida Tiegel 1e1d8f9c60 Update
Update hihi
2021-05-28 08:54:15 +02:00
jona345e 921c1ed876 update game jame 2021-05-07 12:30:02 +02:00
jona345e e82588b955 Merge remote-tracking branch 'origin/main' into main 2021-05-07 12:25:34 +02:00
Ida Tiegel 43d47fb2aa Update 2021-05-07 12:24:07 +02:00
jona345e 4f2cb208fd test 2021-05-05 08:39:27 +02:00
Ida Tiegel 00f6020dbc Update Index.html 2021-05-05 08:32:16 +02:00
Ida Tiegel 3e91dd77b5 Update 2021-05-05 08:25:01 +02:00
Jacob Søfeldt 2b08ef3e07 upload file 2021-04-29 11:47:55 +02:00
Jacob Søfeldt 87830d0a9e addGameJam fix 2021-04-26 11:16:37 +02:00
Jacob Søfeldt 4db2b3d3a3 Merge branch 'main' of https://gitea.itskp-odense.dk/Game-jam-Devs/Game-Jaming 2021-04-26 08:26:20 +02:00
Jacob Søfeldt a034630795 minder index fix 2021-04-26 08:25:41 +02:00
jona345e 619a052309 Merge remote-tracking branch 'origin/main' into main 2021-04-26 08:22:47 +02:00
jona345e 5213c33f2a back end update 2021-04-26 08:21:51 +02:00
37 changed files with 2144 additions and 1804 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ if (isset($_POST['aLogin'])) {
if (password_verify($password, $hashedPassword)) {
$_SESSION['userName'] = $userName;
$_SESSION['admin'] = true;
$_SESSION['success'] = "You are now logged in";
//$_SESSION['success'] = "You are now logged in";
http_response_code(200);
makeAdminLogin($userName);
} else {
+2 -1
View File
@@ -8,7 +8,8 @@ if (isAdmin()) {
if (isset($_POST["newAdmin"])) {
$admin = new AdminUser();
$admin->user_name = $_POST["newUsername"];
$admin->password = $_POST["newPassword"];
$admin->password = password_hash($_POST["newPassword"],PASSWORD_DEFAULT);
if ($admin->save()) {
http_response_code(201);
} else {
@@ -13,9 +13,12 @@ if (isset($_GET['gameDataId'])) {
$registrationIds = Registration::where("group_id", $_GET['groupId'])->pluck("game_data_id")->toArray();
$openGameDataStream = GameData::whereIn("id", $registrationIds)->get();
} elseif (isset($_GET['gameJamId'])) {
$gameDataIds = Group::where("game_jam_id", $_GET['gameJamId'])->pluck("game_data_id")->toArray();
$gameDataIds = Registration::where("game_jam_id", $_GET['gameJamId'])->pluck("game_data_id")->toArray();
$openGameDataStream = GameData::whereIn("id", $gameDataIds)->get();
} else {
} elseif (isset($_GET["newest"])){
$openGameDataStream = GameData::all()->sortByDesc("updated_at")->take($_GET["newest"]);
}
else {
$openGameDataStream = GameData::all();
}
@@ -38,19 +38,30 @@ if (isLogin()) {
$gameData->game_name = $title;
if (isset($gameData) && $gameFileError === 0) {
unlink("../../Games/" . $gameData->game_link);
if(unlink("../../Games/" . $gameData->game_link)){
$gameData->game_link = ZipFileHandler($gameFileName, $gameFileTmp);
}else{
http_response_code(500);
exit();
}
}
$gameData->description = $desc;
if (isset($thumbnail) && $thumbnailFileError === 0) {
unlink("../../../Frontend/images/" . $gameData->img);
if(unlink("../../../Frontend/images/" . $gameData->img)){
$gameData->img = imagesFileHandler($thumbnailFileName, $thumbnailFileTmp);
}else{
http_response_code(500);
exit();
}
}
$gameData->is_web_Based = $isWebBased;
if (!$gameData->save()) {
http_response_code(500);
} else {
http_response_code(201);
http_response_code(200);
}
} else {
+1 -1
View File
@@ -23,7 +23,7 @@ if (isLogin()) {
echo json_encode(["message" => "gameJam not found"]);
exit();
}
$registration = Registration::where('game_jam_id', $gameJam->id)->where("group_id", $group->id)->frist();
$registration = Registration::where('game_jam_id', $gameJam->id)->where("group_id", $group->id)->first();
if ($registration === null) {
http_response_code(401);
echo json_encode(["message" => "group not registered for that game jam"]);
@@ -11,7 +11,20 @@ use Backend\Models\GameJam;
if (isset($_GET['gameJamId'])) {
$dbValue = GameJam::find($_GET['gameJamId']);
}elseif (isset($_GET['hasEnded'])){
$hasEnded = $_GET['hasEnded'];
if($hasEnded == 0 OR $hasEnded == 1){
if ($hasEnded){
$dbValue = GameJam::where("is_finished",1)->get();
}else{
$dbValue = GameJam::where("is_finished",0)->get();
}
}
else{
$dbValue = GameJam::all();
}
}
else {
$dbValue = GameJam::all();
}
@@ -23,7 +23,7 @@ if (isAdmin()) {
$gameJam->description = $_POST['description'];
if ($gameJam->save()) {
http_response_code(201);
http_response_code(200);
} else {
http_response_code(500);
}
+2
View File
@@ -16,3 +16,5 @@ header("Access-Control-Allow-Methods: GET");
header("Access-Control-Allow-Headers: X-Requested-With, Content-Type, Accept");
header('Content-Type: application/json;charset=UTF-8');
echo json_encode(array('data' => $groups->jsonSerialize()));
+1 -2
View File
@@ -10,11 +10,10 @@ if (isAdmin()) {
$password = Password::firstWhere("group_id", $_POST['groupId']);
if ($password) {
$password->password = password_hash($_POST['newPassword'], PASSWORD_DEFAULT);
echo $password;
if (!$password->save()) {
http_response_code(500);
} else {
http_response_code(201);
http_response_code(200);
}
} else {
http_response_code(400);
-3
View File
@@ -8,9 +8,6 @@ use Backend\Models\Password;
use Backend\Models\GameJam;
use Illuminate\Support\Str;
$groupName = "";
$errors = array();
if (isset($_POST['regGroup'])) {
+1 -1
View File
@@ -11,7 +11,7 @@ if (isLogin()) {
if (!$group->save()) {
http_response_code(500);
} else {
http_response_code(201);
http_response_code(200);
}
} else {
http_response_code(400);
+1 -1
View File
@@ -12,7 +12,7 @@ if (isLogin()) {
if (!$password->save()) {
http_response_code(500);
} else {
http_response_code(201);
http_response_code(200);
}
} else {
http_response_code(400);
@@ -1 +1,20 @@
<?php
require_once "../../../bootstrap.php";
use Backend\Models\Registration;
if(isset($_GET["registrationId"])){
$regs = Registration::find($_GET["registrationId"]);
} elseif (isset($_GET["groupId"])){
$regs = Registration::where("group_id", $_GET["groupId"])->get();
} elseif (isset($_GET["gameJamId"])){
$regs = Registration::where("game_jam_id", $_GET["gameJamId"])->get();
}elseif (isset($_GET["gameDataId"])){
$regs = Registration::where("game_data_id", $_GET["gameDataId"])->get();
}else{
$regs = Registration::all();
}
header("Access-Control-Allow-Methods: GET");
header("Access-Control-Allow-Headers: X-Requested-With, Content-Type, Accept");
header('Content-Type: application/json;charset=UTF-8');
echo json_encode(array('data' => $regs->jsonSerialize()));
@@ -6,7 +6,7 @@ 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()){
if($reg = Registration::find($_POST["registrationId"])->where("group_id", groupViaToken($_SESSION['token'])->id)->first()){
$reg->group_amount = $_POST["groupAmount"];
if($reg->save()){
http_response_code(200);
+3 -3
View File
@@ -6,12 +6,12 @@ use \Backend\Models\KeyWord;
use \Backend\Models\GameJam;
use Backend\Models\Registration;
if (!isAdmin()) {
if (isset($_GET['genKeyWord'])) {
if (isAdmin()) {
if (isset($_GET['gameJamId'])) {
$gameJamId = $_GET['gameJamId'];
$game_jam = GameJam::find($gameJamId);
$all_registration_in_game_jam_id = Registration::where("game_jam_id", $game_jam->id)->pluck("id")->toArray();
$find_all_keywords = KeyWord::whereIn("group_id", $all_registration_in_game_jam_id)->inRandomOrder()->take(6)->get();
$find_all_keywords = KeyWord::whereIn("registration_id", $all_registration_in_game_jam_id)->inRandomOrder()->take(6)->get();
$game_jam->key_word = $find_all_keywords->first()->key_word;
if (!$game_jam->save()) {
http_response_code(500);
+6 -6
View File
@@ -7,20 +7,20 @@ use Backend\Models\Registration;
use Backend\Models\Group;
use Backend\Models\KeyWord;
session_start();
if (isLogin()) {
if (isset($_POST['submitKeyWord'])) {
//Find the group
$group = groupViaToken($_SESSION['token']);
if($gameJam = GameJam::find($_POST["gameJamId"]) === null){
if(!$gameJam = GameJam::find($_POST['gameJamId'])){
http_response_code(400);
echo json_encode(["message" => "gameJam not found"]);
exit();
}
$registration = Registration::where('game_jam_id', $gameJam->id)->where("group_id", $group->id)->frist();
if ($registration === null) {
//var_dump($gameJam);
$registration = Registration::where('game_jam_id', $gameJam->id)->where("group_id", $group->id)->first();
if (!$registration) {
http_response_code(401);
echo json_encode(["message" => "group not registered for that game jam"]);
exit();
@@ -33,7 +33,7 @@ if (isLogin()) {
$keyword = new KeyWord();
//Take the keyWord the user typed and set it equal to the keyword valuable
$keyword->key_word = $_POST['key_word'];
$keyword->key_word = $_POST['keyWord'];
//Make foreign key from the groups table to the keyWords table
$keyword->registration()->associate($registration);
+2 -1
View File
@@ -13,7 +13,8 @@ Capsule::schema()->create("game_jams", function (Blueprint $table) {
$table->dateTime("start_time");
$table->dateTime("end_time");
$table->string("key_word")->nullable();
$table->text("description")->nullable();
$table->text("description");
$table->boolean("is_finished")->default(false);
$table->timestamps();
});
+1 -1
View File
@@ -10,7 +10,7 @@ use Illuminate\Support\Facades\Schema;
Capsule::schema()->create("key_words", function (Blueprint $table) {
$table->id();
$table->string('key_word');
$table->foreignId("registrations_id")->constrained("registrations");
$table->foreignId("registration_id")->constrained("registrations");
$table->timestamps();
});
+2 -1
View File
@@ -12,7 +12,8 @@ class GameJam extends Eloquent
'start_time',
'end_time',
'key_word',
'description'
'description',
'is_finished'
];
Binary file not shown.
+2
View File
@@ -1,9 +1,11 @@
{
"ExpandedNodes": [
"",
"\\Html",
"\\Images",
"\\Javascript",
"\\Styles"
],
"SelectedNode": "\\Index.html",
"PreviewInSolutionExplorer": false
}
+149 -56
View File
@@ -75,117 +75,210 @@
<h3>Administration</h3>
<h5>Opret Game Jam</h5>
<div>
<div class="container">
<form id="createGameJam" method="POST">
<!-- <label for="nameOfGameJam">Indtast navn på Game Jam:</label>
<input type="text" name="newGameJam" id="nameOfGameJam"> -->
<div class="row">
<div class="FormField">
<input
type="text"
<input type="text"
class="FormFieldInput"
placeholder="Gamejam title"
name="newGameJam"
id="GamejamTitle"
required
/>
<label for="GamejamTitle" class="FormFieldLabel">
id="gamejamTitle"
required />
<label for="gamejamTitle" class="FormFieldLabel">
Gamejam title
</label>
</div>
</div>
<div class="row row-cols-2">
<div class="col" id="colDate">
<div class="FormField">
<div id="Dates">
<input
type="date"
<input type="date"
class="FormFieldInput"
placeholder="mm/dd/yyyy"
name="startDate"
id="startDate"
required
/>
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
/>
<label for="endDate" class="FormFieldLabel" id="endDateLabel">
Slut dato
</label>
</div>
<div class="Times">
<label for="startTime" class="FormFieldLabel" id="startTimeLabel">
Start
</label>
<input
type="text"
</div>
<div class="col" id="colTime">
<div class="FormField">
<input type="time"
class="FormFieldInput"
placeholder="hh:mm"
name="startTime"
id="startTime"
required
/>
required />
<label for="startTime" class="FormFieldLabel" id="startTimeLabel">
Start tid
</label>
</div>
</div>
<input
type="text"
</div>
<div class="row row-cols-2">
<div class="col" id="colDate">
<div class="FormField">
<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>
<div class="col" id="colTime">
<div class="FormField">
<input type="time"
class="FormFieldInput"
placeholder="hh:mm"
name="endTime"
id="endTime"
required
/>
required />
<label for="endTime" class="FormFieldLabel" id="endTimeLabel">
Slut tid
</label>
</div>
</div>
</div>
<div class="FormField">
<input
type="text"
<input type="text"
class="FormFieldInput"
placeholder="Emne / Keywords (Ikke obligatorisk)"
name="keyWord"
id="keyWord"
required
/>
id="keyWord" />
<label for="keyWord" class="FormFieldLabel" id="keyWordLabel">
Emne / Keywords (Ikke obligatorisk)
Emne (Ikke obligatorisk)
</label>
</div>
<div class="FormField">
<textarea
class="FormFieldInput"
<textarea class="FormFieldInput"
placeholder="Beskrivelse"
name="description"
id="Beskrivelse"
required
></textarea>
required></textarea>
<label for="keyWord" class="FormFieldLabel" id="keyWordLabel">
Beskrivelse
</label>
</div>
<!-- <div class="form-floating">
<textarea class="form-control" name="description" id="description" placeholder="Leave a comment here" id="floatingTextarea2" style="height: 100px"></textarea>
<label for="floatingTextarea2">Beskrivelse</label>
</div> -->
<input type="submit" name="newGameJam" id="indsend" value="Indsend" />
</form>
</div>
<!-- Opret game jam slut -->
<hr class="GradientDivider">
<!-- updater game jam start -->
<h5>updater Game Jam</h5>
<div class="container">
<form id='UpdateGameJam' method='post'>
<section id="game-jame-update-drop-down">
</section>
<section id="game-jame-update">
<div class="row">
<div class="FormField">
<label for='UGameJamTitle' class="FormFieldLabel" id="UGameJamTitleLabel">Game Jam tittle</label>
<input type='text'
class="FormFieldInput"
placeholder="Gamejam title"
id='UGameJamTitle'
required value=""
name="gameJamName" />
</div>
</div>
<div class="row row-cols-2">
<div class="col" id="colDate">
<div class="FormField">
<label for="UStartDate" class="FormFieldLabel" id="UStartDateLabel">Start dag</label>
<input type='date'
class="FormFieldInput"
placeholder="mm/dd/yyyy"
id='UStartDate'
required name="startDate" />
</div>
</div>
<div class="col" id="colTime">
<div class="FormField">
<label for="UStartTime" class="FormFieldLabel" id="UStartTimeLabel">Start tid</label>
<input type="time"
class="FormFieldInput"
placeholder="hh:mm"
id="UStartTime"
required name="startTime" />
</div>
</div>
</div>
<div class="row row-cols-2">
<div class="col" id="colDate">
<div class="FormField">
<label for="UEndDate" class="FormFieldLabel" id="UEndDateLabel">Slut dag</label>
<input type="date"
class="FormFieldInput"
placeholder="mm/dd/yyyy"
id="UEndDate"
required name="endDate" />
</div>
</div>
<div class="col" id="colTime">
<div class="FormField">
<label for="UEndTime" class="FormFieldLabel" id="UEndTimeLabel">slut tid</label>
<input type="time"
Class="FormFieldInput"
placeholder="hh:mm"
id="UEndTime"
required name="endTime" />
</div>
</div>
</div>
<div class="FormField">
<label for="UKeyWord" class="FormFieldLabel" id="UKeyWordLabel">Emne(Ikke obligatorisk)</label>
<input type="text"
class="FormFieldInput"
placeholder="Emne / Keywords (Ikke obligatorisk)"
id="UKeyWord"
name="keyWord" />
</div>
<div class="FormField">
<label for="UKeyWord" class="FormFieldLabel" id="UDescriptionLabel">Beskrivelse</label>
<textarea class="FormFieldInput"
placeholder="Beskrivelse"
id="UDescription"
required name="description"></textarea>
</div>
<input type="submit"
value="set"
name="updateGameJam"
id="updateGameJam" />
</section>
</form>
</div>
<!-- Body scripts -->
<script src="../Javascript/OverlayScrollbar.js"></script>
<!--<script src="../Javascript/AddEvent.js"></script>-->
<script src="../Javascript/AddGameJam.js"></script>
<!-- Body scripts end -->
<script src="../Javascript/AdminPageScript.js"></script>
</body>
</html>
+80
View File
@@ -267,6 +267,86 @@
</div>
</div>
</section>
<section>
<form>
<div class="row">
<div class="col">
<div class="mb-3">
<label for="List1" class="form-label">GameJam</label>
<input
class="form-control"
list="datalistOptions"
id="List1"
placeholder="Type to search..."
/>
<datalist id="datalistOptions">
<option value="text"></option>
</datalist>
</div>
</div>
<div class="col">
<div class="mb-3">
<label for="Text1" class="form-label">Title</label>
<input type="text" class="form-control" id="Text1" required />
</div>
</div>
</div>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" id="Switch1" />
<label class="form-check-label" for="Switch1"
>Er det et web spille?</label
>
</div>
<div class="row">
<div class="col">
<div class="mb-3">
<div>
<label for="formFile1" class="form-label">Game file</label>
<input
class="form-control form-control-sm"
type="file"
id="formFile1"
accept=".zip"
required
/>
</div>
<div class="mb-3 pt-2">
<label for="formFile2" class="form-label"
>Thumbnail file</label
>
<input
class="form-control form-control-sm"
type="file"
id="formFile2"
aria-describedby="fileHelp"
accept="image/*"
/>
<div id="fileHelp" class="form-text">
Thumbnail is optional.
</div>
</div>
</div>
</div>
<div class="col">
<div class="mb-3">
<label for="Text2" class="form-label">Description</label>
<textarea
class="form-control"
id="Text2"
rows="3"
required
></textarea>
</div>
</div>
</div>
<div class="col-12 d-flex justify-content-end">
<button type="submit" class="btn btn-primary btn-lg">
Submit
</button>
</div>
</form>
</section>
</div>
</div>
</body>
+47
View File
@@ -0,0 +1,47 @@
<!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title></title>
</head>
<body>
<div class="col-sm">
<!--Game Jam-->
<button type="button" class="collapsed" data-bs-toggle="collapse" data-bs-target="#gamejam-1" id="activeGameJam" aria-expanded="false">Game Jam</button>
<div class="collapse" id="gamejam-1" style="">
<!--Game-->
<button type="button" class="collapsed" data-bs-toggle="collapse" data-bs-target="#gamejam-1-game-0" id="gameDataId" aria-expanded="false">Spil</button>
<div class="collapse" id="gamejam-1-game-0" style="">
<!--Vote-->
<button type="submit" data-bs-toggle="modal" data-bs-target="#voteAndComment" id="oneVote">Vote</button>
</div>
<!--Game-->
<button type="button" class="collapsed" data-bs-toggle="collapse" data-bs-target="#gamejam-1-game-1" id="gameDataId" aria-expanded="false">Spil</button>
<div class="collapse" id="gamejam-1-game-1" style="">
<!--Vote-->
<button type="submit" data-bs-toggle="modal" data-bs-target="#voteAndComment" id="oneVote">Vote</button>
</div>
<!--Game-->
<button type="button" class="" data-bs-toggle="collapse" data-bs-target="#gamejam-1-game-2" id="gameDataId">Spil</button>
<div class="collapse" id="gamejam-1-game-2">
<!--Vote-->
<button type="submit" data-bs-toggle="modal" data-bs-target="#voteAndComment" id="oneVote">Vote</button>
</div>
<!--Game-->
<button type="button" class="" data-bs-toggle="collapse" data-bs-target="#gamejam-1-game-3" id="gameDataId">Spil</button>
<div class="collapse" id="gamejam-1-game-3">
<!--Vote-->
<button type="submit" data-bs-toggle="modal" data-bs-target="#voteAndComment" id="oneVote">Vote</button>
</div>
<!--Game-->
<button type="button" class="" data-bs-toggle="collapse" data-bs-target="#gamejam-1-game-4" id="gameDataId">Spil</button>
<div class="collapse" id="gamejam-1-game-4">
<!--Vote-->
<button type="submit" data-bs-toggle="modal" data-bs-target="#voteAndComment" id="oneVote">Vote</button>
</div>
</div>
</div>
</body>
</html>
+216 -433
View File
File diff suppressed because it is too large Load Diff
+14 -22
View File
@@ -4,32 +4,24 @@ $(document).ready(function () {
$("#createGameJam").submit(function (e) {
let URL = "/Backend/Controllers/GameJam/NewGameJam.php";
let form = $("#createGameJam")[0];
let formData = new FormData(form);
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);
const params = new URLSearchParams();
params.append("newGameJam", document.getElementById("indsend").value);
params.append("gameJamName", document.getElementById("gamejamTitle").value);
params.append("startDate", document.getElementById("startDate").value);
params.append("endDate", document.getElementById("endDate").value);
params.append("startTime", document.getElementById("startTime").value);
params.append("endTime", document.getElementById("endTime").value);
params.append("keyWord", document.getElementById("keyWord").value);
params.append("description", document.getElementById("Beskrivelse").value);
axios
.post(URL, formData, {
header: "multipart/form-data",
.post(URL, params)
.then(function (response) {
console.log(response);
})
.then((res) => {
if (res.status === 200) {
console.log("New Game Jam Created!");
}
})
.catch((error) => {
console.log(error.response);
.catch(function (error) {
console.log(error);
});
e.preventDefault();
});
});
+46
View File
@@ -0,0 +1,46 @@
async function getGamejames(id = 0) {
if(id !== 0){
var url = "http://localhost/Game-Jaming/Backend/Controllers/GameJam/GetGameJam.php?gameJamId="+id;
}else {
var url = "http://localhost/Game-Jaming/Backend/Controllers/GameJam/GetGameJam.php";
}
let response = await axios.get(url);
return response.data.data
}
async function updateGameDropdown() {
var UGJDropDown = document.getElementById("game-jame-update-drop-down");
var jsondata;
var UGJDropDownHtml = "<label for='gameJamesDropdown'>vælge et game Jam:</label>"+
"<select onchange='changeGameJamUpdate()' id='gameJamesDropdown' name='gameJamId'>";
await getGamejames().then((data) =>
data.forEach(val =>
UGJDropDownHtml += " <option value='"+val.id+"'>"+val.name+"</option>"
));
UGJDropDownHtml += "</select>";
//console.log(UGJDropDownHtml);
UGJDropDown.innerHTML = UGJDropDownHtml;
changeGameJamUpdate()
}
async function changeGameJamUpdate() {
var val = document.getElementById("gameJamesDropdown").value;
await getGamejames(parseInt(val)).then(function (data) {
document.getElementById("UGameJamTitle").value = data.name;
var startDateTime = data.start_time.split(" ");
document.getElementById("UStartDate").value = startDateTime[0];
document.getElementById("UStartTime").value = startDateTime[1];
var endDateTime = data.end_time.split(" ");
document.getElementById("UEndDate").value = endDateTime[0];
document.getElementById("UEndTime").value = endDateTime[1];
document.getElementById("UKeyWord").value = data.key_word;
document.getElementById("UDescription").value = data.description;
}
);
}
updateGameDropdown();
+25
View File
@@ -0,0 +1,25 @@
// JavaScript source code
var numberOfGameJam = 6
var oldGameJam = document.getElementById("oldGameJam");
var html = '<div class="row">'
var numberOfGame = 5
//game jams
for (let i = 1; i <= numberOfGameJam; i++) {
html += '<div class="col-sm">' +
'<button type="button" class="Collapsible" data-bs-toggle="collapse" data-bs-target="#oldGame-' + i + '">Kategori</button>' +
'<div class="collapse" id="oldGame-' + i + '">'
//spil
for (let j = 0; j < numberOfGame; j++) {
html += '<button type="button" class="" data-bs-toggle="collapse" data-bs-target="#oldGame-' + i + '-game-' + j + '" id="gameDataId">Spil</button>';
}
html += '</div>'
html += '</div>'
if ((i % 3 == 0) && (i != numberOfGameJam)) {
html += '</div><div class="row">'
}
}
html += '</div>'
oldGameJam.innerHTML += html;
+2 -1
View File
@@ -83,13 +83,14 @@ $(document).ready(function () {
// Check data before submitting
$("#RegisterForm").submit(function (e) {
/*
if (!selectedGameJam >= 1) {
$("#GameJamSelect").addClass("invalidInput");
e.preventDefault();
return false;
} else {
$("#gameJamId").val($("#GameJamSelect option:selected").val());
}
}*/
if ($("#pass1").val().length === 0) {
$("#pass1").addClass("invalidInput");
+27
View File
@@ -1 +1,28 @@
// JavaScript source code
var numberOfGameJam = 6
var gameJamVote = document.getElementById("gameJamVote");
var html = '<div class="row">'
//game jams
for (let i = 1; i <= numberOfGameJam; i++) {
html += '<div class="col-sm">'+
'<button type="button" class="" data-bs-toggle="collapse" data-bs-target="#gamejam-'+i+'" id="activeGameJam">Game Jam</button>' +
'<div class="collapse" id="gamejam-' + i +'">'
//spil
for (let j = 0; j < 5; j++) {
html += '<button type="button" class="" data-bs-toggle="collapse" data-bs-target="#gamejam-' + i + '-game-' + j +'" id="gameDataId">Spil</button>' +
'<div class="collapse" id="gamejam-' + i +'-game-'+j+'">' +
'<button type="submit" data-bs-toggle="modal" data-bs-target="#voteAndComment" id="oneVote">Vote</button>' +
'</div>'
}
html += '</div>'
html += '</div>'
if ((i % 3 == 0) && (i != numberOfGameJam)) {
html += '</div><div class="row">'
}
}
html += '</div>'
gameJamVote.innerHTML += html;
+29
View File
@@ -0,0 +1,29 @@
$(document).ready(function () {
axios.defaults.baseURL = "http://localhost/Game-Jaming";
$("#uploadFile").submit(function (e) {
let URL = "/Backend/Controllers/FileHandler/upload.php";
const params = new URLSearchParams();
params.append("submitUpload", document.getElementById("indsend1").value);
params.append(
"gameJamId",
document.getElementById("datalistOptions").value
);
params.append("gameTitle", document.getElementById("Text1").value);
params.append("description", document.getElementById("Text2").value);
params.append("gameFile", document.getElementById("formFile1").value);
params.append("thumbnailFile", document.getElementById("formFile2").value);
params.append("isWebBased", document.getElementById("Switch1").checked);
axios
.post(URL, params)
.then(function (response) {
console.log(response);
})
.catch(function (error) {
console.log(error);
});
e.preventDefault();
});
});
+140 -30
View File
@@ -1,11 +1,13 @@
body {
text-align: center;
background-color: #121B26;
color: #F2E6D8;
}
.HeaderPanel {
position: fixed;
overflow: hidden;
background-color: rgb(33, 37, 41);
background-color: #59142D;
padding: 10px 10px;
top: 0;
width: 100%;
@@ -13,13 +15,16 @@ body {
.HeaderPanel a {
text-align: center;
color: rgba(255, 255, 255, .75);
color: #F2E6D8;
padding: 6px;
text-decoration: none;
font-size: 18px;
line-height: 25px;
border-radius: 4px;
}
.HeaderPanel a:hover {
color: #BF7D65;
}
.HeaderTitle {
text-align: center;
@@ -32,10 +37,19 @@ body {
float: left;
}
h5{
padding-bottom: 30px;
}
/*Create game jam*/
.container{
height: 70vh !important;
}
#createGameJam {
justify-content: center;
/*justify-content: center;*/
display: grid;
width: 90%;
}
#createGameJam input{
@@ -48,10 +62,10 @@ body {
}
#startDate {
width: 32.5%;
/*width: 32.5%;*/
display: inline-block !important;
margin-right: 2.5%;
float: left;
}
#startDateLabel {
@@ -60,49 +74,50 @@ body {
}
#endDate {
width: 32.5%;
/*width: 32.5%;
*/
display: inline-block !important;
margin-left: 2.5%;
margin-right: 2.5%;
float: left;
}
#endDateLabel {
display: inline-block;
left: 37.5%;
left: 0;
/* left: 37.5%;
*/
}
#colDate{
width: 60%;
}
#colTime{
width: 40%;
}
#startTime {
width: 12.5%;
display: inline-block !important;
/* width: 12.5%;
*/
/* display: inline-block !important;*/
margin-right: 2.5%;
float: left;
justify-content: center;
display: grid;
}
#startTimeLabel {
display: inline-block;
left: 72.5%;
left: 0;
}
#endTime {
width: 12.5%;
display: inline-block !important;
float: left;
}
#endTimeLabel {
display: inline-block;
left: 87.5%;
}
#description {
background-color: rgb(18, 18, 18);
color: rgba(255, 255, 255, .55);
border-radius: 15px;
border: double;
width:400px;
height:250px;
left: 0;
}
#Beskrivelse {
@@ -110,14 +125,96 @@ body {
}
#indsend {
border-radius: 15px;
color: rgba(255, 255, 255, .55);
background-color: rgb(18, 18, 18);
border: double;
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: #F2E6D8;
border-radius: 24px;
transition: 0.25s;
width: 50%;
}
#indsend:hover {
color: #BF7D65;
}
#row{
width:90%;
}
/*Create Game Jam end*/
/*Update Game Jam start*/
#game-jame-update {
display: grid !important;
width: 90%;
}
#UGameJamTitle {
display: grid;
width: 90%;
}
#UStartDate {
display: inline-block !important;
margin-right: 2.5%;
}
#UStartDateLabel {
display: inline-block;
left: 0;
}
#UStartTime {
margin-right: 2.5%;
float: left;
justify-content: center;
display: grid;
}
#UStartTimeLabel {
display: inline-block;
left: 0;
}
#UEndDate {
display: inline-block !important;
margin-right: 2.5%;
float: left;
}
#UEndDateLabel {
display: inline-block;
left: 0;
}
#UEndTime {
display: inline-block !important;
float: left;
}
#endTimeLabel {
display: inline-block;
left: 0;
}
#UKeyWord {
margin-bottom: 10px;
}
#updateGameJam{
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: #F2E6D8;
border-radius: 24px;
transition: 0.25s;
width: 50%;
}
#updateGameJam:hover {
color: #BF7D65;
}
/*Update Game Jam slut*/
.FormField {
position: relative;
padding: 15px 0 0;
@@ -153,14 +250,16 @@ body {
display: block;
transition: 0.2s;
font-size: 1rem;
color: #9b9b9b;
color: #F2E6D8;
}
.FormFieldInput:focus {
padding-bottom: 6px;
font-weight: 700;
border-width: 3px;
border-image: linear-gradient(to right, #11998e, #38ef7d);
border-image: linear-gradient(to right, #59142D, #FF142D);
/*linear-gradient(to right, #11998e, #38ef7d);*/
border-image-slice: 1;
}
.FormFieldInput:focus ~ .FormFieldLabel {
@@ -169,7 +268,7 @@ body {
display: block;
transition: 0.2s;
font-size: 1rem;
color: #11998e;
color: #BF7D65;
font-weight: 700;
}
@@ -177,3 +276,14 @@ body {
.FormFieldInput:invalid {
box-shadow: none;
}
.GradientDivider {
margin: 16px 0 16px 0;
display: block;
border: none;
height: 3px !important;
background: #59142D !important;
background: linear-gradient( to right, #121B26, #59142D, #94153d, #59142D, #121B26) !important;
opacity: 1;
}
+247 -196
View File
@@ -1,6 +1,7 @@
body,
html {
color: rgba(255, 255, 255, 0.55);
/*rgba(255, 255, 255, 0.55);*/
color: #F2E6D8;
font-family: Arial, Helvetica, sans-serif;
margin: 0;
padding: 0;
@@ -13,7 +14,8 @@ html {
}
body {
background-color: rgb(18, 18, 18);
/* background-color: rgb(18, 18, 18);*/
background-color: #121B26;
overflow: hidden;
transition: padding-top 0.3s ease-in-out;
padding-top: 53px;
@@ -24,11 +26,13 @@ section {
}
a {
color: rgba(255, 255, 255, 0.75);
/*rgba(255, 255, 255, 0.75);*/
color: #F2E6D8;
}
a:hover {
color: rgba(255, 255, 255, 0.75);
/*rgba(255, 255, 255, 0.75);*/
color: #BF7D65;
}
#content {
@@ -81,7 +85,7 @@ a:hover {
}
.mb-container .mb-track .mb-bar {
background-color: rgba(51, 51, 51, 0.75);
background-color: #121B26; /* rgba(51, 51, 51, 0.75);*/
}
.mb-container .mb-track {
@@ -102,13 +106,14 @@ a:hover {
width: 100%;
z-index: 1030;
}
/*Nav-bar start*/
.navbar-toggler:focus {
box-shadow: none;
}
.navbar-collapse {
background-color: rgb(33, 37, 41);
background-color: #59142D; /*rgb(33, 37, 41);*/
text-align: center;
}
@@ -116,6 +121,14 @@ a:hover {
outline: none;
}
.navbar-dark .navbar-nav .nav-link {
color: #F2E6D8 !important;
}
.navbar-dark .navbar-nav .nav-link:hover {
color: #BF7D65 !important;
}
.row.content {
height: 450px;
}
@@ -123,35 +136,36 @@ a:hover {
.CenterDiv {
margin: 1vw 10vw 0;
}
.LoginButton {
color: rgba(255, 255, 255, 0.55);
}
.LoginButton:hover {
color: rgba(255, 255, 255, 0.75);
}
.dropdown-menu {
background-color: rgba(34, 39, 43) !important;
/*rgba(34, 39, 43)*/
background-color: #59142D !important;
}
.dropdown-menu .dropdown-item {
color: rgba(255, 255, 255, 0.5) !important;
/*rgba(255, 255, 255, 0.5)*/
color: #F2E6D8 !important;
}
.dropdown-menu .dropdown-item:hover {
color: rgba(255, 255, 255, 0.75) !important;
/*rgba(255, 255, 255, 0.75)*/
color: #BF7D65 !important;
background-color: transparent !important;
}
.LoginModal .modal-header {
padding: 0;
border-bottom: 0;
background-color: rgb(18, 18, 18);
color: rgba(255, 255, 255, 0.75);
.LoginButton {
/*rgba(255, 255, 255, 0.55);*/
color: #F2E6D8;
}
.LoginButton:hover {
/*rgba(255, 255, 255, 0.75);*/
color: #BF7D65;
}
/*Nav-bar slut*/
/*Regler start*/
#RulesModal .modal-header {
text-align: center;
display: unset;
@@ -160,7 +174,8 @@ a:hover {
#RulesModal .modal-header h1 {
font-weight: bolder;
color: rgba(255, 255, 255, 0.75);
/*rgba(255, 255, 255, 0.75);*/
color: #F2E6D8;
}
#RulesModal .modal-dialog-scrollable .modal-content {
@@ -168,7 +183,7 @@ a:hover {
}
#ModalRulesTabContent ul {
color: rgb(204, 204, 204);
color: #59142D; /*rgb(204, 204, 204)*/
list-style-type: none;
padding-left: 0;
}
@@ -181,14 +196,24 @@ a:hover {
#ModalRulesTabContent li p {
font: 16px/1.5 Helvetica, sans-serif;
padding-left: 60px;
color: rgba(255, 255, 255, 0.55);
color: #F2E6D8; /*rgba(255, 255, 255, 0.55);*/
}
#ModalRulesTabContent span {
position: absolute;
color: rgba(255, 255, 255, 0.75);
color: #59142D; /*rgba(255, 255, 255, 0.75);*/
}
.btn-danger {
color: #F2E6D8;
background-color: #59142D;
border-color: #59142D;
}
.RulesModal .modal-header {
text-align: center;
}
/*Regler slut*/
/*Registering start*/
#pass_info {
position: absolute;
top: 300px;
@@ -196,7 +221,7 @@ a:hover {
right: 22%;
width: 250px;
padding: 15px;
background: rgb(254, 254, 254);
background: #F2E6D8;
font-size: 0.875em;
border-radius: 5px;
box-shadow: 0 1px 3px rgb(204, 204, 204);
@@ -211,7 +236,7 @@ a:hover {
left: 45%;
font-size: 14px;
line-height: 14px;
color: #ddd;
color: rgba(42, 84, 140, 1);
text-shadow: none;
display: block;
}
@@ -227,16 +252,17 @@ li {
margin: 0 0 10px 0;
padding: 0;
font-weight: normal;
color: #201f1f !important;
}
.invalid {
padding-left: 22px;
line-height: 24px;
color: rgb(236, 63, 65);
color: #d00f17;
}
.invalidInput {
border-color: rgb(219, 52, 52) !important;
border-color: #2A558C !important;
}
.invalid::before {
@@ -258,22 +284,28 @@ li {
font-family: "FontAwesome";
content: "\f00c";
}
/*Registering slut*/
.RulesModal .modal-header {
text-align: center;
/*Login start*/
.LoginModal .modal-header {
padding: 0;
border-bottom: 0;
/*background-color: rgb(18, 18, 18);*/
background-color: #121B26;
/*rgba(255, 255, 255, 0.75);*/
color: #F2E6D8;
}
.modal-body {
padding: 0 0;
margin: 2vh 2vw;
background-color: rgb(18, 18, 18);
background-color: #121B26; /*rgb(18, 18, 18);*/
}
.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;
background-color: #121B26; /*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;
}
.modal-backdrop {
@@ -281,24 +313,26 @@ li {
}
.nav-tabs {
border-bottom: 1px solid rgb(80, 80, 80);
border-bottom: 1px solid rgba(89, 19, 45, 1); /*rgb(80, 80, 80);*/
}
.nav-tabs .nav-item.show .nav-link,
.nav-tabs .nav-link.active {
color: rgba(255, 255, 255, 0.75);
background-color: rgb(37, 37, 37);
border-color: rgb(80, 80, 80);
color: #F2E6D8; /*rgba(255, 255, 255, 0.75);*/
background-color: #59142D; /* rgb(37, 37, 37);*/
border-color: #59142D; /*rgb(80, 80, 80);*/
}
.nav-tabs .nav-link {
color: rgba(255, 255, 255, 0.55);
color: #F2E6D8; /*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, 0.75);
border-color: #59142D; /*{rgb(80, 80, 80);*/
color: #BF7D65;
/*rgba(255, 255, 255, 0.75);*/
}
.FullWidthModalTabs {
@@ -321,13 +355,15 @@ li {
width: 16px;
height: 16px;
background-color: transparent;
color: rgba(255, 255, 255, 0.55);
color: #F2E6D8;
/*rgba(255, 255, 255, 0.55);*/
}
.CloseIcon:hover {
color: rgba(255, 255, 255, 0.75);
color: #BF7D65;
/*rgba(255, 255, 255, 0.75);*/
}
/*Kalender knap*/
.btn-close:hover {
fill: rgb(255, 0, 0);
}
@@ -354,9 +390,9 @@ li {
left: 50%;
transform: translate(-50%, -50%);
}
/*
.box #NUDMinus {
color: rgba(255, 255, 255, 0.55);
color: #F2E6D8; /*rgba(255, 255, 255, 0.55);
background-color: transparent;
border: none;
float: left;
@@ -371,7 +407,7 @@ li {
}
.box #NUDDisplay {
color: rgba(255, 255, 255, 0.55);
color: #F2E6D8 !important; /*rgba(255, 255, 255, 0.55);
background-color: transparent;
border: none;
cursor: text;
@@ -387,7 +423,7 @@ li {
}
.box #NUDPlus {
color: rgba(255, 255, 255, 0.55);
color: #F2E6D8; /*rgba(255, 255, 255, 0.55);
background-color: transparent;
border: none;
float: right;
@@ -406,15 +442,15 @@ li {
}
.box #GameJamSelect:hover {
color: rgba(255, 255, 255, 0.75);
color: #BF7D65; /*rgba(255, 255, 255, 0.75);
}
.box #GameJamSelect ul {
background-color: red;
background-color: #2A558C; /*red;
}
*/
.box {
background-color: rgb(18, 18, 18);
background-color: #121B26; /*rgb(18, 18, 18);*/
}
.box #username,
@@ -430,11 +466,11 @@ li {
display: block;
margin: 20px auto;
text-align: center;
border: 2px solid rgb(52, 152, 219);
border: 2px solid rgba(42, 84, 140, 1); /*rgb(52, 152, 219);*/
padding: 10px 10px;
width: 250px;
outline: none;
color: rgba(255, 255, 255, 0.55);
color: #F2E6D8; /*rgba(255, 255, 255, 0.55);*/
border-radius: 24px;
transition: 0.25s;
}
@@ -448,9 +484,9 @@ li {
margin: 20px auto;
padding: 0;
}
/*
.box #NUDMinus {
color: rgba(255, 255, 255, 0.55);
color: #F2E6D8; /*rgba(255, 255, 255, 0.55);
background-color: transparent;
border: none;
float: left;
@@ -465,13 +501,13 @@ li {
}
.box #NUDDisplay {
color: rgba(255, 255, 255, 0.55);
color: #F2E6D8; /*rgba(255, 255, 255, 0.55);
background-color: transparent;
border: none;
cursor: text;
width: 65%;
}
/*
.box #NUDDisplay:focus {
box-shadow: none;
}
@@ -481,7 +517,7 @@ li {
}
.box #NUDPlus {
color: rgba(255, 255, 255, 0.55);
color: #F2E6D8; rgba(255, 255, 255, 0.55);
background-color: transparent;
border: none;
float: right;
@@ -500,18 +536,21 @@ li {
}
.box #GameJamSelect:hover {
color: rgba(255, 255, 255, 0.75);
color: #BF7D65; /*rgba(255, 255, 255, 0.75);
}
.box #GameJamSelect ul {
background-color: red;
}
background-color: #2A558C; /*red;
}*/
.text-muted {
margin-bottom: 5vh;
color: rgba(255, 255, 255, 0.55) !important;
color: #F2E6D8 /*rgba(255, 255, 255, 0.55)*/ !important;
}
.LoginForm {
color: #F2E6D8;
background-color: #121B26;
}
.box h1 {
font-size: 3.2em;
text-align: center;
@@ -535,7 +574,7 @@ li {
.box #pass2:hover,
.box #loginPassword:hover,
.box #adminPassword:hover {
color: rgba(255, 255, 255, 0.75);
color: #BF7D65; /*rgba(255, 255, 255, 0.75);*/
}
.box input[type="submit"] {
@@ -544,18 +583,18 @@ li {
display: block;
margin: 20px auto;
text-align: center;
border: 2px solid rgb(46, 204, 113);
border: 2px solid #59142D; /*rgb(46, 204, 113);*/
padding: 14px 40px;
outline: none;
color: rgba(255, 255, 255, 0.55);
color: #F2E6D8; /*rgba(255, 255, 255, 0.55);*/
border-radius: 24px;
transition: 0.25s;
cursor: pointer;
}
.box input[type="submit"]:hover {
background: rgb(46, 204, 113);
color: rgba(255, 255, 255, 0.75);
background: #59142D; /* rgb(46, 204, 113);*/
color: #F2E6D8; /*rgba(255, 255, 255, 0.75);*/
}
.carousel-item img {
@@ -600,118 +639,6 @@ li {
}
}
/*slideshow effekt*/
.image_img {
display: block;
width: 100%;
}
.image_overlay {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.6);
color: rgb(255, 255, 255);
font-family: Arial;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
opacity: 0;
transition: opacity 0.25s;
}
.image_overlay > * {
transform: translateY(20px);
transition: transform 0.25s;
}
.image_overlay:hover {
opacity: 1;
}
.image_overlay:hover > * {
transform: translateY(0);
}
.image_title {
font-size: 2em;
font-weight: bold;
}
image_gruppenavn {
font-size: 1.25em;
margin-top: 0.25em;
}
/* slide show effekt slut*/
/*Kategori spil*/
.Collapsible {
background-color: rgb(18, 18, 18);
color: rgba(255, 255, 255, 0.55);
cursor: pointer;
padding: 18px;
width: 100%;
border: none;
text-align: left;
outline: none;
font-size: 15px;
width: 33.333%;
}
.CollapsibleContent {
padding: 0 18px;
display: none;
overflow: hidden;
background-color: rgb(18, 18, 18);
}
.left_text {
float: left;
}
.center_text {
display: inline-block;
margin: 0 auto;
}
.right_text {
float: right;
}
#hjem {
padding-top: 0;
}
#header {
position: fixed;
height: 52px;
top: 0;
width: 100%;
z-index: 100;
transition: all 0.3s ease;
box-shadow: 0 1px 25px rgba(0, 0, 0, 0.1);
}
#header.hide {
top: -56px;
}
.GradientDivider {
margin: 16px 0 16px 0;
display: block;
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;
}
/*Kalender*/
.container {
width: 100%;
@@ -823,6 +750,126 @@ image_gruppenavn {
}
/*Kalender slut*/
/*slideshow effekt*/
.image_img {
display: block;
width: 100%;
}
.image_overlay {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.6);
color: rgb(255, 255, 255);
font-family: Arial;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
opacity: 0;
transition: opacity 0.25s;
}
.image_overlay > * {
transform: translateY(20px);
transition: transform 0.25s;
}
.image_overlay:hover {
opacity: 1;
}
.image_overlay:hover > * {
transform: translateY(0);
}
.image_title {
font-size: 2em;
font-weight: bold;
}
image_gruppenavn {
font-size: 1.25em;
margin-top: 0.25em;
}
/* slide show effekt slut*/
/*Kategori spil*/
.Collapsible {
border: 0;
background: none;
display: block;
margin: 20px auto;
text-align: center;
border: 2px solid #2A558C;
padding: 10px 10px;
outline: none;
color: #F2E6D8;
border-radius: 24px;
transition: 0.25s;
width: 90%;
}
.CollapsibleContent {
padding: 0 18px;
display: none;
overflow: hidden;
background-color: transparent;
transition: 0.25s;
margin: 10px;
}
.left_text {
float: left;
}
.center_text {
display: inline-block;
margin: 0 auto;
}
.right_text {
float: right;
}
.Collapsible:hover {
color: #BF7D65;
}
#hjem {
padding-top: 0;
}
#header {
position: fixed;
height: 52px;
top: 0;
width: 100%;
z-index: 100;
transition: all 0.3s ease;
box-shadow: 0 1px 25px rgba(0, 0, 0, 0.1);
}
#header.hide {
top: -56px;
}
.GradientDivider {
margin: 16px 0 16px 0;
display: block;
border: none;
height: 3px !important;
background: #59142D !important;
background: linear-gradient( to right, #121B26, #59142D, #94153d, #59142D, #121B26) !important;
opacity: 1;
/*rgb(18, 18, 18),
rgb(0, 113, 185),
rgb(38, 171, 255),
rgb(0, 113, 185),
rgb(18, 18, 18)*/
}
/*Knap Return to top*/
#return-to-top {
position: fixed;
bottom: 20px;
@@ -864,20 +911,21 @@ image_gruppenavn {
color: rgba(255, 255, 255, 0.55);
top: 5px;
}
/*
.Collapse-Button {
width: 30%;
text-align: center;
font-weight: bold;
font-size: 18px;
border: double;
border-color: rgb(0, 113, 185);
border-color: #59142D;
border-radius: 15px;
background-color: transparent;
}
.Collapse-Button:hover {
border-color: rgb(52, 152, 219);
}
border-color: #721b1a;
}*/
ul.Circle-list {
display: inline-block;
@@ -886,7 +934,7 @@ ul.Circle-list {
ul.Circle-list li:before {
content: "\2022"; /* Unicode for a bullet */
color: rgb(0, 113, 185);
color: #59142D;
font-weight: bold;
display: inline-block; /* Needed to add space between the bullet and the text */
width: 1em; /* Also needed for space (tweak if needed) */
@@ -910,7 +958,7 @@ ol.Subject-list {
border: 2px solid rgb(52, 152, 219);
padding: 10px 10px;
outline: none;
color: rgba(255, 255, 255, .55);
color: #F2E6D8;
border-radius: 24px;
transition: 0.25s;
width: 90%;
@@ -924,7 +972,7 @@ ol.Subject-list {
border: 2px solid rgb(72, 209, 204);
padding: 10px 10px;
outline: none;
color: rgba(255, 255, 255, .55);
color: #F2E6D8;
border-radius: 24px;
transition: 0.25s;
width: 90%;
@@ -935,14 +983,17 @@ ol.Subject-list {
display: block;
margin: 10px auto;
text-align: center;
border: 3px solid rgb(0, 255, 127);
border: 2px solid rgb(0, 255, 127);
padding: 10px 10px;
outline: none;
color: rgba(255, 255, 255, .55);
color: #F2E6D8;
border-radius: 24px;
transition: 0.25s;
width: 90%;
}
#voteAndComment{
#activeGameJam:hover,
#gameDataId:hover,
#oneVote:hover {
color: #BF7D65;
}
/*Stem slut*/
+14 -10
View File
@@ -1,7 +1,7 @@
body,
html {
background-color: rgb(18, 18, 18) !important;
color: rgba(255, 255, 255, .55) !important;
background-color: #121B26 !important;
color: #F2E6D8 !important;
font-family: Arial, Helvetica, sans-serif !important;
margin: 40px !important;
padding: 10px !important;
@@ -19,14 +19,14 @@ html {
#isWebBased {
border: 0;
background: none;
background-color: transparent;
display: block;
margin: 20px auto;
text-align: center;
border: 2px solid rgb(52, 152, 219);
border: 2px solid #2A558C;
padding: 10px 10px;
outline: none;
color: rgba(255, 255, 255, .55);
color: #F2E6D8;
border-radius: 24px;
transition: 0.25s;
position: static;
@@ -34,17 +34,21 @@ html {
display: inline;
left: 27vw;
}
#isWebBased:hover,
#gameFil:hover {
color: #BF7D65;
}
#gameFil {
border: 0;
background: none;
background-color: transparent;
display: block;
margin: 20px auto;
text-align: center;
border: 2px solid rgb(52, 152, 219);
border: 2px solid #2A558C;
padding: 10px 10px;
outline: none;
color: rgba(255, 255, 255, .55);
color: #F2E6D8;
border-radius: 24px;
transition: 0.25s;
position: static;
@@ -81,7 +85,7 @@ html {
display: block;
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: #59142D !important;
background: linear-gradient( to right, #121B26, #59142D, #94153d, #59142D, #121B26) !important;
opacity: 1;
}
+8 -5
View File
@@ -51,8 +51,8 @@
width: 30px;
height: 30px;
text-align: center;
background: #4E443C;
color: #fff;
background: #59142D;
color: #F2E6D8;
text-decoration: none;
text-shadow: 0 0 1px #000;
font: 24px/27px Arial, sans-serif;
@@ -63,6 +63,10 @@
-moz-box-shadow: 0 0 4px #F0EFE7;
box-shadow: 0 0 4px #F0EFE7;
}
.jcarousel-control-prev:hover,
.jcarousel-control-next:hover {
color: #BF7D65;
}
.jcarousel-control-prev {
left: 15px;
@@ -107,10 +111,9 @@
}
.jcarousel-pagination a.active {
background: #4E443C;
color: #fff;
background: #59142D;
color: #F2E6D8;
opacity: 1;
-webkit-box-shadow: 0 0 2px #F0EFE7;
-moz-box-shadow: 0 0 2px #F0EFE7;
box-shadow: 0 0 2px #F0EFE7;
Generated
+39 -39
View File
@@ -103,16 +103,16 @@
},
{
"name": "illuminate/collections",
"version": "v8.38.0",
"version": "v8.40.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/collections.git",
"reference": "21690cd5591f2d42d792e5e4a687f9beba829f1d"
"reference": "deccb956d38710f3f8baf36dd876c3fa1585ec22"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/collections/zipball/21690cd5591f2d42d792e5e4a687f9beba829f1d",
"reference": "21690cd5591f2d42d792e5e4a687f9beba829f1d",
"url": "https://api.github.com/repos/illuminate/collections/zipball/deccb956d38710f3f8baf36dd876c3fa1585ec22",
"reference": "deccb956d38710f3f8baf36dd876c3fa1585ec22",
"shasum": ""
},
"require": {
@@ -153,11 +153,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2021-04-14T11:48:08+00:00"
"time": "2021-04-22T21:08:09+00:00"
},
{
"name": "illuminate/container",
"version": "v8.38.0",
"version": "v8.40.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/container.git",
@@ -208,16 +208,16 @@
},
{
"name": "illuminate/contracts",
"version": "v8.38.0",
"version": "v8.40.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
"reference": "5764f703ea8f74ced163125d810951cd5ef2b7e1"
"reference": "5152041a5c4ac4dbebb3c8ee72d05666c592ae08"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/5764f703ea8f74ced163125d810951cd5ef2b7e1",
"reference": "5764f703ea8f74ced163125d810951cd5ef2b7e1",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/5152041a5c4ac4dbebb3c8ee72d05666c592ae08",
"reference": "5152041a5c4ac4dbebb3c8ee72d05666c592ae08",
"shasum": ""
},
"require": {
@@ -252,20 +252,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2021-04-01T13:09:31+00:00"
"time": "2021-04-23T13:31:10+00:00"
},
{
"name": "illuminate/database",
"version": "v8.38.0",
"version": "v8.40.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/database.git",
"reference": "03c0525b693587f877f4d80dcc55597528c98fc0"
"reference": "742c062a6447278f6b6f8622bd649173ed51fa3a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/database/zipball/03c0525b693587f877f4d80dcc55597528c98fc0",
"reference": "03c0525b693587f877f4d80dcc55597528c98fc0",
"url": "https://api.github.com/repos/illuminate/database/zipball/742c062a6447278f6b6f8622bd649173ed51fa3a",
"reference": "742c062a6447278f6b6f8622bd649173ed51fa3a",
"shasum": ""
},
"require": {
@@ -320,11 +320,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2021-04-17T17:53:05+00:00"
"time": "2021-04-28T14:34:49+00:00"
},
{
"name": "illuminate/macroable",
"version": "v8.38.0",
"version": "v8.40.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/macroable.git",
@@ -370,16 +370,16 @@
},
{
"name": "illuminate/support",
"version": "v8.38.0",
"version": "v8.40.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
"reference": "735391f31e145aad4f7aff3d9736ef70452dd1fe"
"reference": "ce1682ef73ab28a61be01c24ec5b090bdf2c3256"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/735391f31e145aad4f7aff3d9736ef70452dd1fe",
"reference": "735391f31e145aad4f7aff3d9736ef70452dd1fe",
"url": "https://api.github.com/repos/illuminate/support/zipball/ce1682ef73ab28a61be01c24ec5b090bdf2c3256",
"reference": "ce1682ef73ab28a61be01c24ec5b090bdf2c3256",
"shasum": ""
},
"require": {
@@ -434,20 +434,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2021-04-15T11:51:39+00:00"
"time": "2021-04-28T12:56:25+00:00"
},
{
"name": "nesbot/carbon",
"version": "2.46.0",
"version": "2.47.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4"
"reference": "606262fd8888b75317ba9461825a24fc34001e1e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4",
"reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/606262fd8888b75317ba9461825a24fc34001e1e",
"reference": "606262fd8888b75317ba9461825a24fc34001e1e",
"shasum": ""
},
"require": {
@@ -527,7 +527,7 @@
"type": "tidelift"
}
],
"time": "2021-02-24T17:30:44+00:00"
"time": "2021-04-13T21:54:02+00:00"
},
{
"name": "psr/container",
@@ -630,16 +630,16 @@
},
{
"name": "symfony/console",
"version": "v5.2.6",
"version": "v5.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d"
"reference": "90374b8ed059325b49a29b55b3f8bb4062c87629"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/35f039df40a3b335ebf310f244cb242b3a83ac8d",
"reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d",
"url": "https://api.github.com/repos/symfony/console/zipball/90374b8ed059325b49a29b55b3f8bb4062c87629",
"reference": "90374b8ed059325b49a29b55b3f8bb4062c87629",
"shasum": ""
},
"require": {
@@ -707,7 +707,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v5.2.6"
"source": "https://github.com/symfony/console/tree/v5.2.7"
},
"funding": [
{
@@ -723,7 +723,7 @@
"type": "tidelift"
}
],
"time": "2021-03-28T09:42:18+00:00"
"time": "2021-04-19T14:07:32+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -1375,16 +1375,16 @@
},
{
"name": "symfony/translation",
"version": "v5.2.6",
"version": "v5.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "2cc7f45d96db9adfcf89adf4401d9dfed509f4e1"
"reference": "e37ece5242564bceea54d709eafc948377ec9749"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/2cc7f45d96db9adfcf89adf4401d9dfed509f4e1",
"reference": "2cc7f45d96db9adfcf89adf4401d9dfed509f4e1",
"url": "https://api.github.com/repos/symfony/translation/zipball/e37ece5242564bceea54d709eafc948377ec9749",
"reference": "e37ece5242564bceea54d709eafc948377ec9749",
"shasum": ""
},
"require": {
@@ -1448,7 +1448,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/translation/tree/v5.2.6"
"source": "https://github.com/symfony/translation/tree/v5.2.7"
},
"funding": [
{
@@ -1464,7 +1464,7 @@
"type": "tidelift"
}
],
"time": "2021-03-23T19:33:48+00:00"
"time": "2021-04-01T08:15:21+00:00"
},
{
"name": "symfony/translation-contracts",
+4 -4
View File
@@ -1,7 +1,7 @@
{
"driver": "mysql",
"host": "localhost",
"database": "testdb",
"username": "root",
"password": ""
"host": "172.16.5.5",
"database": "GameJamDB",
"username": "ida",
"password": "123qwe"
}