improvement: update to latest phoenix_live_view 1.0

team-alembic · Dec 5, 2024 · 1b9a038 · 1b9a038
1 parent 1eb563e
commit 1b9a038
Show file tree

Hide file tree

Showing 21 changed files with 64 additions and 67 deletions.
diff --git a/dev/dev_web/live/custom_sign_in_live.ex b/dev/dev_web/live/custom_sign_in_live.ex
@@ -33,37 +33,35 @@ defmodule DevWeb.CustomSignInLive do
       >
         <:sign_in_extra :let={form}>
           <div class="mt-2 mb-2 dark:text-white">
-            <%= label(form, :capcha,
+            {label(form, :capcha,
               class: "block text-sm font-medium text-gray-700 mb-1 dark:text-white"
-            ) %>
-            <%= text_input(form, :capcha,
+            )}
+            {text_input(form, :capcha,
               class:
                 "appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-blue-pale-500 focus:border-blue-pale-500 sm:text-sm dark:text-black"
-            ) %>
+            )}
           </div>
         </:sign_in_extra>
 
         <:register_extra :let={form}>
           <div class="mt-2 mb-2 dark:text-white">
-            <%= label(form, :name,
-              class: "block text-sm font-medium text-gray-700 mb-1 dark:text-white"
-            ) %>
-            <%= text_input(form, :name,
+            {label(form, :name, class: "block text-sm font-medium text-gray-700 mb-1 dark:text-white")}
+            {text_input(form, :name,
               class:
                 "appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-blue-pale-500 focus:border-blue-pale-500 sm:text-sm dark:text-black"
-            ) %>
+            )}
           </div>
         </:register_extra>
 
         <:reset_extra :let={form}>
           <div class="mt-2 mb-2 dark:text-white">
-            <%= label(form, :capcha,
+            {label(form, :capcha,
               class: "block text-sm font-medium text-gray-700 mb-1 dark:text-white"
-            ) %>
-            <%= text_input(form, :capcha,
+            )}
+            {text_input(form, :capcha,
               class:
                 "appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-blue-pale-500 focus:border-blue-pale-500 sm:text-sm dark:text-black"
-            ) %>
+            )}
           </div>
         </:reset_extra>
       </.live_component>

diff --git a/dev/dev_web/live/home_page_live.ex b/dev/dev_web/live/home_page_live.ex
@@ -12,7 +12,7 @@ defmodule DevWeb.HomePageLive do
 
     ~H"""
     <%= if @current_user do %>
-      <h2>Current user: <%= @current_user.email %></h2>
+      <h2>Current user: {@current_user.email}</h2>
 
       <.link navigate="/sign-out">Sign out</.link>
     <% else %>

diff --git a/dev/dev_web/templates/auth/failure.html.heex b/dev/dev_web/templates/auth/failure.html.heex
@@ -6,4 +6,4 @@
   </pre>
 </p>
 
-<%= link("Home", to: Routes.live_path(@conn, DevWeb.HomePageLive)) %>
+{link("Home", to: Routes.live_path(@conn, DevWeb.HomePageLive))}
diff --git a/dev/dev_web/templates/auth/sign_out.html.heex b/dev/dev_web/templates/auth/sign_out.html.heex
@@ -1,3 +1,3 @@
 <h2>Signed out</h2>
 
-<%= link("Home", to: Routes.live_path(@conn, DevWeb.HomePageLive)) %>
+{link("Home", to: Routes.live_path(@conn, DevWeb.HomePageLive))}
diff --git a/dev/dev_web/templates/auth/success.html.heex b/dev/dev_web/templates/auth/success.html.heex
@@ -1 +1 @@
-Welcome back <%= @current_user.email %>. <%= link("Home", to: "/") %>
+Welcome back {@current_user.email}. {link("Home", to: "/")}
diff --git a/dev/dev_web/templates/layout/app.html.heex b/dev/dev_web/templates/layout/app.html.heex
@@ -1,5 +1,5 @@
 <main class="container">
-  <p class="alert alert-info" role="alert"><%= Phoenix.Flash.get(@flash, :info) %></p>
-  <p class="alert alert-danger" role="alert"><%= Phoenix.Flash.get(@flash, :error) %></p>
-  <%= @inner_content %>
+  <p class="alert alert-info" role="alert">{Phoenix.Flash.get(@flash, :info)}</p>
+  <p class="alert alert-danger" role="alert">{Phoenix.Flash.get(@flash, :error)}</p>
+  {@inner_content}
 </main>
diff --git a/dev/dev_web/templates/layout/live.html.heex b/dev/dev_web/templates/layout/live.html.heex
@@ -1,11 +1,11 @@
 <main class="container">
   <p class="alert alert-info" role="alert" phx-click="lv:clear-flash" phx-value-key="info">
-    <%= Phoenix.Flash.get(@flash, :info) %>
+    {Phoenix.Flash.get(@flash, :info)}
   </p>
 
   <p class="alert alert-danger" role="alert" phx-click="lv:clear-flash" phx-value-key="error">
-    <%= Phoenix.Flash.get(@flash, :error) %>
+    {Phoenix.Flash.get(@flash, :error)}
   </p>
 
-  <%= @inner_content %>
+  {@inner_content}
 </main>
diff --git a/dev/dev_web/templates/layout/root.html.heex b/dev/dev_web/templates/layout/root.html.heex
@@ -4,9 +4,9 @@
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <%= csrf_meta_tag() %>
+    {csrf_meta_tag()}
     <.live_title>
-      <%= assigns[:page_title] || "Dev" %>
+      {assigns[:page_title] || "Dev"}
     </.live_title>
     <script defer src="https://cdn.tailwindcss.com">
     </script>
@@ -22,6 +22,6 @@
     </script>
   </head>
   <body>
-    <%= @inner_content %>
+    {@inner_content}
   </body>
 </html>
diff --git a/lib/ash_authentication_phoenix/components/apple.ex b/lib/ash_authentication_phoenix/components/apple.ex
@@ -61,7 +61,7 @@ defmodule AshAuthentication.Phoenix.Components.Apple do
 
   def icon(assigns) do
     ~H"""
