merge base project into memex

lib/memex_web/live/home_live.ex

@@ -5,7 +5,7 @@ defmodule MemexWeb.HomeLive do
 
   use MemexWeb, :live_view
   alias Memex.Accounts
-  alias MemexWeb.{Endpoint, FaqLive}
+  alias MemexWeb.FaqLive
 
   @version Mix.Project.config()[:version]
 

lib/memex_web/live/invite_live/form_component.html.heex

@@ -18,13 +18,16 @@
       <%= changeset_errors(@changeset) %>
     </div>
 
-    <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-400") %>
+    <%= label(f, :name, gettext("name"), class: "title text-lg text-primary-400") %>
     <%= text_input(f, :name, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :name, "col-span-3") %>
 
-    <%= label(f, :uses_left, gettext("Uses left"), class: "title text-lg text-primary-400") %>
+    <%= label(f, :uses_left, gettext("uses left"), class: "title text-lg text-primary-400") %>
     <%= number_input(f, :uses_left, min: 0, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :uses_left, "col-span-3") %>
+    <span class="col-span-3 text-primary-500 italic text-center">
+      <%= gettext(~s/Leave "Uses left" blank to make invite unlimited/) %>
+    </span>
 
     <%= submit(dgettext("actions", "Save"),
       class: "mx-auto btn btn-primary col-span-3",

lib/memex_web/live/invite_live/index.ex

@@ -7,7 +7,7 @@ defmodule MemexWeb.InviteLive.Index do
   import MemexWeb.Components.{InviteCard, UserCard}
   alias Memex.Accounts
   alias Memex.Accounts.{Invite, Invites}
-  alias MemexWeb.{Endpoint, HomeLive}
+  alias MemexWeb.HomeLive
   alias Phoenix.LiveView.JS
 
   @impl true

lib/memex_web/live/invite_live/index.html.heex

@@ -8,7 +8,7 @@
       <%= gettext("no invites 😔") %>
     </h1>
 
-    <.link patch={Routes.invite_index_path(Endpoint, :new)} class="btn btn-primary ml-auto">
+    <.link patch={Routes.invite_index_path(Endpoint, :new)} class="btn btn-primary">
       <%= dgettext("actions", "invite someone new!") %>
     </.link>
   <% end %>
@@ -87,7 +87,7 @@
     <hr class="hr" />
 
     <h1 class="title text-xl text-primary-400">
-      <%= gettext("Admins") %>
+      <%= gettext("admins") %>
     </h1>
 
     <div class="flex flex-col justify-center items-stretch space-y-4">
@@ -100,7 +100,7 @@
           data-confirm={
             dgettext(
               "prompts",
-              "are you sure you want to delete %{email}? This action is permanent!",
+              "are you sure you want to delete %{email}? this action is permanent!",
               email: admin.email
             )
           }
@@ -128,7 +128,7 @@
           data-confirm={
             dgettext(
               "prompts",
-              "are you sure you want to delete %{email}? This action is permanent!",
+              "are you sure you want to delete %{email}? this action is permanent!",
               email: user.email
             )
           }

lib/memex_web/live/live_helpers.ex

@@ -28,8 +28,8 @@ defmodule MemexWeb.LiveHelpers do
   def modal(assigns) do
     ~H"""
     <.link
-      patch={@return_to}
       id="modal-bg"
+      patch={@return_to}
       class="fade-in fixed z-10 left-0 top-0
         w-full h-full overflow-hidden
         p-8 flex flex-col justify-center items-center cursor-auto"
@@ -42,7 +42,7 @@ defmodule MemexWeb.LiveHelpers do
     <div
       id="modal"
       class="fixed z-10 left-0 top-0 pointer-events-none
-        w-screen h-screen overflow-hidden
+        w-full h-full overflow-hidden
         p-4 sm:p-8 flex flex-col justify-center items-center"
     >
       <div