Merge branch 'development' into docs

.vscode/settings.json

@@ -1,15 +1,21 @@
 {
-  "files.autoSave": "afterDelay",
-"editor.defaultFormatter": "dbaeumer.vscode-eslint",
-"editor.formatOnSave": true,
-"cSpell.words": [
-    "gedepubliceerd",
-    "depubliceren",
-    "Depubliceren",
-    "Matadata",
-    "nextcloud",
-    "opencatalogi",
-    "pinia",
-    "Toegangs"
-]
+    "files.autoSave": "afterDelay",
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+    "editor.formatOnSave": true,
+    "eslint.format.enable": true,
+    "cSpell.words": [
+        "depubliceren",
+        "Depubliceren",
+        "gedepubliceerd",
+        "Matadata",
+        "nextcloud",
+        "opencatalogi",
+        "organisation",
+        "Organisation",
+        "pinia",
+        "Toegangs"
+    ],
+    "[javascript]": {
+        "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+    },
 }

appinfo/routes.php

@@ -4,6 +4,8 @@
     'resources' => [
         'metadata' => ['url' => '/api/metadata'],
         'publications' => ['url' => '/api/publications'],
+        'organisations' => ['url' => '/api/organisations'],
+        'themes' => ['url' => '/api/themes'],
         'attachments' => ['url' => '/api/attachments'],
         'catalogi' => ['url' => '/api/catalogi'],
         'directory' => ['url' => '/api/directory']
@@ -17,6 +19,7 @@
 		['name' => 'search#index', 'url' => '/api/search', 'verb' => 'GET'],
 		['name' => 'search#show', 'url' => '/api/search/{id}', 'verb' => 'GET'],
 		['name' => 'directory#page', 'url' => '/directory', 'verb' => 'GET'],
+		['name' => 'directory#add', 'url' => '/api/directory/add', 'verb' => 'POST'],
         ['name' => 'configuration#index', 'url' => '/configuration', 'verb' => 'GET'],
         ['name' => 'configuration#create', 'url' => '/configuration', 'verb' => 'POST']
 	],

composer.json

@@ -1,64 +1,65 @@
 {
-    "name": "conductionnl/opencatalogi",
-    "description": "This is a DSO Nextcloud project for the municipality Buren and is done by ConductionNL",
-    "license": "AGPL-3.0-or-later",
-    "authors": [
-        {
-            "name": "Conduction b.v.",
-            "email": "[email protected]",
-            "homepage": "https://conduction.nl"
-        },
-        {
-            "name": "Remko Huisman (Conduction)",
-            "email": "[email protected]",
-            "homepage": "https://conduction.nl"
-        },
-        {
-            "name": "Ruben van der Linde (Conduction)",
-            "email": "[email protected]",
-            "homepage": "https://conduction.nl"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "OCA\\OpenCatalogi\\": "lib/"
-        }
-    },
-    "scripts": {
-        "post-install-cmd": [
-            "@composer bin all install --ansi"
-        ],
-        "post-update-cmd": [
-            "@composer bin all update --ansi"
-        ],
-        "lint": "find . -name \\*.php -not -path './vendor/*' -not -path './vendor-bin/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
-        "cs:check": "php-cs-fixer fix --dry-run --diff",
-        "cs:fix": "php-cs-fixer fix",
-        "psalm": "psalm --threads=1 --no-cache",
-        "test:unit": "phpunit tests -c tests/phpunit.xml --colors=always --fail-on-warning --fail-on-risky",
-        "openapi": "generate-spec"
-    },
-    "require": {
-        "php": "^8.1",
-        "adbario/php-dot-notation": "^3.3.0",
-        "bamarni/composer-bin-plugin": "^1.8",
-        "elasticsearch/elasticsearch": "^v8.14.0",
-        "guzzlehttp/guzzle": "^7.0",
-        "symfony/uid": "^6.4"
-    },
-    "require-dev": {
-        "nextcloud/ocp": "dev-stable29",
-        "roave/security-advisories": "dev-latest"
-    },
-    "config": {
-        "allow-plugins": {
-            "bamarni/composer-bin-plugin": true,
-            "php-http/discovery": true
-        },
-        "optimize-autoloader": true,
-        "sort-packages": true,
-        "platform": {
-            "php": "8.1"
-        }
-    }
+	"name": "conductionnl/opencatalogi",
+	"description": "This is a DSO Nextcloud project for the municipality Buren and is done by ConductionNL",
+	"license": "AGPL-3.0-or-later",
+	"authors": [
+		{
+			"name": "Conduction b.v.",
+			"email": "[email protected]",
+			"homepage": "https://conduction.nl"
+		},
+		{
+			"name": "Remko Huisman (Conduction)",
+			"email": "[email protected]",
+			"homepage": "https://conduction.nl"
+		},
+		{
+			"name": "Ruben van der Linde (Conduction)",
+			"email": "[email protected]",
+			"homepage": "https://conduction.nl"
+		}
+	],
+	"autoload": {
+		"psr-4": {
+			"OCA\\OpenCatalogi\\": "lib/"
+		}
+	},
+	"scripts": {
+		"post-install-cmd": [
+			"@composer bin all install --ansi"
+		],
+		"post-update-cmd": [
+			"@composer bin all update --ansi"
+		],
+		"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './vendor-bin/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
+		"cs:check": "php-cs-fixer fix --dry-run --diff",
+		"cs:fix": "php-cs-fixer fix",
+		"psalm": "psalm --threads=1 --no-cache",
+		"test:unit": "phpunit tests -c tests/phpunit.xml --colors=always --fail-on-warning --fail-on-risky",
+		"openapi": "generate-spec"
+	},
+	"require": {
+		"php": "^8.1",
+		"adbario/php-dot-notation": "^3.3.0",
+		"bamarni/composer-bin-plugin": "^1.8",
+		"elasticsearch/elasticsearch": "^v8.14.0",
+		"adbario/php-dot-notation": "^3.3.0",
+		"guzzlehttp/guzzle": "^7.0",
+		"symfony/uid": "^6.4"
+	},
+	"require-dev": {
+		"nextcloud/ocp": "dev-stable29",
+		"roave/security-advisories": "dev-latest"
+	},
+	"config": {
+		"allow-plugins": {
+			"bamarni/composer-bin-plugin": true,
+			"php-http/discovery": true
+		},
+		"optimize-autoloader": true,
+		"sort-packages": true,
+		"platform": {
+			"php": "8.1"
+		}
+	}
 }