-    <%= raw(icon_svg(@icon, override_for(@overrides, :icon_class))) %>
+    {raw(icon_svg(@icon, override_for(@overrides, :icon_class)))}
     """
   end
 

diff --git a/lib/ash_authentication_phoenix/components/banner.ex b/lib/ash_authentication_phoenix/components/banner.ex
@@ -61,12 +61,12 @@ defmodule AshAuthentication.Phoenix.Components.Banner do
         <% {nil, nil} -> %>
         <% {nil, txt} -> %>
           <div class={override_for(@overrides, :text_class)}>
-            <%= txt %>
+            {txt}
           </div>
         <% {hrf, txt} -> %>
           <div class={override_for(@overrides, :text_class)}>
             <a class={override_for(@overrides, :href_class)} href={hrf}>
-              <%= txt %>
+              {txt}
             </a>
           </div>
       <% end %>

diff --git a/lib/ash_authentication_phoenix/components/horizontal_rule.ex b/lib/ash_authentication_phoenix/components/horizontal_rule.ex
@@ -42,7 +42,7 @@ defmodule AshAuthentication.Phoenix.Components.HorizontalRule do
       </div>
       <div class={override_for(@overrides, :text_outer_class)}>
         <span class={override_for(@overrides, :text_inner_class)}>
-          <%= override_for(@overrides, :text) %>
+          {override_for(@overrides, :text)}
         </span>
       </div>
     </div>

diff --git a/lib/ash_authentication_phoenix/components/magic_link.ex b/lib/ash_authentication_phoenix/components/magic_link.ex
@@ -76,7 +76,7 @@ defmodule AshAuthentication.Phoenix.Components.MagicLink do
     ~H"""
     <div class={override_for(@overrides, :root_class)}>
       <%= if @label do %>
-        <h2 class={override_for(@overrides, :label_class)}><%= @label %></h2>
+        <h2 class={override_for(@overrides, :label_class)}>{@label}</h2>
       <% end %>
 
       <.form

diff --git a/lib/ash_authentication_phoenix/components/oauth2.ex b/lib/ash_authentication_phoenix/components/oauth2.ex
@@ -50,8 +50,7 @@ defmodule AshAuthentication.Phoenix.Components.OAuth2 do
         href={auth_path(@socket, @subject_name, @auth_routes_prefix, @strategy, :request)}
         class={override_for(@overrides, :link_class)}
       >
-        <.icon icon={@strategy.icon} overrides={@overrides} />
-        Sign in with <%= strategy_name(@strategy) %>
+        <.icon icon={@strategy.icon} overrides={@overrides} /> Sign in with {strategy_name(@strategy)}
       </a>
     </div>
     """
@@ -60,7 +59,7 @@ defmodule AshAuthentication.Phoenix.Components.OAuth2 do
   def icon(assigns) do
     ~H"""
     <%= if @icon do %>
