Merge branch 'develop' into trunk
This commit is contained in:
commit
ea9924faa1
4 changed files with 3 additions and 129 deletions
|
|
@ -36,7 +36,3 @@ MAIL_FROM_NAME="${APP_NAME}"
|
|||
|
||||
# SENTRY
|
||||
SENTRY_LARAVEL_DSN=
|
||||
|
||||
# LDC WEB STATUS CHECKER
|
||||
LDC_STATUS_CHECKER_API_KEY="MY_KEY"
|
||||
LDC_STATUS_CHECKER_UUID="UUID_PROJECT"
|
||||
|
|
|
|||
|
|
@ -16,28 +16,14 @@ class DocumentResource extends JsonResource
|
|||
*/
|
||||
public function toArray($request)
|
||||
{
|
||||
switch ($this->lang) {
|
||||
case 1:
|
||||
$tmpLang = "fr";
|
||||
break;
|
||||
case 2:
|
||||
$tmpLang = "en";
|
||||
break;
|
||||
case 3:
|
||||
$tmpLang = "de";
|
||||
break;
|
||||
case 4:
|
||||
$tmpLang = "nl";
|
||||
break;
|
||||
}
|
||||
return [
|
||||
'id' => $this->id,
|
||||
'uuid' => $this->uuid,
|
||||
'title' => $this->title,
|
||||
'type' => $this->type,
|
||||
'type' => $this->type->value,
|
||||
'directory' => $this->directory_id,
|
||||
'path' => $this->path,
|
||||
'lang' => $tmpLang,
|
||||
'lang' => $this->lang->getDefinition(),
|
||||
'published' => ($this->status) ? 1 : 0,
|
||||
'parent' => $this->document_id,
|
||||
'created_at' => $this->created_at,
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
"laravel/tinker": "^2.5",
|
||||
"laravel/ui": "^3.4",
|
||||
"ldc/web-admin-secure-laravel": "^1.0",
|
||||
"ldc/web-status-checker-laravel": "^1.0",
|
||||
"maatwebsite/excel": "^3.1",
|
||||
"mews/purifier": "^3.3",
|
||||
"pion/laravel-chunk-upload": "^1.3",
|
||||
|
|
|
|||
109
composer.lock
generated
109
composer.lock
generated
|
|
@ -4,7 +4,7 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "664a2cc8c042df6165a351c16c897882",
|
||||
"content-hash": "e52603bb78f5e8c3f77480b9714ee63c",
|
||||
"packages": [
|
||||
{
|
||||
"name": "asm89/stack-cors",
|
||||
|
|
@ -2610,113 +2610,6 @@
|
|||
],
|
||||
"description": "Restrict access to LDC Network"
|
||||
},
|
||||
{
|
||||
"name": "ldc/web-status-checker",
|
||||
"version": "1.1.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://lab.s-web.fr/ldc-web/projets/ldc-web-status-checker.git",
|
||||
"reference": "7ce62449f3eb052de2d7bfa2e32d37d4524d60b0"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://lab.s-web.fr/api/v4/projects/21/packages/composer/archives/ldc/web-status-checker.zip?sha=7ce62449f3eb052de2d7bfa2e32d37d4524d60b0",
|
||||
"reference": "7ce62449f3eb052de2d7bfa2e32d37d4524d60b0",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-curl": "*",
|
||||
"php": "~7.3|7.4|~8"
|
||||
},
|
||||
"require-dev": {
|
||||
"slevomat/coding-standard": "^7.0",
|
||||
"squizlabs/php_codesniffer": "^3.5"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"LDC\\WebStatusChecker\\": "src/"
|
||||
}
|
||||
},
|
||||
"autoload-dev": {
|
||||
"psr-4": {
|
||||
"LDC\\WebStatusChecker\\Tests\\": "tests"
|
||||
}
|
||||
},
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Jérémy Munsch",
|
||||
"email": "jeremy.munsch@ldc.fr",
|
||||
"homepage": "https://jeremydev.ovh"
|
||||
}
|
||||
],
|
||||
"description": "Status checker: report status to ldc-web"
|
||||
},
|
||||
{
|
||||
"name": "ldc/web-status-checker-laravel",
|
||||
"version": "1.1.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://lab.s-web.fr/ldc-web/projets/ldc-web-status-checker-laravel.git",
|
||||
"reference": "3918891846f1e8440ba54b23dc47422f005070b9"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://lab.s-web.fr/api/v4/projects/22/packages/composer/archives/ldc/web-status-checker-laravel.zip?sha=3918891846f1e8440ba54b23dc47422f005070b9",
|
||||
"reference": "3918891846f1e8440ba54b23dc47422f005070b9",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"illuminate/support": "~8|~9|~10",
|
||||
"laravel/framework": "~8|~9|~10",
|
||||
"ldc/web-status-checker": "^1.1.0",
|
||||
"php": "~7.3|7.4|~8"
|
||||
},
|
||||
"require-dev": {
|
||||
"slevomat/coding-standard": "^7.0",
|
||||
"squizlabs/php_codesniffer": "^3.5"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"laravel": {
|
||||
"providers": [
|
||||
"LDC\\WebStatusCheckerLaravel\\StatusCheckerServiceProvider"
|
||||
]
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"LDC\\WebStatusCheckerLaravel\\": "src/"
|
||||
}
|
||||
},
|
||||
"autoload-dev": {
|
||||
"psr-4": {
|
||||
"LDC\\WebStatusCheckerLaravel\\Tests\\": "tests"
|
||||
}
|
||||
},
|
||||
"scripts": {
|
||||
"test": [
|
||||
"vendor/bin/phpunit"
|
||||
],
|
||||
"post-autoload-dump": [
|
||||
"@php ./vendor/bin/testbench package:discover --ansi"
|
||||
]
|
||||
},
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Jérémy Munsch",
|
||||
"email": "jeremy.munsch@ldc.fr",
|
||||
"homepage": "https://jeremydev.ovh"
|
||||
}
|
||||
],
|
||||
"description": "Status checker: report status to ldc-web"
|
||||
},
|
||||
{
|
||||
"name": "league/commonmark",
|
||||
"version": "1.6.7",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue