vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Neerholt 2021-05-21 12:28:55 +02:00
parent 3b0b2ff759 9edf378ba3
commit f801455703
11 changed files with 4383 additions and 25185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/php.xml
View File

@ -140,6 +140,8 @@
<path value="$PROJECT_DIR$/skolehjem/vendor/thecodingmachine/safe" />
<path value="$PROJECT_DIR$/skolehjem/vendor/facade/flare-client-php" />
<path value="$PROJECT_DIR$/skolehjem/vendor/psy/psysh" />
<path value="$PROJECT_DIR$/skolehjem/vendor/postcss/postcss" />
<path value="$PROJECT_DIR$/skolehjem/vendor/react/promise" />
</include_path>
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="8.0" />

2
.idea/skolehjem-webapp.iml
View File

@ -135,6 +135,8 @@
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/web-token/jwt-signature-algorithm-ecdsa" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/web-token/jwt-util-ecc" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/webmozart/assert" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/postcss/postcss" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/react/promise" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />

5
skolehjem/app/Http/Middleware/CheckAuth.php
View File

@ -25,13 +25,16 @@ class CheckAuth
/** @var User $user */
$user = Auth::user();
// If user is not logged in - Go to login page
if(!isset($user))
return redirect()->route("users.login");
// If the user has the correct permission - Then go to the correct page
if($user->hasAnyPermission($permissions)) {
return $next($request);
}
return redirect()->route("users.login");
// If the user does not have the correct permission - Send them to home page
return redirect()->route("root.index");
}
}

1
skolehjem/composer.json
View File

@ -20,6 +20,7 @@
"laravel/tinker": "^2.0",
"laravel/ui": "^2.0",
"laravelcollective/html": "^6.1",
"postcss/postcss": "^5.2",
"spatie/laravel-permission": "^3.13"
},
"require-dev": {

103
skolehjem/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": "63e59712c2f2f598190787e17c966739",
"content-hash": "27ce9b0a8ea33912044efdaa3597b77c",
"packages": [
{
"name": "asm89/stack-cors",
@ -2366,6 +2366,57 @@
],
"time": "2020-07-20T17:29:33+00:00"
},
{
"name": "postcss/postcss",
"version": "5.2",
"source": {
"type": "git",
"url": "https://github.com/mlocati/postcss.git",
"reference": "a29c9f083f7a74ef5572d1c4a934b8294b42118f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mlocati/postcss/zipball/a29c9f083f7a74ef5572d1c4a934b8294b42118f",
"reference": "a29c9f083f7a74ef5572d1c4a934b8294b42118f",
"shasum": ""
},
"require": {
"php": ">=5.5.0",
"react/promise": "2.*"
},
"type": "library",
"autoload": {
"psr-4": {
"PostCSS\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michele Locati",
"email": "mlocati@gmail.com",
"role": "Developer"
}
],
"description": "Unifficial native PHP port of the PostCSS processor",
"homepage": "https://github.com/mlocati/postcss",
"keywords": [
"css",
"less",
"lesscss",
"postcss",
"sass",
"scss"
],
"support": {
"issues": "https://github.com/mlocati/postcss/issues",
"source": "https://github.com/mlocati/postcss"
},
"time": "2016-09-23T21:40:48+00:00"
},
{
"name": "psr/container",
"version": "1.1.1",
@ -3013,6 +3064,56 @@
],
"time": "2020-08-18T17:17:46+00:00"
},
{
"name": "react/promise",
"version": "v2.8.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/promise.git",
"reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/promise/zipball/f3cff96a19736714524ca0dd1d4130de73dbbbc4",
"reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4",
"shasum": ""
},
"require": {
"php": ">=5.4.0"
},
"require-dev": {
"phpunit/phpunit": "^7.0 || ^6.5 || ^5.7 || ^4.8.36"
},
"type": "library",
"autoload": {
"psr-4": {
"React\\Promise\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jan Sorgalla",
"email": "jsorgalla@gmail.com"
}
],
"description": "A lightweight implementation of CommonJS Promises/A for PHP",
"keywords": [
"promise",
"promises"
],
"support": {
"issues": "https://github.com/reactphp/promise/issues",
"source": "https://github.com/reactphp/promise/tree/v2.8.0"
},
"time": "2020-05-12T15:16:56+00:00"
},
{
"name": "sabberworm/php-css-parser",
"version": "8.3.1",

7713
skolehjem/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

34
skolehjem/package.json
View File

@ -1,25 +1,24 @@
{
"private": true,
"scripts": {
"dev": "npm run development",
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "npm run development -- --watch",
"watch-poll": "npm run watch -- --watch-poll",
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js",
"prod": "npm run production",
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
"development": "mix",
"watch": "mix watch",
"watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "mix watch --hot",
"production": "mix --production",
"prod": "mix --production"
},
"devDependencies": {
"@ckeditor/ckeditor5-inspector": "^2.2.0",
"@ckeditor/ckeditor5-inspector": "^2.2.2",
"axios": "^0.21.1",
"cross-env": "^7.0",
"jquery": "^3.5.1",
"laravel-mix": "^5.0.9",
"lodash": "^4.17.19",
"resolve-url-loader": "^3.1.2",
"sass": "^1.20.1",
"cross-env": "^7.0.3",
"jquery": "^3.6.0",
"laravel-mix": "^6.0.19",
"lodash": "^4.17.21",
"resolve-url-loader": "^3.1.3",
"sass": "^1.32.13",
"sass-loader": "^8.0.0",
"vue-template-compiler": "^2.6.11"
"vue-template-compiler": "^2.6.12"
},
"dependencies": {
"@ckeditor/ckeditor5-alignment": "^21.0.0",
@ -27,8 +26,9 @@
"@ckeditor/ckeditor5-build-decoupled-document": "^21.0.0",
"@ckeditor/ckeditor5-table": "^21.0.0",
"ckeditor": "github:unisharp/laravel-ckeditor",
"moment": "^2.27.0",
"moment": "^2.29.1",
"postcss": "^8.2.15",
"quill": "^1.3.7",
"sweetalert2": "^10.10.4"
"sweetalert2": "^10.16.9"
}
}

7087
skolehjem/public/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

7259
skolehjem/public/css/webapp.css vendored
View File

File diff suppressed because one or more lines are too long

7302
skolehjem/public/css/webappdark.css vendored
View File

File diff suppressed because one or more lines are too long

6
skolehjem/public/mix-manifest.json
View File

@ -1,7 +1,7 @@
{
"/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css",
"/css/webapp.css": "/css/webapp.css",
"/css/admin.css": "/css/admin.css",
"/css/webappdark.css": "/css/webappdark.css",
"/css/admin.css": "/css/admin.css"
"/css/webapp.css": "/css/webapp.css",
"/css/app.css": "/css/app.css"
}