-      <%= raw(icon_svg(@icon, override_for(@overrides, :icon_class))) %>
+      {raw(icon_svg(@icon, override_for(@overrides, :icon_class)))}
     <% end %>
     """
   end

diff --git a/lib/ash_authentication_phoenix/components/password.ex b/lib/ash_authentication_phoenix/components/password.ex
@@ -173,7 +173,7 @@ defmodule AshAuthentication.Phoenix.Components.Password do
         >
           <%= if @sign_in_extra do %>
             <div class={override_for(@overrides, :slot_class)}>
-              <%= render_slot(@sign_in_extra, form) %>
+              {render_slot(@sign_in_extra, form)}
             </div>
           <% end %>
 
@@ -219,7 +219,7 @@ defmodule AshAuthentication.Phoenix.Components.Password do
           >
             <%= if @register_extra do %>
               <div class={override_for(@overrides, :slot_class)}>
-                <%= render_slot(@register_extra, form) %>
+                {render_slot(@register_extra, form)}
               </div>
             <% end %>
 
@@ -262,7 +262,7 @@ defmodule AshAuthentication.Phoenix.Components.Password do
           >
             <%= if @reset_extra do %>
               <div class={override_for(@overrides, :slot_class)}>
-                <%= render_slot(@reset_extra, form) %>
+                {render_slot(@reset_extra, form)}
               </div>
             <% end %>
 
@@ -308,13 +308,13 @@ defmodule AshAuthentication.Phoenix.Components.Password do
     if assigns[:to] do
       ~H"""
       <.link patch={@to} class={override_for(@overrides, :toggler_class)}>
-        <%= @message %>
+        {@message}
       </.link>
       """
     else
       ~H"""
       <a href="#" phx-click={toggle_js(@show, @hide)} class={override_for(@overrides, :toggler_class)}>
-        <%= @message %>
+        {@message}
       </a>
       """
     end

diff --git a/lib/ash_authentication_phoenix/components/password/input.ex b/lib/ash_authentication_phoenix/components/password/input.ex
@@ -88,16 +88,16 @@ defmodule AshAuthentication.Phoenix.Components.Password.Input do
 
     ~H"""
     <div class={override_for(@overrides, :field_class)}>
-      <%= label(@form, @identity_field, override_for(@overrides, :identity_input_label),
+      {label(@form, @identity_field, override_for(@overrides, :identity_input_label),
         class: override_for(@overrides, :label_class)
-      ) %>
-      <%= text_input(@form, @identity_field,
+      )}
+      {text_input(@form, @identity_field,
         type: to_string(@input_type),
         class: @input_class,
         phx_debounce: override_for(@overrides, :input_debounce),
         autofocus: "true",
         placeholder: override_for(@overrides, :identity_input_placeholder)
-      ) %>
+      )}
       <.error form={@form} field={@identity_field} overrides={@overrides} />
     </div>
     """
@@ -141,14 +141,14 @@ defmodule AshAuthentication.Phoenix.Components.Password.Input do
 
     ~H"""
     <div class={override_for(@overrides, :field_class)}>
-      <%= label(@form, @password_field, override_for(@overrides, :password_input_label),
+      {label(@form, @password_field, override_for(@overrides, :password_input_label),
         class: override_for(@overrides, :label_class)
-      ) %>
-      <%= password_input(@form, @password_field,
+      )}
+      {password_input(@form, @password_field,
         class: @input_class,
         value: input_value(@form, @password_field),
         phx_debounce: override_for(@overrides, :input_debounce)
-      ) %>
+      )}
       <.error form={@form} field={@password_field} overrides={@overrides} />
     </div>
     """
@@ -192,17 +192,17 @@ defmodule AshAuthentication.Phoenix.Components.Password.Input do
 
     ~H"""
     <div class={override_for(@overrides, :field_class)}>
-      <%= label(
+      {label(
         @form,
         @password_confirmation_field,
         override_for(@overrides, :password_confirmation_input_label),
         class: override_for(@overrides, :label_class)
-      ) %>
-      <%= password_input(@form, @password_confirmation_field,
+      )}
+      {password_input(@form, @password_confirmation_field,
         class: @input_class,
         value: input_value(@form, @password_confirmation_field),
         phx_debounce: override_for(@overrides, :input_debounce)
-      ) %>
+      )}
       <.error form={@form} field={@password_confirmation_field} overrides={@overrides} />
     </div>
     """
@@ -269,10 +269,10 @@ defmodule AshAuthentication.Phoenix.Components.Password.Input do
       |> assign_new(:disable_text, fn -> nil end)
 
     ~H"""
