organisation dashboard page

app/main/__init__.py

@@ -3,34 +3,34 @@ from flask import Blueprint
 main = Blueprint('main', __name__)  # noqa
 
 from app.main.views import (  # noqa
+    add_service,
+    api_keys,
+    choose_service,
+    code_not_received,
+    conversation,
+    dashboard,
+    email_branding,
+    feedback,
+    forgot_password,
+    inbound_number,
     index,
+    invites,
+    jobs,
+    letter_jobs,
+    manage_users,
+    new_password,
+    notifications,
+    organisations,
+    platform_admin,
+    providers,
+    register,
+    send,
+    service_settings,
     sign_in,
     sign_out,
-    register,
-    two_factor,
-    verify,
-    send,
-    add_service,
-    code_not_received,
-    jobs,
-    dashboard,
-    templates,
-    service_settings,
-    forgot_password,
-    new_password,
     styleguide,
+    templates,
+    two_factor,
     user_profile,
-    choose_service,
-    api_keys,
-    manage_users,
-    invites,
-    feedback,
-    providers,
-    platform_admin,
-    letter_jobs,
-    email_branding,
-    conversation,
-    organisations,
-    notifications,
-    inbound_number
+    verify
 )

app/main/views/organisations.py

@@ -14,19 +14,38 @@ def organisations():
     orgs = organisations_client.get_organisations()
 
     return render_template(
-        'views/organisations/organisations.html',
+        'views/organisations/index.html',
         organisations=orgs
     )
 
 
-@main.route("/organisation/<org_id>/dashboard", methods=['GET'])
+@main.route("/organisations/add", methods=['GET', 'POST'])
+@login_required
+@user_has_permissions(admin_override=True)
+def add_organisation():
+    form = CreateOrUpdateOrganisation()
+
+    if form.validate_on_submit():
+        organisations_client.create_organisation(
+            name=form.name.data,
+        )
+
+        return redirect(url_for('.organisations'))
+
+    return render_template(
+        'views/organisations/add-organisation.html',
+        form=form
+    )
+
+
+@main.route("/organisation/<org_id>", methods=['GET'])
 @login_required
 @user_has_permissions(admin_override=True)
 def organisation_dashboard(org_id):
     organisation_services = organisations_client.get_organisation_services(org_id)
 
     return render_template(
-        'views/organisations/organisation-dashboard.html',
+        'views/organisations/organisation/index.html',
         organisation_services=organisation_services
     )
 
@@ -50,26 +69,17 @@ def update_organisation(org_id):
     form.name.data = org['name']
 
     return render_template(
-        'views/organisations/manage-organisation.html',
+        'views/organisations/organisation/update-organisation.html',
         form=form,
         organisation=org
     )
 
 
-@main.route("/organisations/add", methods=['GET', 'POST'])
+@main.route("/organisation/<org_id>/users", methods=['GET'])
 @login_required
 @user_has_permissions(admin_override=True)
-def add_organisation():
-    form = CreateOrUpdateOrganisation()
-
-    if form.validate_on_submit():
-        organisations_client.create_organisation(
-            name=form.name.data,
-        )
-
-        return redirect(url_for('.organisations'))
+def organisation_users(org_id):
 
     return render_template(
-        'views/organisations/manage-organisation.html',
-        form=form
+        'views/organisations/organisation/users/index.html',
     )