renommage des pages

www/lib/DNSManager.pm

@@ -54,38 +54,9 @@ get '/' => sub {
     }
 };
 
-post '/login' => sub {
 
-    # Check if user is already logged
+get '/home' => sub {
-    unless ( session('login') )
-    {
-        # Check user login and password
-        if ( param('login') && param('password') )
-        {
-            my $app = initco();
-            my ($auth_ok, $user, $isadmin) = $app->auth(param('login'),
-                param('password') );
-            if( $auth_ok )
-            {
 
-                session login => param('login');
-                # TODO : change password storage…
-                session password => param('password');
-                session user  => freeze( $user );
-                session admin => $isadmin;
-
-            }
-            else
-            {
-                # User login and/or password are incorrect
-            }
-        }
-    }
-    redirect '/';
-};
-
-
-get '/mapage' => sub {
     unless( session('login') )
     {
         redirect '/';
@@ -98,7 +69,7 @@ get '/mapage' => sub {
 
         my @d = @{$app->get_domains( session('login') )};
 
-        template mapage => { 
+        template home => { 
             login           => session('login')
             , domains         => $app->get_domains(session('login'))
             , zones_domains   => \%domains
@@ -108,7 +79,9 @@ get '/mapage' => sub {
     }
 };
 
-any ['post', 'get'] => '/domainupdate/:domain' => sub {
+prefix '/domain' => sub {
+
+    any ['post', 'get'] => '/update/:domain' => sub {
 
         # check if user is logged & if domain parameter is set
         unless( session('login') && param('domain'))
@@ -125,7 +98,7 @@ any ['post', 'get'] => '/domainupdate/:domain' => sub {
                 , param('zoneupdated')
                 , param('domain'));
 
-        redirect '/mapage';
+            redirect '/domain/details/' . param('domain');
         }
 
     };
@@ -154,7 +127,37 @@ get '/details/:domain' => sub {
 
     };
 
-any ['get', 'post'] => '/administration' => sub {
+    post '/add/' => sub {
+
+        # check if user is logged & if domain parameter is set
+        unless( session('login') && param('domain'))
+        {
+            redirect '/';
+        }
+        else
+        {
+
+            my $app = initco();
+            $app->add_domain( session('login'), param('domain') );
+            redirect '/home';
+
+        }
+
+    };
+
+    get '/del/:domain' => sub {
+
+        # TODO tests des droits
+        my $app = initco();
+        $app->delete_domain(session('login'), param('domain'));
+        redirect '/home';
+
+    };
+
+
+};
+
+any ['get', 'post'] => '/admin' => sub {
     unless( session('login') )
     {
         redirect '/';
@@ -167,37 +170,44 @@ any ['get', 'post'] => '/administration' => sub {
     }
 };
 
-any ['post', 'get'] => '/logout' => sub {
+prefix '/user' => sub {
+
+    get '/logout' => sub {
         session->destroy;
         redirect '/';
     };
 
-get '/domainadd' => sub {
+    post '/login' => sub {
-    # check if user is logged & if domain parameter is set
+
+        # Check if user is already logged
         unless ( session('login') )
         {
-        redirect '/';
+            # Check user login and password
+            if ( param('login') && param('password') )
+            {
+
+                my $app = initco();
+                my ($auth_ok, $user, $isadmin) = $app->auth(param('login'),
+                    param('password') );
+                if( $auth_ok )
+                {
+
+                    session login => param('login');
+                    # TODO : change password storage…
+                    session password => param('password');
+                    session user  => freeze( $user );
+                    session admin => $isadmin;
+
                 }
                 else
                 {
-
+                    # User login and/or password are incorrect
-        my $app = initco();
+                }
-
+            }
-        if( param('domain') )
-        {
-            # create domain
-            $app->add_domain( session('login'), param('domain') );
-            # Then, redirect to mapage
-            redirect '/mapage';
         }
 
-    }
+        redirect '/home';
 
     };
 
-get qr{/domaindel/(.*)} => sub {
+};
-    my ($domainToDelete) = splat;
-    my $app = initco();
-    $app->delete_domain(session('login'), $domainToDelete);
-    redirect '/mapage';
-}

www/views/administration.tt

@@ -1,5 +1,14 @@
 <div id="sidebar">
+    Welcome <% login %> !
+
+    <a href="/user/logout">Déconnexion</a>
+
+    <br />
+    <a href='/admin'>Page d'administration</a>
+    <br />
+
     <a href='/'>Accueil</a>
+
 </div>
 
 <div id="page">

www/views/details.tt

@@ -1,19 +1,27 @@
 <div id="sidebar">
     Welcome <% login %> !
-    <form action='logout' method="post" accept-charset="utf-8">
+
-        <input type="submit" name="logout" value="Déconnexion">
+    <br />
-    </form>
+    <a href="/user/logout">Déconnexion</a>
+
+    <br />
+    <a href="/home">Ma page</a>
+
+    <br />
     <% IF admin == 1 %>
-        <a href='administration'>Page d'administration</a>
+        <a href='/admin'>Page d'administration</a>
+        <br />
     <% END %>
+
     <a href='/'>Accueil</a>
+
 </div>
 
 <div id="page">
 
     <h3>Fichier de zone de <% domain %></h3>
 
-    <form action='/domainupdate/<% domain %>' method="post" >
+    <form action='/domain/update/<% domain %>' method="post" >
         <label for='zone'>Votre zone :</label>
 	<br />
         <textarea id='zone' name="zoneupdated" rows="20" cols="100"><% domain_zone %></textarea>

www/views/home.tt

@@ -0,0 +1,50 @@
+<div id="sidebar">
+    Welcome <% login %> !
+
+    <br />
+    <a href="/user/logout">Déconnexion</a>
+
+    <br />
+    <% IF admin == 1 %>
+        <a href='/admin'>Page d'administration</a>
+        <br />
+    <% END %>
+
+    <a href='/'>Accueil</a>
+
+</div>
+
+<div id="page">
+
+<% IF domains && domains.size %>
+    <h3>Vos domaines :</h3>
+    <br />
+
+    <table>
+    <% FOREACH domain in domains %>
+        <tr>
+            <td>
+                <a href="/domain/details/<%domain%>" ><%domain%></a> 
+            </td>
+
+            <td>
+                <a href="/domain/del/<%domain%>">Supprimer</a>
+            </td>
+        </tr>
+    <% END %>
+    </table>
+
+    <br/>
+
+<% ELSE %>
+    Vous n'avez pas encore de noms de domaines… réservez-en un ! \o/
+<% END %>
+
+<h3>Ajouter un nouveau domaine.</h3>
+
+<form action='/domain/add/' method="post" >
+    <input type='text' name='domain'/>
+    <input type='submit' name='submit'/>
+</form>
+
+</div>

www/views/index.tt

@@ -1,14 +1,16 @@
 <div id="sidebar">
 
     <% IF logged == 1 %>
-        Welcome <% login %> !
-        <form action='logout' method="get" accept-charset="utf-8">
-            <input type="submit" name="logout" value="Déconnexion">
-        </form>
 
-        <a href='mapage'>Votre page de configuration</a><br />
+        Welcome <% login %> !
+        <br />
+        <a href="/user/logout">Déconnexion</a>
+
+	<br />
+        <a href='/home'>Votre page de configuration</a><br />
         <% IF admin == 1 %>
-            <a href='administration'>Page d'administration</a><br />
+            <a href='/admin'>Page d'administration</a>
+            <br />
         <% END %>
 
         <% IF domains %>
@@ -19,9 +21,10 @@
         <% END %>
 
     <% ELSE %>
-        <form action="login" method="post" accept-charset="utf-8">
+        <form action="/user/login" method="post" accept-charset="utf-8">
             <label for="login">Votre login : </label>
             <input type="text" name="login" value="" />
+
             <label for="password">Votre mot de passe : </label>
             <input type="password" name="password" value="" />
             <p><input type="submit" value="Connexion &rarr;" /></p>

www/views/mapage.tt

@@ -1,37 +0,0 @@
-<div id="sidebar">
-	Welcome <% login %> !
-    <form action='logout' method="get" accept-charset="utf-8">
-        <input type="submit" name="logout" value="Déconnexion">
-    </form>
-	<% IF admin == 1 %>
-		<a href='administration'>Page d'administration</a>
-	<% END %>
-	<a href='/'>Accueil</a>
-</div>
-
-<div id="page">
-	<% IF domains && domains.size %>
-        <h3>Vos domaines :</h3>
-        <br />
-        <table>
-            <% FOREACH domain in domains %>
-            <tr>
-                <td>
-                    <a href="details/<%domain%>" ><%domain%></a> 
-                </td>
-                <td>
-                    <a href="domaindel/<%domain%>">Supprimer</a>
-                </td>
-            </tr>
-            <% END %>
-        </table>
-		<br/>
-	<% ELSE %>
-        Vous n'avez pas encore de noms de domaines… Voulez-vous en réserver un ?
-	<% END %>
-    <h3>Ajouter un nouveau domaine.</h3>
-    <form action='domainadd'>
-        <input type='text' name='domain'/>
-        <input type='submit' name='submit'/>
-    </form>
-</div>