Skip to content

Commit

Permalink
Merge pull request #132 from ConductionNL/development
Browse files Browse the repository at this point in the history
Development to main
  • Loading branch information
remko48 authored Jan 6, 2025
2 parents 38d4df2 + 3ba5a18 commit 2763e4e
Show file tree
Hide file tree
Showing 135 changed files with 32,538 additions and 27,814 deletions.
442 changes: 221 additions & 221 deletions .github/workflows/release-workflow.yaml

Large diffs are not rendered by default.

23 changes: 21 additions & 2 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,37 @@
['name' => 'dashboard#page', 'url' => '/', 'verb' => 'GET'],
['name' => 'configuration#index', 'url' => '/api/configuration', 'verb' => 'GET'],
['name' => 'configuration#create', 'url' => '/api/configuration', 'verb' => 'POST'],
['name' => 'contactMomenten#page', 'url' => '/contactmomenten', 'verb' => 'GET'],
['name' => 'contactMomenten#page', 'postfix' => 'details', 'url' => '/contactmomenten/{id}', 'verb' => 'GET'],
['name' => 'zaken#page', 'url' => '/zaken', 'verb' => 'GET'],
['name' => 'zaken#page', 'postfix' => 'details', 'url' => '/zaken/{id}', 'verb' => 'GET'],
['name' => 'rollen#page', 'url' => '/rollen', 'verb' => 'GET'],
['name' => 'statussen#page', 'url' => '/statussen', 'verb' => 'GET'],
['name' => 'zaakinformatieobjecten#page', 'url' => '/zaakinformatieobjecten', 'verb' => 'GET'],
['name' => 'zaakTypen#page','url' => '/zaak_typen', 'verb' => 'GET'],
['name' => 'zaakTypen#page','url' => '/zaaktypen', 'verb' => 'GET'],
['name' => 'zaakTypen#page','postfix' => 'details', 'url' => '/zaaktypen/{id}', 'verb' => 'GET'],
['name' => 'taken#page','url' => '/taken', 'verb' => 'GET'],
['name' => 'taken#page','postfix' => 'details', 'url' => '/taken/{id}', 'verb' => 'GET'],
['name' => 'klanten#page','url' => '/klanten', 'verb' => 'GET'],
['name' => 'berichten#index','url' => '/berichten', 'verb' => 'GET'],
['name' => 'klanten#page','postfix' => 'details', 'url' => '/klanten/{id}', 'verb' => 'GET'],
['name' => 'medewerkers#page','url' => '/medewerkers', 'verb' => 'GET'],
['name' => 'medewerkers#page','postfix' => 'details', 'url' => '/medewerkers/{id}', 'verb' => 'GET'],
['name' => 'berichten#page','url' => '/berichten', 'verb' => 'GET'],
['name' => 'berichten#page','postfix' => 'details', 'url' => '/berichten/{id}', 'verb' => 'GET'],
['name' => 'dashboard#page', 'postfix' => 'search', 'url' => '/zoeken', 'verb' => 'GET'],
// user Settings
['name' => 'settings#index','url' => '/settings', 'verb' => 'GET'],
['name' => 'settings#create', 'url' => '/settings', 'verb' => 'POST'],
// User
['name' => 'users#me', 'url' => '/me', 'verb' => 'GET'],
// Object API routes
['name' => 'objects#index', 'url' => 'api/objects/{objectType}', 'verb' => 'GET'],
['name' => 'objects#create', 'url' => 'api/objects/{objectType}', 'verb' => 'POST'],
['name' => 'objects#show', 'url' => 'api/objects/{objectType}/{id}', 'verb' => 'GET'],
['name' => 'objects#update', 'url' => 'api/objects/{objectType}/{id}', 'verb' => 'PUT'],
['name' => 'objects#delete', 'url' => 'api/objects/{objectType}/{id}', 'verb' => 'DELETE'],
['name' => 'objects#getAuditTrail', 'url' => 'api/objects/{objectType}/{id}/audit', 'verb' => 'GET'],
['name' => 'objects#getRelations', 'url' => 'api/objects/{objectType}/{id}/relations', 'verb' => 'GET'],
['name' => 'objects#getUses', 'url' => 'api/objects/{objectType}/{id}/uses', 'verb' => 'GET']
]
];
8 changes: 4 additions & 4 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@
}

.detailGrid {
display: grid;
grid-template-columns: 1fr 1fr;
display: grid;
grid-template-columns: 1fr 1fr;
}

/* Modals */
.form-group > * {
.form-group > * {
margin-block-end: 10px;
}

Expand All @@ -103,4 +103,4 @@
.modalContent {
margin: var(--zaa-margin-50);
text-align: center;
}
}
1 change: 1 addition & 0 deletions img/email-outline-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/email-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/face-agent-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/face-agent.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/mailbox-open-outline-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/mailbox-open-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/phone-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/phone.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions lib/Controller/BerichtenController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IRequest;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Http\ContentSecurityPolicy;

class BerichtenController extends Controller
{
Expand Down Expand Up @@ -39,6 +41,42 @@ public function index(): JSONResponse
return new JSONResponse($data);
}

/**
* Render no page.
*
* @param string|null $getParameter Optional GET parameter
* @return TemplateResponse The rendered template response
*
* @NoAdminRequired
* @NoCSRFRequired
*/
public function page(?string $getParameter): TemplateResponse
{
try {
// Create a new TemplateResponse for the index page
$response = new TemplateResponse(
$this->appName,
'index',
[]
);

// Set up Content Security Policy
$csp = new ContentSecurityPolicy();
$csp->addAllowedConnectDomain('*');
$response->setContentSecurityPolicy($csp);

return $response;
} catch (\Exception $e) {
// Return an error template response if an exception occurs
return new TemplateResponse(
$this->appName,
'error',
['error' => $e->getMessage()],
'500'
);
}
}

/**
* Read a single object
*
Expand Down
Loading

0 comments on commit 2763e4e

Please sign in to comment.