From 419ead4789d44ac34c408e20865f2b628e14ecb8 Mon Sep 17 00:00:00 2001
From: Milo Casagrande <milo.casagrande@linaro.org>
Date: Fri, 13 Jun 2014 16:16:20 +0200
Subject: Rework URL structure.

  * Initial work to have consistent URLs across the web app.
    Rename views and templates, fix URL routes.
  * This work will be needed to create new custom views and
    for breadcrumbs implementation.

Change-Id: I0d19dff6bb4c7cc8d4fa11491a4599ce13efd6d2
---
 app/dashboard/__init__.py | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

(limited to 'app/dashboard/__init__.py')

diff --git a/app/dashboard/__init__.py b/app/dashboard/__init__.py
index 7b45926..18b99ba 100644
--- a/app/dashboard/__init__.py
+++ b/app/dashboard/__init__.py
@@ -23,16 +23,18 @@ from flask import (
 )
 
 from dashboard.views.about import AboutView
-from dashboard.views.build import BuildsView
+from dashboard.views.build import (
+    BuildsAllView,
+    BuildsJobKernelView,
+)
 from dashboard.views.boot import (
     BootIdView,
     BootsView,
 )
 from dashboard.views.index import IndexView
 from dashboard.views.job import (
-    JobsView,
-    JobView,
-    JobIdView,
+    JobsAllView,
+    JobsJobView,
 )
 from utils.backend import (
     ajax_get,
@@ -51,22 +53,36 @@ app.config.from_object('dashboard.default_settings')
 if os.environ.get(APP_ENVVAR):
     app.config.from_envvar(APP_ENVVAR)
 
+# General URLs.
+app.add_url_rule('/', view_func=IndexView.as_view('index'), methods=['GET'])
 app.add_url_rule(
-    '/build/', view_func=BuildsView.as_view('builds'), methods=['GET'],
+    '/info/', view_func=AboutView.as_view('about'), methods=['GET'],
 )
+
+# Builds related URLs.
 app.add_url_rule(
-    '/info/', view_func=AboutView.as_view('about'), methods=['GET'],
+    '/build/', view_func=BuildsAllView.as_view('builds'), methods=['GET'],
 )
 app.add_url_rule(
-    '/job/<string:job>/', view_func=JobView.as_view('job'), methods=['GET'],
+    '/build/all/',
+    view_func=BuildsAllView.as_view('all-builds'),
+    methods=['GET']
 )
-app.add_url_rule('/job/', view_func=JobsView.as_view('jobs'), methods=['GET'])
-app.add_url_rule('/', view_func=IndexView.as_view('index'), methods=['GET'])
 app.add_url_rule(
-    '/job/<string:job>/kernel/<string:kernel>/',
-    view_func=JobIdView.as_view('job-id'),
-    methods=['GET'],
+    '/build/<string:job>/kernel/<string:kernel>/',
+    view_func=BuildsJobKernelView.as_view('job-kernel-builds'),
+    methods=['GET']
 )
+
+# Jobs related URLs
+app.add_url_rule(
+    '/job/', view_func=JobsAllView.as_view('jobs'), methods=['GET']
+)
+app.add_url_rule(
+    '/job/<string:job>/', view_func=JobsJobView.as_view('job'), methods=['GET'],
+)
+
+# Boots related URLs.
 app.add_url_rule(
     '/boot/', view_func=BootsView.as_view('boots'), methods=['GET'],
 )
-- 
cgit v1.2.3