-    <%= submit(@label,
+    {submit(@label,
       class: override_for(@overrides, :submit_class),
       phx_disable_with: @disable_text
-    ) %>
+    )}
     """
   end
 
@@ -310,7 +310,7 @@ defmodule AshAuthentication.Phoenix.Components.Password.Input do
       <ul class={override_for(@overrides, :error_ul)}>
         <%= for error <- @errors do %>
           <li class={override_for(@overrides, :error_li)} phx-feedback-for={input_name(@form, @field)}>
-            <%= error %>
+            {error}
           </li>
         <% end %>
       </ul>

diff --git a/lib/ash_authentication_phoenix/components/password/register_form.ex b/lib/ash_authentication_phoenix/components/password/register_form.ex
@@ -95,7 +95,7 @@ defmodule AshAuthentication.Phoenix.Components.Password.RegisterForm do
     <div class={override_for(@overrides, :root_class)}>
       <%= if @label do %>
         <h2 class={override_for(@overrides, :label_class)}>
-          <%= @label %>
+          {@label}
         </h2>
       <% end %>
 
@@ -119,7 +119,7 @@ defmodule AshAuthentication.Phoenix.Components.Password.RegisterForm do
 
         <%= if @inner_block do %>
           <div class={override_for(@overrides, :slot_class)}>
-            <%= render_slot(@inner_block, form) %>
+            {render_slot(@inner_block, form)}
           </div>
         <% end %>
 

diff --git a/lib/ash_authentication_phoenix/components/password/reset_form.ex b/lib/ash_authentication_phoenix/components/password/reset_form.ex
@@ -79,7 +79,7 @@ defmodule AshAuthentication.Phoenix.Components.Password.ResetForm do
     <div class={override_for(@overrides, :root_class)}>
       <%= if @label do %>
         <h2 class={override_for(@overrides, :label_class)}>
-          <%= @label %>
+          {@label}
         </h2>
       <% end %>
 
@@ -105,7 +105,7 @@ defmodule AshAuthentication.Phoenix.Components.Password.ResetForm do
 
         <%= if @inner_block do %>
           <div class={override_for(@overrides, :slot_class)}>
-            <%= render_slot(@inner_block, form) %>
+            {render_slot(@inner_block, form)}
           </div>
         <% end %>
 

diff --git a/lib/ash_authentication_phoenix/components/password/sign_in_form.ex b/lib/ash_authentication_phoenix/components/password/sign_in_form.ex
@@ -96,7 +96,7 @@ defmodule AshAuthentication.Phoenix.Components.Password.SignInForm do
     ~H"""
     <div class={override_for(@overrides, :root_class)}>
       <%= if @label do %>
-        <h2 class={override_for(@overrides, :label_class)}><%= @label %></h2>
+        <h2 class={override_for(@overrides, :label_class)}>{@label}</h2>
       <% end %>
 
       <.form
@@ -116,7 +116,7 @@ defmodule AshAuthentication.Phoenix.Components.Password.SignInForm do
 
         <%= if @inner_block do %>
           <div class={override_for(@overrides, :slot_class)}>
-            <%= render_slot(@inner_block, form) %>
+            {render_slot(@inner_block, form)}
           </div>
         <% end %>
 

diff --git a/lib/ash_authentication_phoenix/components/reset/form.ex b/lib/ash_authentication_phoenix/components/reset/form.ex
@@ -95,7 +95,7 @@ defmodule AshAuthentication.Phoenix.Components.Reset.Form do
     ~H"""
     <div class={override_for(@overrides, :root_class)}>
       <%= if @label do %>
-        <h2 class={override_for(@overrides, :label_class)}><%= @label %></h2>
+        <h2 class={override_for(@overrides, :label_class)}>{@label}</h2>
       <% end %>
 
       <.form
@@ -117,7 +117,7 @@ defmodule AshAuthentication.Phoenix.Components.Reset.Form do
         method="POST"
         class={override_for(@overrides, :form_class)}
       >
-        <%= hidden_input(form, :reset_token, value: @token) %>
+        {hidden_input(form, :reset_token, value: @token)}
         <Input.error field={:reset_token} form={@form} overrides={@overrides} />
 
         <Input.password_field strategy={@strategy} form={form} overrides={@overrides} />

diff --git a/lib/ash_authentication_phoenix/templates/live.html.heex b/lib/ash_authentication_phoenix/templates/live.html.heex
@@ -6,7 +6,7 @@
     phx-click="lv:clear-flash"
     phx-value-key="info"
   >
-    <%= Phoenix.Flash.get(@flash, :info) %>
+    {Phoenix.Flash.get(@flash, :info)}
   </p>
 <% end %>
 
@@ -18,8 +18,8 @@
     phx-click="lv:clear-flash"
     phx-value-key="error"
   >
-    <%= Phoenix.Flash.get(@flash, :error) %>
+    {Phoenix.Flash.get(@flash, :error)}
   </p>
 <% end %>
 
-<%= @inner_content %>
+{@inner_content}
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ @@
       </pre>
     </p>
-    <%= link("Home", to: Routes.live_path(@conn, DevWeb.HomePageLive)) %>
+    {link("Home", to: Routes.live_path(@conn, DevWeb.HomePageLive))}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Welcome back <%= @current_user.email %>. <%= link("Home", to: "/") %>
		Welcome back {@current_user.email}. {link("Home", to: "/")}