merge base project into memex

2023-02-26 01:47:26 -05:00
parent 12814be5e1 bc2c936480
commit c7debb331c
39 changed files with 1604 additions and 243 deletions
--- a/lib/memex_web/templates/error/error.html.heex
+++ b/lib/memex_web/templates/error/error.html.heex
@ -11,9 +11,9 @@
    <script defer type="text/javascript" src="/js/app.js">
    </script>
  </head>
-  <body class="m-0 p-0 w-full h-full bg-primary-800 text-primary-400 subpixel-antialiased">
+  <body class="pb-8 m-0 p-0 w-full h-full bg-primary-800 text-primary-400 subpixel-antialiased">
    <header>
-      <.topbar current_user={assigns[:current_user]}></.topbar>
+      <.topbar current_user={assigns[:current_user]} />
    </header>

    <div class="pb-8 w-full flex flex-col justify-center items-center text-center">
--- a/lib/memex_web/templates/layout/app.html.heex
+++ b/lib/memex_web/templates/layout/app.html.heex
@ -1,6 +1,6 @@
 <main role="main" class="min-h-full min-w-full">
  <header>
-    <.topbar current_user={assigns[:current_user]}></.topbar>
+    <.topbar current_user={assigns[:current_user]} />

    <div class="mx-8 my-2 flex flex-col space-y-4 text-center">
      <p :if={get_flash(@conn, :info)} class="alert alert-info" role="alert">
--- a/lib/memex_web/templates/layout/live.html.heex
+++ b/lib/memex_web/templates/layout/live.html.heex
@ -1,6 +1,6 @@
 <main class="pb-8 min-w-full">
  <header>
-    <.topbar current_user={assigns[:current_user]}></.topbar>
+    <.topbar current_user={assigns[:current_user]} />

    <div class="mx-8 my-2 flex flex-col space-y-4 text-center">
      <p
--- a/lib/memex_web/templates/user_confirmation/new.html.heex
+++ b/lib/memex_web/templates/user_confirmation/new.html.heex
@ -9,7 +9,7 @@
    action={Routes.user_confirmation_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"
  >
-    <%= label(f, :email, class: "title text-lg text-primary-400") %>
+    <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-400") %>
    <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>

    <%= submit(dgettext("actions", "Resend confirmation instructions"),
--- a/lib/memex_web/templates/user_registration/new.html.heex
+++ b/lib/memex_web/templates/user_registration/new.html.heex
@ -17,11 +17,11 @@
      <%= hidden_input(f, :invite_token, value: @invite_token) %>
    <% end %>

-    <%= label(f, :email, class: "title text-lg text-primary-400") %>
+    <%= label(f, :email, gettext("email"), class: "title text-lg text-primary-400") %>
    <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
    <%= error_tag(f, :email, "col-span-3") %>

-    <%= label(f, :password, class: "title text-lg text-primary-400") %>
+    <%= label(f, :password, gettext("password"), class: "title text-lg text-primary-400") %>
    <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
    <%= error_tag(f, :password, "col-span-3") %>

--- a/lib/memex_web/templates/user_reset_password/edit.html.heex
+++ b/lib/memex_web/templates/user_reset_password/edit.html.heex
@ -9,17 +9,15 @@
    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"
  >
-    <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>
+    <p :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
+      <%= dgettext("errors", "oops, something went wrong! please check the errors below.") %>
+    </p>

-    <%= label(f, :password, "new password", class: "title text-lg text-primary-400") %>
+    <%= label(f, :password, gettext("new password"), class: "title text-lg text-primary-400") %>
    <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
    <%= error_tag(f, :password, "col-span-3") %>

-    <%= label(f, :password_confirmation, "Confirm new password",
+    <%= label(f, :password_confirmation, gettext("confirm new password"),
      class: "title text-lg text-primary-400"
    ) %>
    <%= password_input(f, :password_confirmation,
--- a/lib/memex_web/templates/user_reset_password/new.html.heex
+++ b/lib/memex_web/templates/user_reset_password/new.html.heex
@ -9,7 +9,7 @@
    action={Routes.user_reset_password_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"
  >
-    <%= label(f, :email, class: "title text-lg text-primary-400") %>
+    <%= label(f, :email, gettext("email"), class: "title text-lg text-primary-400") %>
    <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>

    <%= submit(dgettext("actions", "send instructions to reset password"),
--- a/lib/memex_web/templates/user_session/new.html.heex
+++ b/lib/memex_web/templates/user_session/new.html.heex
@ -10,19 +10,17 @@
    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"
  >
-    <div :if={@error_message} class="alert alert-danger col-span-3">
-      <p>
-        <%= @error_message %>
-      </p>
-    </div>
+    <p :if={@error_message} class="alert alert-danger col-span-3">
+      <%= @error_message %>
+    </p>

-    <%= label(f, :email, class: "title text-lg text-primary-400") %>
+    <%= label(f, :email, gettext("email"), class: "title text-lg text-primary-400") %>
    <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>

-    <%= label(f, :password, class: "title text-lg text-primary-400") %>
+    <%= label(f, :password, gettext("password"), class: "title text-lg text-primary-400") %>
    <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>

-    <%= label(f, :remember_me, gettext("Keep me logged in for 60 days"),
+    <%= label(f, :remember_me, gettext("keep me logged in for 60 days"),
      class: "title text-lg text-primary-400"
    ) %>
    <%= checkbox(f, :remember_me, class: "checkbox col-span-2") %>
--- a/lib/memex_web/templates/user_settings/edit.html.heex
+++ b/lib/memex_web/templates/user_settings/edit.html.heex
@ -19,7 +19,7 @@
      :if={@email_changeset.action && not @email_changeset.valid?()}
      class="alert alert-danger col-span-3"
    >
-      <%= dgettext("errors", "oops, something went wrong! Please check the errors below") %>
+      <%= dgettext("errors", "oops, something went wrong! please check the errors below") %>
    </div>

    <%= hidden_input(f, :action, name: "action", value: "update_email") %>
@ -57,12 +57,12 @@
      <%= dgettext("actions", "change password") %>
    </h3>

-    <div
+    <p
      :if={@password_changeset.action && not @password_changeset.valid?()}
      class="alert alert-danger col-span-3"
    >
-      <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
-    </div>
+      <%= dgettext("errors", "oops, something went wrong! please check the errors below.") %>
+    </p>

    <%= hidden_input(f, :action, name: "action", value: "update_password") %>

@ -115,7 +115,7 @@
      :if={@locale_changeset.action && not @locale_changeset.valid?()}
      class="alert alert-danger col-span-3"
    >
-      <%= dgettext("errors", "oops, something went wrong! Please check the errors below") %>
+      <%= dgettext("errors", "oops, something went wrong! please check the errors below") %>
    </div>

    <%= hidden_input(f, :action, name: "action", value: "update_locale") %>