From f2a233fde74be7cfb96cae396cb03e56c75055d1 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 9 Mar 2019 23:21:29 +0100
Subject: [PATCH] Make app,localization in url optional+tld+subdomain

---
 Admin/Install/Navigation.install.json  | 16 ++++++++--------
 Admin/Routes/Web/Backend.php           | 12 ++++++------
 Theme/Backend/kanban-board.tpl.php     |  2 +-
 Theme/Backend/kanban-dashboard.tpl.php |  2 +-
 info.json                              |  4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index ee19603..cf570aa 100644
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -1,11 +1,11 @@
 [
     {
         "id": 1005801001,
-        "pid": "/backend",
+        "pid": "/",
         "type": 2,
         "subtype": 1,
         "name": "Kanban",
-        "uri": "{/lang}/backend/kanban/dashboard?{?}",
+        "uri": "{/prefix}kanban/dashboard?{?}",
         "target": "self",
         "icon": null,
         "order": 45,
@@ -15,11 +15,11 @@
         "children": [
              {
                 "id": 1005802001,
-                "pid": "/backend/kanban",
+                "pid": "/kanban",
                 "type": 3,
                 "subtype": 1,
                 "name": "Boards",
-                "uri": "{/lang}/backend/kanban/dashboard?{?}",
+                "uri": "{/prefix}kanban/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -30,11 +30,11 @@
             },
             {
                 "id": 1005803001,
-                "pid": "/backend/kanban",
+                "pid": "/kanban",
                 "type": 3,
                 "subtype": 1,
                 "name": "Archive",
-                "uri": "{/lang}/backend/kanban/archive?{?}",
+                "uri": "{/prefix}kanban/archive?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 2,
@@ -45,11 +45,11 @@
             },
             {
                 "id": 1005804001,
-                "pid": "/backend/kanban",
+                "pid": "/kanban",
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/lang}/backend/kanban/create?{?}",
+                "uri": "{/prefix}kanban/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 3,
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index d4b8e9d..9b56e10 100644
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType;
 use phpOMS\Router\RouteVerb;
 
 return [
-    '^.*/backend/kanban.*$' => [
+    '^.*/kanban.*$' => [
         [
             'dest' => '\Modules\Kanban\Controller\BackendController:setupStyles',
             'verb' => RouteVerb::GET,
@@ -17,7 +17,7 @@ return [
             ],
         ],
     ],
-    '^.*/backend/kanban/dashboard.*$' => [
+    '^.*/kanban/dashboard.*$' => [
         [
             'dest' => '\Modules\Kanban\Controller\BackendController:viewKanbanDashboard',
             'verb' => RouteVerb::GET,
@@ -28,7 +28,7 @@ return [
             ],
         ],
     ],
-    '^.*/backend/kanban/archive.*$' => [
+    '^.*/kanban/archive.*$' => [
         [
             'dest' => '\Modules\Kanban\Controller\BackendController:viewKanbanArchive',
             'verb' => RouteVerb::GET,
@@ -39,7 +39,7 @@ return [
             ],
         ],
     ],
-    '^.*/backend/kanban/board.*$' => [
+    '^.*/kanban/board.*$' => [
         [
             'dest' => '\Modules\Kanban\Controller\BackendController:viewKanbanBoard',
             'verb' => RouteVerb::GET,
@@ -50,7 +50,7 @@ return [
             ],
         ],
     ],
-    '^.*/backend/kanban/card.*$' => [
+    '^.*/kanban/card.*$' => [
         [
             'dest' => '\Modules\Kanban\Controller\BackendController:viewKanbanCard',
             'verb' => RouteVerb::GET,
@@ -61,7 +61,7 @@ return [
             ],
         ],
     ],
-    '^.*/backend/kanban/create.*$' => [
+    '^.*/kanban/create.*$' => [
         [
             'dest' => '\Modules\Kanban\Controller\BackendController:viewKanbanBoardCreate',
             'verb' => RouteVerb::GET,
diff --git a/Theme/Backend/kanban-board.tpl.php b/Theme/Backend/kanban-board.tpl.php
index 0887439..eeb5a7d 100644
--- a/Theme/Backend/kanban-board.tpl.php
+++ b/Theme/Backend/kanban-board.tpl.php
@@ -8,7 +8,7 @@ $columns = $board->getColumns();
     <div id="kanban-column-<?= $this->printHtml($i); ?>" class="col-xs-12 col-sm-3" draggable="true">
         <header><?= $this->printHtml($column->getName()); ?></header>
         <?php $j = 0; foreach ($cards as $card) : $j++; $labels = $card->getLabels(); ?>
-            <a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('{/lang}/backend/kanban/card?{?}&id=' . $card->getId())); ?>">
+            <a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('{/prefix}kanban/card?{?}&id=' . $card->getId())); ?>">
             <section id="kanban-card-<?= $this->printHtml($i . '-' . $j); ?>" class="box wf-100" draggable="true">
                 <header><h1><?= $this->printHtml($card->getName()); ?></h1></header>
                 <div class="inner">
diff --git a/Theme/Backend/kanban-dashboard.tpl.php b/Theme/Backend/kanban-dashboard.tpl.php
index 217c2b7..1aa9b2d 100644
--- a/Theme/Backend/kanban-dashboard.tpl.php
+++ b/Theme/Backend/kanban-dashboard.tpl.php
@@ -6,7 +6,7 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <?php foreach ($boards as $board) : ?>
     <div class="col-xs-12 col-sm-6 col-lg-3">
-        <a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('{/lang}/backend/kanban/board?{?}&id=' . $board->getId())); ?>">
+        <a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('{/prefix}kanban/board?{?}&id=' . $board->getId())); ?>">
         <section class="box wf-100">
             <header><h1><?= $this->printHtml($board->getName()); ?></h1></header>
             <div class="inner">
diff --git a/info.json b/info.json
index 3f2a208..b163aaf 100644
--- a/info.json
+++ b/info.json
@@ -28,7 +28,7 @@
     "load": [
         {
             "pid": [
-                "/backend/kanban"
+                "/kanban"
             ],
             "type": 4,
             "for": 0,
@@ -37,7 +37,7 @@
         },
         {
             "pid": [
-                "/backend"
+                "/"
             ],
             "type": 5,
             "from": "Kanban",