From bbb77783c68dad786db4717cfb958bd999867153 Mon Sep 17 00:00:00 2001 From: Jeff Daley Date: Wed, 11 Oct 2023 20:38:15 -0400 Subject: [PATCH] Simplify template logic --- web/app/components/footer.hbs | 66 +++--- .../{header/index.hbs => header.hbs} | 2 - .../components/{header/index.ts => header.ts} | 7 +- web/app/components/header/nav.hbs | 204 +++++++++--------- web/app/components/header/toolbar.hbs | 66 +++--- web/app/components/results/index.hbs | 101 +++++---- web/app/components/row-results.hbs | 126 ++++++----- web/app/controllers/authenticated.ts | 12 ++ web/app/styles/components/footer.scss | 6 +- web/app/templates/authenticated.hbs | 13 +- web/app/templates/authenticated/dashboard.hbs | 124 +++++------ web/app/templates/authenticated/documents.hbs | 2 +- web/app/templates/authenticated/drafts.hbs | 2 +- web/app/templates/authenticated/my.hbs | 2 +- web/app/templates/authenticated/new.hbs | 7 +- web/app/templates/authenticated/results.hbs | 2 +- web/app/templates/authenticated/settings.hbs | 19 +- 17 files changed, 364 insertions(+), 397 deletions(-) rename web/app/components/{header/index.hbs => header.hbs} (72%) rename web/app/components/{header/index.ts => header.ts} (64%) create mode 100644 web/app/controllers/authenticated.ts diff --git a/web/app/components/footer.hbs b/web/app/components/footer.hbs index 4bd15dd38..935c3c10c 100644 --- a/web/app/components/footer.hbs +++ b/web/app/components/footer.hbs @@ -1,38 +1,34 @@ -{{#unless (eq this.currentRouteName "authenticated.document")}} -
-
-
-
-
- © - {{this.currentYear}} - HashiCorp -
-
- Hermes v{{this.version}} - ({{this.revision}}) -
-
- -
- - GitHub - - {{#if this.supportURL}} - - Support - - {{/if}} -
+
+
+
+
+ © + {{this.currentYear}} + HashiCorp +
+
+ Hermes v{{this.version}} + ({{this.revision}})
+ +
+ + GitHub + + {{#if this.supportURL}} + + Support + + {{/if}} +
-{{/unless}} +
diff --git a/web/app/components/header/index.hbs b/web/app/components/header.hbs similarity index 72% rename from web/app/components/header/index.hbs rename to web/app/components/header.hbs index ec6906715..4778be132 100644 --- a/web/app/components/header/index.hbs +++ b/web/app/components/header.hbs @@ -1,5 +1,3 @@
- - diff --git a/web/app/components/header/index.ts b/web/app/components/header.ts similarity index 64% rename from web/app/components/header/index.ts rename to web/app/components/header.ts index ff84f89c0..d9c741969 100644 --- a/web/app/components/header/index.ts +++ b/web/app/components/header.ts @@ -1,11 +1,6 @@ import Component from "@glimmer/component"; -import { FacetDropdownGroups } from "hermes/types/facets"; -interface HeaderComponentSignature { - Args: { - facets?: FacetDropdownGroups; - }; -} +interface HeaderComponentSignature {} export default class HeaderComponent extends Component {} diff --git a/web/app/components/header/nav.hbs b/web/app/components/header/nav.hbs index 7f3d30e8a..72d93e92a 100644 --- a/web/app/components/header/nav.hbs +++ b/web/app/components/header/nav.hbs @@ -1,115 +1,109 @@ -
+
+
+ diff --git a/web/app/components/header/toolbar.hbs b/web/app/components/header/toolbar.hbs index 445b9732f..5cb3e563e 100644 --- a/web/app/components/header/toolbar.hbs +++ b/web/app/components/header/toolbar.hbs @@ -1,41 +1,39 @@ {{#if @facets}}
-
-
-
-

- Filter by: -

-
- - - - -
+
+
+

+ Filter by: +

+
+ + + +
-
+
{{/if}} diff --git a/web/app/components/results/index.hbs b/web/app/components/results/index.hbs index 5bd62fc84..eda76e9f0 100644 --- a/web/app/components/results/index.hbs +++ b/web/app/components/results/index.hbs @@ -1,56 +1,51 @@ -
-
- {{#if (and this.firstPageIsShown this.queryIsProductName)}} -
- - - - -
- {{/if}} - -

{{@results.nbHits}} - documents matching “{{@query}}”

-
-
- {{#each @results.hits as |doc|}} - - {{/each}} -
- -
+{{#if (and this.firstPageIsShown this.queryIsProductName)}} +
+ + + + +
+{{/if}} - +

{{@results.nbHits}} + documents matching “{{@query}}”

+
+
+ {{#each @results.hits as |doc|}} + + {{/each}}
-
+
+ + diff --git a/web/app/components/row-results.hbs b/web/app/components/row-results.hbs index fbac6639f..d6d14d45a 100644 --- a/web/app/components/row-results.hbs +++ b/web/app/components/row-results.hbs @@ -1,65 +1,61 @@ -
-
-
- {{#if @docs}} - - <:head as |H|> - - Name - Type - Status - Product/Area - Owner - - - Created - - - - - <:body> - {{#each @docs as |doc|}} - - {{/each}} - - - {{#if this.paginationIsShown}} - - {{/if}} - {{else}} - {{#if @isDraft}} - - No drafts found - - - {{/if}} - {{/if}} -
-
-
+
+ {{#if @docs}} + + <:head as |H|> + + Name + Type + Status + Product/Area + Owner + + + Created + + + + + <:body> + {{#each @docs as |doc|}} + + {{/each}} + + + {{#if this.paginationIsShown}} + + {{/if}} + {{else}} + {{#if @isDraft}} + + No drafts found + + + {{/if}} + {{/if}} +
diff --git a/web/app/controllers/authenticated.ts b/web/app/controllers/authenticated.ts new file mode 100644 index 000000000..5438d76f8 --- /dev/null +++ b/web/app/controllers/authenticated.ts @@ -0,0 +1,12 @@ +import Controller from "@ember/controller"; +import RouterService from "@ember/routing/router-service"; +import { inject as service } from "@ember/service"; + +export default class AuthenticatedController extends Controller { + @service declare router: RouterService; + + protected get standardTemplateIsShown() { + const routeName = this.router.currentRouteName; + return routeName !== "authenticated.document" && routeName !== "404"; + } +} diff --git a/web/app/styles/components/footer.scss b/web/app/styles/components/footer.scss index f1a68d305..8cde3c1c4 100644 --- a/web/app/styles/components/footer.scss +++ b/web/app/styles/components/footer.scss @@ -2,16 +2,12 @@ @apply mt-12 mb-16 w-full text-body-200 text-color-foreground-faint; .footer-inner { - @apply border-t border-t-color-border-primary pt-6 flex w-full items-center justify-between; + @apply flex w-full items-center justify-between border-t border-t-color-border-primary pt-6; } &.compact { @apply mt-0; - .x-container { - @apply px-0; - } - .footer-inner { @apply border-t-0; } diff --git a/web/app/templates/authenticated.hbs b/web/app/templates/authenticated.hbs index e8147bf63..646ca6a5a 100644 --- a/web/app/templates/authenticated.hbs +++ b/web/app/templates/authenticated.hbs @@ -1,4 +1,9 @@ -{{! @glint-nocheck: not typesafe yet }} -{{outlet}} - -
+{{#if this.standardTemplateIsShown}} +
+
+ {{outlet}} +
+
+{{else}} + {{outlet}} +{{/if}} diff --git a/web/app/templates/authenticated/dashboard.hbs b/web/app/templates/authenticated/dashboard.hbs index 38e8ebda3..e58ada3c2 100644 --- a/web/app/templates/authenticated/dashboard.hbs +++ b/web/app/templates/authenticated/dashboard.hbs @@ -1,74 +1,68 @@ {{page-title "Dashboard"}} -
+ -
+

+ Welcome back, + {{this.authenticatedUser.info.given_name}}! +

- +{{#if @model}} + +{{/if}} -

- Welcome back, - {{this.authenticatedUser.info.given_name}}! -

- - {{#if @model}} - - {{/if}} - -
-
- -

Recently viewed

-
+
+
+ +

Recently viewed

+
- {{#if this.recentDocs.all}} -
- {{#each this.recentDocs.all as |r|}} - - {{/each}} -
- {{else if this.recentDocs.fetchAll.isRunning}} -
- -
- {{else if (eq this.recentDocs.all null)}} -
-

- Error fetching documents. -

- + {{#each this.recentDocs.all as |r|}} + -
- {{else}} -
- You havenʼt viewed any documents yet. -
- {{/if}} - -
+ {{/each}} +
+ {{else if this.recentDocs.fetchAll.isRunning}} +
+ +
+ {{else if (eq this.recentDocs.all null)}} +
+

+ Error fetching documents. +

+ +
+ {{else}} +
+ You havenʼt viewed any documents yet. +
+ {{/if}} -
- -
+
- +
+ +
diff --git a/web/app/templates/authenticated/documents.hbs b/web/app/templates/authenticated/documents.hbs index 98c35059b..51d5d3ce5 100644 --- a/web/app/templates/authenticated/documents.hbs +++ b/web/app/templates/authenticated/documents.hbs @@ -1,6 +1,6 @@ {{page-title "All Docs"}} -
+ + + -
-
- {{outlet}} -
-
+{{outlet}} diff --git a/web/app/templates/authenticated/results.hbs b/web/app/templates/authenticated/results.hbs index 362e82199..7578e61cc 100644 --- a/web/app/templates/authenticated/results.hbs +++ b/web/app/templates/authenticated/results.hbs @@ -1,5 +1,5 @@ {{page-title "Search Results"}} -
+ diff --git a/web/app/templates/authenticated/settings.hbs b/web/app/templates/authenticated/settings.hbs index f6da4eb12..9274b5361 100644 --- a/web/app/templates/authenticated/settings.hbs +++ b/web/app/templates/authenticated/settings.hbs @@ -1,16 +1,9 @@ -{{! @glint-nocheck: not typesafe yet }} {{page-title "Email Notifications"}} -
+
-
-
-
- -

Email notifications

-

Get notified when docs are created - in the following areas...

- -
-
-
+

Email notifications

+

Get notified when docs are created in + the following areas...

+ +