katalyst-koi 4.18.1 → 5.0.0.alpha.2

data/app/helpers/koi/modal_helper.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module Koi
+  module ModalHelper
+    def koi_modal_tag(frame_id = "modal", frame: {}, dialog: {}, **attributes, &block)
+      if block
+        turbo_frame_tag(frame_id, **_koi_modal_frame_attributes(frame)) do
+          tag.dialog(**_koi_modal_dialog_attributes(dialog)) do
+            tag.article(**_koi_modal_article_attributes(attributes), &block)
+          end
+        end
+      else
+        turbo_frame_tag(frame_id, **_koi_modal_frame_attributes(frame))
+      end
+    end
+
+    def koi_modal_header(title:, form_id:, **)
+      tag.header(class: "repel", data: "nowrap") do
+        concat(tag.h2(title))
+        concat(tag.button(
+          form:       form_id,
+          formmethod: "dialog",
+          class:      "button",
+          data:       { button_padding: "tight",
+                        "text-button":  "" },
+        ) do
+          tag.icon(" ".html_safe, aria: { hidden: true }, class: "icon", data: { icon: "close" }) +
+            tag.span("Close", class: "visually-hidden")
+        end)
+      end
+    end
+
+    def koi_modal_footer(submit = "Save", discard = "Discard", form_id:, reverse: true)
+      tag.footer(class: "actions", data: { reverse: ("" if reverse) }) do
+        concat(tag.button(submit, form: form_id, class: "button", data: { close_dialog: "" }))
+        if discard.present?
+          concat(tag.button(discard, form: form_id, formmethod: "dialog", class: "button", data: { ghost_button: "" }))
+        end
+      end
+    end
+
+    private
+
+    using Katalyst::HtmlAttributes::HasHtmlAttributes
+
+    def _koi_modal_frame_attributes(attributes)
+      {
+        data: { controller: "koi--modal" },
+      }.merge_html(attributes)
+    end
+
+    def _koi_modal_dialog_attributes(attributes)
+      {
+        class: "modal",
+        data:  {
+          koi__modal_target: "dialog",
+          action:            %w[
+            click->koi--modal#click
+            close->koi--modal#dismiss
+          ],
+        },
+      }.merge_html(attributes)
+    end
+
+    def _koi_modal_article_attributes(attributes)
+      {
+        class: "flow",
+      }.merge_html(attributes)
+    end
+  end
+end

data/app/models/admin/user.rb

@@ -6,9 +6,11 @@ module Admin
     include Koi::Model::OTP
 
     def self.model_name
-      ActiveModel::Name.new(self, nil, "Admin")
+      ActiveModel::Name.new(self, nil, "AdminUser")
     end
 
+    self.table_name = :admins
+
     # disable validations for password_digest
     has_secure_password validations: false
 
@@ -51,5 +53,9 @@ module Admin
       credentials.any?
     end
     alias passkey? passkey
+
+    def to_s
+      name
+    end
   end
 end

data/app/models/url_rewrite.rb

@@ -1,15 +1,7 @@
 # frozen_string_literal: true
 
 class UrlRewrite < ApplicationRecord
-  StatusCode = Struct.new(:code, :label)
-
-  STATUS_CODES = [
-    StatusCode.new(303, "See other"),
-    StatusCode.new(307, "Temporary redirect"),
-    StatusCode.new(308, "Permanent redirect"),
-  ].freeze
-
-  enum :status_code, STATUS_CODES.map(&:code).index_by(&:itself)
+  enum :status_code, [303, 307, 308].index_by(&:itself)
 
   attribute :status_code, :integer, default: 303
 

data/app/views/admin/admin_users/_form.html+self.erb

@@ -0,0 +1,8 @@
+<%# locals: (admin_user:) %>
+
+<%= form_with(model: admin_user) do |form| %>
+  <%= form.govuk_text_field :email %>
+  <%= form.govuk_text_field :name %>
+  <%= form.govuk_password_field :password, label: { text: "Password (optional)" } %>
+  <%= form.button(type: :submit, class: "button") %>
+<% end %>

data/app/views/admin/admin_users/_form.html.erb

@@ -0,0 +1,8 @@
+<%# locals: (admin_user:) %>
+
+<%= form_with(model: admin_user) do |form| %>
+  <%= form.govuk_text_field :email %>
+  <%= form.govuk_text_field :name %>
+  <%= form.govuk_check_box_field :archived if form.object.persisted? %>
+  <%= form.button(type: :submit, class: "button") %>
+<% end %>

