improve templates

lib/memex_web/templates/error/error.html.heex

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>
-      <%= dgettext("errors", "Error") %> | memEx
+      <%= dgettext("errors", "Error") %> | <%= gettext("memEx") %>
     </title>
     <link rel="stylesheet" href="/css/app.css" />
     <script defer type="text/javascript" src="/js/app.js">

lib/memex_web/templates/layout/app.html.heex

@@ -3,16 +3,12 @@
     <.topbar current_user={assigns[:current_user]}></.topbar>
 
     <div class="mx-8 my-2 flex flex-col space-y-4 text-center">
-      <%= if get_flash(@conn, :info) do %>
-        <p class="alert alert-info" role="alert">
-          <%= get_flash(@conn, :info) %>
-        </p>
-      <% end %>
-      <%= if get_flash(@conn, :error) do %>
-        <p class="alert alert-danger" role="alert">
-          <%= get_flash(@conn, :error) %>
-        </p>
-      <% end %>
+      <p :if={get_flash(@conn, :info)} class="alert alert-info" role="alert">
+        <%= get_flash(@conn, :info) %>
+      </p>
+      <p :if={get_flash(@conn, :error)} class="alert alert-danger" role="alert">
+        <%= get_flash(@conn, :error) %>
+      </p>
     </div>
   </header>
 

lib/memex_web/templates/layout/live.html.heex

@@ -3,22 +3,25 @@
     <.topbar current_user={assigns[:current_user]}></.topbar>
 
     <div class="mx-8 my-2 flex flex-col space-y-4 text-center">
-      <%= if @flash && @flash |> Map.has_key?("info") do %>
-        <p class="alert alert-info" role="alert" phx-click="lv:clear-flash" phx-value-key="info">
-          <%= live_flash(@flash, "info") %>
-        </p>
-      <% end %>
+      <p
+        :if={@flash && @flash |> Map.has_key?("info")}
+        class="alert alert-info"
+        role="alert"
+        phx-click="lv:clear-flash"
+        phx-value-key="info"
+      >
+        <%= live_flash(@flash, "info") %>
+      </p>
 
-      <%= if @flash && @flash |> Map.has_key?("error") do %>
-        <p
-          class="alert alert-danger"
-          role="alert"
-          phx-click="lv:clear-flash"
-          phx-value-key="error"
-        >
-          <%= live_flash(@flash, "error") %>
-        </p>
-      <% end %>
+      <p
+        :if={@flash && @flash |> Map.has_key?("error")}
+        class="alert alert-danger"
+        role="alert"
+        phx-click="lv:clear-flash"
+        phx-value-key="error"
+      >
+        <%= live_flash(@flash, "error") %>
+      </p>
     </div>
   </header>
 

lib/memex_web/templates/user_confirmation/new.html.heex

@@ -20,11 +20,13 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <%= if Accounts.allow_registration?() do %>
-      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
-        <%= dgettext("actions", "register") %>
-      </.link>
-    <% end %>
+    <.link
+      :if={Accounts.allow_registration?()}
+      href={Routes.user_registration_path(@conn, :new)}
+      class="btn btn-primary"
+    >
+      <%= dgettext("actions", "register") %>
+    </.link>
     <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
       <%= dgettext("actions", "log in") %>
     </.link>

lib/memex_web/templates/user_registration/new.html.heex

@@ -9,13 +9,11 @@
     action={Routes.user_registration_path(@conn, :create)}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <%= if @changeset.action && not @changeset.valid? do %>
-      <div class="alert alert-danger col-span-3">
-        <p>
-          <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
-        </p>
-      </div>
-    <% end %>
+    <div :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
+      <p>
+        <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
+      </p>
+    </div>
 
     <%= if @invite do %>
       <%= hidden_input(f, :invite_token, value: @invite.token) %>

lib/memex_web/templates/user_reset_password/edit.html.heex

@@ -9,13 +9,11 @@
     action={Routes.user_reset_password_path(@conn, :update, @token)}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <%= if @changeset.action && not @changeset.valid? do %>
-      <div class="alert alert-danger col-span-3">
-        <p>
-          <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
-        </p>
-      </div>
-    <% end %>
+    <div :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
+      <p>
+        <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
+      </p>
+    </div>
 
     <%= label(f, :password, "new password", class: "title text-lg text-primary-400") %>
     <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
