Current -> environment

SwiftPackageIndex · Nov 27, 2024 · 9e75369 · 9e75369
1 parent feeea95
commit 9e75369
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/Sources/App/Views/Blog/BlogActions+Index+View.swift b/Sources/App/Views/Blog/BlogActions+Index+View.swift
@@ -14,6 +14,7 @@
 
 import Foundation
 import Plot
+import Dependencies
 
 extension BlogActions {
 
@@ -108,7 +109,8 @@ extension BlogActions {
             }
 
             override func navMenuItems() -> [NavMenuItem] {
-                if Current.environment() == .production {
+                @Dependency(\.environment) var environment
+                if environment.current() == .production {
                     return [.supporters, .searchLink, .addPackage, .faq]
                 } else {
                     return [.supporters, .searchLink, .addPackage, .faq, .portal]

diff --git a/Sources/App/Views/Home/HomeIndex+View.swift b/Sources/App/Views/Home/HomeIndex+View.swift
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import Plot
+import Dependencies
 
 
 enum HomeIndex {
@@ -114,10 +115,11 @@ enum HomeIndex {
         }
 
         override func navMenuItems() -> [NavMenuItem] {
-            if Current.environment() == .production {
-                [.supporters, .addPackage, .blog, .faq]
+            @Dependency(\.environment) var environment
+            if environment.current() == .production {
+                return [.supporters, .addPackage, .blog, .faq]
             } else {
-                [.supporters, .addPackage, .blog, .faq, .portal]
+                return [.supporters, .addPackage, .blog, .faq, .portal]
             }
         }
     }

diff --git a/Sources/App/Views/PublicPage.swift b/Sources/App/Views/PublicPage.swift
@@ -323,7 +323,8 @@ class PublicPage {
     /// The items to be rendered in the site navigation menu.
     /// - Returns: An array of `NavMenuItem` items used in `header`.
     func navMenuItems() -> [NavMenuItem] {
-        if Current.environment() == .production {
+        @Dependency(\.environment) var environment
+        if environment.current() == .production {
             return [.supporters, .addPackage, .blog, .faq, .search]
         } else {
             return [.supporters, .addPackage, .blog, .faq, .search, .portal]

diff --git a/Sources/App/Views/Search/SearchShow+View.swift b/Sources/App/Views/Search/SearchShow+View.swift
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import Plot
+import Dependencies
 
 
 extension SearchShow {
@@ -64,7 +65,8 @@ extension SearchShow {
         }
 
         override func navMenuItems() -> [NavMenuItem] {
-            if Current.environment() == .production {
+            @Dependency(\.environment) var environment
+            if environment.current() == .production {
                 return [.supporters, .addPackage, .blog, .faq]
             } else {
                 return [.supporters, .addPackage, .blog, .faq, .portal]

diff --git a/Sources/App/routes.swift b/Sources/App/routes.swift
@@ -138,7 +138,7 @@ func routes(_ app: Application) throws {
     let auth = app.routes.grouped([app.sessions.middleware, UserSessionAuthenticator()])
     let redirect = auth.grouped(AuthenticatedUser.redirectMiddleware(path: SiteURL.login.relativeURL()))
 
-    if Current.environment() != .production {
+    if environment.current() != .production {
         do {
             redirect.get(SiteURL.portal.pathComponents, use: PortalController.show)
                 .excludeFromOpenAPI()