data/app/views/admin/admin_users/archived.html.erb

@@ -1,13 +1,16 @@
-<% content_for :header do %>
-  <%= render Koi::Header::IndexComponent.new(model: Admin::User, title: "Archived") do |component| %>
-    <% component.with_breadcrumb "Admins", admin_admin_users_path %>
+<%# locals: (collection:) %>
+
+<% content_for(:header) do %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to("Admin users", admin_admin_users_path) %></li>
   <% end %>
+  <h1>Archived admin users</h1>
 <% end %>
 
 <%= table_query_with(collection:) %>
 
 <%= table_selection_with(collection:) do %>
-  <%= tag.button "Restore", formaction: restore_admin_admin_users_path, formmethod: :put %>
+  <%= tag.button("Restore", formaction: restore_admin_admin_users_path, formmethod: :put, class: "button") %>
 <% end %>
 
 <%= table_with(collection:) do |row| %>

data/app/views/admin/admin_users/edit.html+self.erb

@@ -0,0 +1,12 @@
+<%# locals: (admin_user:) %>
+
+<% content_for(:header) do %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to("Admin users", admin_admin_users_path) %></li>
+    <li><%= link_to(admin_user, admin_admin_user_path(admin_user)) %></li>
+  <% end %>
+
+  <h1>Edit profile</h1>
+<% end %>
+
+<%= render("form", admin_user:) %>

data/app/views/admin/admin_users/edit.html.erb

@@ -1,11 +1,16 @@
-<% content_for :header do %>
-  <%= render Koi::Header::EditComponent.new(resource: admin) %>
-<% end %>
+<%# locals: (admin_user:) %>
+
+<% content_for(:header) do %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to("Admin users", admin_admin_users_path) %></li>
+    <li><%= link_to(admin_user, admin_admin_user_path(admin_user)) %></li>
+  <% end %>
 
-<%= form_with(model: admin, url: admin_admin_user_path(admin)) do |form| %>
-  <%= render "fields", form: %>
+  <h1>Edit admin user</h1>
 
-  <div class="actions">
-    <%= form.admin_save %>
-  </div>
+  <%= actions_list do %>
+    <li><%= link_to_archive_or_delete(admin_user) %></li>
+  <% end %>
 <% end %>
+
+<%= render("form", admin_user:) %>

data/app/views/admin/admin_users/index.html.erb

@@ -1,14 +1,18 @@
-<% content_for :header do %>
-  <%= render Koi::Header::IndexComponent.new(model: Admin::User) do |component| %>
-    <% component.with_action "New", new_admin_admin_user_path %>
-    <% component.with_action "Archived", archived_admin_admin_users_path %>
+<%# locals: (collection:) %>
+
+<% content_for(:header) do %>
+  <h1>Admin users</h1>
+
+  <%= actions_list do %>
+    <li><%= link_to("New", new_admin_admin_user_path) %></li>
+    <li><%= link_to("Archived", archived_admin_admin_users_path) %></li>
   <% end %>
 <% end %>
 
 <%= table_query_with(collection:) %>
 
 <%= table_selection_with(collection:) do %>
-  <%= tag.button "Archive", formaction: archive_admin_admin_users_path, formmethod: :put %>
+  <%= tag.button("Archive", formaction: archive_admin_admin_users_path, formmethod: :put, class: "button") %>
 <% end %>
 
 <%= table_with(collection:) do |row| %>
@@ -21,6 +25,7 @@
   <% row.boolean :otp, label: "MFA" do |cell| %>
     <%= cell.value.present? ? "Yes" : "No" %>
   <% end %>
+  <% row.date :last_sign_in_at, label: "Last active" %>
 <% end %>
 
 <%= table_pagination_with(collection:) %>

data/app/views/admin/admin_users/new.html.erb

@@ -1,11 +1,11 @@
-<% content_for :header do %>
-  <%= render Koi::Header::NewComponent.new(model: Admin::User) %>
-<% end %>
+<%# locals: (admin_user:) %>
 
-<%= form_with(model: admin, url: admin_admin_users_path) do |form| %>
-  <%= render "fields", form: %>
+<% content_for(:header) do %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to("Admin users", admin_admin_users_path) %></li>
+  <% end %>
 
-  <div class="actions">
-    <%= form.admin_save %>
-  </div>
+  <h1>New admin user</h1>
 <% end %>
