From cfcc852bceb37f940bf21266271755f88a31cb5c Mon Sep 17 00:00:00 2001
From: "Steffen D. Sommer" <steffendsommer@icloud.com>
Date: Fri, 24 Aug 2018 18:28:28 +0200
Subject: [PATCH 1/2] Add env badge when outside prod

---
 Resources/Views/AdminPanel/Layout/Partials/navbar.leaf | 2 +-
 Resources/Views/AdminPanel/Layout/Partials/title.leaf  | 6 ++++++
 Sources/AdminPanel/Configs/AdminPanelConfig.swift      | 5 ++++-
 Sources/AdminPanel/Providers/AdminPanelProvider.swift  | 3 ++-
 Sources/AdminPanel/Tags/AdminPanelConfigTag.swift      | 8 +++++++-
 5 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Views/AdminPanel/Layout/Partials/title.leaf

diff --git a/Resources/Views/AdminPanel/Layout/Partials/navbar.leaf b/Resources/Views/AdminPanel/Layout/Partials/navbar.leaf
index f9942ba..90be2fb 100644
--- a/Resources/Views/AdminPanel/Layout/Partials/navbar.leaf
+++ b/Resources/Views/AdminPanel/Layout/Partials/navbar.leaf
@@ -1,5 +1,5 @@
 <nav class="navbar navbar-dark fixed-top bg-dark flex-md-nowrap p-0">
-    <a class="navbar-brand col-sm-3 col-md-2 mr-0" href="#">#adminpanel:config("name")</a>
+    #embed("AdminPanel/Layout/Partials/title")
   
     <ul class="navbar-nav px-3">
         <li class="nav-item text-nowrap">
