diff --git a/.gitignore b/.gitignore index dcca462..7effd69 100755 --- a/.gitignore +++ b/.gitignore @@ -116,4 +116,4 @@ composer.phar *.sqlite Backend/test.php -/config/ +config/database.json diff --git a/Frontend/Html/newPage.html b/Frontend/Html/newPage.html new file mode 100644 index 0000000..a57ca16 --- /dev/null +++ b/Frontend/Html/newPage.html @@ -0,0 +1,85 @@ + + + + + + + + GameJam + + + + + + + + + + + diff --git a/composer.json b/composer.json index fd70852..5eeebd5 100755 --- a/composer.json +++ b/composer.json @@ -3,7 +3,8 @@ "illuminate/database": "^8.30", "ext-mysqli": "*", "ext-sqlite3": "*", - "ext-fileinfo": "*" + "ext-fileinfo": "*", + "twbs/bootstrap": "5.0.0-beta3" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 27f9502..1f7eb62 100755 --- a/composer.lock +++ b/composer.lock @@ -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": "a595c493fc068e54510775d5cd53d649", "packages": [ { "name": "doctrine/inflector", @@ -103,7 +103,7 @@ }, { "name": "illuminate/collections", - "version": "v8.36.0", + "version": "v8.37.0", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", @@ -157,7 +157,7 @@ }, { "name": "illuminate/container", - "version": "v8.36.0", + "version": "v8.37.0", "source": { "type": "git", "url": "https://github.com/illuminate/container.git", @@ -208,7 +208,7 @@ }, { "name": "illuminate/contracts", - "version": "v8.36.0", + "version": "v8.37.0", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", @@ -256,16 +256,16 @@ }, { "name": "illuminate/database", - "version": "v8.36.0", + "version": "v8.37.0", "source": { "type": "git", "url": "https://github.com/illuminate/database.git", - "reference": "09a2d38e27f930a5d9b7ef3514b650a3dc4cdd55" + "reference": "a9d9c78c705bc64e92a61c33453ebbcad6dd5f29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/database/zipball/09a2d38e27f930a5d9b7ef3514b650a3dc4cdd55", - "reference": "09a2d38e27f930a5d9b7ef3514b650a3dc4cdd55", + "url": "https://api.github.com/repos/illuminate/database/zipball/a9d9c78c705bc64e92a61c33453ebbcad6dd5f29", + "reference": "a9d9c78c705bc64e92a61c33453ebbcad6dd5f29", "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-13T13:40:36+00:00" }, { "name": "illuminate/macroable", - "version": "v8.36.0", + "version": "v8.37.0", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -370,16 +370,16 @@ }, { "name": "illuminate/support", - "version": "v8.36.0", + "version": "v8.37.0", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "26aa01648f348df7b7988ee911cdf98bcaae8ea1" + "reference": "074a9b7adefcdd7108e19faa96bc9dacfe922062" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/26aa01648f348df7b7988ee911cdf98bcaae8ea1", - "reference": "26aa01648f348df7b7988ee911cdf98bcaae8ea1", + "url": "https://api.github.com/repos/illuminate/support/zipball/074a9b7adefcdd7108e19faa96bc9dacfe922062", + "reference": "074a9b7adefcdd7108e19faa96bc9dacfe922062", "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-11T23:26:41+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,7 +1678,9 @@ "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "twbs/bootstrap": 10 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/config/database.json b/config/database.json index 364d1a8..4d25429 100644 --- a/config/database.json +++ b/config/database.json @@ -1,7 +1,7 @@ { - "driver":"mysql", - "host":"localhost", - "database":"testdb", - "username":"root", - "password":"V#_xWL6_" -} \ No newline at end of file + "driver": "mysql", + "host": "localhost", + "database": "testdb", + "username": "root", + "password": "" +}