From cac4bf57f51cb86475f9c36986dabdf9e95419f9 Mon Sep 17 00:00:00 2001
From: Mitan Omar <mitan@gmx.ch>
Date: Tue, 19 Sep 2023 11:26:33 +0200
Subject: [PATCH 1/4] chore: change the app name to `Caluma Portal Demo`

---
 ember/app/components/cases-table/template.hbs | 2 +-
 ember/config/environment.js                   | 2 +-
 ember/translations/en.yaml                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ember/app/components/cases-table/template.hbs b/ember/app/components/cases-table/template.hbs
index 033a47d4..061d94b6 100644
--- a/ember/app/components/cases-table/template.hbs
+++ b/ember/app/components/cases-table/template.hbs
@@ -2,7 +2,7 @@
   {{#if this.noCases}}
     <div class="uk-width-2-3 uk-margin-auto">
       <h1 class="uk-text-center">
-        {{t "documents.empty.welcome" appName="Building Permit Demo"}}
+        {{t "documents.empty.welcome" appName="Building Portal Demo"}}
       </h1>
 
       <p
diff --git a/ember/config/environment.js b/ember/config/environment.js
index c5390f3e..cd4e2d19 100644
--- a/ember/config/environment.js
+++ b/ember/config/environment.js
@@ -18,7 +18,7 @@ module.exports = function (environment) {
       // Here you can pass flags/options to your application document
       // when it is created
       navBarLogo: "/assets/nav-bar-logo.png",
-      navBarText: "Caluma Building Permit Demo",
+      navBarText: "Caluma Portal Demo",
 
       caseStateIcons: {
         RUNNING: "clock",
diff --git a/ember/translations/en.yaml b/ember/translations/en.yaml
index 553691cc..bfa8f2da 100644
--- a/ember/translations/en.yaml
+++ b/ember/translations/en.yaml
@@ -1,4 +1,4 @@
-demo: "Caluma Building Permit Demo"
+demo: "Caluma Portal Demo"
 
 global:
   continue: "Continue"

From 34b64edc0fced7e26d05126fafab89ecaed330e6 Mon Sep 17 00:00:00 2001
From: Mitan Omar <mitan@gmx.ch>
Date: Tue, 19 Sep 2023 11:27:17 +0200
Subject: [PATCH 2/4] fix: disable fingerprinting the assets to fix caluma logo
 in production

---
 ember/ember-cli-build.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ember/ember-cli-build.js b/ember/ember-cli-build.js
index 6a7899e5..bbbca31e 100644
--- a/ember/ember-cli-build.js
+++ b/ember/ember-cli-build.js
@@ -3,6 +3,9 @@
 const EmberApp = require("ember-cli/lib/broccoli/ember-app");
 
 module.exports = function (defaults) {
+  defaults.fingerprint = {
+    enabled: false,
+  };
   const app = new EmberApp(defaults, {
     emberApolloClient: {
       keepGraphqlFileExtension: false,

From 91fd64589a8303b55e6a28ae6717960fcff27eee Mon Sep 17 00:00:00 2001
From: Mitan Omar <mitan@gmx.ch>
Date: Tue, 19 Sep 2023 11:28:19 +0200
Subject: [PATCH 3/4] chore: splite the logo from the navbar

---
 ember/app/application/template.hbs        |  3 ++-
 ember/app/components/logo/template.hbs    |  6 ++++++
 ember/app/components/nav-bar/template.hbs |  8 --------
 ember/app/styles/app.scss                 |  1 +
 ember/app/styles/components/_nav-bar.scss |  7 ++++++-
 ember/app/styles/components/logo.scss     | 14 ++++++++++++++
 6 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 ember/app/components/logo/template.hbs
 create mode 100644 ember/app/styles/components/logo.scss

diff --git a/ember/app/application/template.hbs b/ember/app/application/template.hbs
index 27f16358..c0f1a332 100644
--- a/ember/app/application/template.hbs
+++ b/ember/app/application/template.hbs
@@ -1,5 +1,6 @@
 <main>
-  <NavBar @logo={{this.config.navBarLogo}} @text={{this.config.navBarText}} />
+  <Logo @logo={{this.config.navBarLogo}} @text={{this.config.navBarText}} />
+  <NavBar />
   <div class="uk-padding uk-overflow-auto">
     {{outlet}}
   </div>
diff --git a/ember/app/components/logo/template.hbs b/ember/app/components/logo/template.hbs
new file mode 100644
index 00000000..f2235362
--- /dev/null
+++ b/ember/app/components/logo/template.hbs
@@ -0,0 +1,6 @@
+<div class="logo">
+    <LinkTo @route="application" class="uk-navbar-item uk-logo uk-text-primary">
+      <img class="nav-bar-logo" src={{@logo}} alt={{@text}} />
+      {{@text}}
+  </LinkTo>
+</div>
\ No newline at end of file
diff --git a/ember/app/components/nav-bar/template.hbs b/ember/app/components/nav-bar/template.hbs
index 20f66395..c3e42c53 100644
--- a/ember/app/components/nav-bar/template.hbs
+++ b/ember/app/components/nav-bar/template.hbs
@@ -1,12 +1,4 @@
 <nav class="uk-navbar-container uk-navbar-transparent nav-bar" uk-navbar>
-  <LinkTo @route="application" class="uk-navbar-item uk-logo uk-text-primary">
-    {{#if @logo}}
-      <img class="nav-bar-logo" src={{@logo}} alt={{@text}} />
-    {{else}}
-      {{@text}}
-    {{/if}}
-  </LinkTo>
-
   <UkTab as |tab|>
     <tab.item @href="/">{{t "nav.documents"}}</tab.item>
     <tab.item @href="/form-builder">{{t "nav.form-builder"}}</tab.item>
diff --git a/ember/app/styles/app.scss b/ember/app/styles/app.scss
index f881fc0b..c5cf2395 100644
--- a/ember/app/styles/app.scss
+++ b/ember/app/styles/app.scss
@@ -9,6 +9,7 @@ $modal-z-index: 1;
 @import "@projectcaluma/ember-form";
 @import "@projectcaluma/ember-form-builder";
 @import "components/nav-bar";
+@import "components/logo";
 
 main {
   display: flex;
diff --git a/ember/app/styles/components/_nav-bar.scss b/ember/app/styles/components/_nav-bar.scss
index b3cacc2e..dce3e5c5 100644
--- a/ember/app/styles/components/_nav-bar.scss
+++ b/ember/app/styles/components/_nav-bar.scss
@@ -1,12 +1,13 @@
 .nav-bar {
   border-bottom: solid 1px $global-border;
+  padding-bottom: 25px;
   padding-left: 15px;
 
   & img.nav-bar-logo {
     height: 50px;
   }
 
-  & [uk-tab] {
+  .uk-tab {
     margin: 0;
 
     &::before {
@@ -16,6 +17,9 @@
     &,
     & li {
       height: 100%;
+      a {
+        font-size: large;
+      }
     }
 
     & a {
@@ -27,6 +31,7 @@
     }
 
     & .uk-active > a {
+      padding-bottom: 25px;
       border-bottom: solid 2px $app-accent-color;
     }
   }
diff --git a/ember/app/styles/components/logo.scss b/ember/app/styles/components/logo.scss
new file mode 100644
index 00000000..751416f6
--- /dev/null
+++ b/ember/app/styles/components/logo.scss
@@ -0,0 +1,14 @@
+.logo {
+  height: 100px;
+  margin-bottom: 50px;
+
+  a {
+    float: left;
+    margin-left: 50px;
+    margin-top: 14px;
+  }
+
+  img {
+    max-height: 75px;
+  }
+}

From 2e2a40ff823282d88333bfa7063a3eb475ca7dda Mon Sep 17 00:00:00 2001
From: Mitan Omar <mitan@gmx.ch>
Date: Tue, 19 Sep 2023 11:31:38 +0200
Subject: [PATCH 4/4] fix: linter error

---
 ember/app/styles/components/_nav-bar.scss | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ember/app/styles/components/_nav-bar.scss b/ember/app/styles/components/_nav-bar.scss
index dce3e5c5..fcc549b9 100644
--- a/ember/app/styles/components/_nav-bar.scss
+++ b/ember/app/styles/components/_nav-bar.scss
@@ -14,14 +14,6 @@
       border-bottom: none;
     }
 
-    &,
-    & li {
-      height: 100%;
-      a {
-        font-size: large;
-      }
-    }
-
     & a {
       /* stylelint-disable-next-line scss/at-extend-no-missing-placeholder */
       @extend .uk-flex, .uk-flex-middle;
@@ -30,6 +22,15 @@
       height: calc(100% - 2px);
     }
 
+    &,
+    & li {
+      height: 100%;
+
+      a {
+        font-size: large;
+      }
+    }
+
     & .uk-active > a {
       padding-bottom: 25px;
       border-bottom: solid 2px $app-accent-color;