organize plot extensions

Author: rahafjrw

Sources/App/Views/Plot+Extensions.swift

@@ -249,6 +249,43 @@ extension Node where Context == HTML.FormContext {
             .value(query)
         )
     }
+    
+    static func emailField(email: String = "") -> Self {
+        .input(
+            .id("email"),
+            .name("email"),
+            .type(.email),
+            .placeholder("Enter email"),
+            .spellcheck(false),
+            .autocomplete(false),
+            .value(email)
+        )
+    }
+    
+    static func passwordField(password: String = "", passwordFieldText: String = "Enter password") -> Self {
+        .input(
+            .id("password"),
+            .name("password"),
+            .type(.password),
+            .placeholder(passwordFieldText),
+            .spellcheck(false),
+            .autocomplete(false),
+            .value(password)
+        )
+    }
+    
+    static func confirmationCodeField(code: String = "") -> Self {
+        .input(
+            .class("portal-form-inputs"),
+            .id("confirmationCode"),
+            .name("confirmationCode"),
+            .type(.text),
+            .placeholder("Confirmation code"),
+            .spellcheck(false),
+            .autocomplete(false),
+            .value(code)
+        )
+    }
 }
 
 extension Node where Context == HTML.ListContext {

Sources/App/Views/Portal/ForgotPassword+View.swift

@@ -31,7 +31,6 @@ enum ForgotPassword {
     }
 }
 
-// TODO: move to plot extensions
 extension Node where Context: HTML.BodyContext {
     static func forgotPasswordForm(email: String = "") -> Self {
         .form(

Sources/App/Views/Portal/Login+View.swift

@@ -34,7 +34,6 @@ enum Login {
     }
 }
 
-// TODO: move to plot extensions
 extension Node where Context: HTML.BodyContext {
     static func loginForm(email: String = "", password: String = "") -> Self {
         .div(
@@ -73,29 +72,3 @@ extension Node where Context: HTML.BodyContext {
     }
 }
 
-extension Node where Context == HTML.FormContext {
-    static func emailField(email: String = "") -> Self {
-        .input(
-            .id("email"),
-            .name("email"),
-            .type(.email),
-            .placeholder("Enter email"),
-            .spellcheck(false),
-            .autocomplete(false),
-            .value(email)
-        )
-    }
-    
-    static func passwordField(password: String = "", passwordFieldText: String = "Enter password") -> Self {
-        .input(
-            .id("password"),
-            .name("password"),
-            .type(.password),
-            .placeholder(passwordFieldText),
-            .spellcheck(false),
-            .autocomplete(false),
-            .value(password)
-        )
-    }
-}
-

Sources/App/Views/Portal/Portal+View.swift

@@ -32,7 +32,6 @@ enum PortalPage {
     }
 }
 
-// TODO: move to plot extensions
 extension Node where Context: HTML.BodyContext {
     static func logoutButton() -> Self {
         .form(

Sources/App/Views/Portal/Reset+View.swift

@@ -31,14 +31,13 @@ enum Reset {
     }
 }
 
-// TODO: move to plot extensions
 extension Node where Context: HTML.BodyContext {
     static func resetPasswordForm(email: String = "", password: String = "", code: String = "") -> Self {
         .form(
             .action(SiteURL.resetPassword.relativeURL()),
             .method(.post),
             .data(named: "turbo", value: "false"),
-            .codeField(code: code),
+            .confirmationCodeField(code: code),
             .emailField(email: email)   ,
             .passwordField(password: password, passwordFieldText: "Enter new password"),
             .button(

Sources/App/Views/Portal/Signup+View.swift

@@ -31,7 +31,6 @@ enum Signup {
     }
 }
 
-// TODO: move to plot extensions
 extension Node where Context: HTML.BodyContext {
     static func signupForm(email: String = "", password: String = "") -> Self {
         .form(

Sources/App/Views/Portal/Successful+Password+Change.swift

@@ -24,15 +24,14 @@ enum SuccessfulChange {
             .div(
                 .class("portal-page"),
                 .text(self.model.successMessage),
-                .loginButton()
+                .loginRedirectButton()
             )
         }
     }
 }
 
-// TODO: move to plot extensions
 extension Node where Context: HTML.BodyContext {
-    static func loginButton() -> Self {
+    static func loginRedirectButton() -> Self {
         .form(
             .action(SiteURL.login.relativeURL()),
             .button(

Sources/App/Views/Portal/Verify+View.swift

@@ -32,7 +32,6 @@ enum Verify {
     }
 }
 
-// TODO: move to plot extensions
 extension Node where Context: HTML.BodyContext {
     static func verifyForm(email: String = "", code: String = "") -> Self {
         .form(
@@ -44,7 +43,7 @@ extension Node where Context: HTML.BodyContext {
                 .type(.hidden),
                 .value(email)
             ),
-            .codeField(code: code),
+            .confirmationCodeField(code: code),
             .data(named: "turbo", value: "false"),
             .button(
                 .text("Confirm sign up"),
@@ -53,18 +52,3 @@ extension Node where Context: HTML.BodyContext {
         )
     }
 }
-
-extension Node where Context == HTML.FormContext {
-    static func codeField(code: String = "") -> Self {
-        .input(
-            .class("portal-form-inputs"),
-            .id("confirmationCode"),
-            .name("confirmationCode"),
-            .type(.text),
-            .placeholder("Confirmation code"),
-            .spellcheck(false),
-            .autocomplete(false),
-            .value(code)
-        )
-    }
-}