diff --git a/.idea/php.xml b/.idea/php.xml
index aad8794..bb5a856 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -120,9 +120,6 @@
-
-
-
diff --git a/.idea/skolehjem-webapp.iml b/.idea/skolehjem-webapp.iml
index a67a3ae..7c6434f 100644
--- a/.idea/skolehjem-webapp.iml
+++ b/.idea/skolehjem-webapp.iml
@@ -10,8 +10,6 @@
-
-
@@ -122,7 +120,6 @@
-
diff --git a/skolehjem/composer.json b/skolehjem/composer.json
index c13028d..062f5ce 100644
--- a/skolehjem/composer.json
+++ b/skolehjem/composer.json
@@ -9,7 +9,6 @@
"license": "MIT",
"require": {
"php": "^7.2.5",
- "directorytree/ldaprecord-laravel": "^1.7",
"fideloper/proxy": "^4.2",
"fruitcake/laravel-cors": "^1.0",
"guzzlehttp/guzzle": "^6.3",
diff --git a/skolehjem/composer.lock b/skolehjem/composer.lock
index 5b640c7..7b23866 100644
--- a/skolehjem/composer.lock
+++ b/skolehjem/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": "16fbb7c15a7196f1760071a188d1e230",
+ "content-hash": "8ba128c6252a57bde3eb22750ed51bef",
"packages": [
{
"name": "asm89/stack-cors",
@@ -110,130 +110,6 @@
],
"time": "2020-04-15T15:59:35+00:00"
},
- {
- "name": "directorytree/ldaprecord",
- "version": "v1.9.0",
- "source": {
- "type": "git",
- "url": "https://github.com/DirectoryTree/LdapRecord.git",
- "reference": "1e281c2743ce026e2eee1fb6ca20cba3c60e2ca0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/DirectoryTree/LdapRecord/zipball/1e281c2743ce026e2eee1fb6ca20cba3c60e2ca0",
- "reference": "1e281c2743ce026e2eee1fb6ca20cba3c60e2ca0",
- "shasum": ""
- },
- "require": {
- "ext-json": "*",
- "ext-ldap": "*",
- "illuminate/contracts": "^5.0|^6.0|^7.0",
- "nesbot/carbon": "^1.0|^2.0",
- "php": ">=7.2",
- "psr/log": "^1.0",
- "psr/simple-cache": "^1.0",
- "tightenco/collect": "^5.0|^6.0|^7.0"
- },
- "require-dev": {
- "mockery/mockery": "^1.0",
- "phpunit/phpunit": "^6.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "LdapRecord\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Steve Bauman",
- "email": "steven_bauman@outlook.com",
- "role": "Developer"
- }
- ],
- "description": "A fully-featured LDAP ORM.",
- "homepage": "https://www.ldaprecord.com",
- "keywords": [
- "active directory",
- "ad",
- "adLDAP",
- "adldap2",
- "directory",
- "ldap",
- "ldaprecord",
- "orm",
- "windows"
- ],
- "funding": [
- {
- "url": "https://github.com/stevebauman",
- "type": "github"
- }
- ],
- "time": "2020-07-07T16:32:49+00:00"
- },
- {
- "name": "directorytree/ldaprecord-laravel",
- "version": "v1.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/DirectoryTree/LdapRecord-Laravel.git",
- "reference": "0a84a0c9c279c6495241453ff13fb0779de53594"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/DirectoryTree/LdapRecord-Laravel/zipball/0a84a0c9c279c6495241453ff13fb0779de53594",
- "reference": "0a84a0c9c279c6495241453ff13fb0779de53594",
- "shasum": ""
- },
- "require": {
- "directorytree/ldaprecord": "^1.8.2",
- "ext-ldap": "*",
- "illuminate/support": "^5.6|^6.0|^7.0",
- "php": ">=7.2"
- },
- "require-dev": {
- "mockery/mockery": "~1.0",
- "orchestra/testbench": "~3.7",
- "phpunit/phpunit": "~7.0"
- },
- "type": "project",
- "extra": {
- "laravel": {
- "providers": [
- "LdapRecord\\Laravel\\LdapServiceProvider",
- "LdapRecord\\Laravel\\LdapAuthServiceProvider"
- ]
- }
- },
- "autoload": {
- "psr-4": {
- "LdapRecord\\Laravel\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "LDAP Authentication & Management for Laravel.",
- "keywords": [
- "adldap2",
- "laravel",
- "ldap",
- "ldaprecord"
- ],
- "funding": [
- {
- "url": "https://github.com/stevebauman",
- "type": "github"
- }
- ],
- "time": "2020-07-17T16:14:23+00:00"
- },
{
"name": "dnoegel/php-xdg-base-dir",
"version": "v0.1.1",
@@ -1633,16 +1509,16 @@
},
{
"name": "nesbot/carbon",
- "version": "2.35.0",
+ "version": "2.38.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "4b9bd835261ef23d36397a46a76b496a458305e5"
+ "reference": "d8f6a6a91d1eb9304527b040500f61923e97674b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4b9bd835261ef23d36397a46a76b496a458305e5",
- "reference": "4b9bd835261ef23d36397a46a76b496a458305e5",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d8f6a6a91d1eb9304527b040500f61923e97674b",
+ "reference": "d8f6a6a91d1eb9304527b040500f61923e97674b",
"shasum": ""
},
"require": {
@@ -1654,9 +1530,10 @@
"require-dev": {
"doctrine/orm": "^2.7",
"friendsofphp/php-cs-fixer": "^2.14 || ^3.0",
- "kylekatarnls/multi-tester": "^1.1",
+ "kylekatarnls/multi-tester": "^2.0",
"phpmd/phpmd": "^2.8",
- "phpstan/phpstan": "^0.11",
+ "phpstan/extension-installer": "^1.0",
+ "phpstan/phpstan": "^0.12.35",
"phpunit/phpunit": "^7.5 || ^8.0",
"squizlabs/php_codesniffer": "^3.4"
},
@@ -1673,6 +1550,11 @@
"providers": [
"Carbon\\Laravel\\ServiceProvider"
]
+ },
+ "phpstan": {
+ "includes": [
+ "extension.neon"
+ ]
}
},
"autoload": {
@@ -1712,7 +1594,7 @@
"type": "tidelift"
}
],
- "time": "2020-05-24T18:27:52+00:00"
+ "time": "2020-08-04T19:12:46+00:00"
},
{
"name": "nikic/php-parser",
@@ -3497,16 +3379,16 @@
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.17.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
+ "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
- "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
+ "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
"shasum": ""
},
"require": {
@@ -3518,7 +3400,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -3552,7 +3438,21 @@
"portable",
"shim"
],
- "time": "2020-05-12T16:47:27+00:00"
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/polyfill-php72",
@@ -3683,16 +3583,16 @@
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.17.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd"
+ "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd",
- "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+ "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
"shasum": ""
},
"require": {
@@ -3701,7 +3601,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -3741,7 +3645,21 @@
"portable",
"shim"
],
- "time": "2020-05-12T16:47:27+00:00"
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/process",
@@ -4016,16 +3934,16 @@
},
{
"name": "symfony/translation",
- "version": "v5.1.0",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "d387f07d4c15f9c09439cf3f13ddbe0b2c5e8be2"
+ "reference": "4b9bf719f0fa5b05253c37fc7b335337ec7ec427"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/d387f07d4c15f9c09439cf3f13ddbe0b2c5e8be2",
- "reference": "d387f07d4c15f9c09439cf3f13ddbe0b2c5e8be2",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/4b9bf719f0fa5b05253c37fc7b335337ec7ec427",
+ "reference": "4b9bf719f0fa5b05253c37fc7b335337ec7ec427",
"shasum": ""
},
"require": {
@@ -4090,20 +4008,34 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2020-05-30T20:35:19+00:00"
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-06-30T17:42:22+00:00"
},
{
"name": "symfony/translation-contracts",
- "version": "v2.1.2",
+ "version": "v2.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
- "reference": "e5ca07c8f817f865f618aa072c2fe8e0e637340e"
+ "reference": "616a9773c853097607cf9dd6577d5b143ffdcd63"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/e5ca07c8f817f865f618aa072c2fe8e0e637340e",
- "reference": "e5ca07c8f817f865f618aa072c2fe8e0e637340e",
+ "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/616a9773c853097607cf9dd6577d5b143ffdcd63",
+ "reference": "616a9773c853097607cf9dd6577d5b143ffdcd63",
"shasum": ""
},
"require": {
@@ -4116,6 +4048,10 @@
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
+ },
+ "thanks": {
+ "name": "symfony/contracts",
+ "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4161,20 +4097,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-20T17:43:50+00:00"
+ "time": "2020-07-06T13:23:11+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v5.1.0",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "46a942903059b0b05e601f00eb64179e05578c0f"
+ "reference": "2ebe1c7bb52052624d6dc1250f4abe525655d75a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/46a942903059b0b05e601f00eb64179e05578c0f",
- "reference": "46a942903059b0b05e601f00eb64179e05578c0f",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2ebe1c7bb52052624d6dc1250f4abe525655d75a",
+ "reference": "2ebe1c7bb52052624d6dc1250f4abe525655d75a",
"shasum": ""
},
"require": {
@@ -4237,57 +4173,21 @@
"debug",
"dump"
],
- "time": "2020-05-30T20:35:19+00:00"
- },
- {
- "name": "tightenco/collect",
- "version": "v7.19.1",
- "source": {
- "type": "git",
- "url": "https://github.com/tightenco/collect.git",
- "reference": "e070bf74564f311bb3c97e673e97ea036b38a449"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/tightenco/collect/zipball/e070bf74564f311bb3c97e673e97ea036b38a449",
- "reference": "e070bf74564f311bb3c97e673e97ea036b38a449",
- "shasum": ""
- },
- "require": {
- "php": "^7.1.3",
- "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0"
- },
- "require-dev": {
- "mockery/mockery": "^1.0",
- "nesbot/carbon": "^2.23.0",
- "phpunit/phpunit": "^7.0"
- },
- "type": "library",
- "autoload": {
- "files": [
- "src/Collect/Support/helpers.php",
- "src/Collect/Support/alias.php"
- ],
- "psr-4": {
- "Tightenco\\Collect\\": "src/Collect"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
+ "funding": [
{
- "name": "Taylor Otwell",
- "email": "taylorotwell@gmail.com"
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
}
],
- "description": "Collect - Illuminate Collections as a separate package.",
- "keywords": [
- "collection",
- "laravel"
- ],
- "time": "2020-07-10T22:08:24+00:00"
+ "time": "2020-06-24T13:36:18+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
diff --git a/skolehjem/public/mix-manifest.json b/skolehjem/public/mix-manifest.json
index c5852b6..74f5211 100644
--- a/skolehjem/public/mix-manifest.json
+++ b/skolehjem/public/mix-manifest.json
@@ -2,5 +2,6 @@
"/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css",
"/css/webapp.css": "/css/webapp.css",
+ "/css/webappdark.css": "/css/webappdark.css",
"/css/admin.css": "/css/admin.css"
}
diff --git a/skolehjem/resources/sass/webapp/_defaultdark.scss b/skolehjem/resources/sass/webapp/_defaultdark.scss
new file mode 100644
index 0000000..7f0fd98
--- /dev/null
+++ b/skolehjem/resources/sass/webapp/_defaultdark.scss
@@ -0,0 +1,11 @@
+html, body {
+ background-color: rgba(0,0,0, 0.6);
+}
+
+* {
+ color: white;
+}
+
+.sde-blue {
+ color: white;
+}
diff --git a/skolehjem/resources/sass/webapp/webappdark.scss b/skolehjem/resources/sass/webapp/webappdark.scss
new file mode 100644
index 0000000..294c2ae
--- /dev/null
+++ b/skolehjem/resources/sass/webapp/webappdark.scss
@@ -0,0 +1,10 @@
+// App
+@import '../app/app';
+
+//
+// Webapp
+//
+
+// Defaults
+@import "default";
+@import "defaultdark";
diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php
index efb0573..037b67d 100644
--- a/skolehjem/resources/views/app/layout/base.blade.php
+++ b/skolehjem/resources/views/app/layout/base.blade.php
@@ -3,11 +3,19 @@
@yield("title")
-
+ @if(request()->cookie("mode") == "dark")
+
+ @else
+
+ @endif