Make app,localization in url optional+tld+subdomain

This commit is contained in:
Dennis Eichhorn 2019-03-09 23:21:29 +01:00
parent fdadd1c204
commit ef4ff0ad5d
6 changed files with 24 additions and 24 deletions

View File

@ -1,7 +1,7 @@
[ [
{ {
"id": 1002901001, "id": 1002901001,
"pid": "/backend", "pid": "/",
"type": 2, "type": 2,
"subtype": 0, "subtype": 0,
"name": "Support", "name": "Support",
@ -15,11 +15,11 @@
"children": [ "children": [
{ {
"id": 1002901101, "id": 1002901101,
"pid": "/backend", "pid": "/",
"type": 2, "type": 2,
"subtype": 1, "subtype": 1,
"name": "Ticket", "name": "Ticket",
"uri": "{/lang}/backend/support/list?{?}", "uri": "{/prefix}support/list?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 1, "order": 1,
@ -29,11 +29,11 @@
"children": [ "children": [
{ {
"id": 1002903101, "id": 1002903101,
"pid": "/backend/support", "pid": "/support",
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "List", "name": "List",
"uri": "{/lang}/backend/support/list?{?}", "uri": "{/prefix}support/list?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 1, "order": 1,
@ -45,11 +45,11 @@
}, },
{ {
"id": 1002903201, "id": 1002903201,
"pid": "/backend/support", "pid": "/support",
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Create", "name": "Create",
"uri": "{/lang}/backend/support/create?{?}", "uri": "{/prefix}support/create?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 5, "order": 5,
@ -63,11 +63,11 @@
}, },
{ {
"id": 1002901201, "id": 1002901201,
"pid": "/backend", "pid": "/",
"type": 2, "type": 2,
"subtype": 1, "subtype": 1,
"name": "Settings", "name": "Settings",
"uri": "{/lang}/backend/support/settings/dashboard?{?}", "uri": "{/prefix}support/settings/dashboard?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 5, "order": 5,
@ -79,11 +79,11 @@
}, },
{ {
"id": 1002901301, "id": 1002901301,
"pid": "/backend", "pid": "/",
"type": 2, "type": 2,
"subtype": 1, "subtype": 1,
"name": "Analysis", "name": "Analysis",
"uri": "{/lang}/backend/support/analysis/dashboard?{?}", "uri": "{/prefix}support/analysis/dashboard?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 10, "order": 10,
@ -97,11 +97,11 @@
}, },
{ {
"id": 1002902001, "id": 1002902001,
"pid": "/backend", "pid": "/",
"type": 2, "type": 2,
"subtype": 1, "subtype": 1,
"name": "Support", "name": "Support",
"uri": "{/lang}/backend/private/support/dashboard?{?}", "uri": "{/prefix}private/support/dashboard?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 5, "order": 5,

View File

@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
return [ return [
'^.*/backend/support/list.*$' => [ '^.*/support/list.*$' => [
[ [
'dest' => '\Modules\Support\Controller\BackendController:viewSupportList', 'dest' => '\Modules\Support\Controller\BackendController:viewSupportList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -17,7 +17,7 @@ return [
], ],
], ],
], ],
'^.*/backend/support/single.*$' => [ '^.*/support/single.*$' => [
[ [
'dest' => '\Modules\Support\Controller\BackendController:viewSupportTicket', 'dest' => '\Modules\Support\Controller\BackendController:viewSupportTicket',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -28,7 +28,7 @@ return [
], ],
], ],
], ],
'^.*/backend/support/create.*$' => [ '^.*/support/create.*$' => [
[ [
'dest' => '\Modules\Support\Controller\BackendController:viewSupportCreate', 'dest' => '\Modules\Support\Controller\BackendController:viewSupportCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -39,7 +39,7 @@ return [
], ],
], ],
], ],
'^.*/backend/support/analysis.*$' => [ '^.*/support/analysis.*$' => [
[ [
'dest' => '\Modules\Support\Controller\BackendController:viewSupportAnalysis', 'dest' => '\Modules\Support\Controller\BackendController:viewSupportAnalysis',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -50,7 +50,7 @@ return [
], ],
], ],
], ],
'^.*/backend/support/settings.*$' => [ '^.*/support/settings.*$' => [
[ [
'dest' => '\Modules\Support\Controller\BackendController:viewSupportSettings', 'dest' => '\Modules\Support\Controller\BackendController:viewSupportSettings',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -61,7 +61,7 @@ return [
], ],
], ],
], ],
'^.*/backend/private/support/dashboard.*$' => [ '^.*/private/support/dashboard.*$' => [
[ [
'dest' => '\Modules\Support\Controller\BackendController:viewPrivateSupportDashboard', 'dest' => '\Modules\Support\Controller\BackendController:viewPrivateSupportDashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,

View File

@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>
<tfoot> <tfoot>
<tbody> <tbody>
<?php $c = 0; foreach ($tickets as $key => $ticket) : $c++; <?php $c = 0; foreach ($tickets as $key => $ticket) : $c++;
$url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/support/single?{?}&id=' . $ticket->getId()); $url = \phpOMS\Uri\UriFactory::build('{/prefix}support/single?{?}&id=' . $ticket->getId());
$color = 'darkred'; $color = 'darkred';
if ($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; } if ($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
elseif ($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; } elseif ($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }

View File

@ -20,7 +20,7 @@ echo $this->getData('nav')->render(); ?>
<section class="box wf-100"> <section class="box wf-100">
<header><h1><?= $this->getHtml('Ticket'); ?></h1></header> <header><h1><?= $this->getHtml('Ticket'); ?></h1></header>
<div class="inner"> <div class="inner">
<form action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/helper/template'); ?>" method="post"> <form action="<?= \phpOMS\Uri\UriFactory::build('{/api}helper/template'); ?>" method="post">
<table class="layout wf-100"> <table class="layout wf-100">
<tbody> <tbody>
<tr><td><label for="iTitle"><?= $this->getHtml('Department'); ?></label> <tr><td><label for="iTitle"><?= $this->getHtml('Department'); ?></label>

View File

@ -82,7 +82,7 @@ echo $this->getData('nav')->render(); ?>
<section class="box wf-100"> <section class="box wf-100">
<div class="inner"> <div class="inner">
<form id="taskElementCreate" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/task/element?{?}&csrf={$CSRF}'); ?>"> <form id="taskElementCreate" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}task/element?{?}&csrf={$CSRF}'); ?>">
<table class="layout wf-100"> <table class="layout wf-100">
<tr><td><label for="iMessage"><?= $this->getHtml('Message') ?></label> <tr><td><label for="iMessage"><?= $this->getHtml('Message') ?></label>
<tr><td><textarea id="iMessage" name="description"></textarea> <tr><td><textarea id="iMessage" name="description"></textarea>

View File

@ -26,7 +26,7 @@
"load": [ "load": [
{ {
"pid": [ "pid": [
"/backend/support" "/support"
], ],
"type": 4, "type": 4,
"for": 0, "for": 0,
@ -35,7 +35,7 @@
}, },
{ {
"pid": [ "pid": [
"/backend" "/"
], ],
"type": 5, "type": 5,
"from": "Support", "from": "Support",