- also group api routes in routes/api.php
- formating inside web.php - composer updates
This commit is contained in:
parent
00bea6885e
commit
b6338b0543
|
|
@ -2,12 +2,11 @@
|
||||||
|
|
||||||
namespace App\Listeners;
|
namespace App\Listeners;
|
||||||
|
|
||||||
// use Illuminate\Queue\InteractsWithQueue;
|
|
||||||
// use Illuminate\Contracts\Queue\ShouldQueue;
|
|
||||||
use App\Events\Dataset\DatasetUpdated as DatasetUpdatedEvent;
|
use App\Events\Dataset\DatasetUpdated as DatasetUpdatedEvent;
|
||||||
use App\Models\Dataset;
|
use App\Models\Dataset;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use App\Library\Search\SolariumAdapter;
|
use App\Library\Search\SolariumAdapter;
|
||||||
|
use \Exception;
|
||||||
|
|
||||||
class DatasetUpdated
|
class DatasetUpdated
|
||||||
{
|
{
|
||||||
|
|
@ -59,10 +58,8 @@ class DatasetUpdated
|
||||||
// Opus_Search_Service::selectIndexingService('onDocumentChange')
|
// Opus_Search_Service::selectIndexingService('onDocumentChange')
|
||||||
$service = new SolariumAdapter("solr", config('solarium'));
|
$service = new SolariumAdapter("solr", config('solarium'));
|
||||||
$service->addDatasetsToIndex($dataset);
|
$service->addDatasetsToIndex($dataset);
|
||||||
} catch (Opus_Search_Exception $e) {
|
} catch (Exception $e) {
|
||||||
Log::debug(__METHOD__ . ': ' . 'Indexing document ' . $dataset->id . ' failed: ' . $e->getMessage());
|
Log::warning(__METHOD__ . ': ' . 'Indexing document ' . $dataset->id . ' failed: ' . $e->getMessage());
|
||||||
} catch (InvalidArgumentException $e) {
|
|
||||||
Log::warning(__METHOD__ . ': ' . $e->getMessage());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
172
composer.lock
generated
172
composer.lock
generated
|
|
@ -3268,20 +3268,21 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/console",
|
"name": "symfony/console",
|
||||||
"version": "v5.2.8",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/console.git",
|
"url": "https://github.com/symfony/console.git",
|
||||||
"reference": "864568fdc0208b3eba3638b6000b69d2386e6768"
|
"reference": "058553870f7809087fa80fa734704a21b9bcaeb2"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/console/zipball/864568fdc0208b3eba3638b6000b69d2386e6768",
|
"url": "https://api.github.com/repos/symfony/console/zipball/058553870f7809087fa80fa734704a21b9bcaeb2",
|
||||||
"reference": "864568fdc0208b3eba3638b6000b69d2386e6768",
|
"reference": "058553870f7809087fa80fa734704a21b9bcaeb2",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=7.2.5",
|
"php": ">=7.2.5",
|
||||||
|
"symfony/deprecation-contracts": "^2.1",
|
||||||
"symfony/polyfill-mbstring": "~1.0",
|
"symfony/polyfill-mbstring": "~1.0",
|
||||||
"symfony/polyfill-php73": "^1.8",
|
"symfony/polyfill-php73": "^1.8",
|
||||||
"symfony/polyfill-php80": "^1.15",
|
"symfony/polyfill-php80": "^1.15",
|
||||||
|
|
@ -3345,7 +3346,7 @@
|
||||||
"terminal"
|
"terminal"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/console/tree/v5.2.8"
|
"source": "https://github.com/symfony/console/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -3361,20 +3362,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-05-11T15:45:21+00:00"
|
"time": "2021-05-26T17:43:10+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/css-selector",
|
"name": "symfony/css-selector",
|
||||||
"version": "v5.2.9",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/css-selector.git",
|
"url": "https://github.com/symfony/css-selector.git",
|
||||||
"reference": "5d5f97809015102116208b976eb2edb44b689560"
|
"reference": "fcd0b29a7a0b1bb5bfbedc6231583d77fea04814"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/css-selector/zipball/5d5f97809015102116208b976eb2edb44b689560",
|
"url": "https://api.github.com/repos/symfony/css-selector/zipball/fcd0b29a7a0b1bb5bfbedc6231583d77fea04814",
|
||||||
"reference": "5d5f97809015102116208b976eb2edb44b689560",
|
"reference": "fcd0b29a7a0b1bb5bfbedc6231583d77fea04814",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3410,7 +3411,7 @@
|
||||||
"description": "Converts CSS selectors to XPath expressions",
|
"description": "Converts CSS selectors to XPath expressions",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/css-selector/tree/v5.2.9"
|
"source": "https://github.com/symfony/css-selector/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -3426,7 +3427,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-05-16T13:07:46+00:00"
|
"time": "2021-05-26T17:40:38+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/deprecation-contracts",
|
"name": "symfony/deprecation-contracts",
|
||||||
|
|
@ -3497,16 +3498,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/error-handler",
|
"name": "symfony/error-handler",
|
||||||
"version": "v5.2.8",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/error-handler.git",
|
"url": "https://github.com/symfony/error-handler.git",
|
||||||
"reference": "1416bc16317a8188aabde251afef7618bf4687ac"
|
"reference": "0e6768b8c0dcef26df087df2bbbaa143867a59b2"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/error-handler/zipball/1416bc16317a8188aabde251afef7618bf4687ac",
|
"url": "https://api.github.com/repos/symfony/error-handler/zipball/0e6768b8c0dcef26df087df2bbbaa143867a59b2",
|
||||||
"reference": "1416bc16317a8188aabde251afef7618bf4687ac",
|
"reference": "0e6768b8c0dcef26df087df2bbbaa143867a59b2",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3546,7 +3547,7 @@
|
||||||
"description": "Provides tools to manage errors and ease debugging PHP code",
|
"description": "Provides tools to manage errors and ease debugging PHP code",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/error-handler/tree/v5.2.8"
|
"source": "https://github.com/symfony/error-handler/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -3562,20 +3563,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-05-07T13:42:21+00:00"
|
"time": "2021-05-26T17:43:10+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/event-dispatcher",
|
"name": "symfony/event-dispatcher",
|
||||||
"version": "v5.2.4",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/event-dispatcher.git",
|
"url": "https://github.com/symfony/event-dispatcher.git",
|
||||||
"reference": "d08d6ec121a425897951900ab692b612a61d6240"
|
"reference": "67a5f354afa8e2f231081b3fa11a5912f933c3ce"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d08d6ec121a425897951900ab692b612a61d6240",
|
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/67a5f354afa8e2f231081b3fa11a5912f933c3ce",
|
||||||
"reference": "d08d6ec121a425897951900ab692b612a61d6240",
|
"reference": "67a5f354afa8e2f231081b3fa11a5912f933c3ce",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3631,7 +3632,7 @@
|
||||||
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
|
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/event-dispatcher/tree/v5.2.4"
|
"source": "https://github.com/symfony/event-dispatcher/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -3647,7 +3648,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-02-18T17:12:37+00:00"
|
"time": "2021-05-26T17:43:10+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/event-dispatcher-contracts",
|
"name": "symfony/event-dispatcher-contracts",
|
||||||
|
|
@ -3730,16 +3731,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/finder",
|
"name": "symfony/finder",
|
||||||
"version": "v5.2.9",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/finder.git",
|
"url": "https://github.com/symfony/finder.git",
|
||||||
"reference": "ccccb9d48ca42757dd12f2ca4bf857a4e217d90d"
|
"reference": "0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/finder/zipball/ccccb9d48ca42757dd12f2ca4bf857a4e217d90d",
|
"url": "https://api.github.com/repos/symfony/finder/zipball/0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6",
|
||||||
"reference": "ccccb9d48ca42757dd12f2ca4bf857a4e217d90d",
|
"reference": "0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3771,7 +3772,7 @@
|
||||||
"description": "Finds files and directories via an intuitive fluent interface",
|
"description": "Finds files and directories via an intuitive fluent interface",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/finder/tree/v5.2.9"
|
"source": "https://github.com/symfony/finder/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -3787,7 +3788,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-05-16T13:07:46+00:00"
|
"time": "2021-05-26T12:52:38+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/http-client-contracts",
|
"name": "symfony/http-client-contracts",
|
||||||
|
|
@ -3869,16 +3870,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/http-foundation",
|
"name": "symfony/http-foundation",
|
||||||
"version": "v5.2.8",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/http-foundation.git",
|
"url": "https://github.com/symfony/http-foundation.git",
|
||||||
"reference": "e8fbbab7c4a71592985019477532629cb2e142dc"
|
"reference": "31f25d99b329a1461f42bcef8505b54926a30be6"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/e8fbbab7c4a71592985019477532629cb2e142dc",
|
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/31f25d99b329a1461f42bcef8505b54926a30be6",
|
||||||
"reference": "e8fbbab7c4a71592985019477532629cb2e142dc",
|
"reference": "31f25d99b329a1461f42bcef8505b54926a30be6",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3922,7 +3923,7 @@
|
||||||
"description": "Defines an object-oriented layer for the HTTP specification",
|
"description": "Defines an object-oriented layer for the HTTP specification",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/http-foundation/tree/v5.2.8"
|
"source": "https://github.com/symfony/http-foundation/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -3938,20 +3939,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-05-07T13:41:16+00:00"
|
"time": "2021-05-26T17:43:10+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/http-kernel",
|
"name": "symfony/http-kernel",
|
||||||
"version": "v5.2.9",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/http-kernel.git",
|
"url": "https://github.com/symfony/http-kernel.git",
|
||||||
"reference": "eb540ef6870dbf33c92e372cfb869ebf9649e6cb"
|
"reference": "f8e8f5391b6909e2f0ba8c12220ab7af3050eb4f"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/eb540ef6870dbf33c92e372cfb869ebf9649e6cb",
|
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/f8e8f5391b6909e2f0ba8c12220ab7af3050eb4f",
|
||||||
"reference": "eb540ef6870dbf33c92e372cfb869ebf9649e6cb",
|
"reference": "f8e8f5391b6909e2f0ba8c12220ab7af3050eb4f",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3961,7 +3962,7 @@
|
||||||
"symfony/error-handler": "^4.4|^5.0",
|
"symfony/error-handler": "^4.4|^5.0",
|
||||||
"symfony/event-dispatcher": "^5.0",
|
"symfony/event-dispatcher": "^5.0",
|
||||||
"symfony/http-client-contracts": "^1.1|^2",
|
"symfony/http-client-contracts": "^1.1|^2",
|
||||||
"symfony/http-foundation": "^4.4|^5.0",
|
"symfony/http-foundation": "^5.3",
|
||||||
"symfony/polyfill-ctype": "^1.8",
|
"symfony/polyfill-ctype": "^1.8",
|
||||||
"symfony/polyfill-php73": "^1.9",
|
"symfony/polyfill-php73": "^1.9",
|
||||||
"symfony/polyfill-php80": "^1.15"
|
"symfony/polyfill-php80": "^1.15"
|
||||||
|
|
@ -3971,7 +3972,7 @@
|
||||||
"symfony/cache": "<5.0",
|
"symfony/cache": "<5.0",
|
||||||
"symfony/config": "<5.0",
|
"symfony/config": "<5.0",
|
||||||
"symfony/console": "<4.4",
|
"symfony/console": "<4.4",
|
||||||
"symfony/dependency-injection": "<5.1.8",
|
"symfony/dependency-injection": "<5.3",
|
||||||
"symfony/doctrine-bridge": "<5.0",
|
"symfony/doctrine-bridge": "<5.0",
|
||||||
"symfony/form": "<5.0",
|
"symfony/form": "<5.0",
|
||||||
"symfony/http-client": "<5.0",
|
"symfony/http-client": "<5.0",
|
||||||
|
|
@ -3991,7 +3992,7 @@
|
||||||
"symfony/config": "^5.0",
|
"symfony/config": "^5.0",
|
||||||
"symfony/console": "^4.4|^5.0",
|
"symfony/console": "^4.4|^5.0",
|
||||||
"symfony/css-selector": "^4.4|^5.0",
|
"symfony/css-selector": "^4.4|^5.0",
|
||||||
"symfony/dependency-injection": "^5.1.8",
|
"symfony/dependency-injection": "^5.3",
|
||||||
"symfony/dom-crawler": "^4.4|^5.0",
|
"symfony/dom-crawler": "^4.4|^5.0",
|
||||||
"symfony/expression-language": "^4.4|^5.0",
|
"symfony/expression-language": "^4.4|^5.0",
|
||||||
"symfony/finder": "^4.4|^5.0",
|
"symfony/finder": "^4.4|^5.0",
|
||||||
|
|
@ -4034,7 +4035,7 @@
|
||||||
"description": "Provides a structured process for converting a Request into a Response",
|
"description": "Provides a structured process for converting a Request into a Response",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/http-kernel/tree/v5.2.9"
|
"source": "https://github.com/symfony/http-kernel/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -4050,20 +4051,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-05-19T12:23:45+00:00"
|
"time": "2021-05-31T10:44:03+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/mime",
|
"name": "symfony/mime",
|
||||||
"version": "v5.2.9",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/mime.git",
|
"url": "https://github.com/symfony/mime.git",
|
||||||
"reference": "64258e870f8cc75c3dae986201ea2df58c210b52"
|
"reference": "ed710d297b181f6a7194d8172c9c2423d58e4852"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/mime/zipball/64258e870f8cc75c3dae986201ea2df58c210b52",
|
"url": "https://api.github.com/repos/symfony/mime/zipball/ed710d297b181f6a7194d8172c9c2423d58e4852",
|
||||||
"reference": "64258e870f8cc75c3dae986201ea2df58c210b52",
|
"reference": "ed710d297b181f6a7194d8172c9c2423d58e4852",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4117,7 +4118,7 @@
|
||||||
"mime-type"
|
"mime-type"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/mime/tree/v5.2.9"
|
"source": "https://github.com/symfony/mime/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -4133,7 +4134,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-05-16T13:07:46+00:00"
|
"time": "2021-05-26T17:43:10+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-ctype",
|
"name": "symfony/polyfill-ctype",
|
||||||
|
|
@ -4866,16 +4867,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/process",
|
"name": "symfony/process",
|
||||||
"version": "v5.2.7",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/process.git",
|
"url": "https://github.com/symfony/process.git",
|
||||||
"reference": "98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e"
|
"reference": "53e36cb1c160505cdaf1ef201501669c4c317191"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/process/zipball/98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e",
|
"url": "https://api.github.com/repos/symfony/process/zipball/53e36cb1c160505cdaf1ef201501669c4c317191",
|
||||||
"reference": "98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e",
|
"reference": "53e36cb1c160505cdaf1ef201501669c4c317191",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4908,7 +4909,7 @@
|
||||||
"description": "Executes commands in sub-processes",
|
"description": "Executes commands in sub-processes",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/process/tree/v5.3.0-BETA1"
|
"source": "https://github.com/symfony/process/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -4924,20 +4925,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-04-08T10:27:02+00:00"
|
"time": "2021-05-26T12:52:38+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/routing",
|
"name": "symfony/routing",
|
||||||
"version": "v5.2.9",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/routing.git",
|
"url": "https://github.com/symfony/routing.git",
|
||||||
"reference": "4a7b2bf5e1221be1902b6853743a9bb317f6925e"
|
"reference": "368e81376a8e049c37cb80ae87dbfbf411279199"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/routing/zipball/4a7b2bf5e1221be1902b6853743a9bb317f6925e",
|
"url": "https://api.github.com/repos/symfony/routing/zipball/368e81376a8e049c37cb80ae87dbfbf411279199",
|
||||||
"reference": "4a7b2bf5e1221be1902b6853743a9bb317f6925e",
|
"reference": "368e81376a8e049c37cb80ae87dbfbf411279199",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4946,14 +4947,15 @@
|
||||||
"symfony/polyfill-php80": "^1.15"
|
"symfony/polyfill-php80": "^1.15"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"symfony/config": "<5.0",
|
"doctrine/annotations": "<1.12",
|
||||||
|
"symfony/config": "<5.3",
|
||||||
"symfony/dependency-injection": "<4.4",
|
"symfony/dependency-injection": "<4.4",
|
||||||
"symfony/yaml": "<4.4"
|
"symfony/yaml": "<4.4"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"doctrine/annotations": "^1.10.4",
|
"doctrine/annotations": "^1.12",
|
||||||
"psr/log": "~1.0",
|
"psr/log": "~1.0",
|
||||||
"symfony/config": "^5.0",
|
"symfony/config": "^5.3",
|
||||||
"symfony/dependency-injection": "^4.4|^5.0",
|
"symfony/dependency-injection": "^4.4|^5.0",
|
||||||
"symfony/expression-language": "^4.4|^5.0",
|
"symfony/expression-language": "^4.4|^5.0",
|
||||||
"symfony/http-foundation": "^4.4|^5.0",
|
"symfony/http-foundation": "^4.4|^5.0",
|
||||||
|
|
@ -4997,7 +4999,7 @@
|
||||||
"url"
|
"url"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/routing/tree/v5.2.9"
|
"source": "https://github.com/symfony/routing/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -5013,7 +5015,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-05-16T13:07:46+00:00"
|
"time": "2021-05-26T17:43:10+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/service-contracts",
|
"name": "symfony/service-contracts",
|
||||||
|
|
@ -5096,16 +5098,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/string",
|
"name": "symfony/string",
|
||||||
"version": "v5.2.8",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/string.git",
|
"url": "https://github.com/symfony/string.git",
|
||||||
"reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db"
|
"reference": "a9a0f8b6aafc5d2d1c116dcccd1573a95153515b"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/string/zipball/01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db",
|
"url": "https://api.github.com/repos/symfony/string/zipball/a9a0f8b6aafc5d2d1c116dcccd1573a95153515b",
|
||||||
"reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db",
|
"reference": "a9a0f8b6aafc5d2d1c116dcccd1573a95153515b",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -5159,7 +5161,7 @@
|
||||||
"utf8"
|
"utf8"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/string/tree/v5.2.8"
|
"source": "https://github.com/symfony/string/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -5175,24 +5177,25 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-05-10T14:56:10+00:00"
|
"time": "2021-05-26T17:43:10+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/translation",
|
"name": "symfony/translation",
|
||||||
"version": "v5.2.9",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/translation.git",
|
"url": "https://github.com/symfony/translation.git",
|
||||||
"reference": "61af68dba333e2d376a325a29c2a3f2a605b4876"
|
"reference": "251de0d921c42ef0a81494d8f37405421deefdf6"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/translation/zipball/61af68dba333e2d376a325a29c2a3f2a605b4876",
|
"url": "https://api.github.com/repos/symfony/translation/zipball/251de0d921c42ef0a81494d8f37405421deefdf6",
|
||||||
"reference": "61af68dba333e2d376a325a29c2a3f2a605b4876",
|
"reference": "251de0d921c42ef0a81494d8f37405421deefdf6",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=7.2.5",
|
"php": ">=7.2.5",
|
||||||
|
"symfony/deprecation-contracts": "^2.1",
|
||||||
"symfony/polyfill-mbstring": "~1.0",
|
"symfony/polyfill-mbstring": "~1.0",
|
||||||
"symfony/polyfill-php80": "^1.15",
|
"symfony/polyfill-php80": "^1.15",
|
||||||
"symfony/translation-contracts": "^2.3"
|
"symfony/translation-contracts": "^2.3"
|
||||||
|
|
@ -5215,6 +5218,7 @@
|
||||||
"symfony/finder": "^4.4|^5.0",
|
"symfony/finder": "^4.4|^5.0",
|
||||||
"symfony/http-kernel": "^5.0",
|
"symfony/http-kernel": "^5.0",
|
||||||
"symfony/intl": "^4.4|^5.0",
|
"symfony/intl": "^4.4|^5.0",
|
||||||
|
"symfony/polyfill-intl-icu": "^1.21",
|
||||||
"symfony/service-contracts": "^1.1.2|^2",
|
"symfony/service-contracts": "^1.1.2|^2",
|
||||||
"symfony/yaml": "^4.4|^5.0"
|
"symfony/yaml": "^4.4|^5.0"
|
||||||
},
|
},
|
||||||
|
|
@ -5252,7 +5256,7 @@
|
||||||
"description": "Provides tools to internationalize your application",
|
"description": "Provides tools to internationalize your application",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/translation/tree/v5.2.9"
|
"source": "https://github.com/symfony/translation/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -5268,7 +5272,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-05-16T13:07:46+00:00"
|
"time": "2021-05-29T22:28:28+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/translation-contracts",
|
"name": "symfony/translation-contracts",
|
||||||
|
|
@ -5350,16 +5354,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/var-dumper",
|
"name": "symfony/var-dumper",
|
||||||
"version": "v5.2.8",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/var-dumper.git",
|
"url": "https://github.com/symfony/var-dumper.git",
|
||||||
"reference": "d693200a73fae179d27f8f1b16b4faf3e8569eba"
|
"reference": "1d3953e627fe4b5f6df503f356b6545ada6351f3"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/d693200a73fae179d27f8f1b16b4faf3e8569eba",
|
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/1d3953e627fe4b5f6df503f356b6545ada6351f3",
|
||||||
"reference": "d693200a73fae179d27f8f1b16b4faf3e8569eba",
|
"reference": "1d3953e627fe4b5f6df503f356b6545ada6351f3",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -5418,7 +5422,7 @@
|
||||||
"dump"
|
"dump"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/var-dumper/tree/v5.2.8"
|
"source": "https://github.com/symfony/var-dumper/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -5434,7 +5438,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-05-07T13:42:21+00:00"
|
"time": "2021-05-27T12:28:50+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "tijsverkoyen/css-to-inline-styles",
|
"name": "tijsverkoyen/css-to-inline-styles",
|
||||||
|
|
|
||||||
110
routes/api.php
110
routes/api.php
|
|
@ -15,54 +15,68 @@ use App\Models\Person;
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
Route::middleware('auth:api')->get('/user', function (Request $request) {
|
Route::domain('tethys.at')->group(function () {
|
||||||
return $request->user();
|
|
||||||
});
|
|
||||||
|
|
||||||
Route::get('/oai', 'Oai\RequestController@identify');
|
|
||||||
|
|
||||||
Route::get('/api/persons', function () {
|
|
||||||
$request = request();
|
|
||||||
//$query = Person::query();//->with('group');
|
|
||||||
$query = Person::where('status', true);
|
|
||||||
|
|
||||||
// handle sort option
|
Route::match(array('GET', 'POST'), '/oai', ['as' => 'oai', 'uses' => 'Oai\RequestController@index']);
|
||||||
//if (request()->has('sort')) {
|
|
||||||
if (null !== ($request->input('sort'))) {
|
|
||||||
// handle multisort
|
|
||||||
$sorts = explode(',', request()->sort);
|
|
||||||
foreach ($sorts as $sort) {
|
|
||||||
list($sortCol, $sortDir) = explode('|', $sort);
|
|
||||||
$query = $query->orderBy($sortCol, $sortDir);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$query = $query->orderBy('id', 'asc');
|
|
||||||
}
|
|
||||||
|
|
||||||
//handle filter
|
//Route::get('/', 'LocalizationController@index');
|
||||||
if ($request->exists('filter')) {
|
Route::get(
|
||||||
$query->where(function ($q) use ($request) {
|
'setlocale/{lang}',
|
||||||
$value = "%{$request->filter}%";
|
[
|
||||||
$q->where('first_name', 'like', $value)
|
'as' => 'setlocale', //name()
|
||||||
->orWhere('last_name', 'like', $value)
|
'uses' => 'Frontend\LocalizationController@setLocale',
|
||||||
->orWhere('email', 'like', $value);
|
]
|
||||||
});
|
);
|
||||||
}
|
|
||||||
$perPage = request()->has('per_page') ? (int) request()->per_page : null;
|
Route::middleware('auth:api')->get('/user', function (Request $request) {
|
||||||
// $pagination = $query->with('address')->paginate($perPage);
|
return $request->user();
|
||||||
$pagination = $query->paginate($perPage);
|
});
|
||||||
// $pagination = $query->get();
|
|
||||||
$pagination->appends([
|
Route::get('/oai', 'Oai\RequestController@identify');
|
||||||
'sort' => request()->sort,
|
|
||||||
'filter' => request()->filter,
|
Route::get('/api/persons', function () {
|
||||||
'per_page' => request()->per_page
|
$request = request();
|
||||||
]);
|
//$query = Person::query();//->with('group');
|
||||||
// The headers 'Access-Control-Allow-Origin' and 'Access-Control-Allow-Methods'
|
$query = Person::where('status', true);
|
||||||
// are to allow you to call this from any domain (see CORS for more info).
|
|
||||||
// This is for local testing only. You should not do this in production server,
|
// handle sort option
|
||||||
// unless you know what it means.
|
//if (request()->has('sort')) {
|
||||||
return response()
|
if (null !== ($request->input('sort'))) {
|
||||||
->json($pagination)
|
// handle multisort
|
||||||
->header('Access-Control-Allow-Origin', '*')
|
$sorts = explode(',', request()->sort);
|
||||||
->header('Access-Control-Allow-Methods', 'GET');
|
foreach ($sorts as $sort) {
|
||||||
|
list($sortCol, $sortDir) = explode('|', $sort);
|
||||||
|
$query = $query->orderBy($sortCol, $sortDir);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$query = $query->orderBy('id', 'asc');
|
||||||
|
}
|
||||||
|
|
||||||
|
//handle filter
|
||||||
|
if ($request->exists('filter')) {
|
||||||
|
$query->where(function ($q) use ($request) {
|
||||||
|
$value = "%{$request->filter}%";
|
||||||
|
$q->where('first_name', 'like', $value)
|
||||||
|
->orWhere('last_name', 'like', $value)
|
||||||
|
->orWhere('email', 'like', $value);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
$perPage = request()->has('per_page') ? (int) request()->per_page : null;
|
||||||
|
// $pagination = $query->with('address')->paginate($perPage);
|
||||||
|
$pagination = $query->paginate($perPage);
|
||||||
|
// $pagination = $query->get();
|
||||||
|
$pagination->appends([
|
||||||
|
'sort' => request()->sort,
|
||||||
|
'filter' => request()->filter,
|
||||||
|
'per_page' => request()->per_page
|
||||||
|
]);
|
||||||
|
// The headers 'Access-Control-Allow-Origin' and 'Access-Control-Allow-Methods'
|
||||||
|
// are to allow you to call this from any domain (see CORS for more info).
|
||||||
|
// This is for local testing only. You should not do this in production server,
|
||||||
|
// unless you know what it means.
|
||||||
|
return response()
|
||||||
|
->json($pagination)
|
||||||
|
->header('Access-Control-Allow-Origin', '*')
|
||||||
|
->header('Access-Control-Allow-Methods', 'GET');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -30,13 +30,12 @@ Route::group([
|
||||||
|
|
||||||
Route::get('/', function () {
|
Route::get('/', function () {
|
||||||
redirect()->route('frontend.home.index');
|
redirect()->route('frontend.home.index');
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Route::group([
|
// Route::group([
|
||||||
// 'domain' => ($base_domain|'www.tethys.at')
|
// 'domain' => ($base_domain|'www.tethys.at')
|
||||||
// ],
|
// ],
|
||||||
$appRoutes = function () {
|
$appRoutes = function () {
|
||||||
|
|
||||||
Route::match(array('GET', 'POST'), '/oai', ['as' => 'oai', 'uses' => 'Oai\RequestController@index']);
|
Route::match(array('GET', 'POST'), '/oai', ['as' => 'oai', 'uses' => 'Oai\RequestController@index']);
|
||||||
|
|
@ -540,26 +539,6 @@ $appRoutes = function () {
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
//=================================================borrow====================================================
|
|
||||||
Route::get('borrow', [
|
|
||||||
'as' => 'borrow.borrow', 'uses' => 'BorrowController@index',
|
|
||||||
]);
|
|
||||||
Route::post('borrow.post', [
|
|
||||||
'as' => 'borrow.post', 'uses' => 'BorrowController@store',
|
|
||||||
]);
|
|
||||||
Route::get('laporan', [
|
|
||||||
'as' => 'borrow.report', 'uses' => 'BorrowController@report',
|
|
||||||
]);
|
|
||||||
Route::get('pengembalian/{id}', [
|
|
||||||
'as' => 'borrow.pengembalian', 'uses' => 'BorrowController@pengembalian',
|
|
||||||
]);
|
|
||||||
Route::get('perpanjang/{id}', [
|
|
||||||
'as' => 'borrow.perpanjang', 'uses' => 'BorrowController@perpanjang',
|
|
||||||
]);
|
|
||||||
Route::get('history', [
|
|
||||||
'as' => 'borrow.history', 'uses' => 'BorrowController@histori',
|
|
||||||
]);
|
|
||||||
|
|
||||||
//====================================authentication===========================================================================
|
//====================================authentication===========================================================================
|
||||||
// Route::controllers([
|
// Route::controllers([
|
||||||
// 'auth' => 'Auth\AuthController',
|
// 'auth' => 'Auth\AuthController',
|
||||||
|
|
@ -583,7 +562,6 @@ $appRoutes = function () {
|
||||||
Route::get('refresh-csrf', function () {
|
Route::get('refresh-csrf', function () {
|
||||||
return csrf_token();
|
return csrf_token();
|
||||||
});
|
});
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
Route::group(array('domain' => $base_domain), $appRoutes);
|
Route::group(array('domain' => $base_domain), $appRoutes);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user