Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Minik Gaarde Lambrecht 2021-03-26 08:36:26 +01:00
commit 47b0e2c33d
4 changed files with 16 additions and 70 deletions

View File

@ -826,62 +826,6 @@ image_gruppenavn{
top: 5px;
}
/*Adminside*/
/*Lodtrækning*/
#startTime {
border-radius: 10px;
color: #474747;
background-color: rgba(255, 255, 255, .55);
border: double;
filter: invert(90%);
}
#endTime {
border-radius: 10px;
color: #474747;
background-color: rgba(255, 255, 255, .55);
border: double;
filter: invert(90%);
}
#startDate {
border-radius: 10px;
color: #474747;
background-color: rgba(255, 255, 255, .55);
border: double;
filter: invert(90%);
}
#endDate {
border-radius: 10px;
/*color: rgb(18, 18, 18);*/
color: #474747;
background-color: rgba(255, 255, 255, .55);
border: double;
filter: invert(90%);
}
#nameOfGameJam {
background-color: rgb(18, 18, 18);
color: rgba(255, 255, 255, .55);
border-radius: 15px;
border: double;
}
}
#description {
background-color: rgb(18, 18, 18);
color: rgba(255, 255, 255, .55);
border-radius:15px;
border:double;
}
#indsend {
border-radius: 10px;
color: rgba(255, 255, 255, .55);
background-color: rgb(18, 18, 18);
border: double;
}
/*Adminside slut*/
/*Lodtrækning slut*/

View File

@ -1,13 +1,8 @@
<?php
require "vendor/autoload.php";
require_once "vendor/autoload.php";
use Illuminate\Database\Capsule\Manager as Capsule;
$capsule = new Capsule;
$capsule->addConnection([
"driver" => "mysql",
"host" =>"localhost",
"database" => "TestDB",
"username" => "root",
"password" => "V#_xWL6_"
]);
$con = json_decode(file_get_contents('config/database.json', true), true);
$capsule->addConnection($con);
$capsule->setAsGlobal();
$capsule->bootEloquent();

View File

@ -1,10 +1,15 @@
{
"require": {
"illuminate/database": "^8.30"
"illuminate/database": "^8.30",
"ext-mysqli": "*",
"ext-sqlite3": "*",
"ext-fileinfo": "*"
},
"autoload": {
"classmap": [
"Backend/Models"
]
}
},
"name": "",
"description": ""
}

6
composer.lock generated
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": "f8dc5027639f0368374ccb33723ddcd2",
"content-hash": "ad0077c071ef4b41a72fb0922a0643e4",
"packages": [
{
"name": "doctrine/inflector",
@ -1625,7 +1625,9 @@
"stability-flags": [],
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],
"platform": {
"ext-mysqli": "*"
},
"platform-dev": [],
"plugin-api-version": "2.0.0"
}