From 9ab1552fd4c9404388e92d36f0080906b0b666c4 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 | 12 ++++++------
 Admin/Routes/Web/Backend.php          |  8 ++++----
 Theme/Backend/clients-create.tpl.php  |  4 ++--
 Theme/Backend/clients-list.tpl.php    |  2 +-
 Theme/Backend/clients-profile.tpl.php |  4 ++--
 info.json                             |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 47e420c..adad9c5 100644
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -1,11 +1,11 @@
 [
     {
         "id": 1003102001,
-        "pid": "/backend",
+        "pid": "/",
         "type": 2,
         "subtype": 1,
         "name": "Clients",
-        "uri": "{/lang}/backend/sales/client/list?{?}",
+        "uri": "{/prefix}sales/client/list?{?}",
         "target": "self",
         "icon": null,
         "order": 1,
@@ -15,11 +15,11 @@
         "children": [
             {
                 "id": 1003102101,
-                "pid": "/backend/sales/client",
+                "pid": "/sales/client",
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/lang}/backend/sales/client/list?{?}",
+                "uri": "{/prefix}sales/client/list?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -30,11 +30,11 @@
             },
             {
                 "id": 1003102201,
-                "pid": "/backend/sales/client",
+                "pid": "/sales/client",
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/lang}/backend/sales/client/create?{?}",
+                "uri": "{/prefix}sales/client/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index cbbbb10..e72e6d7 100644
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -7,7 +7,7 @@ use phpOMS\Router\RouteVerb;
 
 
 return [
-    '^.*/backend/sales/client/list.*$' => [
+    '^.*/sales/client/list.*$' => [
         [
             'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientList',
             'verb' => RouteVerb::GET,
@@ -18,7 +18,7 @@ return [
             ],
         ],
     ],
-    '^.*/backend/sales/client/create.*$' => [
+    '^.*/sales/client/create.*$' => [
         [
             'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientCreate',
             'verb' => RouteVerb::GET,
@@ -29,7 +29,7 @@ return [
             ],
         ],
     ],
-    '^.*/backend/sales/client/profile.*$' => [
+    '^.*/sales/client/profile.*$' => [
         [
             'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientProfile',
             'verb' => RouteVerb::GET,
@@ -40,7 +40,7 @@ return [
             ],
         ],
     ],
-    '^.*/backend/sales/client/analysis.*$' => [
+    '^.*/sales/client/analysis.*$' => [
         [
             'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientAnalysis',
             'verb' => RouteVerb::GET,
diff --git a/Theme/Backend/clients-create.tpl.php b/Theme/Backend/clients-create.tpl.php
index efbba5e..af3a86f 100644
--- a/Theme/Backend/clients-create.tpl.php
+++ b/Theme/Backend/clients-create.tpl.php
@@ -183,7 +183,7 @@ echo $this->getData('nav')->render(); ?>
                     <section class="box wf-100">
                         <header><h1><?= $this->getHtml('Price'); ?></h1></header>
                         <div class="inner">
-                            <form action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/...'); ?>" method="post">
+                            <form action="<?= \phpOMS\Uri\UriFactory::build('{/api}...'); ?>" method="post">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td colspan="2"><label for="iPType"><?= $this->getHtml('Type'); ?></label>
@@ -225,7 +225,7 @@ echo $this->getData('nav')->render(); ?>
                     <section class="box wf-100">
                         <header><h1><?= $this->getHtml('AreaManager'); ?></h1></header>
                         <div class="inner">
-                            <form action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/...'); ?>" method="post">
+                            <form action="<?= \phpOMS\Uri\UriFactory::build('{/api}...'); ?>" method="post">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iManager"><?= $this->getHtml('AreaManager'); ?></label>
diff --git a/Theme/Backend/clients-list.tpl.php b/Theme/Backend/clients-list.tpl.php
index 3893bfb..6208a67 100644
--- a/Theme/Backend/clients-list.tpl.php
+++ b/Theme/Backend/clients-list.tpl.php
@@ -78,7 +78,7 @@ echo $this->getData('nav')->render(); ?>
                     <td colspan="8">
                 <tbody>
                 <?php $count = 0; foreach ($clients as $key => $value) : ++$count;
-                 $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/sales/client/profile?{?}&id=' . $value->getId()); ?>
+                 $url = \phpOMS\Uri\UriFactory::build('{/prefix}sales/client/profile?{?}&id=' . $value->getId()); ?>
                 <tr data-href="<?= $url; ?>">
                     <td data-label="<?= $this->getHtml('ID', 0, 0) ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getNumber()); ?></a>
                     <td data-label="<?= $this->getHtml('Name1') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getProfile()->getAccount()->getName1()); ?></a>
diff --git a/Theme/Backend/clients-profile.tpl.php b/Theme/Backend/clients-profile.tpl.php
index 7619438..0433d67 100644
--- a/Theme/Backend/clients-profile.tpl.php
+++ b/Theme/Backend/clients-profile.tpl.php
@@ -192,7 +192,7 @@ echo $this->getData('nav')->render();
                     <section class="box wf-100">
                         <header><h1><?= $this->getHtml('Price'); ?></h1></header>
                         <div class="inner">
-                            <form action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/...'); ?>" method="post">
+                            <form action="<?= \phpOMS\Uri\UriFactory::build('{/api}...'); ?>" method="post">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td colspan="2"><label for="iPType"><?= $this->getHtml('Type'); ?></label>
@@ -234,7 +234,7 @@ echo $this->getData('nav')->render();
                     <section class="box wf-100">
                         <header><h1><?= $this->getHtml('AreaManager'); ?></h1></header>
                         <div class="inner">
-                            <form action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/...'); ?>" method="post">
+                            <form action="<?= \phpOMS\Uri\UriFactory::build('{/api}...'); ?>" method="post">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iManager"><?= $this->getHtml('AreaManager'); ?></label>
diff --git a/info.json b/info.json
index e28dbe6..7db12cc 100644
--- a/info.json
+++ b/info.json
@@ -27,7 +27,7 @@
     "load": [
         {
             "pid": [
-                "/backend/sales/customer"
+                "/sales/customer"
             ],
             "type": 4,
             "for": 0,
@@ -36,7 +36,7 @@
         },
         {
             "pid": [
-                "/backend"
+                "/"
             ],
             "type": 5,
             "from": "ClientManagement",