v1.5.9 Added and fixed preview, the only problem is that images on event, guide category and guide resource id is not display on the different pages
This commit is contained in:
neerholt
parent
abe4a9dda9
commit
dd7acc1d24
|
|
@ -1,11 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
|
||||
<data-source source="LOCAL" name="SQLite - laravel.sqlite" uuid="bf392a85-1584-4a27-a552-e491a55b9410">
|
||||
<data-source source="LOCAL" name="SQLite - laravel.sqlite" uuid="095712fb-c818-450c-85ac-af2c7366a10f">
|
||||
<driver-ref>sqlite.xerial</driver-ref>
|
||||
<synchronize>true</synchronize>
|
||||
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
|
||||
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/skolehjem/database/laravel.sqlite</jdbc-url>
|
||||
<jdbc-url>jdbc:sqlite:C:\xampp\htdocs\skolehjem-webapp\skolehjem\database\laravel.sqlite</jdbc-url>
|
||||
<working-dir>$ProjectFileDir$</working-dir>
|
||||
</data-source>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -14,11 +14,9 @@
|
|||
<path value="$PROJECT_DIR$/skolehjem/vendor/brick/math" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/nikic/php-parser" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/defuse/php-encryption" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/league/commonmark" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/league/event" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/league/flysystem" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/league/oauth2-server" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/nesbot/carbon" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/nyholm/psr7" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/ramsey/collection" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/ramsey/uuid" />
|
||||
|
|
@ -59,14 +57,12 @@
|
|||
<path value="$PROJECT_DIR$/skolehjem/vendor/doctrine/inflector" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/doctrine/lexer" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/firebase/php-jwt" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/fideloper/proxy" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/fruitcake/laravel-cors" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/paragonie/random_compat" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/phpoption/phpoption" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/phpseclib/phpseclib" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/ralouphie/getallheaders" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/guzzlehttp/guzzle" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/guzzlehttp/promises" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/guzzlehttp/psr7" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/swiftmailer/swiftmailer" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/tijsverkoyen/css-to-inline-styles" />
|
||||
|
|
@ -74,17 +70,11 @@
|
|||
<path value="$PROJECT_DIR$/skolehjem/vendor/composer" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/spatie/laravel-permission" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/laravel/ui" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/jaybizzle/crawler-detect" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/jenssegers/agent" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/mobiledetect/mobiledetectlib" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/filp/whoops" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/facade/ignition-contracts" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/facade/flare-client-php" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/mockery/mockery" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/theseer/tokenizer" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/webmozart/assert" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/fzaninotto/faker" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/facade/ignition" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-code-coverage" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-text-template" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-token-stream" />
|
||||
|
|
@ -118,19 +108,12 @@
|
|||
<path value="$PROJECT_DIR$/skolehjem/vendor/dompdf/dompdf" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/barryvdh/laravel-dompdf" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/phenx/php-font-lib" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/sabberworm/php-css-parser" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/phenx/php-svg-lib" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/spomky-labs/base64url" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/laravel-notification-channels/webpush" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/minishlink/web-push" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/psr/http-client" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/psr/http-factory" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/web-token/jwt-util-ecc" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/web-token/jwt-signature-algorithm-ecdsa" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/web-token/jwt-key-mgmt" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/web-token/jwt-core" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/web-token/jwt-signature" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/fgrosse/phpasn1" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/laminas/laminas-diactoros" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/laminas/laminas-zendframework-bridge" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/lcobucci/jwt" />
|
||||
|
|
@ -138,6 +121,24 @@
|
|||
<path value="$PROJECT_DIR$/skolehjem/vendor/symfony/http-client-contracts" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-timer" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-file-iterator" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/nesbot/carbon" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/league/commonmark" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/sabberworm/php-css-parser" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/filp/whoops" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/facade/flare-client-php" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/facade/ignition" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/fgrosse/phpasn1" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/fideloper/proxy" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/guzzlehttp/promises" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/mobiledetect/mobiledetectlib" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/jaybizzle/crawler-detect" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/jenssegers/agent" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/web-token/jwt-util-ecc" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/spomky-labs/base64url" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/web-token/jwt-core" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/web-token/jwt-signature" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/web-token/jwt-signature-algorithm-ecdsa" />
|
||||
<path value="$PROJECT_DIR$/skolehjem/vendor/league/mime-type-detection" />
|
||||
</include_path>
|
||||
</component>
|
||||
<component name="PhpProjectSharedConfiguration" php_language_level="7.2" />
|
||||
|
|
|
|||
|
|
@ -18,37 +18,26 @@
|
|||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/dompdf/dompdf" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/dragonmantank/cron-expression" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/egulias/email-validator" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/facade/flare-client-php" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/facade/ignition" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/facade/ignition-contracts" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/fgrosse/phpasn1" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/fideloper/proxy" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/filp/whoops" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/firebase/php-jwt" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/fruitcake/laravel-cors" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/fzaninotto/faker" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/guzzlehttp/guzzle" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/guzzlehttp/promises" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/guzzlehttp/psr7" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/hamcrest/hamcrest-php" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/jaybizzle/crawler-detect" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/jenssegers/agent" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laravel-notification-channels/webpush" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laravel/framework" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laravel/passport" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laravel/tinker" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laravel/ui" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laravelcollective/html" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/league/commonmark" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/league/event" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/league/flysystem" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/league/oauth2-server" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/minishlink/web-push" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/mobiledetect/mobiledetectlib" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/mockery/mockery" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/monolog/monolog" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/myclabs/deep-copy" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/nesbot/carbon" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/nikic/php-parser" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/nunomaduro/collision" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/nyholm/psr7" />
|
||||
|
|
@ -79,7 +68,6 @@
|
|||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/ralouphie/getallheaders" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/ramsey/collection" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/ramsey/uuid" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sabberworm/php-css-parser" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/code-unit-reverse-lookup" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/comparator" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/diff" />
|
||||
|
|
@ -93,7 +81,6 @@
|
|||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/type" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/version" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/spatie/laravel-permission" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/spomky-labs/base64url" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/swiftmailer/swiftmailer" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/console" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/css-selector" />
|
||||
|
|
@ -126,15 +113,29 @@
|
|||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/tijsverkoyen/css-to-inline-styles" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/vlucas/phpdotenv" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/voku/portable-ascii" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/web-token/jwt-core" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/web-token/jwt-key-mgmt" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/web-token/jwt-signature" />
|
||||
<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/symfony/http-client-contracts" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpunit/php-timer" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpunit/php-file-iterator" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/nesbot/carbon" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/league/commonmark" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sabberworm/php-css-parser" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/filp/whoops" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/facade/flare-client-php" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/facade/ignition" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/fgrosse/phpasn1" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/fideloper/proxy" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/guzzlehttp/promises" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/mobiledetect/mobiledetectlib" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/jaybizzle/crawler-detect" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/jenssegers/agent" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/web-token/jwt-util-ecc" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/spomky-labs/base64url" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/web-token/jwt-core" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/web-token/jwt-signature" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/web-token/jwt-signature-algorithm-ecdsa" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/league/mime-type-detection" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ class Helpers
|
|||
return $html;
|
||||
}
|
||||
|
||||
|
||||
public static function sendNewsNotification(News $news, Collection $users){
|
||||
$headers = 'Content-Transfer-Encoding: 8bit'. "\r\n".
|
||||
'Content-Type: text/html; charset="UTF-8"';
|
||||
|
|
@ -40,6 +41,10 @@ class Helpers
|
|||
|
||||
$msg = "Hej " . $user->name_first . " ". $user->name_last . ".\n\nDer er kommet en ny nyhed i skolehjems appen! ";
|
||||
|
||||
//Hello, im here to help the future developer that has this problem,
|
||||
//you have to open up you installed php version, find and
|
||||
//open your php.ini and search for [mail function] and enter the
|
||||
// right information and enable some stuff - Big Smoke
|
||||
mail($email, $subject, $msg, $headers);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -292,6 +292,7 @@ class EventController extends Controller
|
|||
$convertToJsonArray = json_encode($event);
|
||||
return $convertToJsonArray;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -275,4 +275,11 @@ class GuideController extends Controller
|
|||
return Response($output);
|
||||
}
|
||||
}
|
||||
|
||||
public function previewPages(Request $request){
|
||||
$event = Guide::find($request->preview);
|
||||
$convertToJsonArray = json_encode($event);
|
||||
return $convertToJsonArray;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -245,4 +245,11 @@ class MenuPlanController extends Controller
|
|||
}
|
||||
}
|
||||
|
||||
public function previewPages(Request $request){
|
||||
$event = MenuPlan::find($request->preview);
|
||||
$convertToJsonArray = json_encode($event);
|
||||
return $convertToJsonArray;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -181,4 +181,12 @@ class NewsController extends Controller
|
|||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public function previewPages(Request $request){
|
||||
$event = News::find($request->preview);
|
||||
$convertToJsonArray = json_encode($event);
|
||||
return $convertToJsonArray;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1207,31 +1207,31 @@
|
|||
},
|
||||
{
|
||||
"name": "laravel/framework",
|
||||
"version": "v7.28.4",
|
||||
"version": "v7.30.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/framework.git",
|
||||
"reference": "de187e9200948bab6975167e480950abcd5efdac"
|
||||
"reference": "9dd38140dc2924daa1a020a3d7a45f9ceff03df3"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/de187e9200948bab6975167e480950abcd5efdac",
|
||||
"reference": "de187e9200948bab6975167e480950abcd5efdac",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/9dd38140dc2924daa1a020a3d7a45f9ceff03df3",
|
||||
"reference": "9dd38140dc2924daa1a020a3d7a45f9ceff03df3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/inflector": "^1.4|^2.0",
|
||||
"dragonmantank/cron-expression": "^2.0",
|
||||
"dragonmantank/cron-expression": "^2.3.1",
|
||||
"egulias/email-validator": "^2.1.10",
|
||||
"ext-json": "*",
|
||||
"ext-mbstring": "*",
|
||||
"ext-openssl": "*",
|
||||
"league/commonmark": "^1.3",
|
||||
"league/flysystem": "^1.0.34",
|
||||
"league/flysystem": "^1.1",
|
||||
"monolog/monolog": "^2.0",
|
||||
"nesbot/carbon": "^2.17",
|
||||
"opis/closure": "^3.1",
|
||||
"php": "^7.2.5",
|
||||
"nesbot/carbon": "^2.31",
|
||||
"opis/closure": "^3.6",
|
||||
"php": "^7.2.5|^8.0",
|
||||
"psr/container": "^1.0",
|
||||
"psr/simple-cache": "^1.0",
|
||||
"ramsey/uuid": "^3.7|^4.0",
|
||||
|
|
@ -1288,21 +1288,21 @@
|
|||
"illuminate/view": "self.version"
|
||||
},
|
||||
"require-dev": {
|
||||
"aws/aws-sdk-php": "^3.0",
|
||||
"aws/aws-sdk-php": "^3.155",
|
||||
"doctrine/dbal": "^2.6",
|
||||
"filp/whoops": "^2.4",
|
||||
"guzzlehttp/guzzle": "^6.3.1|^7.0",
|
||||
"filp/whoops": "^2.8",
|
||||
"guzzlehttp/guzzle": "^6.3.1|^7.0.1",
|
||||
"league/flysystem-cached-adapter": "^1.0",
|
||||
"mockery/mockery": "^1.3.1",
|
||||
"mockery/mockery": "~1.3.3|^1.4.2",
|
||||
"moontoast/math": "^1.1",
|
||||
"orchestra/testbench-core": "^5.0",
|
||||
"orchestra/testbench-core": "^5.8",
|
||||
"pda/pheanstalk": "^4.0",
|
||||
"phpunit/phpunit": "^8.4|^9.0",
|
||||
"phpunit/phpunit": "^8.4|^9.3.3",
|
||||
"predis/predis": "^1.1.1",
|
||||
"symfony/cache": "^5.0"
|
||||
},
|
||||
"suggest": {
|
||||
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).",
|
||||
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.155).",
|
||||
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
|
||||
"ext-ftp": "Required to use the Flysystem FTP driver.",
|
||||
"ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().",
|
||||
|
|
@ -1310,18 +1310,18 @@
|
|||
"ext-pcntl": "Required to use all features of the queue worker.",
|
||||
"ext-posix": "Required to use all features of the queue worker.",
|
||||
"ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
|
||||
"filp/whoops": "Required for friendly error pages in development (^2.4).",
|
||||
"fzaninotto/faker": "Required to use the eloquent factory builder (^1.9.1).",
|
||||
"guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^6.3.1|^7.0).",
|
||||
"fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
|
||||
"filp/whoops": "Required for friendly error pages in development (^2.8).",
|
||||
"guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^6.3.1|^7.0.1).",
|
||||
"laravel/tinker": "Required to use the tinker console command (^2.0).",
|
||||
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
|
||||
"league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
|
||||
"league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
|
||||
"mockery/mockery": "Required to use mocking (^1.3.1).",
|
||||
"mockery/mockery": "Required to use mocking (~1.3.3|^1.4.2).",
|
||||
"moontoast/math": "Required to use ordered UUIDs (^1.1).",
|
||||
"nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
|
||||
"pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
|
||||
"phpunit/phpunit": "Required to use assertions and run tests (^8.4|^9.0).",
|
||||
"phpunit/phpunit": "Required to use assertions and run tests (^8.4|^9.3.3).",
|
||||
"predis/predis": "Required to use the predis connector (^1.1.2).",
|
||||
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
|
||||
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).",
|
||||
|
|
@ -1365,7 +1365,7 @@
|
|||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2020-10-06T14:22:09+00:00"
|
||||
"time": "2021-01-21T14:10:48+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/tinker",
|
||||
|
|
@ -1665,28 +1665,29 @@
|
|||
},
|
||||
{
|
||||
"name": "league/flysystem",
|
||||
"version": "1.0.46",
|
||||
"version": "1.1.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/thephpleague/flysystem.git",
|
||||
"reference": "f3e0d925c18b92cf3ce84ea5cc58d62a1762a2b2"
|
||||
"reference": "9be3b16c877d477357c015cec057548cf9b2a14a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f3e0d925c18b92cf3ce84ea5cc58d62a1762a2b2",
|
||||
"reference": "f3e0d925c18b92cf3ce84ea5cc58d62a1762a2b2",
|
||||
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9be3b16c877d477357c015cec057548cf9b2a14a",
|
||||
"reference": "9be3b16c877d477357c015cec057548cf9b2a14a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.5.9"
|
||||
"ext-fileinfo": "*",
|
||||
"league/mime-type-detection": "^1.3",
|
||||
"php": "^7.2.5 || ^8.0"
|
||||
},
|
||||
"conflict": {
|
||||
"league/flysystem-sftp": "<1.0.6"
|
||||
},
|
||||
"require-dev": {
|
||||
"ext-fileinfo": "*",
|
||||
"phpspec/phpspec": "^3.4",
|
||||
"phpunit/phpunit": "^5.7.10"
|
||||
"phpspec/prophecy": "^1.11.1",
|
||||
"phpunit/phpunit": "^8.5.8"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-fileinfo": "Required for MimeType",
|
||||
|
|
@ -1747,22 +1748,84 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/thephpleague/flysystem/issues",
|
||||
"source": "https://github.com/thephpleague/flysystem/tree/master"
|
||||
"source": "https://github.com/thephpleague/flysystem/tree/1.x"
|
||||
},
|
||||
"time": "2018-08-22T07:45:22+00:00"
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://offset.earth/frankdejonge",
|
||||
"type": "other"
|
||||
}
|
||||
],
|
||||
"time": "2020-08-23T07:39:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "minishlink/web-push",
|
||||
"version": "v6.0.3",
|
||||
"name": "league/mime-type-detection",
|
||||
"version": "1.7.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/web-push-libs/web-push-php.git",
|
||||
"reference": "8911bad58026db19ab5e39d19341ea9925cb1edb"
|
||||
"url": "https://github.com/thephpleague/mime-type-detection.git",
|
||||
"reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/web-push-libs/web-push-php/zipball/8911bad58026db19ab5e39d19341ea9925cb1edb",
|
||||
"reference": "8911bad58026db19ab5e39d19341ea9925cb1edb",
|
||||
"url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3",
|
||||
"reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-fileinfo": "*",
|
||||
"php": "^7.2 || ^8.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"friendsofphp/php-cs-fixer": "^2.18",
|
||||
"phpstan/phpstan": "^0.12.68",
|
||||
"phpunit/phpunit": "^8.5.8 || ^9.3"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"League\\MimeTypeDetection\\": "src"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Frank de Jonge",
|
||||
"email": "info@frankdejonge.nl"
|
||||
}
|
||||
],
|
||||
"description": "Mime-type detection for Flysystem",
|
||||
"support": {
|
||||
"issues": "https://github.com/thephpleague/mime-type-detection/issues",
|
||||
"source": "https://github.com/thephpleague/mime-type-detection/tree/1.7.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://github.com/frankdejonge",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/league/flysystem",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2021-01-18T20:58:21+00:00"
|
||||
},
|
||||
{
|
||||
"name": "minishlink/web-push",
|
||||
"version": "v6.0.5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/web-push-libs/web-push-php.git",
|
||||
"reference": "d87e9e3034ca2b95b1822b1b335e7761c14b89f6"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/web-push-libs/web-push-php/zipball/d87e9e3034ca2b95b1822b1b335e7761c14b89f6",
|
||||
"reference": "d87e9e3034ca2b95b1822b1b335e7761c14b89f6",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1810,9 +1873,9 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/web-push-libs/web-push-php/issues",
|
||||
"source": "https://github.com/web-push-libs/web-push-php/tree/v6.0.3"
|
||||
"source": "https://github.com/web-push-libs/web-push-php/tree/v6.0.5"
|
||||
},
|
||||
"time": "2020-11-06T10:06:32+00:00"
|
||||
"time": "2021-04-08T15:22:50+00:00"
|
||||
},
|
||||
{
|
||||
"name": "mobiledetect/mobiledetectlib",
|
||||
|
|
@ -6075,16 +6138,16 @@
|
|||
},
|
||||
{
|
||||
"name": "facade/flare-client-php",
|
||||
"version": "1.6.0",
|
||||
"version": "1.6.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/facade/flare-client-php.git",
|
||||
"reference": "16129c4f39eeae0a26c4ac7ad5292264bce6715c"
|
||||
"reference": "f2b0969f2d9594704be74dbeb25b201570a98098"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/facade/flare-client-php/zipball/16129c4f39eeae0a26c4ac7ad5292264bce6715c",
|
||||
"reference": "16129c4f39eeae0a26c4ac7ad5292264bce6715c",
|
||||
"url": "https://api.github.com/repos/facade/flare-client-php/zipball/f2b0969f2d9594704be74dbeb25b201570a98098",
|
||||
"reference": "f2b0969f2d9594704be74dbeb25b201570a98098",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -6128,7 +6191,7 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/facade/flare-client-php/issues",
|
||||
"source": "https://github.com/facade/flare-client-php/tree/1.6.0"
|
||||
"source": "https://github.com/facade/flare-client-php/tree/1.6.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -6136,20 +6199,20 @@
|
|||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2021-04-08T08:06:50+00:00"
|
||||
"time": "2021-04-08T08:50:01+00:00"
|
||||
},
|
||||
{
|
||||
"name": "facade/ignition",
|
||||
"version": "2.8.0",
|
||||
"version": "2.8.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/facade/ignition.git",
|
||||
"reference": "ae602ea1c061bdc5b96b4d5af9ffca1fcb5fa80b"
|
||||
"reference": "cb7f790e6306caeb4a9ffe21e59942b7128cc630"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/facade/ignition/zipball/ae602ea1c061bdc5b96b4d5af9ffca1fcb5fa80b",
|
||||
"reference": "ae602ea1c061bdc5b96b4d5af9ffca1fcb5fa80b",
|
||||
"url": "https://api.github.com/repos/facade/ignition/zipball/cb7f790e6306caeb4a9ffe21e59942b7128cc630",
|
||||
"reference": "cb7f790e6306caeb4a9ffe21e59942b7128cc630",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -6213,7 +6276,7 @@
|
|||
"issues": "https://github.com/facade/ignition/issues",
|
||||
"source": "https://github.com/facade/ignition"
|
||||
},
|
||||
"time": "2021-04-08T08:42:27+00:00"
|
||||
"time": "2021-04-08T10:42:53+00:00"
|
||||
},
|
||||
{
|
||||
"name": "facade/ignition-contracts",
|
||||
|
|
|
|||
|
|
@ -1434,47 +1434,24 @@
|
|||
"dev": true
|
||||
},
|
||||
"adjust-sourcemap-loader": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.2.0.tgz",
|
||||
"integrity": "sha512-958oaHHVEXMvsY7v7cC5gEkNIcoaAVIhZ4mBReYVZJOTP9IgKmzLjIOhTtzpLMu+qriXvLsVjJ155EeInp45IQ==",
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz",
|
||||
"integrity": "sha512-YBrGyT2/uVQ/c6Rr+t6ZJXniY03YtHGMJQYal368burRGYKqhx9qGTWqcBU5s1CwYY9E/ri63RYyG1IacMZtqw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"assert": "^1.3.0",
|
||||
"camelcase": "^1.2.1",
|
||||
"loader-utils": "^1.1.0",
|
||||
"lodash.assign": "^4.0.1",
|
||||
"lodash.defaults": "^3.1.2",
|
||||
"object-path": "^0.9.2",
|
||||
"regex-parser": "^2.2.9"
|
||||
"loader-utils": "^2.0.0",
|
||||
"regex-parser": "^2.2.11"
|
||||
},
|
||||
"dependencies": {
|
||||
"camelcase": {
|
||||
"version": "1.2.1",
|
||||
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
|
||||
"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
|
||||
"dev": true
|
||||
},
|
||||
"lodash.defaults": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
|
||||
"integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=",
|
||||
"loader-utils": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
|
||||
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"lodash.assign": "^3.0.0",
|
||||
"lodash.restparam": "^3.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"lodash.assign": {
|
||||
"version": "3.2.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
|
||||
"integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"lodash._baseassign": "^3.0.0",
|
||||
"lodash._createassigner": "^3.0.0",
|
||||
"lodash.keys": "^3.0.0"
|
||||
}
|
||||
}
|
||||
"big.js": "^5.2.2",
|
||||
"emojis-list": "^3.0.0",
|
||||
"json5": "^2.1.2"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1582,6 +1559,12 @@
|
|||
"sprintf-js": "~1.0.2"
|
||||
}
|
||||
},
|
||||
"arity-n": {
|
||||
"version": "1.0.4",
|
||||
"resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
|
||||
"integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=",
|
||||
"dev": true
|
||||
},
|
||||
"arr-diff": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
|
||||
|
|
@ -2556,6 +2539,15 @@
|
|||
"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
|
||||
"dev": true
|
||||
},
|
||||
"compose-function": {
|
||||
"version": "3.0.3",
|
||||
"resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
|
||||
"integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"arity-n": "^1.0.4"
|
||||
}
|
||||
},
|
||||
"compressible": {
|
||||
"version": "2.0.18",
|
||||
"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
|
||||
|
|
@ -3082,6 +3074,16 @@
|
|||
"integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
|
||||
"dev": true
|
||||
},
|
||||
"d": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
|
||||
"integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"es5-ext": "^0.10.50",
|
||||
"type": "^1.0.1"
|
||||
}
|
||||
},
|
||||
"de-indent": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
|
||||
|
|
@ -3538,6 +3540,38 @@
|
|||
"is-symbol": "^1.0.2"
|
||||
}
|
||||
},
|
||||
"es5-ext": {
|
||||
"version": "0.10.53",
|
||||
"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
|
||||
"integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"es6-iterator": "~2.0.3",
|
||||
"es6-symbol": "~3.1.3",
|
||||
"next-tick": "~1.0.0"
|
||||
}
|
||||
},
|
||||
"es6-iterator": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
|
||||
"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"d": "1",
|
||||
"es5-ext": "^0.10.35",
|
||||
"es6-symbol": "^3.1.1"
|
||||
}
|
||||
},
|
||||
"es6-symbol": {
|
||||
"version": "3.1.3",
|
||||
"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
|
||||
"integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"d": "^1.0.1",
|
||||
"ext": "^1.1.2"
|
||||
}
|
||||
},
|
||||
"es6-templates": {
|
||||
"version": "0.2.3",
|
||||
"resolved": "https://registry.npmjs.org/es6-templates/-/es6-templates-0.2.3.tgz",
|
||||
|
|
@ -3822,6 +3856,23 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"ext": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
|
||||
"integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"type": "^2.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"type": {
|
||||
"version": "2.5.0",
|
||||
"resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
|
||||
"integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"extend": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
|
||||
|
|
@ -5482,98 +5533,12 @@
|
|||
"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
|
||||
"integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="
|
||||
},
|
||||
"lodash._baseassign": {
|
||||
"version": "3.2.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
|
||||
"integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"lodash._basecopy": "^3.0.0",
|
||||
"lodash.keys": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"lodash._basecopy": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
|
||||
"integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
|
||||
"dev": true
|
||||
},
|
||||
"lodash._bindcallback": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
|
||||
"integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
|
||||
"dev": true
|
||||
},
|
||||
"lodash._createassigner": {
|
||||
"version": "3.1.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
|
||||
"integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"lodash._bindcallback": "^3.0.0",
|
||||
"lodash._isiterateecall": "^3.0.0",
|
||||
"lodash.restparam": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"lodash._getnative": {
|
||||
"version": "3.9.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
|
||||
"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
|
||||
"dev": true
|
||||
},
|
||||
"lodash._isiterateecall": {
|
||||
"version": "3.0.9",
|
||||
"resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
|
||||
"integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
|
||||
"dev": true
|
||||
},
|
||||
"lodash.assign": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
|
||||
"integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
|
||||
"dev": true
|
||||
},
|
||||
"lodash.defaults": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
|
||||
"integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
|
||||
"dev": true
|
||||
},
|
||||
"lodash.isarguments": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
|
||||
"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
|
||||
"dev": true
|
||||
},
|
||||
"lodash.isarray": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
|
||||
"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
|
||||
"dev": true
|
||||
},
|
||||
"lodash.keys": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
|
||||
"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"lodash._getnative": "^3.0.0",
|
||||
"lodash.isarguments": "^3.0.0",
|
||||
"lodash.isarray": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"lodash.memoize": {
|
||||
"version": "4.1.2",
|
||||
"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
|
||||
"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
|
||||
"dev": true
|
||||
},
|
||||
"lodash.restparam": {
|
||||
"version": "3.6.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
|
||||
"integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
|
||||
"dev": true
|
||||
},
|
||||
"lodash.uniq": {
|
||||
"version": "4.5.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
|
||||
|
|
@ -5965,6 +5930,12 @@
|
|||
"integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
|
||||
"dev": true
|
||||
},
|
||||
"next-tick": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
|
||||
"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
|
||||
"dev": true
|
||||
},
|
||||
"nice-try": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
|
||||
|
|
@ -6176,12 +6147,6 @@
|
|||
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
|
||||
"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
|
||||
},
|
||||
"object-path": {
|
||||
"version": "0.9.2",
|
||||
"resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz",
|
||||
"integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU=",
|
||||
"dev": true
|
||||
},
|
||||
"object-visit": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
|
||||
|
|
@ -7649,9 +7614,9 @@
|
|||
}
|
||||
},
|
||||
"regex-parser": {
|
||||
"version": "2.2.10",
|
||||
"resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
|
||||
"integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==",
|
||||
"version": "2.2.11",
|
||||
"resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
|
||||
"integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
|
||||
"dev": true
|
||||
},
|
||||
"regexp.prototype.flags": {
|
||||
|
|
@ -7803,27 +7768,74 @@
|
|||
"dev": true
|
||||
},
|
||||
"resolve-url-loader": {
|
||||
"version": "2.3.2",
|
||||
"resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-2.3.2.tgz",
|
||||
"integrity": "sha512-sc/UVgiADdoTc+4cGPB7cUCnlEkzlxD1NXHw4oa9qA0fp30H8mAQ2ePJBP9MQ029DUuhEPouhNdvzT37pBCV0g==",
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz",
|
||||
"integrity": "sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"adjust-sourcemap-loader": "^1.1.0",
|
||||
"camelcase": "^4.1.0",
|
||||
"convert-source-map": "^1.5.1",
|
||||
"loader-utils": "^1.1.0",
|
||||
"lodash.defaults": "^4.0.0",
|
||||
"rework": "^1.0.1",
|
||||
"rework-visit": "^1.0.0",
|
||||
"source-map": "^0.5.7",
|
||||
"urix": "^0.1.0"
|
||||
"adjust-sourcemap-loader": "3.0.0",
|
||||
"camelcase": "5.3.1",
|
||||
"compose-function": "3.0.3",
|
||||
"convert-source-map": "1.7.0",
|
||||
"es6-iterator": "2.0.3",
|
||||
"loader-utils": "1.2.3",
|
||||
"postcss": "7.0.21",
|
||||
"rework": "1.0.1",
|
||||
"rework-visit": "1.0.0",
|
||||
"source-map": "0.6.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"camelcase": {
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
|
||||
"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
|
||||
"emojis-list": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
|
||||
"integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
|
||||
"dev": true
|
||||
},
|
||||
"json5": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
|
||||
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"minimist": "^1.2.0"
|
||||
}
|
||||
},
|
||||
"loader-utils": {
|
||||
"version": "1.2.3",
|
||||
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
|
||||
"integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"big.js": "^5.2.2",
|
||||
"emojis-list": "^2.0.0",
|
||||
"json5": "^1.0.1"
|
||||
}
|
||||
},
|
||||
"postcss": {
|
||||
"version": "7.0.21",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
|
||||
"integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"chalk": "^2.4.2",
|
||||
"source-map": "^0.6.1",
|
||||
"supports-color": "^6.1.0"
|
||||
}
|
||||
},
|
||||
"source-map": {
|
||||
"version": "0.6.1",
|
||||
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
|
||||
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
|
||||
"dev": true
|
||||
},
|
||||
"supports-color": {
|
||||
"version": "6.1.0",
|
||||
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
|
||||
"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"has-flag": "^3.0.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -8963,6 +8975,12 @@
|
|||
"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
|
||||
"dev": true
|
||||
},
|
||||
"type": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
|
||||
"integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
|
||||
"dev": true
|
||||
},
|
||||
"type-is": {
|
||||
"version": "1.6.18",
|
||||
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
"jquery": "^3.5.1",
|
||||
"laravel-mix": "^5.0.9",
|
||||
"lodash": "^4.17.19",
|
||||
"resolve-url-loader": "^2.3.1",
|
||||
"resolve-url-loader": "^3.1.2",
|
||||
"sass": "^1.20.1",
|
||||
"sass-loader": "^8.0.0",
|
||||
"vue-template-compiler": "^2.6.11"
|
||||
|
|
|
|||
|
|
@ -6928,17 +6928,23 @@ nav > .pagination {
|
|||
/* Fallback color */
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
/* Black w/ opacity */
|
||||
-webkit-backdrop-filter: blur(6px);
|
||||
backdrop-filter: blur(6px);
|
||||
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
|
||||
}
|
||||
|
||||
/* Modal Content */
|
||||
|
||||
.modal-content {
|
||||
background-color: #fefefe;
|
||||
background-color: #E0E0E0;
|
||||
margin: auto;
|
||||
padding: 20px;
|
||||
border: 1px solid #888;
|
||||
border: 2px solid #888;
|
||||
width: 330px;
|
||||
min-width: 400px;
|
||||
border-radius: 6px;
|
||||
overflow: auto;
|
||||
padding-bottom: 120px;
|
||||
}
|
||||
|
||||
/* The Close Button */
|
||||
|
|
|
|||
|
|
@ -11,16 +11,21 @@
|
|||
overflow: auto; /* Enable scroll if needed */
|
||||
background-color: rgb(0,0,0); /* Fallback color */
|
||||
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
|
||||
backdrop-filter: blur(6px);
|
||||
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
|
||||
}
|
||||
|
||||
/* Modal Content */
|
||||
.modal-content {
|
||||
background-color: #fefefe;
|
||||
background-color: #E0E0E0;
|
||||
margin: auto;
|
||||
padding: 20px;
|
||||
border: 1px solid #888;
|
||||
border: 2px solid #888;
|
||||
width: 330px;
|
||||
min-width: 400px;
|
||||
border-radius: 6px;
|
||||
overflow: auto;
|
||||
padding-bottom: 120px;
|
||||
}
|
||||
|
||||
/* The Close Button */
|
||||
|
|
|
|||
|
|
@ -32,10 +32,10 @@
|
|||
<label for="accountable">Aktivitet Ansvarlig:</label>
|
||||
<input type="text" name="accountable" id="accountable" required>
|
||||
<label for="description">Aktivitet Beskrivelse:</label>
|
||||
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
|
||||
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere teksten du vil lave op til et link først.</small>
|
||||
<div id="editor"></div>
|
||||
<textarea name="description" class="d-none" id="hiddenArea"></textarea>
|
||||
<label for="date">Aktivitet dato:</label>
|
||||
<label for="date">Aktivitets dato:</label>
|
||||
<input type="datetime-local" name="date" id="date" required>
|
||||
<label class="toggle">
|
||||
<input class="toggle__input" type="checkbox" name="newsoption">
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
<span class="toggle__text">Opret som nyhed</span>
|
||||
</span>
|
||||
</label>
|
||||
<label id="fileuploadee"for="fileuploade">Baggrundsbillede til nyheden (Valgfri):</label>
|
||||
<label id="fileuploadee"for="fileuploade">Baggrundsbillede til nyheden (Valgfri)</label>
|
||||
<input id="fileuploade" type="file" name="resource" accept="image/*">
|
||||
|
||||
<input id="disable" type="submit" class="btn btn-dark text-white" value="Opret">
|
||||
|
|
|
|||
|
|
@ -26,10 +26,11 @@
|
|||
</div>
|
||||
<table class="tbl mt-2 letterSpaceTable fixOverflow" id="table_id">
|
||||
<thead>
|
||||
<th>Aktivitet Navn</th>
|
||||
<th>Aktivitet Ansvarlig</th>
|
||||
<th>Aktivitet Dato</th>
|
||||
<th>Aktivitets Navn</th>
|
||||
<th>Aktivitets Ansvarlig</th>
|
||||
<th>Aktivitets Dato</th>
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/eye.svg') }}" alt="Show"></th>
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/preview.svg') }}" alt="preview"></th>
|
||||
@if(auth()->user()->can('event.edit'))
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
|
||||
@endif
|
||||
|
|
@ -45,6 +46,7 @@
|
|||
<td>{{ $event->accountable }}</td>
|
||||
<td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</td>
|
||||
<td><a href="{{ route("events.signups", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/eye-dark.svg') }}" alt="Show"></a></td>
|
||||
<td><a id="preview" onclick="modalNewsContent({{$event->id}})" style="cursor: pointer" ><img class="w-100" src="{{ asset('/images/icons/preview-dark.svg') }}" alt="preview"></a></td>
|
||||
@if(auth()->user()->can('event.edit'))
|
||||
<td><a href="{{ route("events.edit", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
|
||||
@endif
|
||||
|
|
@ -59,13 +61,64 @@
|
|||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div id="newsModal" class="modal zindex-100">
|
||||
<div id="modal-content" class="modal-content text-black d-block w-50">
|
||||
<span class="close" onclick="closeModal()">×</span>
|
||||
<center>
|
||||
<h1 id="name"></h1>
|
||||
<hr>
|
||||
<strong><label for="date">Aktivitets dato</label></strong>
|
||||
<p id="date"></p>
|
||||
<strong><label for="accountable">Aktivitets ansvarlig</label></strong>
|
||||
<p id="accountable"></p>
|
||||
<hr>
|
||||
<img src="{{ asset(\App\Resource::query()->where($event->id, "=", $event->resource_id)->first()->filename) }}">
|
||||
<p id="description"></p>
|
||||
</center>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@section('scripts')
|
||||
<script>
|
||||
var modalNews = document.getElementById("newsModal");
|
||||
|
||||
function modalNewsContent(id) {
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: '{{route('events.preview')}}',
|
||||
data: {'preview':id},
|
||||
success:function (data) {
|
||||
modalNews.style.display = "block";
|
||||
var l = JSON.parse(data);
|
||||
console.log(l);
|
||||
$("#name").html(l.name);
|
||||
$("#date").html(l.date);
|
||||
$("#accountable").html(l.accountable);
|
||||
$("#description").html(l.description);
|
||||
$("#f").html(l.resource_id);
|
||||
},
|
||||
error:function (data) {
|
||||
console.log(data);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function closeModal() {
|
||||
modalNews.style.display = "none";
|
||||
}
|
||||
|
||||
window.onmousedown = function(event) {
|
||||
if (event.target == modalNews) {
|
||||
modalNews.style.display = "none";
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<script>
|
||||
$(document).ready( function () {
|
||||
$('#table_id').DataTable({
|
||||
columnDefs: [
|
||||
{ orderable: false, targets: [-1, -2, -3] }
|
||||
{ orderable: false, targets: [-1, -2, -3, -4] }
|
||||
]
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
<tr>
|
||||
<th>Navn</th>
|
||||
<th>Kategori</th>
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/preview.svg') }}" alt="preview"></th>
|
||||
@if(auth()->user()->can('guides.edit'))
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
|
||||
@endif
|
||||
|
|
@ -39,8 +40,8 @@
|
|||
<tr id="guide_row_{{ $guide->id }}" data-id="guide_category_row{{ \App\GuidesCategory::query()->where('id', '=', $guide->guide_category_id)->first()->id }}">
|
||||
<td>{{$guide->name}}</td>
|
||||
<td>{{ \App\GuidesCategory::query()->where('id', '=', $guide->guide_category_id)->first()->guidesCategoryName }}</td>
|
||||
<td><a id="preview" onclick="modalNewsContent({{$guide->id}})" style="cursor: pointer" ><img class="w-100" src="{{ asset('/images/icons/preview-dark.svg') }}" alt="preview"></a></td>
|
||||
@if(auth()->user()->can('guides.edit'))
|
||||
<!-- <td><input type="image" name="preview" onclick="preview()" src="{{ asset('/images/icons/preview-dark.svg') }}" alt="preview"></td>-->
|
||||
<td><a href="{{ route("guides.edit", [ "guide" => $guide ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
|
||||
@endif
|
||||
@if(auth()->user()->can('guides.delete'))
|
||||
|
|
@ -88,15 +89,51 @@
|
|||
</div>
|
||||
|
||||
|
||||
<script>
|
||||
function preview(){
|
||||
$value = $('#preview').val();
|
||||
console.log($value);
|
||||
|
||||
}
|
||||
</script>
|
||||
<div id="newsModal" class="modal zindex-100">
|
||||
<div id="modal-content" class="modal-content text-black d-block w-50">
|
||||
<span class="close" onclick="closeModal()">×</span>
|
||||
<center>
|
||||
<h1 id="name"></h1>
|
||||
<hr>
|
||||
<strong><label for="guide_articles">Vejledning</label></strong>
|
||||
<p id="guide_articles"></p>
|
||||
</center>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@section('scripts')
|
||||
<script>
|
||||
var modalNews = document.getElementById("newsModal");
|
||||
|
||||
function modalNewsContent(id) {
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: '{{route('guides.preview')}}',
|
||||
data: {'preview':id},
|
||||
success:function (data) {
|
||||
modalNews.style.display = "block";
|
||||
var l = JSON.parse(data);
|
||||
console.log(l);
|
||||
$("#name").html(l.name);
|
||||
$("#guide_articles").html(l.guide_articles);
|
||||
//We need to add guide_category_id and resource_id
|
||||
},
|
||||
error:function (data) {
|
||||
console.log(data);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function closeModal() {
|
||||
modalNews.style.display = "none";
|
||||
}
|
||||
|
||||
window.onmousedown = function(event) {
|
||||
if (event.target == modalNews) {
|
||||
modalNews.style.display = "none";
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<script>
|
||||
function delete_guide(id) {
|
||||
var token = $("input[name='_token']").val();
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
<table class="tbl letterSpaceTable" id="table_id">
|
||||
<thead>
|
||||
<th>Uge</th>
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/preview.svg') }}" alt="preview"></th>
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/print-hvid.svg') }}" alt="Print"></th>
|
||||
@if(auth()->user()->can('menuplan.edit'))
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
|
||||
|
|
@ -37,6 +38,7 @@
|
|||
@foreach($menuPlans as $menuplan)
|
||||
<tr id="row_{{ $menuplan->id }}">
|
||||
<td>{{$menuplan->week}}</td>
|
||||
<td><a id="preview" onclick="modalNewsContent({{$menuplan->id}})" style="cursor: pointer" ><img class="w-100" src="{{ asset('/images/icons/preview-dark.svg') }}" alt="preview"></a></td>
|
||||
<td><a href="{{ route("pdf.genPDF", [ "menuPlan" => $menuplan ]) }}" target="_blank"><img class="w-100" src="{{ asset('/images/icons/print.svg') }}" alt="Print"></a></td>
|
||||
@if(auth()->user()->can('menuplan.edit'))
|
||||
<td><a href="{{ route("menu-plans.edit", [ "menu_plan" => $menuplan ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
|
||||
|
|
@ -51,13 +53,64 @@
|
|||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div id="newsModal" class="modal zindex-100">
|
||||
<div id="modal-content" class="modal-content text-black d-block w-50">
|
||||
<span class="close" onclick="closeModal()">×</span>
|
||||
<center>
|
||||
<h1 id="week"></h1>
|
||||
<hr>
|
||||
<strong><label for="monday">Mandag</label></strong>
|
||||
<p id="monday"></p>
|
||||
<strong><label for="tuesday">Tirsdag</label></strong>
|
||||
<p id="tuesday"></p>
|
||||
<strong><label for="wednesday">Onsdag</label></strong>
|
||||
<p id="wednesday"></p>
|
||||
<strong><label for="thursday">Torsdag</label></strong>
|
||||
<p id="thursday"></p>
|
||||
</center>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@section('scripts')
|
||||
<script>
|
||||
var modalNews = document.getElementById("newsModal");
|
||||
|
||||
function modalNewsContent(id) {
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: '{{route('menuplans.preview')}}',
|
||||
data: {'preview':id},
|
||||
success:function (data) {
|
||||
modalNews.style.display = "block";
|
||||
var l = JSON.parse(data);
|
||||
$("#week").html("Menuplan for uge " + l.week);
|
||||
$("#monday").html(l.monday);
|
||||
$("#tuesday").html(l.tuesday);
|
||||
$("#wednesday").html(l.wednesday);
|
||||
$("#thursday").html(l.thursday);
|
||||
},
|
||||
error:function (data) {
|
||||
console.log(data);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function closeModal() {
|
||||
modalNews.style.display = "none";
|
||||
}
|
||||
|
||||
window.onmousedown = function(event) {
|
||||
if (event.target == modalNews) {
|
||||
modalNews.style.display = "none";
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<script>
|
||||
$(document).ready( function () {
|
||||
$('#table_id').DataTable({
|
||||
columnDefs: [
|
||||
{ orderable: false, targets: [-1, -2, -3] }
|
||||
{ orderable: false, targets: [-1, -2, -3, -4] }
|
||||
]
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@
|
|||
<thead>
|
||||
<th>Navn</th>
|
||||
<th>Udløbsdato</th>
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/preview.svg') }}" alt="preview"></th>
|
||||
@if(auth()->user()->can('news.edit'))
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/preview.svg') }}" alt="Update"></th>
|
||||
@endif
|
||||
@if(auth()->user()->can('news.delete'))
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
|
||||
|
|
@ -41,9 +41,9 @@
|
|||
@else
|
||||
<td>Ingen udløbsdato</td>
|
||||
@endif
|
||||
<td><a id="preview" onclick="modalNewsContent({{$new->id}})" style="cursor: pointer" ><img class="w-100" src="{{ asset('/images/icons/preview-dark.svg') }}" alt="preview"></a></td>
|
||||
@if(auth()->user()->can('news.edit'))
|
||||
<td><a href="{{ route("news.edit", [ "news" => $new ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
|
||||
<td><a href="#" id="preview" onclick="modalNewsContent({{$new->id}})" ><img class="w-100" src="{{ asset('/images/icons/preview-dark.svg') }}" alt="Update"></a></td>
|
||||
@endif
|
||||
@if(auth()->user()->can('news.delete'))
|
||||
<td>
|
||||
|
|
@ -76,16 +76,14 @@
|
|||
function modalNewsContent(id) {
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: '{{route('events.preview')}}',
|
||||
url: '{{route('news.preview')}}',
|
||||
data: {'preview':id},
|
||||
success:function (data) {
|
||||
modalNews.style.display = "block";
|
||||
var l = JSON.parse(data);
|
||||
$("#titleEvent").text(l.name);
|
||||
$("#dateEvent").text(l.date);
|
||||
$("#descriptionEvent").text(l.description);
|
||||
|
||||
|
||||
$("#titleEvent").html(l.subname);
|
||||
$("#dateEvent").html(l.news_expiration_date);
|
||||
$("#descriptionEvent").html(l.content);
|
||||
},
|
||||
error:function (data) {
|
||||
console.log(data);
|
||||
|
|
|
|||
|
|
@ -58,7 +58,11 @@ Route::get("/darkmode", "UserController@setDarkMode")->name("users.setDarkMode")
|
|||
Route::get("/pdf/{menuPlan}", "MenuPlanController@genPDF")->name("pdf.genPDF")->hasParameter("Id");
|
||||
|
||||
//Preview
|
||||
Route::get("/newsPreview", "NewsController@previewPages")->name("news.preview");
|
||||
Route::get("/menuplanPreview", "MenuPlanController@previewPages")->name("menuplans.preview");
|
||||
Route::get("/eventPreview", "EventController@previewPages")->name("events.preview");
|
||||
Route::get("/guidePreview", "GuideController@previewPages")->name("guides.preview");
|
||||
|
||||
|
||||
//Check name adminpanel
|
||||
Route::get("/usersCheck", "UserController@nameCheck")->name("users.nameCheck");
|
||||
|
|
|
|||
Loading…
Reference in New Issue