Compare commits

..

4 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
jona345e 4f2cb208fd test 2021-05-05 08:39:27 +02:00
19 changed files with 457 additions and 224 deletions
@@ -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);
$gameData->game_link = ZipFileHandler($gameFileName, $gameFileTmp);
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);
$gameData->img = imagesFileHandler($thumbnailFileName, $thumbnailFileTmp);
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"]);
+14 -1
View File
@@ -11,7 +11,20 @@ use Backend\Models\GameJam;
if (isset($_GET['gameJamId'])) {
$dbValue = GameJam::find($_GET['gameJamId']);
} else {
}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();
}
+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.
+1 -1
View File
@@ -6,6 +6,6 @@
"\\Javascript",
"\\Styles"
],
"SelectedNode": "\\Javascript\\Stem.js",
"SelectedNode": "\\Index.html",
"PreviewInSolutionExplorer": false
}
+211 -120
View File
@@ -57,137 +57,228 @@
</head>
<body>
<div class="HeaderPanel" id="header">
<div class="HeaderLeft">
<a style="display: inline-block" href="../Index.html">
<i class="fas fa-arrow-left"></i>
</a>
<div class="HeaderPanel" id="header">
<div class="HeaderLeft">
<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>
</div>
</div>
<div class="HeaderTitle">
<h2 style="margin-bottom: 0px">Admin Panel</h2>
<!--Opret game jam-->
<br />
<br />
<h3>Administration</h3>
<h5>Opret Game Jam</h5>
<div class="container">
<form id="createGameJam" method="POST">
<div class="row">
<div class="FormField">
<input type="text"
class="FormFieldInput"
placeholder="Gamejam title"
name="newGameJam"
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">
<input type="date"
class="FormFieldInput"
placeholder="mm/dd/yyyy"
name="startDate"
id="startDate"
required />
<label for="startDate" class="FormFieldLabel" id="startDateLabel">
Start dato
</label>
</div>
</div>
<div class="col" id="colTime">
<div class="FormField">
<input type="time"
class="FormFieldInput"
placeholder="hh:mm"
name="startTime"
id="startTime"
required />
<label for="startTime" class="FormFieldLabel" id="startTimeLabel">
Start tid
</label>
</div>
</div>
</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 />
<label for="endTime" class="FormFieldLabel" id="endTimeLabel">
Slut tid
</label>
</div>
</div>
</div>
<div class="FormField">
<input type="text"
class="FormFieldInput"
placeholder="Emne / Keywords (Ikke obligatorisk)"
name="keyWord"
id="keyWord" />
<label for="keyWord" class="FormFieldLabel" id="keyWordLabel">
Emne (Ikke obligatorisk)
</label>
</div>
<div class="FormField">
<textarea class="FormFieldInput"
placeholder="Beskrivelse"
name="description"
id="Beskrivelse"
required></textarea>
<label for="keyWord" class="FormFieldLabel" id="keyWordLabel">
Beskrivelse
</label>
</div>
<input type="submit" name="newGameJam" id="indsend" value="Indsend" />
</form>
</div>
</div>
<!-- Opret game jam slut -->
<!--Opret game jam-->
<br />
<br />
<hr class="GradientDivider">
<h3>Administration</h3>
<h5>Opret Game Jam</h5>
<!-- updater game jam start -->
<h5>updater Game Jam</h5>
<div class="container">
<form id="createGameJam" method="POST">
<div class="row">
<div>
<div class="container">
<form id='UpdateGameJam' method='post'>
<section id="game-jame-update-drop-down">
</section>
<div class="FormField">
<input type="text"
class="FormFieldInput"
placeholder="Gamejam title"
name="newGameJam"
id="gamejamTitle"
required />
<label for="gamejamTitle" class="FormFieldLabel">
Gamejam title
</label>
</div>
</div>
</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="startDate"
id="startDate"
required />
<label for="startDate" class="FormFieldLabel" id="startDateLabel">
Start dato
</label>
</div>
</div>
<div class="col" id="colTime">
<div class="FormField">
<input type="time"
class="FormFieldInput"
placeholder="hh:mm"
name="startTime"
id="startTime"
required />
<label for="startTime" class="FormFieldLabel" id="startTimeLabel">
Start tid
</label>
</div>
</div>
</div>
<div class="row row-cols-2">
<section id="game-jame-update">
<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="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="col" id="colTime">
<div class="FormField">
<input type="time"
class="FormFieldInput"
placeholder="hh:mm"
name="endTime"
id="endTime"
required />
<label for="endTime" class="FormFieldLabel" id="endTimeLabel">
Slut tid
</label>
</div>
</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>
<!--Behold-->
<div class="FormField">
<input type="text"
class="FormFieldInput"
placeholder="Emne / Keywords (Ikke obligatorisk)"
name="keyWord"
id="keyWord" />
<label for="keyWord" class="FormFieldLabel" id="keyWordLabel">
Emne (Ikke obligatorisk)
</label>
</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" />
<div class="FormField">
<textarea class="FormFieldInput"
placeholder="Beskrivelse"
name="description"
id="Beskrivelse"
required></textarea>
<label for="keyWord" class="FormFieldLabel" id="keyWordLabel">
Beskrivelse
</label>
</div>
<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/AddGameJam.js"></script>
<!-- Body scripts end -->
</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>
+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();
+83 -24
View File
@@ -108,31 +108,16 @@ h5{
#startTimeLabel {
display: inline-block;
left: 0;
/*left: 72.5%;
*/
}
#endTime {
/*width: 12.5%;
*/ display: inline-block !important;
display: inline-block !important;
float: left;
}
#endTimeLabel {
display: inline-block;
left: 0;
/* left: 87.5%;*/
}
#description {
color: #F2E6D8;
border-radius: 15px;
border: double;
width: 100%;
height: 250px;
}
#Beskrivelse {
@@ -140,10 +125,6 @@ h5{
}
#indsend {
/* background-color: #121B26;
border-radius: 15px;
color: #F2E6D8;
border: double;*/
border: 0;
background: none;
display: block;
@@ -162,15 +143,82 @@ h5{
}
#row{
width:100%;
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;
margin-top: 10px;
position: relative;
padding: 15px 0 0;
margin-top: 10px;
}
.FormFieldInput {
@@ -227,4 +275,15 @@ h5{
.FormFieldInput:required,
.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;
}
+2 -1
View File
@@ -861,12 +861,13 @@ image_gruppenavn {
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)*/
opacity: 1;
}
/*Knap Return to top*/
#return-to-top {
+4
View File
@@ -34,6 +34,10 @@ html {
display: inline;
left: 27vw;
}
#isWebBased:hover,
#gameFil:hover {
color: #BF7D65;
}
#gameFil {
border: 0;
+17 -14
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,10 +63,14 @@
-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;
}
.jcarousel-control-prev {
left: 15px;
}
.jcarousel-control-next {
right: 15px;
@@ -106,12 +110,11 @@
box-shadow: 0 0 2px #4E443C;
}
.jcarousel-pagination a.active {
background: #4E443C;
color: #fff;
opacity: 1;
-webkit-box-shadow: 0 0 2px #F0EFE7;
-moz-box-shadow: 0 0 2px #F0EFE7;
box-shadow: 0 0 2px #F0EFE7;
}
.jcarousel-pagination a.active {
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"
}