+
+<%= render("form", admin_user:) %>

data/app/views/admin/admin_users/show.html+self.erb

@@ -1,25 +1,34 @@
-<%# locals: (admin:) %>
+<%# locals: (admin_user:) %>
 
-<% content_for :header do %>
-  <%= render Koi::Header::ShowComponent.new(resource: admin) %>
+<% content_for(:header) do %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to("Admin users", admin_admin_users_path) %></li>
+  <% end %>
+
+  <h1><%= admin_user %></h1>
+
+  <%= actions_list do %>
+    <li><%= link_to("Edit", edit_admin_admin_user_path(admin_user)) %></li>
+  <% end %>
 <% end %>
 
-<%= render Koi::SummaryTableComponent.new(model: admin) do |builder| %>
-  <%= builder.text :name %>
-  <%= builder.text :email %>
-  <%= builder.date :created_at %>
-  <%= builder.date :last_sign_in_at, label: "Last sign in" %>
-  <%= builder.boolean :passkey %>
-  <%= builder.boolean :otp, label: "MFA" do |otp| %>
+<%= summary_table_with(model: admin_user) do |row| %>
+  <% row.text :name %>
+  <% row.text :email %>
+  <% row.date :created_at %>
+  <% row.date(:last_sign_in_at, label: "Last access") %>
+  <% row.boolean :passkey %>
+  <% row.boolean(:otp, label: "MFA") do |otp| %>
     <span class="repel">
       <%= otp %>
       <% if otp.value %>