@@ -38,11 +36,13 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <%= if Accounts.allow_registration?() do %>
-      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
-        <%= dgettext("actions", "register") %>
-      </.link>
-    <% end %>
+    <.link
+      :if={Accounts.allow_registration?()}
+      href={Routes.user_registration_path(@conn, :new)}
+      class="btn btn-primary"
+    >
+      <%= dgettext("actions", "register") %>
+    </.link>
     <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
       <%= dgettext("actions", "log in") %>
     </.link>

lib/memex_web/templates/user_reset_password/new.html.heex

@@ -20,11 +20,13 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <%= if Accounts.allow_registration?() do %>
-      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
-        <%= dgettext("actions", "register") %>
-      </.link>
-    <% end %>
+    <.link
+      :if={Accounts.allow_registration?()}
+      href={Routes.user_registration_path(@conn, :new)}
+      class="btn btn-primary"
+    >
+      <%= dgettext("actions", "register") %>
+    </.link>
     <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
       <%= dgettext("actions", "log in") %>
     </.link>

lib/memex_web/templates/user_session/new.html.heex

@@ -10,13 +10,11 @@
     as="user"
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <%= if @error_message do %>
-      <div class="alert alert-danger col-span-3">
-        <p>
-          <%= @error_message %>
-        </p>
-      </div>
-    <% end %>
+    <div :if={@error_message} class="alert alert-danger col-span-3">
+      <p>
+        <%= @error_message %>
+      </p>
+    </div>
 
     <%= label(f, :email, class: "title text-lg text-primary-400") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
@@ -35,11 +33,13 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <%= if Accounts.allow_registration?() do %>
-      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
-        <%= dgettext("actions", "register") %>
-      </.link>
-    <% end %>
+    <.link
+      :if={Accounts.allow_registration?()}
+      href={Routes.user_registration_path(@conn, :new)}
+      class="btn btn-primary"
+    >
+      <%= dgettext("actions", "register") %>
+    </.link>
     <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary">
       <%= dgettext("actions", "forgot your password?") %>
     </.link>

lib/memex_web/templates/user_settings/edit.html.heex

@@ -15,13 +15,14 @@
       <%= dgettext("actions", "change email") %>
     </h3>
 
-    <%= if @email_changeset.action && not @email_changeset.valid? do %>
-      <div class="alert alert-danger col-span-3">
-        <p>
-          <%= dgettext("errors", "oops, something went wrong! Please check the errors below") %>
-        </p>
-      </div>
-    <% end %>
+    <div
+      :if={@email_changeset.action && not @email_changeset.valid?()}
+      class="alert alert-danger col-span-3"
+    >
+      <p>
+        <%= dgettext("errors", "oops, something went wrong! Please check the errors below") %>
+      </p>
+    </div>
 
     <%= hidden_input(f, :action, name: "action", value: "update_email") %>
 
@@ -58,13 +59,14 @@
       <%= dgettext("actions", "change password") %>
     </h3>
 
-    <%= if @password_changeset.action && not @password_changeset.valid? do %>
-      <div class="alert alert-danger col-span-3">
-        <p>
-          <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
-        </p>
-      </div>
-    <% end %>
+    <div
+      :if={@password_changeset.action && not @password_changeset.valid?()}
+      class="alert alert-danger col-span-3"
+    >
+      <p>
+        <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
+      </p>
+    </div>
 
     <%= hidden_input(f, :action, name: "action", value: "update_password") %>
 
@@ -113,13 +115,14 @@
       <%= dgettext("actions", "change language") %>
     </h3>
 
-    <%= if @locale_changeset.action && not @locale_changeset.valid? do %>
-      <div class="alert alert-danger">
-        <p>
-          <%= dgettext("errors", "oops, something went wrong! Please check the errors below") %>
-        </p>
-      </div>
-    <% end %>
+    <div
+      :if={@locale_changeset.action && not @locale_changeset.valid?()}
+      class="alert alert-danger"
+    >
+      <p>
+        <%= dgettext("errors", "oops, something went wrong! Please check the errors below") %>
+      </p>
+    </div>
 
     <%= hidden_input(f, :action, name: "action", value: "update_locale") %>