From 409467af23dae2bc5d86304eb3864eed4719500d Mon Sep 17 00:00:00 2001
From: Fredy Morales <fmorales@MAC-SOFT6.local>
Date: Thu, 10 Sep 2015 12:57:50 -0500
Subject: [PATCH 1/2] Improves relative paths for react-router

Signed-off-by: Fredy Morales <saiberz@hotmail.com>
---
 src/routes.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/routes.js b/src/routes.js
index bce15a611a..628786ec04 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -32,24 +32,24 @@ var App = React.createClass({
 
 var routes = (
   <Route name="app" path="/" handler={App}>
-    <Route name="account" path="/account" handler={Account}>
-      <Route name="signup" path="/account/signup" handler={AccountSignup}/>
-      <Route name="login" path="/account/login" handler={AccountLogin}/>
+    <Route name="account" path="account" handler={Account}>
+      <Route name="signup" path="signup" handler={AccountSignup}/>
+      <Route name="login" path="login" handler={AccountLogin}/>
     </Route>
-    <Route name="containers" handler={Containers}>
-      <Route name="container" path="containers/details/:name" handler={ContainerDetails}>
+    <Route name="containers" path="containers" handler={Containers}>
+      <Route name="container" path="details/:name" handler={ContainerDetails}>
         <DefaultRoute name="containerHome" handler={ContainerHome} />
-        <Route name="containerLogs" path="containers/details/:name/logs" handler={ContainerLogs}/>
-        <Route name="containerSettings" path="containers/details/:name/settings" handler={ContainerSettings}>
-          <Route name="containerSettingsGeneral" path="containers/details/:name/settings/general" handler={ContainerSettingsGeneral}/>
-          <Route name="containerSettingsPorts" path="containers/details/:name/settings/ports" handler={ContainerSettingsPorts}/>
-          <Route name="containerSettingsVolumes" path="containers/details/:name/settings/volumes" handler={ContainerSettingsVolumes}/>
-          <Route name="containerSettingsAdvanced" path="containers/details/:name/settings/advanced" handler={ContainerSettingsAdvanced}/>
+        <Route name="containerLogs" path="logs" handler={ContainerLogs}/>
+        <Route name="containerSettings" path="settings" handler={ContainerSettings}>
+          <Route name="containerSettingsGeneral" path="general" handler={ContainerSettingsGeneral}/>
+          <Route name="containerSettingsPorts" path="ports" handler={ContainerSettingsPorts}/>
+          <Route name="containerSettingsVolumes" path="volumes" handler={ContainerSettingsVolumes}/>
+          <Route name="containerSettingsAdvanced" path="advanced" handler={ContainerSettingsAdvanced}/>
         </Route>
       </Route>
-      <Route name="new" path="containers/new">
+      <Route name="new" path="new">
         <DefaultRoute name="search" handler={NewContainerSearch}/>
-        <Route name="pull" path="containers/new/pull" handler={NewContainerPull}></Route>
+        <Route name="pull" path="pull" handler={NewContainerPull}></Route>
       </Route>
       <Route name="preferences" path="/preferences" handler={Preferences}/>
       <Route name="about" path="/about" handler={About}/>

From 83f988ab93e5c9c809f4df5872dc883c1576d7a3 Mon Sep 17 00:00:00 2001
From: Fredy Morales <saiberz@hotmail.com>
Date: Tue, 15 Sep 2015 10:51:16 -0500
Subject: [PATCH 2/2] Fixes relative paths

Signed-off-by: Fredy Morales <saiberz@hotmail.com>
---
 src/routes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes.js b/src/routes.js
index 628786ec04..b8f628fbad 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -51,8 +51,8 @@ var routes = (
         <DefaultRoute name="search" handler={NewContainerSearch}/>
         <Route name="pull" path="pull" handler={NewContainerPull}></Route>
       </Route>
-      <Route name="preferences" path="/preferences" handler={Preferences}/>
-      <Route name="about" path="/about" handler={About}/>
+      <Route name="preferences" path="preferences" handler={Preferences}/>
+      <Route name="about" path="about" handler={About}/>
     </Route>
     <DefaultRoute name="setup" handler={Setup}/>
   </Route>