-        <%= button_to("Remove", admin_admin_user_otp_path(admin),
+        <%= button_to("Remove", admin_admin_user_otp_path(admin_user),
                       class:  "button button--text",
                       method: :delete,
                       form:   { data: { turbo_confirm: "Are you sure?" } }) %>
       <% else %>
-        <%= kpop_link_to "Add", new_admin_admin_user_otp_path(admin) %>
+        <%= link_to("Add", new_admin_admin_user_otp_path(admin_user),
+                    class: "button", data: { turbo_frame: "edit" }) %>
       <% end %>
     </span>
   <% end %>
@@ -27,7 +36,10 @@
 
 <div class="repel">
   <h3>Passkeys</h3>
-  <%= kpop_link_to "New passkey", new_admin_admin_user_credential_path(admin), class: "button button--primary" %>
+  <%= link_to("New passkey", new_admin_admin_user_credential_path(admin_user),
+              class: "button", data: { turbo_frame: "edit" }) %>
 </div>
 
-<%= render "admin/credentials/credentials", admin: %>
+<%= render "admin/credentials/credentials", admin_user: %>
+
+<%= koi_modal_tag("edit") %>

data/app/views/admin/admin_users/show.html.erb

@@ -1,25 +1,27 @@
-<%# locals: (admin:) %>
+<%# locals: (admin_user:) %>
 
-<% content_for :header do %>
-  <%= render Koi::Header::ShowComponent.new(resource: admin) %>
+<% content_for(:header) do %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to("Admin users", admin_admin_users_path) %></li>
+  <% end %>
+
+  <h1><%= admin_user %></h1>
+
+  <%= actions_list do %>
+    <li><%= link_to("Edit", edit_admin_admin_user_path(admin_user)) %></li>
+  <% end %>
 <% end %>
 
-<%= render Koi::SummaryTableComponent.new(model: admin, class: "item-table") do |builder| %>
-  <%= builder.text :name %>
-  <%= builder.text :email %>
-  <%= builder.date :created_at %>
-  <%= builder.date :last_sign_in_at, label: "Last sign in" %>
-  <%= builder.boolean :passkey %>
-  <%= builder.boolean :otp, label: "MFA" %>
-  <%= builder.boolean :archived? %>
+<%= summary_table_with(model: admin_user) do |row| %>
+  <% row.text :name %>
+  <% row.text :email %>
+  <% row.date :created_at %>
+  <% row.date :last_sign_in_at, label: "Last access" %>
+  <% row.boolean :passkey %>
+  <% row.boolean :otp, label: "MFA" %>
+  <% row.boolean :archived? %>
 <% end %>
 
-<div class="actions">
-  <% if admin.archived? %>
-    <%= button_to "Delete", admin_admin_user_path(admin),
-                  class:  "button button--secondary",
-                  method: :delete,
-                  form:   { data: { turbo_confirm: "Are you sure?" } } %>
-  <% end %>
-  <%= button_to "Generate login link", admin_admin_user_tokens_path(admin), class: "button button--primary", form: { id: "invite" } %>
-</div>
+<% unless admin_user.archived? %>
+  <%= button_to "Generate login link", admin_admin_user_tokens_path(admin_user), class: "button", form: { id: "invite" } %>
+<% end %>

data/app/views/admin/credentials/_credentials.html+self.erb

@@ -1,10 +1,12 @@
-<%= table_with(id: dom_id(admin, :credentials), collection: admin.credentials) do |t, c| %>
-  <% t.text :nickname, label: "Name" %>
-  <% t.date :updated_at, label: "Last use" do |date| %>
-    <%= date unless c.created_at == c.updated_at %>
+<%# locals: (admin_user:) %>
+
+<%= table_with(id: dom_id(admin_user, :credentials), collection: admin_user.credentials) do |table, credential| %>
+  <% table.text :nickname, label: "Name" %>
+  <% table.date :updated_at, label: "Last use" do |date| %>
+    <%= date unless credential.created_at == credential.updated_at %>
   <% end %>
-  <% t.cell :actions, label: "" do %>
-    <%= link_to("Remove passkey", admin_admin_user_credential_path(admin, c),
+  <% table.cell :actions, label: "" do %>
+    <%= link_to("Remove passkey", admin_admin_user_credential_path(admin_user, credential),
                 data: { turbo_method: :delete }) %>
   <% end %>
 <% end %>

data/app/views/admin/credentials/_credentials.html.erb

@@ -1,4 +1,6 @@
-<%= table_with(id: dom_id(admin, :credentials), collection: admin.credentials) do |t, c| %>
+<%# locals: (admin_user:) %>
+
+<%= table_with(id: dom_id(admin_user, :credentials), collection: admin_user.credentials) do |t, c| %>
   <% t.text :nickname, label: "Name" %>
   <% t.date :updated_at, label: "Last use" do |date| %>
     <%= date unless c.created_at == c.updated_at %>

data/app/views/admin/credentials/create.turbo_stream.erb

@@ -1,4 +1,5 @@
-<%= turbo_stream.kpop.dismiss %>
-<%= turbo_stream.replace(dom_id(admin, :credentials)) do %>
-  <%= render "admin/credentials/credentials", admin: %>
+<%# locals: (admin_user:) %>
+
+<%= turbo_stream.replace(dom_id(admin_user, :credentials)) do %>
+  <%= render "admin/credentials/credentials", admin_user: %>
 <% end %>

data/app/views/admin/credentials/destroy.turbo_stream.erb

@@ -1,3 +1,5 @@
-<%= turbo_stream.replace(dom_id(admin, :credentials)) do %>
-  <%= render "admin/credentials/credentials", admin: %>
+<%# locals: (admin_user:) %>
+
+<%= turbo_stream.replace(dom_id(admin_user, :credentials)) do %>
+  <%= render "admin/credentials/credentials", admin_user: %>
 <% end %>

data/app/views/admin/credentials/new.html.erb

@@ -1,37 +1,43 @@
-<%= render Kpop::ModalComponent.new(title: "New passkey") do %>
-  <%= form_with model: admin.credentials.new,
-                url:   admin_admin_user_credentials_path(admin),
-                class: "flow prose",
-                data:  {
-                  controller:                          "webauthn-registration",
-                  action:                              "submit->webauthn-registration#submit",
-                  webauthn_registration_options_value: { publicKey: options },
-                } do |form| %>
-    <%= form.hidden_field :response, data: { webauthn_registration_target: "response" } %>
-    <section class="flow prose" data-webauthn-registration-target="intro">
-      <p>
-        Passkeys are secure secrets that are stored by your device.
-        You will need the device where your passkey is stored to log in.
-      </p>
-      <p>
-        Unlike a password, your password doesn't get sent to the server when you log
-        in and can't be stolen in a data breach. When you log in with a passkey,
-        your operating system will prompt you for permission to use the passkey
-        secret to authenticate the login attempt.
-      </p>
-      <p>
-        We recommend that you store your passkey on your phone or cloud account.
-        Depending on your browser, you may need to choose "more options" to see
-        a QR code that you can scan with your phone.
-      </p>
-    </section>
-    <section class="flow" data-webauthn-registration-target="nickname" hidden>
-      <%= form.govuk_text_field :nickname, label: { text: "Passkey name" } do %>
-        Enter a name for this passkey to help you distinguish it from other passkeys you may have for this site.
-        <br>
-        Example: My Phone, Chrome, iCloud, 1Password
-      <% end %>
-    </section>
-    <%= form.admin_save("Next") %>
-  <% end %>
+<%# locals: (admin_user:, credential:, options:) %>
+
+<%= koi_modal_tag("edit", title: "New passkey") do %>
+  <%= koi_modal_header(title: "New passkey", form_id: dom_id(credential, :form)) %>
+  <main>
+    <%= form_with(model: credential,
+                  url:   admin_admin_user_credentials_path(admin_user),
+                  id:    dom_id(credential, :form),
+                  class: "flow prose",
+                  data:  {
+                    controller:                          "webauthn-registration",
+                    action:                              "submit->webauthn-registration#submit",
+                    webauthn_registration_options_value: { publicKey: options },
+                  }) do |form| %>
+      <%= form.hidden_field :response, data: { webauthn_registration_target: "response" } %>
+      <section class="flow prose" data-webauthn-registration-target="intro">
+        <p>
+          Passkeys are secure secrets that are stored by your device.
+          You will need the device where your passkey is stored to log in.
+        </p>
+        <p>
+          Unlike a password, your password doesn't get sent to the server when you log
+          in and can't be stolen in a data breach. When you log in with a passkey,
+          your operating system will prompt you for permission to use the passkey
+          secret to authenticate the login attempt.
+        </p>
+        <p>
+          We recommend that you store your passkey on your phone or cloud account.
+          Depending on your browser, you may need to choose "more options" to see
+          a QR code that you can scan with your phone.
+        </p>
+      </section>
+      <section class="flow" data-webauthn-registration-target="nickname" hidden>
+        <%= form.govuk_text_field :nickname, label: { text: "Passkey name" } do %>
+          Enter a name for this passkey to help you distinguish it from other passkeys you may have for this site.
+          <br>
+          Example: My Phone, Chrome, iCloud, 1Password
+        <% end %>
+      </section>
+    <% end %>
+  </main>
+  <%= koi_modal_footer("Next", nil, form_id: dom_id(credential, :form)) %>
 <% end %>

data/app/views/admin/dashboards/show.html.erb

@@ -1 +1,13 @@
-<% content_for :title, "Dashboard" %>
+<% content_for :header do %>
+  <h1>Dashboard</h1>
+<% end %>
+
+<%= navigation_menu_with(
+      menu:  Koi::Menu.dashboard_menu,
+      list:  {
+        class: "navigation-list | flow",
+        role:  "list",
+      },
+      class: "navigation-group | flow",
+      role:  "list",
+    ) %>

data/app/views/admin/otps/_form.html.erb

@@ -1,8 +1,8 @@
-<%# locals: (admin:) %>
+<%# locals: (admin_user:) %>
 
-<%= form_with(id:     dom_id(admin, :otp),
-              model:  admin,
-              url:    admin_admin_user_otp_path(admin),
+<%= form_with(id:     dom_id(admin_user, :otp),
+              model:  admin_user,
+              url:    admin_admin_user_otp_path(admin_user),
               method: :post,
               class:  "flow") do |form| %>
   <section class="flow prose">
@@ -15,11 +15,12 @@
     <ol class="flow">
       <li>Install an MFA app. Most password managers support MFA.</li>
       <li>Scan this code using your mobile device or password manager:<br>
-        <% otp_app_name = t("koi.auth.otp_app_name", host: URI.parse(root_url).host, email: admin.email) %>
-        <%== RQRCode::QRCode.new(admin.otp.provisioning_uri(otp_app_name)).as_svg(
+        <% otp_app_name = t("koi.auth.otp_app_name", host: URI.parse(root_url).host, email: admin_user.email) %>
+        <%== RQRCode::QRCode.new(admin_user.otp.provisioning_uri(otp_app_name)).as_svg(
                color:           "000",
                shape_rendering: "crispEdges",
                module_size:     3,
+               svg_attributes:  { class: "qrcode" },
                use_path:        true,
              ) %>
       </li>
@@ -28,5 +29,4 @@
   </section>
   <%= form.hidden_field :otp_secret %>
   <%= form.govuk_text_field :token %>
-  <%= form.admin_save %>
 <% end %>

data/app/views/admin/otps/create.turbo_stream.erb

@@ -1,5 +1,5 @@
-<%# locals: (admin:) %>
+<%# locals: (admin_user:) %>
 
-<%= turbo_stream.replace(dom_id(admin, :otp)) do %>
-  <%= render("form", admin:) %>
+<%= turbo_stream.replace(dom_id(admin_user, :otp)) do %>
+  <%= render("form", admin_user:) %>
 <% end %>

data/app/views/admin/otps/new.html.erb

@@ -1,5 +1,7 @@
-<%# locals: (admin:) %>
+<%# locals: (admin_user:) %>
 
-<%= render Kpop::ModalComponent.new(title: "Configure MFA") do %>
-  <%= render("form", admin:) %>
+<%= koi_modal_tag("edit") do %>
+  <%= koi_modal_header(title: "Configure MFA", form_id: dom_id(admin_user, :otp)) %>
+  <%= tag.main(render("form", admin_user:)) %>
+  <%= koi_modal_footer(form_id: dom_id(admin_user, :otp)) %>
 <% end %>

data/app/views/admin/sessions/new.html.erb

@@ -1,9 +1,8 @@
 <%# locals: (admin_user:) %>
 
-<%= render "layouts/koi/navigation_header" %>
-
 <%= form_with(
       model: admin_user,
+      scope: :admin,
       url:   admin_session_path,
       data:  {
         controller:                            "webauthn-authentication",
@@ -24,7 +23,7 @@
   <%= form.govuk_email_field :email, autofocus: true, autocomplete: "off" %>
   <%= form.hidden_field :response, data: { webauthn_authentication_target: "response" } %>
   <%= hidden_field_tag(:redirect, redirect) %>
-  <div class="actions-group">
+  <div class="actions">
     <%= form.admin_save "Next" %>
     <%= form.button "🔑", type: :button, class: "button button--secondary", data: { action: "webauthn-authentication#authenticate" } %>
   </div>

data/app/views/admin/sessions/otp.html.erb

@@ -1,8 +1,6 @@
 <%# locals: (admin_user:) %>
 
-<%= render "layouts/koi/navigation_header" %>
-
-<%= form_with(model: admin_user, url: admin_session_path, method: :post) do |form| %>
+<%= form_with(model: admin_user, scope: :admin, url: admin_session_path, method: :post) do |form| %>
   <%# note, autocomplete off is ignored by browsers but required by PCI-DSS %>
   <%= form.govuk_text_field :token, autofocus: true, autocomplete: "off" %>
   <%= hidden_field_tag(:redirect, params[:redirect]) %>

data/app/views/admin/sessions/password.html.erb

@@ -1,8 +1,6 @@
 <%# locals: (admin_user:) %>
 
-<%= render "layouts/koi/navigation_header" %>
-
-<%= form_with(model: admin_user, url: admin_session_path) do |form| %>
+<%= form_with(model: admin_user, scope: :admin, url: admin_session_path) do |form| %>
   <%= form.hidden_field(:email) %>
   <%# note, autocomplete off is ignored by browsers but required by PCI-DSS %>
   <%= form.govuk_password_field :password, autofocus: true, autocomplete: "off" %>

data/app/views/admin/tokens/show.html.erb

@@ -1,14 +1,12 @@
 <%# locals: (admin_user:, token:) %>
 
-<%= render "layouts/koi/navigation_header" %>
-
 <%= form_with(url: admin_session_token_path(token), method: :patch) do |form| %>
   <p>Welcome to Koi Admin</p>
-  <%= render Koi::SummaryListComponent.new(model: admin_user, class: "item-table") do |builder| %>
-    <%= builder.text :name %>
-    <%= builder.text :email %>
+  <%= summary_table_with(model: admin_user) do |row| %>
+    <%= row.text :name %>
+    <%= row.text :email %>
   <% end %>
-  <div class="actions-group">
+  <div class="actions">
     <%= form.admin_save "Sign in" %>
   </div>
 <% end %>

data/app/views/admin/url_rewrites/_form.html.erb

@@ -0,0 +1,9 @@
+<%# locals: (url_rewrite:) %>
+
+<%= form_with(model: url_rewrite) do |form| %>
+  <%= form.govuk_text_field(:from, hint: { text: "Should begin with /" }) %>
+  <%= form.govuk_text_field :to %>
+  <%= form.govuk_check_box_field :active %>
+  <%= form.govuk_enum_select :status_code %>
+  <%= form.button(type: :submit, class: "button") %>
+<% end %>