diff --git a/Resources/Views/AdminPanel/Layout/Partials/title.leaf b/Resources/Views/AdminPanel/Layout/Partials/title.leaf
new file mode 100644
index 0000000..a52b1de
--- /dev/null
+++ b/Resources/Views/AdminPanel/Layout/Partials/title.leaf
@@ -0,0 +1,6 @@
+<a class="navbar-brand col-sm-3 col-md-2 mr-0" href="#">
+    #adminpanel:config("name")
+    #if(adminpanel:config("environment") != "production") {
+        <span class="badge badge-primary">#adminpanel:config("environment")</span>
+    }
+</a>
\ No newline at end of file
diff --git a/Sources/AdminPanel/Configs/AdminPanelConfig.swift b/Sources/AdminPanel/Configs/AdminPanelConfig.swift
index 388d9ae..4232a66 100644
--- a/Sources/AdminPanel/Configs/AdminPanelConfig.swift
+++ b/Sources/AdminPanel/Configs/AdminPanelConfig.swift
@@ -36,6 +36,7 @@ public struct AdminPanelConfig<U: AdminPanelUserType>: Service {
     public let resetPasswordEmail: ResetPasswordEmail
     public let specifyPasswordEmail: SpecifyPasswordEmail
     public let newUserSetPasswordSigner: ExpireableJWTSigner
+    public let environment: Environment
 
     public init(
         name: String,
@@ -46,7 +47,8 @@ public struct AdminPanelConfig<U: AdminPanelUserType>: Service {
         sidebarMenuPathGenerator: @escaping SidebarMenuPathGenerator<U.Role> = U.Role.sidebarMenuPathGenerator,
         resetPasswordEmail: ResetPasswordEmail = .default,
         specifyPasswordEmail: SpecifyPasswordEmail = .default,
-        newUserSetPasswordSigner: ExpireableJWTSigner
+        newUserSetPasswordSigner: ExpireableJWTSigner,
+        environment: Environment
     ) {
         self.name = name
         self.baseUrl = baseUrl
@@ -57,6 +59,7 @@ public struct AdminPanelConfig<U: AdminPanelUserType>: Service {
         self.resetPasswordEmail = resetPasswordEmail
         self.specifyPasswordEmail = specifyPasswordEmail
         self.newUserSetPasswordSigner = newUserSetPasswordSigner
+        self.environment = environment
     }
 }
 
diff --git a/Sources/AdminPanel/Providers/AdminPanelProvider.swift b/Sources/AdminPanel/Providers/AdminPanelProvider.swift
index ec8aacd..d2e196e 100644
--- a/Sources/AdminPanel/Providers/AdminPanelProvider.swift
+++ b/Sources/AdminPanel/Providers/AdminPanelProvider.swift
@@ -113,7 +113,8 @@ public final class AdminPanelProvider<U: AdminPanelUserType>: Provider {
         services.register(AdminPanelConfigTagData<U>(
             name: config.name,
             baseUrl: config.baseUrl,
-            sidebarMenuPathGenerator: config.sidebarMenuPathGenerator
+            sidebarMenuPathGenerator: config.sidebarMenuPathGenerator,
+            environment: config.environment
         ))
         services.register(config)
         services.register(KeyedCacheSessions.self)
diff --git a/Sources/AdminPanel/Tags/AdminPanelConfigTag.swift b/Sources/AdminPanel/Tags/AdminPanelConfigTag.swift
index 413bcce..3bdd55f 100644
--- a/Sources/AdminPanel/Tags/AdminPanelConfigTag.swift
+++ b/Sources/AdminPanel/Tags/AdminPanelConfigTag.swift
@@ -27,23 +27,27 @@ public final class AdminPanelConfigTagData<U: AdminPanelUserType>: Service {
         case baseUrl = "baseUrl"
         case sidebarMenuPath = "sidebarMenuPath"
         case dashboardPath = "dashboardPath"
+        case environment = "environment"
     }
 
     public var name = ""
     public var baseUrl = ""
     public var dashboardPath: String?
     public var sidebarMenuPathGenerator: SidebarMenuPathGenerator<U.Role>
+    public var environment: Environment
 
     init(
         name: String,
         baseUrl: String,
         sidebarMenuPathGenerator: @escaping SidebarMenuPathGenerator<U.Role>,
-        dashboardPath: String? = nil
+        dashboardPath: String? = nil,
+        environment: Environment
     ) {
         self.name = name
         self.baseUrl = baseUrl
         self.sidebarMenuPathGenerator = sidebarMenuPathGenerator
         self.dashboardPath = dashboardPath
+        self.environment = environment
     }
 
     func viewData(for data: TemplateData, user: U?, tag: TagContext) throws -> TemplateData {
@@ -66,6 +70,8 @@ public final class AdminPanelConfigTagData<U: AdminPanelUserType>: Service {
             } ?? .null
         case .dashboardPath:
             return dashboardPath.map { .string($0) } ?? .null
+        case .environment:
+            return .string(environment.name)
         }
     }
 }

From ede2fde48ccc58ba3d6f4d3fd3f3ad68277e65fc Mon Sep 17 00:00:00 2001
From: "Steffen D. Sommer" <steffendsommer@icloud.com>
Date: Fri, 24 Aug 2018 19:38:45 +0200
Subject: [PATCH 2/2] Add link to site title

---
 Resources/Views/AdminPanel/Layout/Partials/navbar.leaf          | 2 +-
 .../AdminPanel/Layout/Partials/{title.leaf => sitetitle.leaf}   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename Resources/Views/AdminPanel/Layout/Partials/{title.leaf => sitetitle.leaf} (71%)

diff --git a/Resources/Views/AdminPanel/Layout/Partials/navbar.leaf b/Resources/Views/AdminPanel/Layout/Partials/navbar.leaf
index 90be2fb..ec0b039 100644
--- a/Resources/Views/AdminPanel/Layout/Partials/navbar.leaf
+++ b/Resources/Views/AdminPanel/Layout/Partials/navbar.leaf
@@ -1,5 +1,5 @@
 <nav class="navbar navbar-dark fixed-top bg-dark flex-md-nowrap p-0">
-    #embed("AdminPanel/Layout/Partials/title")
+    #embed("AdminPanel/Layout/Partials/sitetitle")
   
     <ul class="navbar-nav px-3">
         <li class="nav-item text-nowrap">
diff --git a/Resources/Views/AdminPanel/Layout/Partials/title.leaf b/Resources/Views/AdminPanel/Layout/Partials/sitetitle.leaf
similarity index 71%
rename from Resources/Views/AdminPanel/Layout/Partials/title.leaf
rename to Resources/Views/AdminPanel/Layout/Partials/sitetitle.leaf
index a52b1de..49d5206 100644
--- a/Resources/Views/AdminPanel/Layout/Partials/title.leaf
+++ b/Resources/Views/AdminPanel/Layout/Partials/sitetitle.leaf
@@ -1,4 +1,4 @@
-<a class="navbar-brand col-sm-3 col-md-2 mr-0" href="#">
+<a class="navbar-brand col-sm-3 col-md-2 mr-0" href="/admin/dashboard">
     #adminpanel:config("name")
     #if(adminpanel:config("environment") != "production") {
         <span class="badge badge-primary">#adminpanel:config("environment")</span>