From b6f96245442acf032319ea6fd16b452f69d8ea83 Mon Sep 17 00:00:00 2001
From: touffies <claffont@openstudio.fr>
Date: Wed, 23 Oct 2013 11:49:36 +0200
Subject: [PATCH] Add a generic route (default) to manage the simple path

---
 .../Thelia/Config/Resources/routing/front.xml | 70 ++++---------------
 1 file changed, 15 insertions(+), 55 deletions(-)

diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml
index 97ddce393..3531487ce 100755
--- a/core/lib/Thelia/Config/Resources/routing/front.xml
+++ b/core/lib/Thelia/Config/Resources/routing/front.xml
@@ -4,66 +4,37 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
-    <route id="home" path="/">
+    <!--<route id="home" path="/">
         <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
         <default key="_view">index</default>
     </route>
 
+     Customer routes -->
 
-    <!-- Search routes -->
-    <route id="search" path="/search">
-        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
-        <default key="_view">search</default>
-    </route>
-
-    <route id="view_all" path="/view_all"  methods="get">
-        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
-        <default key="_view">view_all</default>
-    </route>
-
-    <!-- Customer routes : Register -->
+    <!-- Register -->
     <route id="customer.create.process" path="/register" methods="post">
         <default key="_controller">Thelia\Controller\Front\CustomerController::createAction</default>
         <default key="_view">register</default>
     </route>
 
-    <route id="customer.create.view" path="/register">
-        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
-        <default key="_view">register</default>
-    </route>
-
-    <!-- Customer routes : Login -->
+    <!-- Login -->
     <route id="customer.login.process" path="/login" methods="post">
         <default key="_controller">Thelia\Controller\Front\CustomerController::loginAction</default>
         <default key="_view">login</default>
     </route>
 
-    <route id="customer.login.view" path="/login">
-        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
-        <default key="_view">login</default>
-    </route>
-
+    <!-- Forgot Password -->
     <route id="customer.password.retrieve.process" path="/password" methods="post">
         <default key="_controller">Thelia\Controller\Front\CustomerController::newPasswordAction</default>
         <default key="_view">password</default>
     </route>
 
-    <route id="customer.password.retrieve.view" path="/password" methods="get">
-        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
-        <default key="_view">password</default>
-    </route>
-
-    <!-- Customer routes : Logout -->
+    <!-- Logout -->
     <route id="customer.logout.process" path="/logout">
         <default key="_controller">Thelia\Controller\Front\CustomerController::logoutAction</default>
     </route>
 
-    <!-- Customer routes : Account -->
-    <route id="customer.account.view" path="/account">
-        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
-        <default key="_view">account</default>
-    </route>
-
+    <!-- Account -->
     <route id="customer.update.view" path="/account/update" methods="get">
         <default key="_controller">Thelia\Controller\Front\CustomerController::viewAction</default>
         <default key="_view">account-update</default>
@@ -84,7 +55,6 @@
         <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
         <default key="_view">account-password</default>
     </route>
-
     <!-- end customer routes -->
 
     <!-- customer address routes -->
@@ -122,11 +92,6 @@
     <!-- end customer address routes -->
 
     <!-- cart routes -->
-    <route id="cart.view" path="/cart">
-        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
-        <default key="_view">cart</default>
-    </route>
-
     <route id="cart.add.process" path="/cart/add">
         <default key="_controller">Thelia\Controller\Front\CartController::addItem</default>
     </route>
@@ -140,7 +105,6 @@
         <default key="_controller">Thelia\Controller\Front\CartController::changeItem</default>
         <default key="_view">cart</default>
     </route>
-
     <!-- end cart routes -->
 
     <!-- order management process -->
@@ -179,11 +143,6 @@
     </route>
 
     <!-- contact management -->
-    <route id="contact.display" path="/contact" methods="get">
-        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
-        <default key="_view">contact</default>
-    </route>
-
     <route id="contact.send" path="/contact" methods="post">
         <default key="_controller">Thelia\Controller\Front\ContactController::sendAction</default>
         <default key="_view">contact</default>
@@ -196,16 +155,17 @@
     <!-- end contact management -->
 
     <!-- newsletter management -->
-
-    <route id="newsletter.display" path="/newsletter" methods="get">
-        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
-        <default key="_view">newsletter</default>
-    </route>
-
     <route id="newsletter.process" path="/newsletter" methods="post">
         <default key="_controller">Thelia\Controller\Front\NewsletterController::subscribeAction</default>
         <default key="_view">newsletter</default>
     </route>
-
     <!-- end newsletter management -->
+
+    <!-- Default Route -->
+    <route id="default" path="/{_view}">
+        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
+        <default key="_view">index</default>
+        <requirement key="_view">^(?!admin)[^/]+</requirement>
+    </route>
+
 </routes>