Merge pull request #67 from hashicorp/refactor-sidebars

Refactor sidebars

ui/core/app/routes/orgs/org/projects/project.js

@@ -36,7 +36,7 @@ export default class OrgsOrgProjectsProjectRoute extends Route {
    */
   renderTemplate(controller, model) {
     this.render('orgs/org/projects/project/_sidebar', {
-      into: 'application',
+      into: 'orgs/org',
       outlet: 'sidebar',
       model: model
     });

ui/core/app/routes/orgs/org/roles.js

@@ -14,19 +14,5 @@ export default class OrgsOrgRolesRoute extends Route {
       // Error: Assertion Failed: You made a 'findAll' request for 'role' records, but the adapter's response did not have any data
     });
   }
-
-  /**
-   * Renders the roles-specific sidebar template.
-   * @override
-   * @param {object} controller
-   * @param {object} model
-   */
-  renderTemplate(controller, model) {
-    this.render('orgs/org/roles/_sidebar', {
-      into: 'application',
-      outlet: 'sidebar',
-      model: model
-    });
-    super.renderTemplate(...arguments);
-  }
+  
 }

ui/core/app/styles/app.scss

@@ -5,6 +5,11 @@
 
 .rose-nav-sidebar {
   margin-top: sizing.rems(xxl);
+  margin-bottom: sizing.rems(l);
+
+  & + .rose-nav-sidebar {
+    margin-top: 0;
+  }
 }
 
 .rose-form {

ui/core/app/templates/application.hbs

@@ -26,14 +26,7 @@
   </layout.header>
 
   <layout.body>
-    <Rose::Layout::Sidebar as |sidebarLayout|>
-      <sidebarLayout.sidebar>
-        {{outlet "sidebar"}}
-      </sidebarLayout.sidebar>
-      <sidebarLayout.body @tagName="main">
-        {{outlet}}
-      </sidebarLayout.body>
-    </Rose::Layout::Sidebar>
+    {{outlet}}
   </layout.body>
 
 </Rose::Layout::Global>

ui/core/app/templates/orgs/org.hbs

@@ -1 +1,27 @@
-{{outlet}}
+<Rose::Layout::Sidebar as |sidebarLayout|>
+
+  <sidebarLayout.sidebar>
+
+    <Rose::Nav::Sidebar @title={{t "titles.general"}} as |nav|>
+      <nav.link @route="orgs.org.projects">
+        {{t "resources.projects"}}
+      </nav.link>
+    </Rose::Nav::Sidebar>
+
+    {{outlet "sidebar"}}
+
+    <Rose::Nav::Sidebar @title={{t "titles.iam"}} as |nav|>
+      <nav.link @route="orgs.org.roles">
+        {{t "resources.roles"}}
+      </nav.link>
+    </Rose::Nav::Sidebar>
+
+  </sidebarLayout.sidebar>
+
+  <sidebarLayout.body>
+    <main>
+      {{outlet}}
+    </main>
+  </sidebarLayout.body>
+
+</Rose::Layout::Sidebar>

ui/core/app/templates/orgs/org/roles/_sidebar.hbs

@@ -1,18 +0,0 @@
-<Rose::Nav::Sidebar @title={{t "titles.general"}} as |nav|>
-
-  <nav.link
-    @route="orgs.org.projects"
-  >
-    {{t "resources.projects"}}
-  </nav.link>
-
-</Rose::Nav::Sidebar>
-<Rose::Nav::Sidebar @title={{t "titles.iam"}} as |nav|>
-
-  <nav.link
-    @route="orgs.org.roles"
-  >
-    {{t "resources.roles"}}
-  </nav.link>
-
-</Rose::Nav::Sidebar>