.credo.exs

@@ -157,17 +157,17 @@
         #
         # Controversial and experimental checks (opt-in, just replace `false` with `[]`)
         #
-        {Credo.Check.Consistency.MultiAliasImportRequireUse, []},
+        {Credo.Check.Consistency.MultiAliasImportRequireUse, false},
-        {Credo.Check.Consistency.UnusedVariableNames, [force: :meaningful]},
+        {Credo.Check.Consistency.UnusedVariableNames, false},
         {Credo.Check.Design.DuplicatedCode, false},
         {Credo.Check.Readability.AliasAs, false},
         {Credo.Check.Readability.BlockPipe, false},
         {Credo.Check.Readability.ImplTrue, false},
         {Credo.Check.Readability.MultiAlias, false},
-        {Credo.Check.Readability.SeparateAliasRequire, []},
+        {Credo.Check.Readability.SeparateAliasRequire, false},
         {Credo.Check.Readability.SinglePipe, false},
         {Credo.Check.Readability.Specs, false},
-        {Credo.Check.Readability.StrictModuleLayout, []},
+        {Credo.Check.Readability.StrictModuleLayout, false},
         {Credo.Check.Readability.WithCustomTaggedTuple, false},
         {Credo.Check.Refactor.ABCSize, false},
         {Credo.Check.Refactor.AppendSingleItem, false},
@@ -176,9 +176,9 @@
         {Credo.Check.Refactor.NegatedIsNil, false},
         {Credo.Check.Refactor.PipeChainStart, false},
         {Credo.Check.Refactor.VariableRebinding, false},
-        {Credo.Check.Warning.LeakyEnvironment, []},
+        {Credo.Check.Warning.LeakyEnvironment, false},
-        {Credo.Check.Warning.MapGetUnsafePass, []},
+        {Credo.Check.Warning.MapGetUnsafePass, false},
-        {Credo.Check.Warning.UnsafeToAtom, []}
+        {Credo.Check.Warning.UnsafeToAtom, false}
 
         #
         # Custom checks can be created using `mix credo.gen.check`.

changelog.md

@@ -1,10 +1,3 @@
-# v0.1.8
-- Fix bug with public registration
-- Improve templates
-- Improve invites, record usage
-- Fix padding on more pages when using chrome
-- Add oban metrics to server log and live dashboard
-
 # v0.1.7
 - Update dependencies
 - Show topbar on form submit/page refresh

config/config.exs

@@ -11,8 +11,6 @@ config :memex,
   ecto_repos: [Memex.Repo],
   generators: [binary_id: true]
 
-config :memex, Memex.Accounts, registration: System.get_env("REGISTRATION", "invite")
-
 # Configures the endpoint
 config :memex, MemexWeb.Endpoint,
   url: [scheme: "https", host: System.get_env("HOST") || "localhost", port: "443"],
@@ -20,7 +18,8 @@ config :memex, MemexWeb.Endpoint,
   secret_key_base: "KH59P0iZixX5gP/u+zkxxG8vAAj6vgt0YqnwEB5JP5K+E567SsqkCz69uWShjE7I",
   render_errors: [view: MemexWeb.ErrorView, accepts: ~w(html json), layout: false],
   pubsub_server: Memex.PubSub,
-  live_view: [signing_salt: "zOLgd3lr"]
+  live_view: [signing_salt: "zOLgd3lr"],
+  registration: System.get_env("REGISTRATION") || "invite"
 
 config :memex, Memex.Application, automigrate: false
 

config/dev.exs

@@ -64,9 +64,8 @@ config :memex, MemexWeb.Endpoint,
     ]
   ]
 
-config :logger, :console,
+# Do not include metadata nor timestamps in development logs
-  format: "[$level] $message $metadata\n\n",
+config :logger, :console, format: "[$level] $message\n"
-  metadata: [:data]
 
 # Set a higher stacktrace during development. Avoid configuring such
 # in production as building large stacktraces may be expensive.

config/runtime.exs

@@ -50,11 +50,8 @@ config :memex, MemexWeb.Endpoint,
     ip: interface,
     port: String.to_integer(System.get_env("PORT", "4000"))
   ],
-  server: true
+  server: true,
-
+  registration: System.get_env("REGISTRATION", "invite")
-if config_env() in [:dev, :prod] do
-  config :memex, Memex.Accounts, registration: System.get_env("REGISTRATION", "invite")
-end
 
 if config_env() == :prod do
   # The secret key base is used to sign/encrypt cookies and other secrets.

config/test.exs

@@ -22,9 +22,6 @@ config :memex, MemexWeb.Endpoint,
 # In test we don't send emails.
 config :memex, Memex.Mailer, adapter: Swoosh.Adapters.Test
 
-# Don't require invites for signups
-config :memex, Memex.Accounts, registration: "public"
-
 # Print only warnings and errors during test
 config :logger, level: :warn
 

lib/memex/accounts.ex

@@ -5,7 +5,7 @@ defmodule Memex.Accounts do
 
   import Ecto.Query, warn: false
   alias Memex.{Mailer, Repo}
-  alias Memex.Accounts.{Invite, Invites, User, UserToken}
+  alias Memex.Accounts.{User, UserToken}
   alias Ecto.{Changeset, Multi}
   alias Oban.Job
 
@@ -16,27 +16,23 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> get_user_by_email("foo@example.com")
-      iex> with %User{} <- get_user_by_email("foo@example.com"), do: :passed
+      %User{}
-      :passed
 
       iex> get_user_by_email("unknown@example.com")
       nil
 
   """
   @spec get_user_by_email(email :: String.t()) :: User.t() | nil
-  def get_user_by_email(email) when is_binary(email) do
+  def get_user_by_email(email) when is_binary(email), do: Repo.get_by(User, email: email)
-    Repo.get_by(User, email: email)
-  end
 
   @doc """
   Gets a user by email and password.
 
   ## Examples
 
-      iex> register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> get_user_by_email_and_password("foo@example.com", "correct_password")
-      iex> with %User{} <- get_user_by_email_and_password("foo@example.com", "valid_password"), do: :passed
+      %User{}
-      :passed
 
       iex> get_user_by_email_and_password("foo@example.com", "invalid_password")
       nil
@@ -57,33 +53,28 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> get_user!(123)
-      iex> get_user!(user.id)
+      %User{}
-      user
 
-      > get_user!()
+      iex> get_user!(456)
       ** (Ecto.NoResultsError)
 
   """
   @spec get_user!(User.t()) :: User.t()
-  def get_user!(id) do
+  def get_user!(id), do: Repo.get!(User, id)
-    Repo.get!(User, id)
-  end
 
   @doc """
   Returns all users grouped by role.
 
   ## Examples
 
-      iex> {:ok, user1} = register_user(%{email: "foo1@example.com", password: "valid_password"})
+      iex> list_users_by_role(%User{id: 123, role: :admin})
-      iex> {:ok, user2} = register_user(%{email: "foo2@example.com", password: "valid_password"})
+      [admin: [%User{}], user: [%User{}, %User{}]]
-      iex> with %{admin: [^user1], user: [^user2]} <- list_all_users_by_role(user1), do: :passed
-      :passed
 
   """
-  @spec list_all_users_by_role(User.t()) :: %{User.role() => [User.t()]}
+  @spec list_all_users_by_role(User.t()) :: %{String.t() => [User.t()]}
   def list_all_users_by_role(%User{role: :admin}) do
-    Repo.all(from u in User, order_by: u.email) |> Enum.group_by(fn %{role: role} -> role end)
+    Repo.all(from u in User, order_by: u.email) |> Enum.group_by(fn user -> user.role end)
   end
 
   @doc """
@@ -91,13 +82,13 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> list_users_by_role(%User{id: 123, role: :admin})
-      iex> with [^user] <- list_users_by_role(:admin), do: :passed
+      [%User{}]
-      :passed
 
   """
-  @spec list_users_by_role(:admin) :: [User.t()]
+  @spec list_users_by_role(User.role()) :: [User.t()]
-  def list_users_by_role(:admin = role) do
+  def list_users_by_role(role) do
+    role = role |> to_string()
     Repo.all(from u in User, where: u.role == ^role, order_by: u.email)
   end
 
@@ -108,38 +99,26 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> with {:ok, %User{email: "foo@example.com"}} <-
+      iex> register_user(%{field: value})
-      ...>        register_user(%{email: "foo@example.com", password: "valid_password"}),
+      {:ok, %User{}}
-      ...>      do: :passed
-      :passed
 
-      iex> with {:error, %Changeset{}} <- register_user(%{email: "foo@example"}), do: :passed
+      iex> register_user(%{field: bad_value})
-      :passed
+      {:error, %Changeset{}}
 
   """
-  @spec register_user(attrs :: map()) ::
+  @spec register_user(attrs :: map()) :: {:ok, User.t()} | {:error, User.changeset()}
-          {:ok, User.t()} | {:error, :invalid_token | User.changeset()}
+  def register_user(attrs) do
-  @spec register_user(attrs :: map(), Invite.token() | nil) ::
-          {:ok, User.t()} | {:error, :invalid_token | User.changeset()}
-  def register_user(attrs, invite_token \\ nil) do
     Multi.new()
     |> Multi.one(:users_count, from(u in User, select: count(u.id), distinct: true))
-    |> Multi.run(:use_invite, fn _changes_so_far, _repo ->
+    |> Multi.insert(:add_user, fn %{users_count: count} ->
-      if allow_registration?() and invite_token |> is_nil() do
-        {:ok, nil}
-      else
-        Invites.use_invite(invite_token)
-      end
-    end)
-    |> Multi.insert(:add_user, fn %{users_count: count, use_invite: invite} ->
       # if no registered users, make first user an admin
-      role = if count == 0, do: :admin, else: :user
+      role = if count == 0, do: "admin", else: "user"
-      User.registration_changeset(attrs, invite) |> User.role_changeset(role)
+
+      User.registration_changeset(attrs) |> User.role_changeset(role)
     end)
     |> Repo.transaction()
     |> case do
       {:ok, %{add_user: user}} -> {:ok, user}
-      {:error, :use_invite, :invalid_token, _changes_so_far} -> {:error, :invalid_token}
       {:error, :add_user, changeset, _changes_so_far} -> {:error, changeset}
     end
   end
@@ -149,18 +128,14 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> with %Changeset{} <- change_user_registration(), do: :passed
+      iex> change_user_registration(user)
-      :passed
+      %Changeset{data: %User{}}
-
-      iex> with %Changeset{} <- change_user_registration(%{password: "hi"}), do: :passed
-      :passed
 
   """
   @spec change_user_registration() :: User.changeset()
   @spec change_user_registration(attrs :: map()) :: User.changeset()
-  def change_user_registration(attrs \\ %{}) do
+  def change_user_registration(attrs \\ %{}),
-    User.registration_changeset(attrs, nil, hash_password: false)
+    do: User.registration_changeset(attrs, hash_password: false)
-  end
 
   ## Settings
 
@@ -169,29 +144,24 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> with %Changeset{} <- change_user_email(%User{email: "foo@example.com"}), do: :passed
+      iex> change_user_email(user)
-      :passed
+      %Changeset{data: %User{}}
 
   """
-  @spec change_user_email(User.t()) :: User.changeset()
   @spec change_user_email(User.t(), attrs :: map()) :: User.changeset()
-  def change_user_email(user, attrs \\ %{}) do
+  def change_user_email(user, attrs \\ %{}), do: User.email_changeset(user, attrs)
-    User.email_changeset(user, attrs)
-  end
 
   @doc """
   Returns an `%Changeset{}` for changing the user role.
 
   ## Examples
 
-      iex> with %Changeset{} <- change_user_role(%User{}, :user), do: :passed
+      iex> change_user_role(user)
-      :passed
+      %Changeset{data: %User{}}
 
   """
   @spec change_user_role(User.t(), User.role()) :: User.changeset()
-  def change_user_role(user, role) do
+  def change_user_role(user, role), do: User.role_changeset(user, role)
-    User.role_changeset(user, role)
-  end
 
   @doc """
   Emulates that the email will change without actually changing
@@ -199,20 +169,14 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> apply_user_email(user, "valid password", %{email: ...})
-      iex> with {:ok, %User{}} <-
+      {:ok, %User{}}
-      ...>        apply_user_email(user, "valid_password", %{email: "new_email@account.com"}),
-      ...>      do: :passed
-      :passed
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> apply_user_email(user, "invalid password", %{email: ...})
-      iex> with {:error, %Changeset{}} <-
+      {:error, %Changeset{}}
-      ...>        apply_user_email(user, "invalid password", %{email: "new_email@account"}),
-      ...>      do: :passed
-      :passed
 
   """
-  @spec apply_user_email(User.t(), email :: String.t(), attrs :: map()) ::
+  @spec apply_user_email(User.t(), password :: String.t(), attrs :: map()) ::
           {:ok, User.t()} | {:error, User.changeset()}
   def apply_user_email(user, password, attrs) do
     user
@@ -236,7 +200,7 @@ defmodule Memex.Accounts do
          {:ok, _} <- Repo.transaction(user_email_multi(user, email, context)) do
       :ok
     else
-      _error_tuple -> :error
+      _ -> :error
     end
   end
 
@@ -254,12 +218,8 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> {:ok, %{id: user_id} = user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> deliver_update_email_instructions(user, current_email, &Routes.user_update_email_url(conn, :edit, &1))
-      iex> with %Oban.Job{
+      {:ok, %{to: ..., body: ...}}
-      ...>        args: %{email: :update_email, user_id: ^user_id, attrs: %{url: "example url"}}
-      ...>      } <- deliver_update_email_instructions(user, "new_foo@example.com", fn _token -> "example url" end),
-      ...>      do: :passed
-      :passed
 
   """
   @spec deliver_update_email_instructions(User.t(), current_email :: String.t(), function) ::
@@ -276,37 +236,27 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> with %Changeset{} <- change_user_password(%User{}), do: :passed
+      iex> change_user_password(user)
-      :passed
+      %Changeset{data: %User{}}
 
   """
   @spec change_user_password(User.t(), attrs :: map()) :: User.changeset()
-  def change_user_password(user, attrs \\ %{}) do
+  def change_user_password(user, attrs \\ %{}),
-    User.password_changeset(user, attrs, hash_password: false)
+    do: User.password_changeset(user, attrs, hash_password: false)
-  end
 
   @doc """
   Updates the user password.
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> update_user_password(user, "valid password", %{password: ...})
-      iex> with {:ok, %User{}} <-
+      {:ok, %User{}}
-      ...>         reset_user_password(user, %{
-      ...>           password: "new password",
-      ...>           password_confirmation: "new password"
-      ...>         }),
-      ...>      do: :passed
-      :passed
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> update_user_password(user, "invalid password", %{password: ...})
-      iex> with {:error, %Changeset{}} <-
+      {:error, %Changeset{}}
-      ...>        update_user_password(user, "invalid password", %{password: "123"}),
-      ...>      do: :passed
-      :passed
 
   """
-  @spec update_user_password(User.t(), String.t(), attrs :: map()) ::
+  @spec update_user_password(User.t(), password :: String.t(), attrs :: map()) ::
           {:ok, User.t()} | {:error, User.changeset()}
   def update_user_password(user, password, attrs) do
     changeset =
@@ -320,62 +270,54 @@ defmodule Memex.Accounts do
     |> Repo.transaction()
     |> case do
       {:ok, %{user: user}} -> {:ok, user}
-      {:error, :user, changeset, _changes_so_far} -> {:error, changeset}
+      {:error, :user, changeset, _} -> {:error, changeset}
     end
   end
 
   @doc """
-  Returns an `Ecto.Changeset.t()` for changing the user locale.
+  Returns an `%Changeset{}` for changing the user locale.
 
   ## Examples
 
-      iex> with %Changeset{} <- change_user_locale(%User{}), do: :passed
+      iex> change_user_locale(user)
-      :passed
+      %Changeset{data: %User{}}
 
   """
   @spec change_user_locale(User.t()) :: User.changeset()
-  def change_user_locale(%{locale: locale} = user) do
+  def change_user_locale(%{locale: locale} = user), do: User.locale_changeset(user, locale)
-    User.locale_changeset(user, locale)
-  end
 
   @doc """
   Updates the user locale.
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> update_user_locale(user, "valid locale")
-      iex> with {:ok, %User{}} <- update_user_locale(user, "en_US"), do: :passed
+      {:ok, %User{}}
-      :passed
+
+      iex> update_user_password(user, "invalid locale")
+      {:error, %Changeset{}}
 
   """
   @spec update_user_locale(User.t(), locale :: String.t()) ::
           {:ok, User.t()} | {:error, User.changeset()}
-  def update_user_locale(user, locale) do
+  def update_user_locale(user, locale),
-    user |> User.locale_changeset(locale) |> Repo.update()
+    do: user |> User.locale_changeset(locale) |> Repo.update()
-  end
 
   @doc """
   Deletes a user. must be performed by an admin or the same user!
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> delete_user!(user_to_delete, %User{id: 123, role: :admin})
-      iex> with %User{} <- delete_user!(user, %User{id: 123, role: :admin}), do: :passed
+      %User{}
-      :passed
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> delete_user!(%User{id: 123}, %User{id: 123})
-      iex> with %User{} <- delete_user!(user, user), do: :passed
+      %User{}
-      :passed
 
   """
   @spec delete_user!(user_to_delete :: User.t(), User.t()) :: User.t()
-  def delete_user!(user, %User{role: :admin}) do
+  def delete_user!(user, %User{role: :admin}), do: user |> Repo.delete!()
-    user |> Repo.delete!()
+  def delete_user!(%User{id: user_id} = user, %User{id: user_id}), do: user |> Repo.delete!()
-  end
-
-  def delete_user!(%User{id: user_id} = user, %User{id: user_id}) do
-    user |> Repo.delete!()
-  end
 
   ## Session
 
@@ -403,7 +345,7 @@ defmodule Memex.Accounts do
   """
   @spec delete_session_token(token :: String.t()) :: :ok
   def delete_session_token(token) do
-    UserToken.token_and_context_query(token, "session") |> Repo.delete_all()
+    Repo.delete_all(UserToken.token_and_context_query(token, "session"))
     :ok
   end
 
@@ -412,40 +354,20 @@ defmodule Memex.Accounts do
   """
   @spec allow_registration?() :: boolean()
   def allow_registration? do
-    Application.get_env(:memex, Memex.Accounts)[:registration] == "public" or
+    Application.get_env(:memex, MemexWeb.Endpoint)[:registration] == "public" or
       list_users_by_role(:admin) |> Enum.empty?()
   end
 
   @doc """
   Checks if user is an admin
-
-  ## Examples
-
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> is_admin?(user)
-      true
-
-      iex> is_admin?(%User{id: Ecto.UUID.generate()})
-      false
-
   """
   @spec is_admin?(User.t()) :: boolean()
   def is_admin?(%User{id: user_id}) do
-    Repo.exists?(from u in User, where: u.id == ^user_id, where: u.role == :admin)
+    Repo.exists?(from u in User, where: u.id == ^user_id and u.role == :admin)
   end
 
   @doc """
   Checks to see if user has the admin role
-
-  ## Examples
-
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> is_already_admin?(user)
-      true
-
-      iex> is_already_admin?(%User{})
-      false
-
   """
   @spec is_already_admin?(User.t() | nil) :: boolean()
   def is_already_admin?(%User{role: :admin}), do: true
@@ -458,16 +380,10 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> {:ok, %{id: user_id} = user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> deliver_user_confirmation_instructions(user, &Routes.user_confirmation_url(conn, :confirm, &1))
-      iex> with %Oban.Job{
+      {:ok, %{to: ..., body: ...}}
-      ...>   args: %{email: :welcome, user_id: ^user_id, attrs: %{url: "example url"}}
-      ...> } <- deliver_user_confirmation_instructions(user, fn _token -> "example url" end),
-      ...> do: :passed
-      :passed
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> deliver_user_confirmation_instructions(confirmed_user, &Routes.user_confirmation_url(conn, :confirm, &1))
-      iex> user = user |> User.confirm_changeset() |> Repo.update!()
-      iex> deliver_user_confirmation_instructions(user, fn _token -> "example url" end)
       {:error, :already_confirmed}
 
   """
@@ -489,14 +405,14 @@ defmodule Memex.Accounts do
   If the token matches, the user account is marked as confirmed
   and the token is deleted.
   """
-  @spec confirm_user(token :: String.t()) :: {:ok, User.t()} | :error
+  @spec confirm_user(token :: String.t()) :: {:ok, User.t()} | atom()
   def confirm_user(token) do
     with {:ok, query} <- UserToken.verify_email_token_query(token, "confirm"),
          %User{} = user <- Repo.one(query),
          {:ok, %{user: user}} <- Repo.transaction(confirm_user_multi(user)) do
       {:ok, user}
     else
-      _error_tuple -> :error
+      _ -> :error
     end
   end
 
@@ -514,12 +430,8 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> {:ok, %{id: user_id} = user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> deliver_user_reset_password_instructions(user, &Routes.user_reset_password_url(conn, :edit, &1))
-      iex> with %Oban.Job{args: %{
+      {:ok, %{to: ..., body: ...}}
-      ...>        email: :reset_password, user_id: ^user_id, attrs: %{url: "example url"}}
-      ...>    } <- deliver_user_reset_password_instructions(user, fn _token -> "example url" end),
-      ...>    do: :passed
-      :passed
 
   """
   @spec deliver_user_reset_password_instructions(User.t(), function()) :: Job.t()
@@ -535,11 +447,8 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> get_user_by_reset_password_token("validtoken")
-      iex> {encoded_token, user_token} = UserToken.build_email_token(user, "reset_password")
+      %User{}
-      iex> Repo.insert!(user_token)
-      iex> with %User{} <- get_user_by_reset_password_token(encoded_token), do: :passed
-      :passed
 
       iex> get_user_by_reset_password_token("invalidtoken")
       nil
@@ -551,7 +460,7 @@ defmodule Memex.Accounts do
          %User{} = user <- Repo.one(query) do
       user
     else
-      _error_tuple -> nil
+      _ -> nil
     end
   end
 
@@ -560,20 +469,11 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> reset_user_password(user, %{password: "new long password", password_confirmation: "new long password"})
-      iex> with {:ok, %User{}} <-
+      {:ok, %User{}}
-      ...>         reset_user_password(user, %{
-      ...>           password: "new password",
-      ...>           password_confirmation: "new password"
-      ...>         }),
-      ...>      do: :passed
-      :passed
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
+      iex> reset_user_password(user, %{password: "valid", password_confirmation: "not the same"})
-      iex> with {:error, %Changeset{}} <-
+      {:error, %Changeset{}}
-      ...>        reset_user_password(user, %{password: "valid", password_confirmation: "not the same"}),
-      ...>      do: :passed
-      :passed
 
   """
   @spec reset_user_password(User.t(), attrs :: map()) ::
@@ -585,7 +485,7 @@ defmodule Memex.Accounts do
     |> Repo.transaction()
     |> case do
       {:ok, %{user: user}} -> {:ok, user}
-      {:error, :user, changeset, _changes_so_far} -> {:error, changeset}
+      {:error, :user, changeset, _} -> {:error, changeset}
     end
   end
 end

lib/memex/accounts/invites.ex

@@ -1,198 +0,0 @@
-defmodule Memex.Accounts.Invites do
-  @moduledoc """
-  The Invites context.
-  """
-
-  import Ecto.Query, warn: false
-  alias Ecto.Multi
-  alias Memex.Accounts.{Invite, User}
-  alias Memex.Repo
-
-  @invite_token_length 20
-
-  @doc """
-  Returns the list of invites.
-
-  ## Examples
-
-      iex> list_invites(%User{id: 123, role: :admin})
-      [%Invite{}, ...]
-
-  """
-  @spec list_invites(User.t()) :: [Invite.t()]
-  def list_invites(%User{role: :admin}) do
-    Repo.all(from i in Invite, order_by: i.name)
-  end
-
-  @doc """
-  Gets a single invite for a user
-
-  Raises `Ecto.NoResultsError` if the Invite does not exist.
-
-  ## Examples
-
-      iex> get_invite!(123, %User{id: 123, role: :admin})
-      %Invite{}
-
-      > get_invite!(456, %User{id: 123, role: :admin})
-      ** (Ecto.NoResultsError)
-
-  """
-  @spec get_invite!(Invite.id(), User.t()) :: Invite.t()
-  def get_invite!(id, %User{role: :admin}) do
-    Repo.get!(Invite, id)
-  end
-
-  @doc """
-  Returns if an invite token is still valid
-
-  ## Examples
-
-      iex> valid_invite_token?("valid_token")
-      %Invite{}
-
-      iex> valid_invite_token?("invalid_token")
-      nil
-  """
-  @spec valid_invite_token?(Invite.token() | nil) :: boolean()
-  def valid_invite_token?(token) when token in [nil, ""], do: false
-
-  def valid_invite_token?(token) do
-    Repo.exists?(
-      from i in Invite,
-        where: i.token == ^token,
-        where: i.disabled_at |> is_nil()
-    )
-  end
-
-  @doc """
-  Uses invite by decrementing uses_left, or marks invite invalid if it's been
-  completely used.
-  """
-  @spec use_invite(Invite.token()) :: {:ok, Invite.t()} | {:error, :invalid_token}
-  def use_invite(invite_token) do
-    Multi.new()
-    |> Multi.run(:invite, fn _changes_so_far, _repo ->
-      invite_token |> get_invite_by_token()
-    end)
-    |> Multi.update(:decrement_invite, fn %{invite: invite} ->
-      decrement_invite_changeset(invite)
-    end)
-    |> Repo.transaction()
-    |> case do
-      {:ok, %{decrement_invite: invite}} -> {:ok, invite}
-      {:error, :invite, :invalid_token, _changes_so_far} -> {:error, :invalid_token}
-    end
-  end
-
-  @spec get_invite_by_token(Invite.token() | nil) :: {:ok, Invite.t()} | {:error, :invalid_token}
-  defp get_invite_by_token(token) when token in [nil, ""], do: {:error, :invalid_token}
-
-  defp get_invite_by_token(token) do
-    Repo.one(
-      from i in Invite,
-        where: i.token == ^token,
-        where: i.disabled_at |> is_nil()
-    )
-    |> case do
-      nil -> {:error, :invalid_token}
-      invite -> {:ok, invite}
-    end
-  end
-
-  @spec get_use_count(Invite.t(), User.t()) :: non_neg_integer()
-  def get_use_count(%Invite{id: invite_id}, %User{role: :admin}) do
-    Repo.one(
-      from u in User,
-        where: u.invite_id == ^invite_id,
-        select: count(u.id)
-    )
-  end
-
-  @spec decrement_invite_changeset(Invite.t()) :: Invite.changeset()
-  defp decrement_invite_changeset(%Invite{uses_left: nil} = invite) do
-    invite |> Invite.update_changeset(%{})
-  end
-
-  defp decrement_invite_changeset(%Invite{uses_left: 1} = invite) do
-    now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
-    invite |> Invite.update_changeset(%{uses_left: 0, disabled_at: now})
-  end
-
-  defp decrement_invite_changeset(%Invite{uses_left: uses_left} = invite) do
-    invite |> Invite.update_changeset(%{uses_left: uses_left - 1})
-  end
-
-  @doc """
-  Creates a invite.
-
-  ## Examples
-
-      iex> create_invite(%User{id: 123, role: :admin}, %{field: value})
-      {:ok, %Invite{}}
-
-      iex> create_invite(%User{id: 123, role: :admin}, %{field: bad_value})
-      {:error, %Changeset{}}
-
-  """
-  @spec create_invite(User.t(), attrs :: map()) ::
-          {:ok, Invite.t()} | {:error, Invite.changeset()}
-  def create_invite(%User{role: :admin} = user, attrs) do
-    token =
-      :crypto.strong_rand_bytes(@invite_token_length)
-      |> Base.url_encode64()
-      |> binary_part(0, @invite_token_length)
-
-    Invite.create_changeset(user, token, attrs) |> Repo.insert()
-  end
-
-  @doc """
-  Updates a invite.
-
-  ## Examples
-
-      iex> update_invite(invite, %{field: new_value}, %User{id: 123, role: :admin})
-      {:ok, %Invite{}}
-
-      iex> update_invite(invite, %{field: bad_value}, %User{id: 123, role: :admin})
-      {:error, %Changeset{}}
-
-  """
-  @spec update_invite(Invite.t(), attrs :: map(), User.t()) ::
-          {:ok, Invite.t()} | {:error, Invite.changeset()}
-  def update_invite(invite, attrs, %User{role: :admin}) do
-    invite |> Invite.update_changeset(attrs) |> Repo.update()
-  end
-
-  @doc """
-  Deletes a invite.
-
-  ## Examples
-
-      iex> delete_invite(invite, %User{id: 123, role: :admin})
-      {:ok, %Invite{}}
-
-      iex> delete_invite(invite, %User{id: 123, role: :admin})
-      {:error, %Changeset{}}
-
-  """
-  @spec delete_invite(Invite.t(), User.t()) ::
-          {:ok, Invite.t()} | {:error, Invite.changeset()}
-  def delete_invite(invite, %User{role: :admin}) do
-    invite |> Repo.delete()
-  end
-
-  @doc """
-  Deletes a invite.
-
-  ## Examples
-
-      iex> delete_invite(invite, %User{id: 123, role: :admin})
-      %Invite{}
-
-  """
-  @spec delete_invite!(Invite.t(), User.t()) :: Invite.t()
-  def delete_invite!(invite, %User{role: :admin}) do
-    invite |> Repo.delete!()
-  end
-end

lib/memex/accounts/user.ex

@@ -6,8 +6,8 @@ defmodule Memex.Accounts.User do
   use Ecto.Schema
   import Ecto.Changeset
   import MemexWeb.Gettext
-  alias Ecto.{Association, Changeset, UUID}
+  alias Ecto.{Changeset, UUID}
-  alias Memex.Accounts.{Invite, User}
+  alias Memex.Invites.Invite
 
   @derive {Jason.Encoder,
            only: [
@@ -30,31 +30,27 @@ defmodule Memex.Accounts.User do
     field :role, Ecto.Enum, values: [:admin, :user], default: :user
     field :locale, :string
 
-    has_many :created_invites, Invite, foreign_key: :created_by_id
+    has_many :invites, Invite, on_delete: :delete_all
-
-    belongs_to :invite, Invite
 
     timestamps()
   end
 
-  @type t :: %User{
+  @type t :: %__MODULE__{
           id: id(),
           email: String.t(),
           password: String.t(),
           hashed_password: String.t(),
           confirmed_at: NaiveDateTime.t(),
           role: role(),
+          invites: [Invite.t()],
           locale: String.t() | nil,
-          created_invites: [Invite.t()] | Association.NotLoaded.t(),
-          invite: Invite.t() | nil | Association.NotLoaded.t(),
-          invite_id: Invite.id() | nil,
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
         }
-  @type new_user :: %User{}
+  @type new_user :: %__MODULE__{}
   @type id :: UUID.t()
   @type changeset :: Changeset.t(t() | new_user())
-  @type role :: :admin | :user
+  @type role :: :user | :admin | String.t()
 
   @doc """
   A user changeset for registration.
@@ -73,22 +69,22 @@ defmodule Memex.Accounts.User do
       validations on a LiveView form), this option can be set to `false`.
       Defaults to `true`.
   """
-  @spec registration_changeset(attrs :: map(), Invite.t() | nil) :: changeset()
+  @spec registration_changeset(attrs :: map()) :: changeset()
-  @spec registration_changeset(attrs :: map(), Invite.t() | nil, opts :: keyword()) :: changeset()
+  @spec registration_changeset(attrs :: map(), opts :: keyword()) :: changeset()
-  def registration_changeset(attrs, invite, opts \\ []) do
+  def registration_changeset(attrs, opts \\ []) do
-    %User{}
+    %__MODULE__{}
     |> cast(attrs, [:email, :password, :locale])
-    |> put_change(:invite_id, if(invite, do: invite.id))
     |> validate_email()
     |> validate_password(opts)
   end
 
   @doc """
   A user changeset for role.
+
   """
   @spec role_changeset(t() | new_user() | changeset(), role()) :: changeset()
   def role_changeset(user, role) do
-    user |> change(role: role)
+    user |> cast(%{"role" => role}, [:role])
   end
 
   @spec validate_email(changeset()) :: changeset()
@@ -103,8 +99,7 @@ defmodule Memex.Accounts.User do
     |> unique_constraint(:email)
   end
 
-  @spec validate_password(changeset(), opts :: keyword()) ::
+  @spec validate_password(changeset(), opts :: keyword()) :: changeset()
-          changeset()
   defp validate_password(changeset, opts) do
     changeset
     |> validate_required([:password])
@@ -182,12 +177,12 @@ defmodule Memex.Accounts.User do
   `Bcrypt.no_user_verify/0` to avoid timing attacks.
   """
   @spec valid_password?(t(), String.t()) :: boolean()
-  def valid_password?(%User{hashed_password: hashed_password}, password)
+  def valid_password?(%__MODULE__{hashed_password: hashed_password}, password)
       when is_binary(hashed_password) and byte_size(password) > 0 do
     Bcrypt.verify_pass(password, hashed_password)
   end
 
-  def valid_password?(_invalid_user, _invalid_password) do
+  def valid_password?(_, _) do
     Bcrypt.no_user_verify()
     false
   end

lib/memex/accounts/user_token.ex

@@ -5,8 +5,6 @@ defmodule Memex.Accounts.UserToken do
 
   use Ecto.Schema
   import Ecto.Query
-  alias Ecto.{Association, UUID}
-  alias Memex.Accounts.User
 
   @hash_algorithm :sha256
   @rand_size 32
@@ -24,25 +22,11 @@ defmodule Memex.Accounts.UserToken do
     field :token, :binary
     field :context, :string
     field :sent_to, :string
-
+    belongs_to :user, Memex.Accounts.User
-    belongs_to :user, User
 
     timestamps(updated_at: false)
   end
 
-  @type t :: %__MODULE__{
-          id: id(),
-          token: token(),
-          context: String.t(),
-          sent_to: String.t(),
-          user: User.t() | Association.NotLoaded.t(),
-          user_id: User.id() | nil,
-          inserted_at: NaiveDateTime.t()
-        }
-  @type new_user_token :: %__MODULE__{}
-  @type id :: UUID.t()
-  @type token :: binary()
-
   @doc """
   Generates a token that will be stored in a signed place,
   such as session or cookie. As they are signed, those
@@ -50,7 +34,7 @@ defmodule Memex.Accounts.UserToken do
   """
   def build_session_token(user) do
     token = :crypto.strong_rand_bytes(@rand_size)
-    {token, %__MODULE__{token: token, context: "session", user_id: user.id}}
+    {token, %Memex.Accounts.UserToken{token: token, context: "session", user_id: user.id}}
   end
 
   @doc """
@@ -85,7 +69,7 @@ defmodule Memex.Accounts.UserToken do
     hashed_token = :crypto.hash(@hash_algorithm, token)
 
     {Base.url_encode64(token, padding: false),
-     %__MODULE__{
+     %Memex.Accounts.UserToken{
        token: hashed_token,
        context: context,
        sent_to: sent_to,
@@ -145,17 +129,17 @@ defmodule Memex.Accounts.UserToken do
   Returns the given token with the given context.
   """
   def token_and_context_query(token, context) do
-    from __MODULE__, where: [token: ^token, context: ^context]
+    from Memex.Accounts.UserToken, where: [token: ^token, context: ^context]
   end
 
   @doc """
   Gets all tokens for the given user for the given contexts.
   """
   def user_and_contexts_query(user, :all) do
-    from t in __MODULE__, where: t.user_id == ^user.id
+    from t in Memex.Accounts.UserToken, where: t.user_id == ^user.id
   end
 
   def user_and_contexts_query(user, [_ | _] = contexts) do
-    from t in __MODULE__, where: t.user_id == ^user.id and t.context in ^contexts
+    from t in Memex.Accounts.UserToken, where: t.user_id == ^user.id and t.context in ^contexts
   end
 end

lib/memex/application.ex

@@ -4,7 +4,6 @@ defmodule Memex.Application do
   @moduledoc false
 
   use Application
-  alias Memex.ErrorReporter
 
   @impl true
   def start(_type, _args) do
@@ -18,24 +17,16 @@ defmodule Memex.Application do
       # Start the Endpoint (http/https)
       MemexWeb.Endpoint,
       # Add Oban
-      {Oban, oban_config()},
+      {Oban, oban_config()}
-      Memex.Repo.Migrator
       # Start a worker by calling: Memex.Worker.start_link(arg)
       # {Memex.Worker, arg}
     ]
 
-    # Oban events logging https://hexdocs.pm/oban/Oban.html#module-reporting-errors
+    # Automatically migrate on start in prod
-    :ok =
+    children =
-      :telemetry.attach_many(
+      if Application.get_env(:memex, Memex.Application, automigrate: false)[:automigrate],
-        "oban-logger",
+        do: children ++ [Memex.Repo.Migrator],
-        [
+        else: children
-          [:oban, :job, :exception],
-          [:oban, :job, :start],
-          [:oban, :job, :stop]
-        ],
-        &ErrorReporter.handle_event/4,
-        []
-      )
 
     # See https://hexdocs.pm/elixir/Supervisor.html
     # for other strategies and supported options

lib/memex/error_reporter.ex

@@ -1,57 +0,0 @@
-defmodule Memex.ErrorReporter do
-  @moduledoc """
-  Custom logger for telemetry events
-
-  Oban implementation taken from
-  https://hexdocs.pm/oban/Oban.html#module-reporting-errors
-  """
-
-  require Logger
-
-  def handle_event([:oban, :job, :exception], measure, %{stacktrace: stacktrace} = meta, _config) do
-    data =
-      get_oban_job_data(meta, measure)
-      |> Map.put(:stacktrace, Exception.format_stacktrace(stacktrace))
-
-    Logger.error(meta.reason, data: pretty_encode(data))
-  end
-
-  def handle_event([:oban, :job, :start], measure, meta, _config) do
-    Logger.info("Started oban job", data: get_oban_job_data(meta, measure) |> pretty_encode())
-  end
-
-  def handle_event([:oban, :job, :stop], measure, meta, _config) do
-    Logger.info("Finished oban job", data: get_oban_job_data(meta, measure) |> pretty_encode())
-  end
-
-  def handle_event([:oban, :job, unhandled_event], measure, meta, _config) do
-    data =
-      get_oban_job_data(meta, measure)
-      |> Map.put(:event, unhandled_event)
-
-    Logger.warning("Unhandled oban job event", data: pretty_encode(data))
-  end
-
-  def handle_event(unhandled_event, measure, meta, config) do
-    data = %{
-      event: unhandled_event,
-      meta: meta,
-      measurements: measure,
-      config: config
-    }
-
-    Logger.warning("Unhandled telemetry event", data: pretty_encode(data))
-  end
-
-  defp get_oban_job_data(%{job: job}, measure) do
-    job
-    |> Map.take([:id, :args, :meta, :queue, :worker])
-    |> Map.merge(measure)
-  end
-
-  defp pretty_encode(data) do
-    data
-    |> Jason.encode!()
-    |> Jason.Formatter.pretty_print()
-  end
-end

lib/memex/invites.ex

@@ -0,0 +1,173 @@
+defmodule Memex.Invites do
+  @moduledoc """
+  The Invites context.
+  """
+
+  import Ecto.Query, warn: false
+  alias Ecto.Changeset
+  alias Memex.{Accounts.User, Invites.Invite, Repo}
+
+  @invite_token_length 20
+
+  @doc """
+  Returns the list of invites.
+
+  ## Examples
+
+      iex> list_invites(%User{id: 123, role: :admin})
+      [%Invite{}, ...]
+
+  """
+  @spec list_invites(User.t()) :: [Invite.t()]
+  def list_invites(%User{role: :admin}) do
+    Repo.all(from i in Invite, order_by: i.name)
+  end
+
+  @doc """
+  Gets a single invite.
+
+  Raises `Ecto.NoResultsError` if the Invite does not exist.
+
+  ## Examples
+
+      iex> get_invite!(123, %User{id: 123, role: :admin})
+      %Invite{}
+
+      iex> get_invite!(456, %User{id: 123, role: :admin})
+      ** (Ecto.NoResultsError)
+
+  """
+  @spec get_invite!(Invite.id(), User.t()) :: Invite.t()
+  def get_invite!(id, %User{role: :admin}) do
+    Repo.get!(Invite, id)
+  end
+
+  @doc """
+  Returns a valid invite or nil based on the attempted token
+
+  ## Examples
+
+      iex> get_invite_by_token("valid_token")
+      %Invite{}
+
+      iex> get_invite_by_token("invalid_token")
+      nil
+  """
+  @spec get_invite_by_token(token :: String.t() | nil) :: Invite.t() | nil
+  def get_invite_by_token(nil), do: nil
+  def get_invite_by_token(""), do: nil
+
+  def get_invite_by_token(token) do
+    Repo.one(
+      from(i in Invite,
+        where: i.token == ^token and i.disabled_at |> is_nil()
+      )
+    )
+  end
+
+  @doc """
+  Uses invite by decrementing uses_left, or marks invite invalid if it's been
+  completely used.
+  """
+  @spec use_invite!(Invite.t()) :: Invite.t()
+  def use_invite!(%Invite{uses_left: nil} = invite), do: invite
+
+  def use_invite!(%Invite{uses_left: uses_left} = invite) do
+    new_uses_left = uses_left - 1
+
+    attrs =
+      if new_uses_left <= 0 do
+        now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
+        %{"uses_left" => 0, "disabled_at" => now}
+      else
+        %{"uses_left" => new_uses_left}
+      end
+
+    invite |> Invite.update_changeset(attrs) |> Repo.update!()
+  end
+
+  @doc """
+  Creates a invite.
+
+  ## Examples
+
+      iex> create_invite(%User{id: 123, role: :admin}, %{field: value})
+      {:ok, %Invite{}}
+
+      iex> create_invite(%User{id: 123, role: :admin}, %{field: bad_value})
+      {:error, %Changeset{}}
+
+  """
+  @spec create_invite(User.t(), attrs :: map()) ::
+          {:ok, Invite.t()} | {:error, Changeset.t(Invite.new_invite())}
+  def create_invite(%User{id: user_id, role: :admin}, attrs) do
+    token =
+      :crypto.strong_rand_bytes(@invite_token_length)
+      |> Base.url_encode64()
+      |> binary_part(0, @invite_token_length)
+
+    attrs = attrs |> Map.merge(%{"user_id" => user_id, "token" => token})
+
+    %Invite{} |> Invite.create_changeset(attrs) |> Repo.insert()
+  end
+
+  @doc """
+  Updates a invite.
+
+  ## Examples
+
+      iex> update_invite(invite, %{field: new_value}, %User{id: 123, role: :admin})
+      {:ok, %Invite{}}
+
+      iex> update_invite(invite, %{field: bad_value}, %User{id: 123, role: :admin})
+      {:error, %Changeset{}}
+
+  """
+  @spec update_invite(Invite.t(), attrs :: map(), User.t()) ::
+          {:ok, Invite.t()} | {:error, Changeset.t(Invite.t())}
+  def update_invite(invite, attrs, %User{role: :admin}),
+    do: invite |> Invite.update_changeset(attrs) |> Repo.update()
+
+  @doc """
+  Deletes a invite.
+
+  ## Examples
+
+      iex> delete_invite(invite, %User{id: 123, role: :admin})
+      {:ok, %Invite{}}
+
+      iex> delete_invite(invite, %User{id: 123, role: :admin})
+      {:error, %Changeset{}}
+
+  """
+  @spec delete_invite(Invite.t(), User.t()) ::
+          {:ok, Invite.t()} | {:error, Changeset.t(Invite.t())}
+  def delete_invite(invite, %User{role: :admin}), do: invite |> Repo.delete()
+
+  @doc """
+  Deletes a invite.
+
+  ## Examples
+
+      iex> delete_invite(invite, %User{id: 123, role: :admin})
+      %Invite{}
+
+  """
+  @spec delete_invite!(Invite.t(), User.t()) :: Invite.t()
+  def delete_invite!(invite, %User{role: :admin}), do: invite |> Repo.delete!()
+
+  @doc """
+  Returns an `%Changeset{}` for tracking invite changes.
+
+  ## Examples
+
+      iex> change_invite(invite)
+      %Changeset{data: %Invite{}}
+
+  """
+  @spec change_invite(Invite.t() | Invite.new_invite()) ::
+          Changeset.t(Invite.t() | Invite.new_invite())
+  @spec change_invite(Invite.t() | Invite.new_invite(), attrs :: map()) ::
+          Changeset.t(Invite.t() | Invite.new_invite())
+  def change_invite(invite, attrs \\ %{}), do: invite |> Invite.update_changeset(attrs)
+end

lib/memex/invites/invite.ex

@@ -1,4 +1,4 @@
-defmodule Memex.Accounts.Invite do
+defmodule Memex.Invites.Invite do
   @moduledoc """
   An invite, created by an admin to allow someone to join their instance. An
   invite can be enabled or disabled, and can have an optional number of uses if
@@ -7,8 +7,8 @@ defmodule Memex.Accounts.Invite do
 
   use Ecto.Schema
   import Ecto.Changeset
-  alias Ecto.{Association, Changeset, UUID}
+  alias Ecto.{Changeset, UUID}
-  alias Memex.Accounts.User
+  alias Memex.{Accounts.User, Invites.Invite}
 
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
@@ -18,46 +18,40 @@ defmodule Memex.Accounts.Invite do
     field :uses_left, :integer, default: nil
     field :disabled_at, :naive_datetime
 
-    belongs_to :created_by, User
+    belongs_to :user, User
-
-    has_many :users, User
 
     timestamps()
   end
 
-  @type t :: %__MODULE__{
+  @type t :: %Invite{
           id: id(),
           name: String.t(),
-          token: token(),
+          token: String.t(),
           uses_left: integer() | nil,
           disabled_at: NaiveDateTime.t(),
-          created_by: User.t() | nil | Association.NotLoaded.t(),
+          user: User.t(),
-          created_by_id: User.id() | nil,
+          user_id: User.id(),
-          users: [User.t()] | Association.NotLoaded.t(),
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
         }
-  @type new_invite :: %__MODULE__{}
+  @type new_invite :: %Invite{}
   @type id :: UUID.t()
-  @type changeset :: Changeset.t(t() | new_invite())
-  @type token :: String.t()
 
   @doc false
-  @spec create_changeset(User.t(), token(), attrs :: map()) :: changeset()
+  @spec create_changeset(new_invite(), attrs :: map()) :: Changeset.t(new_invite())
-  def create_changeset(%User{id: user_id}, token, attrs) do
+  def create_changeset(invite, attrs) do
-    %__MODULE__{}
+    invite
-    |> change(token: token, created_by_id: user_id)
+    |> cast(attrs, [:name, :token, :uses_left, :disabled_at, :user_id])
-    |> cast(attrs, [:name, :uses_left, :disabled_at])
+    |> validate_required([:name, :token, :user_id])
-    |> validate_required([:name, :token, :created_by_id])
     |> validate_number(:uses_left, greater_than_or_equal_to: 0)
   end
 
   @doc false
-  @spec update_changeset(t() | new_invite(), attrs :: map()) :: changeset()
+  @spec update_changeset(t() | new_invite(), attrs :: map()) :: Changeset.t(t() | new_invite())
   def update_changeset(invite, attrs) do
     invite
     |> cast(attrs, [:name, :uses_left, :disabled_at])
-    |> validate_required([:name])
+    |> validate_required([:name, :token, :user_id])
     |> validate_number(:uses_left, greater_than_or_equal_to: 0)
   end
 end

lib/memex/release.ex

@@ -7,9 +7,7 @@ defmodule Memex.Release do
 
   def rollback(repo, version) do
     load_app()
-
+    {:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version))
-    {:ok, _fun_return, _apps} =
-      Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version))
   end
 
   defp load_app do
@@ -20,8 +18,7 @@ defmodule Memex.Release do
     load_app()
 
     for repo <- Application.fetch_env!(@app, :ecto_repos) do
-      {:ok, _fun_return, _apps} =
+      {:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :up, all: true))
-        Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :up, all: true))
     end
   end
 end

lib/memex/repo/migrator.ex

@@ -6,20 +6,17 @@ defmodule Memex.Repo.Migrator do
   use GenServer
   require Logger
 
-  def start_link(_opts) do
+  def start_link(_) do
     GenServer.start_link(__MODULE__, [], [])
   end
 
-  def init(_opts) do
+  def init(_) do
-    {:ok, if(automigrate_enabled?(), do: migrate!())}
+    migrate!()
+    {:ok, nil}
   end
 
   def migrate! do
-    path = Application.app_dir(:lokal, "priv/repo/migrations")
+    path = Application.app_dir(:memex, "priv/repo/migrations")
-    Ecto.Migrator.run(Lokal.Repo, path, :up, all: true)
+    Ecto.Migrator.run(Memex.Repo, path, :up, all: true)
-  end
-
-  defp automigrate_enabled? do
-    Application.get_env(:lokal, Lokal.Application, automigrate: false)[:automigrate]
   end
 end

lib/memex_web.ex

@@ -73,16 +73,15 @@ defmodule MemexWeb do
     quote do
       use Phoenix.Router
 
-      import Phoenix.{Controller, LiveView.Router}
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import Plug.Conn
+      import Phoenix.Controller
+      import Phoenix.LiveView.Router
     end
   end
 
   def channel do
     quote do
       use Phoenix.Channel
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import MemexWeb.Gettext
     end
   end
@@ -90,15 +89,16 @@ defmodule MemexWeb do
   defp view_helpers do
     quote do
       # Use all HTML functionality (forms, tags, etc)
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       use Phoenix.HTML
 
       # Import LiveView and .heex helpers (live_render, live_patch, <.form>, etc)
-      # Import basic rendering functionality (render, render_layout, etc)
+      import Phoenix.Component
-      import Phoenix.{Component, View}
+      import MemexWeb.LiveHelpers
-      import MemexWeb.{ErrorHelpers, Gettext, LiveHelpers, ViewHelpers}
 
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
+      # Import basic rendering functionality (render, render_layout, etc)
+      import Phoenix.View
+
+      import MemexWeb.{ErrorHelpers, Gettext, LiveHelpers, ViewHelpers}
       alias MemexWeb.Endpoint
       alias MemexWeb.Router.Helpers, as: Routes
     end

lib/memex_web/components/contexts_table_component.ex

@@ -109,13 +109,11 @@ defmodule MemexWeb.Components.ContextsTableComponent do
 
     ~H"""
     <div class="flex flex-wrap justify-center space-x-1">
-      <.link
+      <%= for tag <- @tags do %>
-        :for={tag <- @tags}
+        <.link patch={Routes.context_index_path(Endpoint, :search, tag)} class="link">
-        patch={Routes.context_index_path(Endpoint, :search, tag)}
-        class="link"
-      >
           <%= tag %>
         </.link>
+      <% end %>
     </div>
     """
   end

lib/memex_web/components/invite_card.ex

@@ -4,19 +4,9 @@ defmodule MemexWeb.Components.InviteCard do
   """
 
   use MemexWeb, :component
-  alias Memex.Accounts.{Invite, Invites, User}
-  alias MemexWeb.Endpoint
 
-  attr :invite, Invite, required: true
+  def invite_card(assigns) do
-  attr :current_user, User, required: true
+    assigns = assigns |> assign_new(:code_actions, fn -> [] end)
-  slot(:inner_block)
-  slot(:code_actions)
-
-  def invite_card(%{invite: invite, current_user: current_user} = assigns) do
-    assigns =
-      assigns
-      |> assign(:use_count, Invites.get_use_count(invite, current_user))
-      |> assign_new(:code_actions, fn -> [] end)
 
     ~H"""
     <div class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
@@ -30,8 +20,8 @@ defmodule MemexWeb.Components.InviteCard do
         <h2 class="title text-md">
           <%= if @invite.uses_left do %>
             <%= gettext(
-              "uses left: %{uses_left_count}",
+              "uses left: %{uses_left}",
-              uses_left_count: @invite.uses_left
+              uses_left: @invite.uses_left
             ) %>
           <% else %>
             <%= gettext("uses left: unlimited") %>
@@ -48,10 +38,6 @@ defmodule MemexWeb.Components.InviteCard do
         filename={@invite.name}
       />
 
-      <h2 :if={@use_count != 0} class="title text-md">
-        <%= gettext("uses: %{uses_count}", uses_count: @use_count) %>
-      </h2>
-
       <div class="flex flex-row flex-wrap justify-center items-center">
         <code
           id={"code-#{@invite.id}"}
@@ -61,9 +47,11 @@ defmodule MemexWeb.Components.InviteCard do
         <%= render_slot(@code_actions) %>
       </div>
 
-      <div :if={@inner_block} class="flex space-x-4 justify-center items-center">
+      <%= if @inner_block do %>
+        <div class="flex space-x-4 justify-center items-center">
           <%= render_slot(@inner_block) %>
         </div>
+      <% end %>
     </div>
     """
   end

lib/memex_web/components/notes_table_component.ex

@@ -109,9 +109,11 @@ defmodule MemexWeb.Components.NotesTableComponent do
 
     ~H"""
     <div class="flex flex-wrap justify-center space-x-1">
-      <.link :for={tag <- @tags} patch={Routes.note_index_path(Endpoint, :search, tag)} class="link">
+      <%= for tag <- @tags do %>
+        <.link patch={Routes.note_index_path(Endpoint, :search, tag)} class="link">
           <%= tag %>
         </.link>
+      <% end %>
     </div>
     """
   end

lib/memex_web/components/pipelines_table_component.ex

@@ -122,13 +122,11 @@ defmodule MemexWeb.Components.PipelinesTableComponent do
 
     ~H"""
     <div class="flex flex-wrap justify-center space-x-1">
-      <.link
+      <%= for tag <- @tags do %>
-        :for={tag <- @tags}
+        <.link patch={Routes.pipeline_index_path(Endpoint, :search, tag)} class="link">
-        patch={Routes.pipeline_index_path(Endpoint, :search, tag)}
-        class="link"
-      >
           <%= tag %>
         </.link>
+      <% end %>
     </div>
     """
   end

lib/memex_web/components/table_component.html.heex

@@ -33,11 +33,10 @@
       </tr>
     </thead>
     <tbody>
-      <tr
+      <%= for {values, i} <- @rows |> Enum.with_index() do %>
-        :for={{values, i} <- @rows |> Enum.with_index()}
+        <tr class={if i |> Integer.is_even(), do: @row_class, else: @alternate_row_class}>
-        class={if i |> Integer.is_even(), do: @row_class, else: @alternate_row_class}
+          <%= for %{key: key} = value <- @columns do %>
-      >
+            <td class={["p-2", value[:class]]}>
-        <td :for={%{key: key} = value <- @columns} class={["p-2", value[:class]]}>
               <%= case values |> Map.get(key) do %>
                 <% {_custom_sort_value, value} -> %>
                   <%= value %>
@@ -45,7 +44,9 @@
                   <%= value %>
               <% end %>
             </td>
+          <% end %>
         </tr>
+      <% end %>
     </tbody>
   </table>
 </div>

lib/memex_web/components/topbar.ex

@@ -65,7 +65,8 @@ defmodule MemexWeb.Components.Topbar do
           <li class="mx-2 my-1 border-left border border-primary-700">​</li>
 
           <%= if @current_user do %>
-            <li :if={@current_user |> Accounts.is_already_admin?()} class="mx-2 my-1">
+            <%= if @current_user |> Accounts.is_already_admin?() do %>
+              <li class="mx-2 my-1">
                 <.link
                   navigate={Routes.invite_index_path(Endpoint, :index)}
                   class="text-primary-400 text-primary-400 hover:underline"
@@ -73,6 +74,7 @@ defmodule MemexWeb.Components.Topbar do
                   <%= gettext("invites") %>
                 </.link>
               </li>
+            <% end %>
 
             <li class="mx-2 my-1">
               <.link
@@ -93,12 +95,8 @@ defmodule MemexWeb.Components.Topbar do
               </.link>
             </li>
 
-            <li
+            <%= if @current_user.role == :admin and function_exported?(Routes, :live_dashboard_path, 2) do %>
-              :if={
+              <li class="mx-2 my-1">
-                @current_user.role == :admin and function_exported?(Routes, :live_dashboard_path, 2)
-              }
-              class="mx-2 my-1"
-            >
                 <.link
                   navigate={Routes.live_dashboard_path(Endpoint, :home)}
                   class="text-primary-400 text-primary-400 hover:underline"
@@ -106,8 +104,10 @@ defmodule MemexWeb.Components.Topbar do
                   <i class="fas fa-gauge"></i>
                 </.link>
               </li>
+            <% end %>
           <% else %>
-            <li :if={Accounts.allow_registration?()} class="mx-2 my-1">
+            <%= if Accounts.allow_registration?() do %>
+              <li class="mx-2 my-1">
                 <.link
                   navigate={Routes.user_registration_path(Endpoint, :new)}
                   class="text-primary-400 text-primary-400 hover:underline truncate"
@@ -115,6 +115,7 @@ defmodule MemexWeb.Components.Topbar do
                   <%= dgettext("actions", "register") %>
                 </.link>
               </li>
+            <% end %>
 
             <li class="mx-2 my-1">
               <.link

lib/memex_web/components/user_card.ex

@@ -39,9 +39,11 @@ defmodule MemexWeb.Components.UserCard do
         </p>
       </h3>
 
-      <div :if={@inner_block} class="px-4 py-2 flex space-x-4 justify-center items-center">
+      <%= if @inner_block do %>
+        <div class="px-4 py-2 flex space-x-4 justify-center items-center">
           <%= render_slot(@inner_block) %>
         </div>
+      <% end %>
     </div>
     """
   end

lib/memex_web/controllers/user_registration_controller.ex

@@ -1,12 +1,14 @@
 defmodule MemexWeb.UserRegistrationController do
   use MemexWeb, :controller
   import MemexWeb.Gettext
-  alias Memex.{Accounts, Accounts.Invites}
+  alias Memex.{Accounts, Invites}
-  alias MemexWeb.{Endpoint, HomeLive}
+  alias MemexWeb.HomeLive
 
   def new(conn, %{"invite" => invite_token}) do
-    if Invites.valid_invite_token?(invite_token) do
+    invite = Invites.get_invite_by_token(invite_token)
-      conn |> render_new(invite_token)
+
+    if invite do
+      conn |> render_new(invite)
     else
       conn
       |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
@@ -25,17 +27,19 @@ defmodule MemexWeb.UserRegistrationController do
   end
 
   # renders new user registration page
-  defp render_new(conn, invite_token \\ nil) do
+  defp render_new(conn, invite \\ nil) do
     render(conn, "new.html",
       changeset: Accounts.change_user_registration(),
-      invite_token: invite_token,
+      invite: invite,
       page_title: gettext("register")
     )
   end
 
   def create(conn, %{"user" => %{"invite_token" => invite_token}} = attrs) do
-    if Invites.valid_invite_token?(invite_token) do
+    invite = Invites.get_invite_by_token(invite_token)
-      conn |> create_user(attrs, invite_token)
+
+    if invite do
+      conn |> create_user(attrs, invite)
     else
       conn
       |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
@@ -53,25 +57,24 @@ defmodule MemexWeb.UserRegistrationController do
     end
   end
 
-  defp create_user(conn, %{"user" => user_params}, invite_token \\ nil) do
+  defp create_user(conn, %{"user" => user_params}, invite \\ nil) do
-    case Accounts.register_user(user_params, invite_token) do
+    case Accounts.register_user(user_params) do
       {:ok, user} ->
+        unless invite |> is_nil() do
+          invite |> Invites.use_invite!()
+        end
+
         Accounts.deliver_user_confirmation_instructions(
           user,
           &Routes.user_confirmation_url(conn, :confirm, &1)
         )
 
         conn
-        |> put_flash(:info, dgettext("prompts", "please check your email to verify your account"))
+        |> put_flash(:info, dgettext("prompts", "Please check your email to verify your account"))
         |> redirect(to: Routes.user_session_path(Endpoint, :new))
 
-      {:error, :invalid_token} ->
-        conn
-        |> put_flash(:error, dgettext("errors", "sorry, this invite was not found or expired"))
-        |> redirect(to: Routes.live_path(Endpoint, HomeLive))
-
       {:error, %Ecto.Changeset{} = changeset} ->
-        conn |> render("new.html", changeset: changeset, invite_token: invite_token)
+        conn |> render("new.html", changeset: changeset, invite: invite)
     end
   end
 end

lib/memex_web/controllers/user_settings_controller.ex

@@ -7,7 +7,7 @@ defmodule MemexWeb.UserSettingsController do
   plug :assign_email_and_password_changesets
 
   def edit(conn, _params) do
-    render(conn, "edit.html", page_title: gettext("settings"))
+    render(conn, "edit.html", page_title: gettext("Settings"))
   end
 
   def update(%{assigns: %{current_user: user}} = conn, %{
@@ -28,7 +28,7 @@ defmodule MemexWeb.UserSettingsController do
           :info,
           dgettext(
             "prompts",
-            "a link to confirm your email change has been sent to the new address."
+            "A link to confirm your email change has been sent to the new address."
           )
         )
         |> redirect(to: Routes.user_settings_path(conn, :edit))
@@ -46,7 +46,7 @@ defmodule MemexWeb.UserSettingsController do
     case Accounts.update_user_password(user, password, user_params) do
       {:ok, user} ->
         conn
-        |> put_flash(:info, dgettext("prompts", "password updated successfully."))
+        |> put_flash(:info, dgettext("prompts", "Password updated successfully."))
         |> put_session(:user_return_to, Routes.user_settings_path(conn, :edit))
         |> UserAuth.log_in_user(user)
 
@@ -74,14 +74,14 @@ defmodule MemexWeb.UserSettingsController do
     case Accounts.update_user_email(user, token) do
       :ok ->
         conn
-        |> put_flash(:info, dgettext("prompts", "email changed successfully."))
+        |> put_flash(:info, dgettext("prompts", "Email changed successfully."))
         |> redirect(to: Routes.user_settings_path(conn, :edit))
 
       :error ->
         conn
         |> put_flash(
           :error,
-          dgettext("errors", "email change link is invalid or it has expired.")
+          dgettext("errors", "Email change link is invalid or it has expired.")
         )
         |> redirect(to: Routes.user_settings_path(conn, :edit))
     end
@@ -92,11 +92,11 @@ defmodule MemexWeb.UserSettingsController do
       current_user |> Accounts.delete_user!(current_user)
 
       conn
-      |> put_flash(:error, dgettext("prompts", "your account has been deleted"))
+      |> put_flash(:error, dgettext("prompts", "Your account has been deleted"))
       |> redirect(to: Routes.live_path(conn, HomeLive))
     else
       conn
-      |> put_flash(:error, dgettext("errors", "unable to delete user"))
+      |> put_flash(:error, dgettext("errors", "Unable to delete user"))
       |> redirect(to: Routes.user_settings_path(conn, :edit))
     end
   end

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

@@ -30,15 +30,16 @@
       contexts={@contexts}
     >
       <:actions :let={context}>
+        <%= if is_owner?(context, @current_user) do %>
           <.link
-          :if={is_owner?(context, @current_user)}
             patch={Routes.context_index_path(@socket, :edit, context.slug)}
             data-qa={"context-edit-#{context.id}"}
           >
             <%= dgettext("actions", "edit") %>
           </.link>
+        <% end %>
+        <%= if is_owner_or_admin?(context, @current_user) do %>
           <.link
-          :if={is_owner_or_admin?(context, @current_user)}
             href="#"
             phx-click="delete"
             phx-value-id={context.id}
@@ -47,20 +48,20 @@
           >
             <%= dgettext("actions", "delete") %>
           </.link>
+        <% end %>
       </:actions>
     </.live_component>
   <% end %>
 
-  <.link
+  <%= if @current_user do %>
-    :if={@current_user}
+    <.link patch={Routes.context_index_path(@socket, :new)} class="self-end btn btn-primary">
-    patch={Routes.context_index_path(@socket, :new)}
-    class="self-end btn btn-primary"
-  >
       <%= dgettext("actions", "new context") %>
     </.link>
+  <% end %>
 </div>
 
-<.modal :if={@live_action in [:new, :edit]} return_to={Routes.context_index_path(@socket, :index)}>
+<%= if @live_action in [:new, :edit] do %>
+  <.modal return_to={Routes.context_index_path(@socket, :index)}>
     <.live_component
       module={MemexWeb.ContextLive.FormComponent}
       id={@context.id || :new}
@@ -71,3 +72,4 @@
       return_to={Routes.context_index_path(@socket, :index)}
     />
   </.modal>
+<% end %>

lib/memex_web/live/context_live/show.ex

@@ -11,7 +11,7 @@ defmodule MemexWeb.ContextLive.Show do
   @impl true
   def handle_params(
         %{"slug" => slug},
-        _params,
+        _,
         %{assigns: %{live_action: live_action, current_user: current_user}} = socket
       ) do
     context =

lib/memex_web/live/context_live/show.html.heex

@@ -4,13 +4,11 @@
   </h1>
 
   <div class="flex flex-wrap space-x-1">
-    <.link
+    <%= for tag <- @context.tags do %>
-      :for={tag <- @context.tags}
+      <.link navigate={Routes.context_index_path(Endpoint, :search, tag)} class="link">
-      navigate={Routes.context_index_path(Endpoint, :search, tag)}
-      class="link"
-    >
         <%= tag %>
       </.link>
+    <% end %>
   </div>
 
   <.context_content context={@context} />
@@ -23,15 +21,16 @@
     <.link class="btn btn-primary" navigate={Routes.context_index_path(@socket, :index)}>
       <%= dgettext("actions", "back") %>
     </.link>
+    <%= if is_owner?(@context, @current_user) do %>
       <.link
-      :if={is_owner?(@context, @current_user)}
         class="btn btn-primary"
         patch={Routes.context_show_path(@socket, :edit, @context.slug)}
       >
         <%= dgettext("actions", "edit") %>
       </.link>
+    <% end %>
+    <%= if is_owner_or_admin?(@context, @current_user) do %>
       <button
-      :if={is_owner_or_admin?(@context, @current_user)}
         type="button"
         class="btn btn-primary"
         phx-click="delete"
@@ -40,13 +39,12 @@
       >
         <%= dgettext("actions", "delete") %>
       </button>
+    <% end %>
   </div>
 </div>
 
-<.modal
+<%= if @live_action in [:edit] do %>
-  :if={@live_action == :edit}
+  <.modal return_to={Routes.context_show_path(@socket, :show, @context.slug)}>
-  return_to={Routes.context_show_path(@socket, :show, @context.slug)}
->
     <.live_component
       module={MemexWeb.ContextLive.FormComponent}
       id={@context.id}
@@ -57,3 +55,4 @@
       return_to={Routes.context_show_path(@socket, :show, @context.slug)}
     />
   </.modal>
+<% end %>

lib/memex_web/live/home_live.ex

@@ -3,12 +3,12 @@ defmodule MemexWeb.HomeLive do
   Liveview for the main home page
   """
 
+  @version Mix.Project.config()[:version]
+
   use MemexWeb, :live_view
   alias Memex.Accounts
   alias MemexWeb.{Endpoint, FaqLive}
 
-  @version Mix.Project.config()[:version]
-
   @impl true
   def mount(_params, _session, socket) do
     admins = Accounts.list_users_by_role(:admin)

lib/memex_web/live/home_live.html.heex

@@ -38,7 +38,7 @@
         navigate={Routes.live_path(Endpoint, FaqLive)}
         class="link title text-primary-400 text-lg"
       >
-        <%= gettext("read more on how to use memEx") %>
+        <%= gettext("read more on how to use %{name}", name: "memEx") %>
       </.link>
     </li>
   </ul>
@@ -92,13 +92,15 @@
       <p>
         <%= if @admins |> Enum.empty?() do %>
           <.link href={Routes.user_registration_path(Endpoint, :new)} class="link">
-            <%= dgettext("prompts", "register to setup memEx") %>
+            <%= dgettext("prompts", "register to setup %{name}", name: "memEx") %>
           </.link>
         <% else %>
           <div class="flex flex-wrap justify-center space-x-2">
-            <a :for={%{email: email} <- @admins} class="link" href={"mailto:#{email}"}>
+            <%= for admin <- @admins do %>
-              <%= email %>
+              <a class="link" href={"mailto:#{admin.email}"}>
+                <%= admin.email %>
               </a>
+            <% end %>
           </div>
         <% end %>
       </p>
@@ -107,7 +109,8 @@
     <li class="flex flex-row justify-center space-x-2">
       <b><%= gettext("registration:") %></b>
       <p>
-        <%= case Application.get_env(:memex, Memex.Accounts)[:registration] do
+        <%= Application.get_env(:memex, Endpoint)[:registration]
+        |> case do
           "public" -> gettext("public signups")
           _ -> gettext("invite only")
         end %>

lib/memex_web/live/invite_live/form_component.ex

@@ -1,11 +1,11 @@
 defmodule MemexWeb.InviteLive.FormComponent do
   @moduledoc """
-  Livecomponent that can update or create an Memex.Accounts.Invite
+  Livecomponent that can update or create an Memex.Invites.Invite
   """
 
   use MemexWeb, :live_component
   alias Ecto.Changeset
-  alias Memex.Accounts.{Invite, Invites, User}
+  alias Memex.{Accounts.User, Invites, Invites.Invite}
   alias Phoenix.LiveView.Socket
 
   @impl true
@@ -13,44 +13,23 @@ defmodule MemexWeb.InviteLive.FormComponent do
           %{:invite => Invite.t(), :current_user => User.t(), optional(any) => any},
           Socket.t()
         ) :: {:ok, Socket.t()}
-  def update(%{invite: _invite} = assigns, socket) do
+  def update(%{invite: invite} = assigns, socket) do
-    {:ok, socket |> assign(assigns) |> assign_changeset(%{})}
+    {:ok, socket |> assign(assigns) |> assign(:changeset, Invites.change_invite(invite))}
   end
 
   @impl true
-  def handle_event("validate", %{"invite" => invite_params}, socket) do
+  def handle_event(
-    {:noreply, socket |> assign_changeset(invite_params)}
+        "validate",
+        %{"invite" => invite_params},
+        %{assigns: %{invite: invite}} = socket
+      ) do
+    {:noreply, socket |> assign(:changeset, invite |> Invites.change_invite(invite_params))}
   end
 
   def handle_event("save", %{"invite" => invite_params}, %{assigns: %{action: action}} = socket) do
     save_invite(socket, action, invite_params)
   end
 
-  defp assign_changeset(
-         %{assigns: %{action: action, current_user: user, invite: invite}} = socket,
-         invite_params
-       ) do
-    changeset_action =
-      case action do
-        :new -> :insert
-        :edit -> :update
-      end
-
-    changeset =
-      case action do
-        :new -> Invite.create_changeset(user, "example_token", invite_params)
-        :edit -> invite |> Invite.update_changeset(invite_params)
-      end
-
-    changeset =
-      case changeset |> Changeset.apply_action(changeset_action) do
-        {:ok, _data} -> changeset
-        {:error, changeset} -> changeset
-      end
-
-    socket |> assign(:changeset, changeset)
-  end
-
   defp save_invite(
          %{assigns: %{current_user: current_user, invite: invite, return_to: return_to}} = socket,
          :edit,
@@ -59,7 +38,9 @@ defmodule MemexWeb.InviteLive.FormComponent do
     socket =
       case invite |> Invites.update_invite(invite_params, current_user) do
         {:ok, %{name: invite_name}} ->
-          prompt = dgettext("prompts", "%{name} updated successfully", name: invite_name)
+          prompt =
+            dgettext("prompts", "%{invite_name} updated successfully", invite_name: invite_name)
+
           socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
@@ -77,7 +58,9 @@ defmodule MemexWeb.InviteLive.FormComponent do
     socket =
       case current_user |> Invites.create_invite(invite_params) do
         {:ok, %{name: invite_name}} ->
-          prompt = dgettext("prompts", "%{name} created successfully", name: invite_name)
+          prompt =
+            dgettext("prompts", "%{invite_name} created successfully", invite_name: invite_name)
+
           socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->

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

@@ -11,12 +11,11 @@
     phx-change="validate"
     phx-submit="save"
   >
-    <div
+    <%= if @changeset.action && not @changeset.valid? do %>
-      :if={@changeset.action && not @changeset.valid?()}
+      <div class="invalid-feedback col-span-3 text-center">
-      class="invalid-feedback col-span-3 text-center"
-    >
         <%= changeset_errors(@changeset) %>
       </div>
+    <% end %>
 
     <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-400") %>
     <%= text_input(f, :name, class: "input input-primary col-span-2") %>

lib/memex_web/live/invite_live/index.ex

@@ -1,13 +1,12 @@
 defmodule MemexWeb.InviteLive.Index do
   @moduledoc """
-  Liveview to show a Memex.Accounts.Invite index
+  Liveview to show a Memex.Invites.Invite index
   """
 
   use MemexWeb, :live_view
   import MemexWeb.Components.{InviteCard, UserCard}
-  alias Memex.Accounts
+  alias Memex.{Accounts, Invites, Invites.Invite}
-  alias Memex.Accounts.{Invite, Invites}
+  alias MemexWeb.HomeLive
-  alias MemexWeb.{Endpoint, HomeLive}
   alias Phoenix.LiveView.JS
 
   @impl true
@@ -16,9 +15,9 @@ defmodule MemexWeb.InviteLive.Index do
       if current_user |> Map.get(:role) == :admin do
         socket |> display_invites()
       else
-        prompt = dgettext("errors", "you are not authorized to view this page")
+        prompt = dgettext("errors", "You are not authorized to view this page")
         return_to = Routes.live_path(Endpoint, HomeLive)
-        socket |> put_flash(:error, prompt) |> push_redirect(to: return_to)
+        socket |> put_flash(:error, prompt) |> push_navigate(to: return_to)
       end
 
     {:ok, socket}
@@ -62,7 +61,7 @@ defmodule MemexWeb.InviteLive.Index do
       ) do
     socket =
       Invites.get_invite!(id, current_user)
-      |> Invites.update_invite(%{uses_left: nil}, current_user)
+      |> Invites.update_invite(%{"uses_left" => nil}, current_user)
       |> case do
         {:ok, %{name: invite_name}} ->
           prompt =
@@ -84,7 +83,7 @@ defmodule MemexWeb.InviteLive.Index do
       ) do
     socket =
       Invites.get_invite!(id, current_user)
-      |> Invites.update_invite(%{uses_left: nil, disabled_at: nil}, current_user)
+      |> Invites.update_invite(%{"uses_left" => nil, "disabled_at" => nil}, current_user)
       |> case do
         {:ok, %{name: invite_name}} ->
           prompt =
@@ -108,7 +107,7 @@ defmodule MemexWeb.InviteLive.Index do
 
     socket =
       Invites.get_invite!(id, current_user)
-      |> Invites.update_invite(%{uses_left: 0, disabled_at: now}, current_user)
+      |> Invites.update_invite(%{"uses_left" => 0, "disabled_at" => now}, current_user)
       |> case do
         {:ok, %{name: invite_name}} ->
           prompt =
@@ -124,8 +123,8 @@ defmodule MemexWeb.InviteLive.Index do
   end
 
   @impl true
-  def handle_event("copy_to_clipboard", _params, socket) do
+  def handle_event("copy_to_clipboard", _, socket) do
-    prompt = dgettext("prompts", "copied to clipboard")
+    prompt = dgettext("prompts", "Copied to clipboard")
     {:noreply, socket |> put_flash(:info, prompt)}
   end
 

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

@@ -18,7 +18,8 @@
   <% end %>
 
   <div class="w-full flex flex-row flex-wrap justify-center items-center">
-    <.invite_card :for={invite <- @invites} invite={invite} current_user={@current_user}>
+    <%= for invite <- @invites do %>
+      <.invite_card invite={invite}>
         <:code_actions>
           <form phx-submit="copy_to_clipboard">
             <button
@@ -53,17 +54,18 @@
           <i class="fa-fw fa-lg fas fa-trash"></i>
         </.link>
 
-      <a
+        <%= if invite.disabled_at |> is_nil() do %>
-        href="#"
+          <a href="#" class="btn btn-primary" phx-click="disable_invite" phx-value-id={invite.id}>
-        class="btn btn-primary"
+            <%= gettext("disable") %>
-        phx-click={if invite.disabled_at, do: "enable_invite", else: "disable_invite"}
-        phx-value-id={invite.id}
-      >
-        <%= if invite.disabled_at, do: gettext("enable"), else: gettext("disable") %>
           </a>
+        <% else %>
+          <a href="#" class="btn btn-primary" phx-click="enable_invite" phx-value-id={invite.id}>
+            <%= gettext("enable") %>
+          </a>
+        <% end %>
 
+        <%= if invite.disabled_at |> is_nil() and not (invite.uses_left |> is_nil()) do %>
           <a
-        :if={invite.disabled_at |> is_nil() and not (invite.uses_left |> is_nil())}
             href="#"
             class="btn btn-primary"
             phx-click="set_unlimited"
@@ -76,7 +78,9 @@
           >
             <%= gettext("set unlimited") %>
           </a>
+        <% end %>
       </.invite_card>
+    <% end %>
   </div>
 
   <%= unless @admins |> Enum.empty?() do %>
@@ -87,7 +91,8 @@
     </h1>
 
     <div class="w-full flex flex-row flex-wrap justify-center items-center">
-      <.user_card :for={admin <- @admins} user={admin}>
+      <%= for admin <- @admins do %>
+        <.user_card user={admin}>
           <.link
             href="#"
             class="text-primary-400 link"
@@ -104,6 +109,7 @@
             <i class="fa-fw fa-lg fas fa-trash"></i>
           </.link>
         </.user_card>
+      <% end %>
     </div>
   <% end %>
 
@@ -115,7 +121,8 @@
     </h1>
 
     <div class="w-full flex flex-row flex-wrap justify-center items-center">
-      <.user_card :for={user <- @users} user={user}>
+      <%= for user <- @users do %>
+        <.user_card user={user}>
           <.link
             href="#"
             class="text-primary-400 link"
@@ -132,11 +139,13 @@
             <i class="fa-fw fa-lg fas fa-trash"></i>
           </.link>
         </.user_card>
+      <% end %>
     </div>
   <% end %>
 </div>
 
-<.modal :if={@live_action in [:new, :edit]} return_to={Routes.invite_index_path(Endpoint, :index)}>
+<%= if @live_action in [:new, :edit] do %>
+  <.modal return_to={Routes.invite_index_path(Endpoint, :index)}>
     <.live_component
       module={MemexWeb.InviteLive.FormComponent}
       id={@invite.id || :new}
@@ -147,3 +156,4 @@
       current_user={@current_user}
     />
   </.modal>
+<% end %>

lib/memex_web/live/live_helpers.ex

@@ -1,6 +1,6 @@
 defmodule MemexWeb.LiveHelpers do
   @moduledoc """
-  Contains common helper functions for liveviews
+  Contains resuable methods for all liveviews
   """
 
   import Phoenix.Component
@@ -31,7 +31,7 @@ defmodule MemexWeb.LiveHelpers do
       patch={@return_to}
       id="modal-bg"
       class="fade-in fixed z-10 left-0 top-0
-        w-full h-full overflow-hidden
+         w-screen h-screen overflow-hidden
          p-8 flex flex-col justify-center items-center cursor-auto"
       style="background-color: rgba(0,0,0,0.4);"
       phx-remove={hide_modal()}
@@ -63,7 +63,7 @@ defmodule MemexWeb.LiveHelpers do
           <i class="fa-fw fa-lg fas fa-times"></i>
         </.link>
 
-        <div class="overflow-x-hidden overflow-y-auto w-full p-8 flex flex-col space-y-4 justify-start items-stretch">
+        <div class="overflow-x-hidden overflow-y-visible p-8 flex flex-col space-y-4 justify-start items-stretch">
           <%= render_slot(@inner_block) %>
         </div>
       </div>
@@ -71,57 +71,10 @@ defmodule MemexWeb.LiveHelpers do
     """
   end
 
-  defp hide_modal(js \\ %JS{}) do
+  def hide_modal(js \\ %JS{}) do
     js
     |> JS.hide(to: "#modal", transition: "fade-out")
     |> JS.hide(to: "#modal-bg", transition: "fade-out")
     |> JS.hide(to: "#modal-content", transition: "fade-out-scale")
   end
-
-  @doc """
-  A toggle button element that can be directed to a liveview or a
-  live_component's `handle_event/3`.
-
-  ## Examples
-
-  <.toggle_button action="my_liveview_action" value={@some_value}>
-    <span>Toggle me!</span>
-  </.toggle_button>
-  <.toggle_button action="my_live_component_action" target={@myself} value={@some_value}>
-    <span>Whatever you want</span>
-  </.toggle_button>
-  """
-  def toggle_button(assigns) do
-    assigns = assigns |> assign_new(:id, fn -> assigns.action end)
-
-    ~H"""
-    <label for={@id} class="inline-flex relative items-center cursor-pointer">
-      <input
-        id={@id}
-        type="checkbox"
-        value={@value}
-        checked={@value}
-        class="sr-only peer"
-        data-qa={@id}
-        {
-          if assigns |> Map.has_key?(:target),
-            do: %{"phx-click": @action, "phx-value-value": @value, "phx-target": @target},
-            else: %{"phx-click": @action, "phx-value-value": @value}
-        }
-      />
-      <div class="w-11 h-6 bg-gray-300 rounded-full peer
-        peer-focus:ring-4 peer-focus:ring-teal-300 dark:peer-focus:ring-teal-800
-        peer-checked:bg-gray-600
-        peer-checked:after:translate-x-full peer-checked:after:border-white
-        after:content-[''] after:absolute after:top-1 after:left-[2px] after:bg-white after:border-gray-300
-        after:border after:rounded-full after:h-5 after:w-5
-        after:transition-all after:duration-250 after:ease-in-out
-        transition-colors duration-250 ease-in-out">
-      </div>
-      <span class="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300">
-        <%= render_slot(@inner_block) %>
-      </span>
-    </label>
-    """
-  end
 end

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

@@ -30,15 +30,16 @@
       notes={@notes}
     >
       <:actions :let={note}>
+        <%= if is_owner?(note, @current_user) do %>
           <.link
-          :if={is_owner?(note, @current_user)}
             patch={Routes.note_index_path(@socket, :edit, note.slug)}
             data-qa={"note-edit-#{note.id}"}
           >
             <%= dgettext("actions", "edit") %>
           </.link>
+        <% end %>
+        <%= if is_owner_or_admin?(note, @current_user) do %>
           <.link
-          :if={is_owner_or_admin?(note, @current_user)}
             href="#"
             phx-click="delete"
             phx-value-id={note.id}
@@ -47,20 +48,20 @@
           >
             <%= dgettext("actions", "delete") %>
           </.link>
+        <% end %>
       </:actions>
     </.live_component>
   <% end %>
 
-  <.link
+  <%= if @current_user do %>
-    :if={@current_user}
+    <.link patch={Routes.note_index_path(@socket, :new)} class="self-end btn btn-primary">
-    patch={Routes.note_index_path(@socket, :new)}
-    class="self-end btn btn-primary"
-  >
       <%= dgettext("actions", "new note") %>
     </.link>
+  <% end %>
 </div>
 
-<.modal :if={@live_action in [:new, :edit]} return_to={Routes.note_index_path(@socket, :index)}>
+<%= if @live_action in [:new, :edit] do %>
+  <.modal return_to={Routes.note_index_path(@socket, :index)}>
     <.live_component
       module={MemexWeb.NoteLive.FormComponent}
       id={@note.id || :new}
@@ -71,3 +72,4 @@
       return_to={Routes.note_index_path(@socket, :index)}
     />
   </.modal>
+<% end %>

lib/memex_web/live/note_live/show.ex

@@ -11,7 +11,7 @@ defmodule MemexWeb.NoteLive.Show do
   @impl true
   def handle_params(
         %{"slug" => slug},
-        _params,
+        _,
         %{assigns: %{live_action: live_action, current_user: current_user}} = socket
       ) do
     note =

lib/memex_web/live/note_live/show.html.heex

@@ -4,13 +4,11 @@
   </h1>
 
   <div class="flex flex-wrap space-x-1">
-    <.link
+    <%= for tag <- @note.tags do %>
-      :for={tag <- @note.tags}
+      <.link navigate={Routes.note_index_path(Endpoint, :search, tag)} class="link">
-      navigate={Routes.note_index_path(Endpoint, :search, tag)}
-      class="link"
-    >
         <%= tag %>
       </.link>
+    <% end %>
   </div>
 
   <.note_content note={@note} />
@@ -23,15 +21,13 @@
     <.link class="btn btn-primary" navigate={Routes.note_index_path(@socket, :index)}>
       <%= dgettext("actions", "back") %>
     </.link>
-    <.link
+    <%= if is_owner?(@note, @current_user) do %>
-      :if={is_owner?(@note, @current_user)}
+      <.link class="btn btn-primary" patch={Routes.note_show_path(@socket, :edit, @note.slug)}>
-      class="btn btn-primary"
-      patch={Routes.note_show_path(@socket, :edit, @note.slug)}
-    >
         <%= dgettext("actions", "edit") %>
       </.link>
+    <% end %>
+    <%= if is_owner_or_admin?(@note, @current_user) do %>
       <button
-      :if={is_owner_or_admin?(@note, @current_user)}
         type="button"
         class="btn btn-primary"
         phx-click="delete"
@@ -40,10 +36,12 @@
       >
         <%= dgettext("actions", "delete") %>
       </button>
+    <% end %>
   </div>
 </div>
 
-<.modal :if={@live_action == :edit} return_to={Routes.note_show_path(@socket, :show, @note.slug)}>
+<%= if @live_action in [:edit] do %>
+  <.modal return_to={Routes.note_show_path(@socket, :show, @note.slug)}>
     <.live_component
       module={MemexWeb.NoteLive.FormComponent}
       id={@note.id}
@@ -54,3 +52,4 @@
       return_to={Routes.note_show_path(@socket, :show, @note.slug)}
     />
   </.modal>
+<% end %>

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

@@ -30,15 +30,16 @@
       pipelines={@pipelines}
     >
       <:actions :let={pipeline}>
+        <%= if is_owner?(pipeline, @current_user) do %>
           <.link
-          :if={is_owner?(pipeline, @current_user)}
             patch={Routes.pipeline_index_path(@socket, :edit, pipeline.slug)}
             data-qa={"pipeline-edit-#{pipeline.id}"}
           >
             <%= dgettext("actions", "edit") %>
           </.link>
+        <% end %>
+        <%= if is_owner_or_admin?(pipeline, @current_user) do %>
           <.link
-          :if={is_owner_or_admin?(pipeline, @current_user)}
             href="#"
             phx-click="delete"
             phx-value-id={pipeline.id}
@@ -47,23 +48,20 @@
           >
             <%= dgettext("actions", "delete") %>
           </.link>
+        <% end %>
       </:actions>
     </.live_component>
   <% end %>
 
-  <.link
+  <%= if @current_user do %>
-    :if={@current_user}
+    <.link patch={Routes.pipeline_index_path(@socket, :new)} class="self-end btn btn-primary">
-    patch={Routes.pipeline_index_path(@socket, :new)}
-    class="self-end btn btn-primary"
-  >
       <%= dgettext("actions", "new pipeline") %>
     </.link>
+  <% end %>
 </div>
 
-<.modal
+<%= if @live_action in [:new, :edit] do %>
-  :if={@live_action in [:new, :edit]}
+  <.modal return_to={Routes.pipeline_index_path(@socket, :index)}>
-  return_to={Routes.pipeline_index_path(@socket, :index)}
->
     <.live_component
       module={MemexWeb.PipelineLive.FormComponent}
       id={@pipeline.id || :new}
@@ -74,3 +72,4 @@
       return_to={Routes.pipeline_index_path(@socket, :index)}
     />
   </.modal>
+<% end %>

lib/memex_web/live/pipeline_live/show.html.heex

@@ -4,17 +4,15 @@
   </h1>
 
   <div class="flex flex-wrap space-x-1">
-    <.link
+    <%= for tag <- @pipeline.tags do %>
-      :for={tag <- @pipeline.tags}
+      <.link navigate={Routes.pipeline_index_path(Endpoint, :search, tag)} class="link">
-      navigate={Routes.pipeline_index_path(Endpoint, :search, tag)}
-      class="link"
-    >
         <%= tag %>
       </.link>
+    <% end %>
   </div>
 
+  <%= if @pipeline.description do %>
     <textarea
-    :if={@pipeline.description}
       id="show-pipeline-description"
       class="input input-primary h-32 min-h-32"
       phx-hook="MaintainAttrs"
@@ -22,6 +20,7 @@
       readonly
       phx-no-format
     ><%= @pipeline.description %></textarea>
+  <% end %>
 
   <p class="self-end">
     <%= gettext("Visibility: %{visibility}", visibility: @pipeline.visibility) %>
@@ -31,15 +30,16 @@
     <.link class="btn btn-primary" navigate={Routes.pipeline_index_path(@socket, :index)}>
       <%= dgettext("actions", "back") %>
     </.link>
+    <%= if is_owner?(@pipeline, @current_user) do %>
       <.link
-      :if={is_owner?(@pipeline, @current_user)}
         class="btn btn-primary"
         patch={Routes.pipeline_show_path(@socket, :edit, @pipeline.slug)}
       >
         <%= dgettext("actions", "edit") %>
       </.link>
+    <% end %>
+    <%= if is_owner_or_admin?(@pipeline, @current_user) do %>
       <button
-      :if={is_owner_or_admin?(@pipeline, @current_user)}
         type="button"
         class="btn btn-primary"
         phx-click="delete"
@@ -48,6 +48,7 @@
       >
         <%= dgettext("actions", "delete") %>
       </button>
+    <% end %>
   </div>
 
   <hr class="hr" />
@@ -125,14 +126,15 @@
     <% end %>
   <% end %>
 
+  <%= if is_owner?(@pipeline, @current_user) do %>
     <.link
-    :if={is_owner?(@pipeline, @current_user)}
       class="self-end btn btn-primary"
       patch={Routes.pipeline_show_path(@socket, :add_step, @pipeline.slug)}
       data-qa={"add-step-#{@pipeline.id}"}
     >
       <%= dgettext("actions", "add step") %>
     </.link>
+  <% end %>
 </div>
 
 <%= case @live_action do %>
@@ -148,7 +150,20 @@
         return_to={Routes.pipeline_show_path(@socket, :show, @pipeline.slug)}
       />
     </.modal>
-  <% action when action in [:add_step, :edit_step] -> %>
+  <% :add_step -> %>
+    <.modal return_to={Routes.pipeline_show_path(@socket, :show, @pipeline.slug)}>
+      <.live_component
+        module={MemexWeb.StepLive.FormComponent}
+        id={@pipeline.id || :new}
+        current_user={@current_user}
+        title={@page_title}
+        action={@live_action}
+        pipeline={@pipeline}
+        step={@step}
+        return_to={Routes.pipeline_show_path(@socket, :show, @pipeline.slug)}
+      />
+    </.modal>
+  <% :edit_step -> %>
     <.modal return_to={Routes.pipeline_show_path(@socket, :show, @pipeline.slug)}>
       <.live_component
         module={MemexWeb.StepLive.FormComponent}

lib/memex_web/telemetry.ex

@@ -57,30 +57,6 @@ defmodule MemexWeb.Telemetry do
           "The time the connection spent waiting before being checked out for the query"
       ),
 
-      # Oban Metrics
-      counter("oban.job.exception",
-        tags: [:queue, :worker],
-        event_name: [:oban, :job, :exception],
-        measurement: :duration,
-        description: "Number of oban jobs that raised an exception"
-      ),
-      counter("oban.job.start",
-        tags: [:queue, :worker],
-        event_name: [:oban, :job, :start],
-        measurement: :system_time,
-        description: "Number of oban jobs started"
-      ),
-      summary("oban.job.stop.duration",
-        tags: [:queue, :worker],
-        unit: {:native, :millisecond},
-        description: "Length of time spent processing the oban job"
-      ),
-      summary("oban.job.stop.queue_time",
-        tags: [:queue, :worker],
-        unit: {:native, :millisecond},
-        description: "Time the oban job spent waiting in milliseconds"
-      ),
-
       # VM Metrics
       summary("vm.memory.total", unit: {:byte, :kilobyte}),
       summary("vm.total_run_queue_lengths.total"),

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") %> | <%= gettext("memEx") %>
+      <%= dgettext("errors", "Error") %> | 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,12 +3,16 @@
     <.topbar current_user={assigns[:current_user]}></.topbar>
 
     <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">
+      <%= if get_flash(@conn, :info) do %>
+        <p class="alert alert-info" role="alert">
           <%= get_flash(@conn, :info) %>
         </p>
-      <p :if={get_flash(@conn, :error)} class="alert alert-danger" role="alert">
+      <% end %>
+      <%= if get_flash(@conn, :error) do %>
+        <p class="alert alert-danger" role="alert">
           <%= get_flash(@conn, :error) %>
         </p>
+      <% end %>
     </div>
   </header>
 

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

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

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

@@ -1,4 +1,4 @@
-<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-400 text-xl">
     <%= dgettext("actions", "Resend confirmation instructions") %>
   </h1>
@@ -20,13 +20,11 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <.link
+    <%= if Accounts.allow_registration?() do %>
-      :if={Accounts.allow_registration?()}
+      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
-      href={Routes.user_registration_path(@conn, :new)}
-      class="btn btn-primary"
-    >
         <%= dgettext("actions", "register") %>
       </.link>
+    <% end %>
     <.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

@@ -1,4 +1,4 @@
-<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-400 text-xl">
     <%= dgettext("actions", "register") %>
   </h1>
@@ -9,12 +9,16 @@
     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"
   >
-    <p :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
+    <%= if @changeset.action && not @changeset.valid? do %>
-      <%= dgettext("errors", "oops, something went wrong! please check the errors below.") %>
+      <div class="alert alert-danger col-span-3">
+        <p>
+          <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
         </p>
+      </div>
+    <% end %>
 
-    <%= if @invite_token do %>
+    <%= if @invite do %>
-      <%= hidden_input(f, :invite_token, value: @invite_token) %>
+      <%= hidden_input(f, :invite_token, value: @invite.token) %>
     <% end %>
 
     <%= label(f, :email, class: "title text-lg text-primary-400") %>

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

@@ -1,4 +1,4 @@
-<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-400 text-xl">
     <%= dgettext("actions", "Reset password") %>
   </h1>
@@ -9,11 +9,13 @@
     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">
+    <%= 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 %>
 
     <%= 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") %>
@@ -36,13 +38,11 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <.link
+    <%= if Accounts.allow_registration?() do %>
-      :if={Accounts.allow_registration?()}
+      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
-      href={Routes.user_registration_path(@conn, :new)}
-      class="btn btn-primary"
-    >
         <%= dgettext("actions", "register") %>
       </.link>
+    <% end %>
     <.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

@@ -1,4 +1,4 @@
-<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-400 text-xl">
     <%= dgettext("actions", "forgot your password?") %>
   </h1>
@@ -20,13 +20,11 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <.link
+    <%= if Accounts.allow_registration?() do %>
-      :if={Accounts.allow_registration?()}
+      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
-      href={Routes.user_registration_path(@conn, :new)}
-      class="btn btn-primary"
-    >
         <%= dgettext("actions", "register") %>
       </.link>
+    <% end %>
     <.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

@@ -1,4 +1,4 @@
-<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-400 text-xl">
     <%= dgettext("actions", "log in") %>
   </h1>
@@ -10,11 +10,13 @@
     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">
+    <%= if @error_message do %>
+      <div class="alert alert-danger col-span-3">
         <p>
           <%= @error_message %>
         </p>
       </div>
+    <% end %>
 
     <%= label(f, :email, class: "title text-lg text-primary-400") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
@@ -33,13 +35,11 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <.link
+    <%= if Accounts.allow_registration?() do %>
-      :if={Accounts.allow_registration?()}
+      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
-      href={Routes.user_registration_path(@conn, :new)}
-      class="btn btn-primary"
-    >
         <%= dgettext("actions", "register") %>
       </.link>
+    <% end %>
     <.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

@@ -1,4 +1,4 @@
-<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center text-center space-y-4">
+<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center text-center space-y-4">
   <h1 class="pb-4 title text-primary-400 text-xl">
     <%= gettext("settings") %>
   </h1>
@@ -15,14 +15,13 @@
       <%= dgettext("actions", "change email") %>
     </h3>
 
-    <div
+    <%= if @email_changeset.action && not @email_changeset.valid? do %>
-      :if={@email_changeset.action && not @email_changeset.valid?()}
+      <div class="alert alert-danger col-span-3">
-      class="alert alert-danger col-span-3"
-    >
         <p>
           <%= dgettext("errors", "oops, something went wrong! Please check the errors below") %>
         </p>
       </div>
+    <% end %>
 
     <%= hidden_input(f, :action, name: "action", value: "update_email") %>
 
@@ -59,14 +58,13 @@
       <%= dgettext("actions", "change password") %>
     </h3>
 
-    <div
+    <%= if @password_changeset.action && not @password_changeset.valid? do %>
-      :if={@password_changeset.action && not @password_changeset.valid?()}
+      <div class="alert alert-danger col-span-3">
-      class="alert alert-danger col-span-3"
-    >
         <p>
           <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
         </p>
       </div>
+    <% end %>
 
     <%= hidden_input(f, :action, name: "action", value: "update_password") %>
 
@@ -115,14 +113,13 @@
       <%= dgettext("actions", "change language") %>
     </h3>
 
-    <div
+    <%= if @locale_changeset.action && not @locale_changeset.valid? do %>
-      :if={@locale_changeset.action && not @locale_changeset.valid?()}
+      <div class="alert alert-danger">
-      class="alert alert-danger"
-    >
         <p>
           <%= dgettext("errors", "oops, something went wrong! Please check the errors below") %>
         </p>
       </div>
+    <% end %>
 
     <%= hidden_input(f, :action, name: "action", value: "update_locale") %>
 

lib/memex_web/views/email_view.ex

@@ -2,6 +2,7 @@ defmodule MemexWeb.EmailView do
   @moduledoc """
   A view for email-related helper functions
   """
-  use MemexWeb, :view
   alias MemexWeb.HomeLive
+
+  use MemexWeb, :view
 end

lib/memex_web/views/error_helpers.ex

@@ -17,13 +17,11 @@ defmodule MemexWeb.ErrorHelpers do
     assigns = %{extra_class: extra_class, form: form, field: field}
 
     ~H"""
-    <span
+    <%= for error <- Keyword.get_values(@form.errors, @field) do %>
-      :for={error <- Keyword.get_values(@form.errors, @field)}
+      <span class={["invalid-feedback", @extra_class]} phx-feedback-for={input_name(@form, @field)}>
-      class={["invalid-feedback", @extra_class]}
-      phx-feedback-for={input_name(@form, @field)}
-    >
         <%= translate_error(error) %>
       </span>
+    <% end %>
     """
   end
 

lib/memex_web/views/error_view.ex

@@ -8,7 +8,7 @@ defmodule MemexWeb.ErrorView do
       case error_path do
         "404.html" -> dgettext("errors", "not found")
         "401.html" -> dgettext("errors", "unauthorized")
-        _other_path -> dgettext("errors", "internal server error")
+        _ -> dgettext("errors", "internal server error")
       end
 
     render("error.html", %{error_string: error_string})

lib/memex_web/views/layout_view.ex

@@ -7,11 +7,6 @@ defmodule MemexWeb.LayoutView do
   # so we instruct Elixir to not warn if the dashboard route is missing.
   @compile {:no_warn_undefined, {Routes, :live_dashboard_path, 2}}
 
-  def get_title(%{assigns: %{title: title}}) do
+  def get_title(%{assigns: %{title: title}}), do: gettext("memEx | %{title}", title: title)
-    gettext("memEx | %{title}", title: title)
+  def get_title(_conn), do: gettext("memEx")
-  end
-
-  def get_title(_conn) do
-    gettext("memEx")
-  end
 end

lib/memex_web/views/view_helpers.ex

@@ -16,8 +16,8 @@ defmodule MemexWeb.ViewHelpers do
 
   def datetime(assigns) do
     ~H"""
+    <%= if @datetime do %>
       <time
-      :if={@datetime}
         datetime={cast_datetime(@datetime)}
         x-data={"{
           datetime:
@@ -28,6 +28,7 @@ defmodule MemexWeb.ViewHelpers do
       >
         <%= cast_datetime(@datetime) %>
       </time>
+    <% end %>
     """
   end
 
@@ -47,8 +48,8 @@ defmodule MemexWeb.ViewHelpers do
 
   def date(assigns) do
     ~H"""
+    <%= if @date do %>
       <time
-      :if={@date}
         datetime={@date |> Date.to_iso8601(:extended)}
         x-data={"{
           date:
@@ -59,6 +60,7 @@ defmodule MemexWeb.ViewHelpers do
       >
         <%= @date |> Date.to_iso8601(:extended) %>
       </time>
+    <% end %>
     """
   end
 

mix.exs

@@ -4,7 +4,7 @@ defmodule Memex.MixProject do
   def project do
     [
       app: :memex,
-      version: "0.1.8",
+      version: "0.1.7",
       elixir: "~> 1.14",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: Mix.compilers(),
@@ -34,7 +34,7 @@ defmodule Memex.MixProject do
   def application do
     [
       mod: {Memex.Application, []},
-      extra_applications: [:logger, :runtime_tools, :os_mon, :crypto]
+      extra_applications: [:logger, :runtime_tools, :os_mon]
     ]
   end
 

priv/gettext/actions.pot

@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:29
+#: lib/memex_web/live/invite_live/index.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Copy to clipboard"
 msgstr ""
@@ -22,30 +22,30 @@ msgid "Resend confirmation instructions"
 msgstr ""
 
 #: lib/memex_web/templates/user_reset_password/edit.html.heex:3
-#: lib/memex_web/templates/user_reset_password/edit.html.heex:31
+#: lib/memex_web/templates/user_reset_password/edit.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/form_component.html.heex:29
+#: lib/memex_web/live/invite_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
 
 #: lib/memex_web/templates/user_settings/edit.html.heex:15
-#: lib/memex_web/templates/user_settings/edit.html.heex:45
+#: lib/memex_web/templates/user_settings/edit.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "change email"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:115
+#: lib/memex_web/templates/user_settings/edit.html.heex:113
-#: lib/memex_web/templates/user_settings/edit.html.heex:134
+#: lib/memex_web/templates/user_settings/edit.html.heex:131
 #, elixir-autogen, elixir-format
 msgid "change language"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:59
+#: lib/memex_web/templates/user_settings/edit.html.heex:58
-#: lib/memex_web/templates/user_settings/edit.html.heex:101
+#: lib/memex_web/templates/user_settings/edit.html.heex:99
 #, elixir-autogen, elixir-format
 msgid "change password"
 msgstr ""
@@ -55,29 +55,29 @@ msgstr ""
 msgid "create invite"
 msgstr ""
 
-#: lib/memex_web/live/context_live/index.html.heex:48
+#: lib/memex_web/live/context_live/index.html.heex:49
-#: lib/memex_web/live/context_live/show.html.heex:41
+#: lib/memex_web/live/context_live/show.html.heex:40
-#: lib/memex_web/live/note_live/index.html.heex:48
+#: lib/memex_web/live/note_live/index.html.heex:49
-#: lib/memex_web/live/note_live/show.html.heex:41
+#: lib/memex_web/live/note_live/show.html.heex:37
-#: lib/memex_web/live/pipeline_live/index.html.heex:48
+#: lib/memex_web/live/pipeline_live/index.html.heex:49
 #: lib/memex_web/live/pipeline_live/show.html.heex:49
-#: lib/memex_web/live/pipeline_live/show.html.heex:118
+#: lib/memex_web/live/pipeline_live/show.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "delete"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:157
+#: lib/memex_web/templates/user_settings/edit.html.heex:154
 #, elixir-autogen, elixir-format
 msgid "delete user"
 msgstr ""
 
 #: lib/memex_web/live/context_live/index.html.heex:38
-#: lib/memex_web/live/context_live/show.html.heex:31
+#: lib/memex_web/live/context_live/show.html.heex:29
 #: lib/memex_web/live/note_live/index.html.heex:38
-#: lib/memex_web/live/note_live/show.html.heex:31
+#: lib/memex_web/live/note_live/show.html.heex:26
 #: lib/memex_web/live/pipeline_live/index.html.heex:38
-#: lib/memex_web/live/pipeline_live/show.html.heex:39
+#: lib/memex_web/live/pipeline_live/show.html.heex:38
-#: lib/memex_web/live/pipeline_live/show.html.heex:107
+#: lib/memex_web/live/pipeline_live/show.html.heex:108
 #, elixir-autogen, elixir-format
 msgid "edit"
 msgstr ""
@@ -87,39 +87,39 @@ msgstr ""
 msgid "invite someone new!"
 msgstr ""
 
-#: lib/memex_web/components/topbar.ex:124
+#: lib/memex_web/components/topbar.ex:125
-#: lib/memex_web/templates/user_confirmation/new.html.heex:31
+#: lib/memex_web/templates/user_confirmation/new.html.heex:29
-#: lib/memex_web/templates/user_registration/new.html.heex:44
+#: lib/memex_web/templates/user_registration/new.html.heex:48
 #: lib/memex_web/templates/user_reset_password/edit.html.heex:47
-#: lib/memex_web/templates/user_reset_password/new.html.heex:31
+#: lib/memex_web/templates/user_reset_password/new.html.heex:29
 #: lib/memex_web/templates/user_session/new.html.heex:3
-#: lib/memex_web/templates/user_session/new.html.heex:30
+#: lib/memex_web/templates/user_session/new.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "log in"
 msgstr ""
 
-#: lib/memex_web/live/context_live/index.html.heex:59
+#: lib/memex_web/live/context_live/index.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "new context"
 msgstr ""
 
-#: lib/memex_web/live/note_live/index.html.heex:59
+#: lib/memex_web/live/note_live/index.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "new note"
 msgstr ""
 
-#: lib/memex_web/live/pipeline_live/index.html.heex:59
+#: lib/memex_web/live/pipeline_live/index.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "new pipeline"
 msgstr ""
 
 #: lib/memex_web/components/topbar.ex:115
-#: lib/memex_web/templates/user_confirmation/new.html.heex:28
+#: lib/memex_web/templates/user_confirmation/new.html.heex:25
 #: lib/memex_web/templates/user_registration/new.html.heex:3
-#: lib/memex_web/templates/user_registration/new.html.heex:37
+#: lib/memex_web/templates/user_registration/new.html.heex:41
-#: lib/memex_web/templates/user_reset_password/edit.html.heex:44
+#: lib/memex_web/templates/user_reset_password/edit.html.heex:43
-#: lib/memex_web/templates/user_reset_password/new.html.heex:28
+#: lib/memex_web/templates/user_reset_password/new.html.heex:25
-#: lib/memex_web/templates/user_session/new.html.heex:41
+#: lib/memex_web/templates/user_session/new.html.heex:40
 #, elixir-autogen, elixir-format
 msgid "register"
 msgstr ""
@@ -132,19 +132,19 @@ msgstr ""
 msgid "save"
 msgstr ""
 
-#: lib/memex_web/live/context_live/show.html.heex:24
+#: lib/memex_web/live/context_live/show.html.heex:22
-#: lib/memex_web/live/note_live/show.html.heex:24
+#: lib/memex_web/live/note_live/show.html.heex:22
-#: lib/memex_web/live/pipeline_live/show.html.heex:32
+#: lib/memex_web/live/pipeline_live/show.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "back"
 msgstr ""
 
-#: lib/memex_web/live/pipeline_live/show.html.heex:134
+#: lib/memex_web/live/pipeline_live/show.html.heex:135
 #, elixir-autogen, elixir-format
 msgid "add step"
 msgstr ""
 
-#: lib/memex_web/templates/user_registration/new.html.heex:47
+#: lib/memex_web/templates/user_registration/new.html.heex:51
 #: lib/memex_web/templates/user_reset_password/new.html.heex:3
 #: lib/memex_web/templates/user_session/new.html.heex:44
 #, elixir-autogen, elixir-format
@@ -156,7 +156,7 @@ msgstr ""
 msgid "send instructions to reset password"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:148
+#: lib/memex_web/templates/user_settings/edit.html.heex:145
 #, elixir-autogen, elixir-format
 msgid "export data as json"
 msgstr ""

priv/gettext/de/LC_MESSAGES/actions.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Language: de\n"
 
-#: lib/memex_web/live/invite_live/index.html.heex:29
+#: lib/memex_web/live/invite_live/index.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Copy to clipboard"
 msgstr ""
@@ -22,30 +22,30 @@ msgid "Resend confirmation instructions"
 msgstr ""
 
 #: lib/memex_web/templates/user_reset_password/edit.html.heex:3
-#: lib/memex_web/templates/user_reset_password/edit.html.heex:31
+#: lib/memex_web/templates/user_reset_password/edit.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/form_component.html.heex:29
+#: lib/memex_web/live/invite_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
 
 #: lib/memex_web/templates/user_settings/edit.html.heex:15
-#: lib/memex_web/templates/user_settings/edit.html.heex:45
+#: lib/memex_web/templates/user_settings/edit.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "change email"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:115
+#: lib/memex_web/templates/user_settings/edit.html.heex:113
-#: lib/memex_web/templates/user_settings/edit.html.heex:134
+#: lib/memex_web/templates/user_settings/edit.html.heex:131
 #, elixir-autogen, elixir-format
 msgid "change language"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:59
+#: lib/memex_web/templates/user_settings/edit.html.heex:58
-#: lib/memex_web/templates/user_settings/edit.html.heex:101
+#: lib/memex_web/templates/user_settings/edit.html.heex:99
 #, elixir-autogen, elixir-format
 msgid "change password"
 msgstr ""
@@ -55,29 +55,29 @@ msgstr ""
 msgid "create invite"
 msgstr ""
 
-#: lib/memex_web/live/context_live/index.html.heex:48
+#: lib/memex_web/live/context_live/index.html.heex:49
-#: lib/memex_web/live/context_live/show.html.heex:41
+#: lib/memex_web/live/context_live/show.html.heex:40
-#: lib/memex_web/live/note_live/index.html.heex:48
+#: lib/memex_web/live/note_live/index.html.heex:49
-#: lib/memex_web/live/note_live/show.html.heex:41
+#: lib/memex_web/live/note_live/show.html.heex:37
-#: lib/memex_web/live/pipeline_live/index.html.heex:48
+#: lib/memex_web/live/pipeline_live/index.html.heex:49
 #: lib/memex_web/live/pipeline_live/show.html.heex:49
-#: lib/memex_web/live/pipeline_live/show.html.heex:118
+#: lib/memex_web/live/pipeline_live/show.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "delete"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:157
+#: lib/memex_web/templates/user_settings/edit.html.heex:154
 #, elixir-autogen, elixir-format
 msgid "delete user"
 msgstr ""
 
 #: lib/memex_web/live/context_live/index.html.heex:38
-#: lib/memex_web/live/context_live/show.html.heex:31
+#: lib/memex_web/live/context_live/show.html.heex:29
 #: lib/memex_web/live/note_live/index.html.heex:38
-#: lib/memex_web/live/note_live/show.html.heex:31
+#: lib/memex_web/live/note_live/show.html.heex:26
 #: lib/memex_web/live/pipeline_live/index.html.heex:38
-#: lib/memex_web/live/pipeline_live/show.html.heex:39
+#: lib/memex_web/live/pipeline_live/show.html.heex:38
-#: lib/memex_web/live/pipeline_live/show.html.heex:107
+#: lib/memex_web/live/pipeline_live/show.html.heex:108
 #, elixir-autogen, elixir-format
 msgid "edit"
 msgstr ""
@@ -87,39 +87,39 @@ msgstr ""
 msgid "invite someone new!"
 msgstr ""
 
-#: lib/memex_web/components/topbar.ex:124
+#: lib/memex_web/components/topbar.ex:125
-#: lib/memex_web/templates/user_confirmation/new.html.heex:31
+#: lib/memex_web/templates/user_confirmation/new.html.heex:29
-#: lib/memex_web/templates/user_registration/new.html.heex:44
+#: lib/memex_web/templates/user_registration/new.html.heex:48
 #: lib/memex_web/templates/user_reset_password/edit.html.heex:47
-#: lib/memex_web/templates/user_reset_password/new.html.heex:31
+#: lib/memex_web/templates/user_reset_password/new.html.heex:29
 #: lib/memex_web/templates/user_session/new.html.heex:3
-#: lib/memex_web/templates/user_session/new.html.heex:30
+#: lib/memex_web/templates/user_session/new.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "log in"
 msgstr ""
 
-#: lib/memex_web/live/context_live/index.html.heex:59
+#: lib/memex_web/live/context_live/index.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "new context"
 msgstr ""
 
-#: lib/memex_web/live/note_live/index.html.heex:59
+#: lib/memex_web/live/note_live/index.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "new note"
 msgstr ""
 
-#: lib/memex_web/live/pipeline_live/index.html.heex:59
+#: lib/memex_web/live/pipeline_live/index.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "new pipeline"
 msgstr ""
 
 #: lib/memex_web/components/topbar.ex:115
-#: lib/memex_web/templates/user_confirmation/new.html.heex:28
+#: lib/memex_web/templates/user_confirmation/new.html.heex:25
 #: lib/memex_web/templates/user_registration/new.html.heex:3
-#: lib/memex_web/templates/user_registration/new.html.heex:37
+#: lib/memex_web/templates/user_registration/new.html.heex:41
-#: lib/memex_web/templates/user_reset_password/edit.html.heex:44
+#: lib/memex_web/templates/user_reset_password/edit.html.heex:43
-#: lib/memex_web/templates/user_reset_password/new.html.heex:28
+#: lib/memex_web/templates/user_reset_password/new.html.heex:25
-#: lib/memex_web/templates/user_session/new.html.heex:41
+#: lib/memex_web/templates/user_session/new.html.heex:40
 #, elixir-autogen, elixir-format
 msgid "register"
 msgstr ""
@@ -132,19 +132,19 @@ msgstr ""
 msgid "save"
 msgstr ""
 
-#: lib/memex_web/live/context_live/show.html.heex:24
+#: lib/memex_web/live/context_live/show.html.heex:22
-#: lib/memex_web/live/note_live/show.html.heex:24
+#: lib/memex_web/live/note_live/show.html.heex:22
-#: lib/memex_web/live/pipeline_live/show.html.heex:32
+#: lib/memex_web/live/pipeline_live/show.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "back"
 msgstr ""
 
-#: lib/memex_web/live/pipeline_live/show.html.heex:134
+#: lib/memex_web/live/pipeline_live/show.html.heex:135
 #, elixir-autogen, elixir-format
 msgid "add step"
 msgstr ""
 
-#: lib/memex_web/templates/user_registration/new.html.heex:47
+#: lib/memex_web/templates/user_registration/new.html.heex:51
 #: lib/memex_web/templates/user_reset_password/new.html.heex:3
 #: lib/memex_web/templates/user_session/new.html.heex:44
 #, elixir-autogen, elixir-format, fuzzy
@@ -156,7 +156,7 @@ msgstr ""
 msgid "send instructions to reset password"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:148
+#: lib/memex_web/templates/user_settings/edit.html.heex:145
 #, elixir-autogen, elixir-format
 msgid "export data as json"
 msgstr ""

priv/gettext/de/LC_MESSAGES/default.po

@@ -21,7 +21,7 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#: lib/memex_web/live/invite_live/index.html.heex:86
+#: lib/memex_web/live/invite_live/index.html.heex:90
 #, elixir-autogen, elixir-format
 msgid "Admins"
 msgstr ""
@@ -31,17 +31,17 @@ msgstr ""
 msgid "Confirm your account"
 msgstr ""
 
-#: lib/memex_web/templates/user_session/new.html.heex:25
+#: lib/memex_web/templates/user_session/new.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/form_component.html.heex:21
+#: lib/memex_web/live/invite_live/form_component.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
 
-#: lib/memex_web/templates/layout/live.html.heex:43
+#: lib/memex_web/templates/layout/live.html.heex:40
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr ""
@@ -51,14 +51,19 @@ msgstr ""
 msgid "Reset your password"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/form_component.html.heex:25
+#: lib/memex_web/controllers/user_settings_controller.ex:10
+#, elixir-autogen, elixir-format
+msgid "Settings"
+msgstr ""
+
+#: lib/memex_web/live/invite_live/form_component.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Uses left"
 msgstr ""
 
-#: lib/memex_web/live/context_live/show.html.heex:19
+#: lib/memex_web/live/context_live/show.html.heex:17
-#: lib/memex_web/live/note_live/show.html.heex:19
+#: lib/memex_web/live/note_live/show.html.heex:17
-#: lib/memex_web/live/pipeline_live/show.html.heex:27
+#: lib/memex_web/live/pipeline_live/show.html.heex:26
 #, elixir-autogen, elixir-format
 msgid "Visibility: %{visibility}"
 msgstr ""
@@ -78,7 +83,7 @@ msgstr ""
 msgid "built with sharing and collaboration in mind"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:80
+#: lib/memex_web/templates/user_settings/edit.html.heex:78
 #, elixir-autogen, elixir-format
 msgid "confirm new password"
 msgstr ""
@@ -106,13 +111,13 @@ msgstr ""
 msgid "convenient:"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:33
+#: lib/memex_web/templates/user_settings/edit.html.heex:32
-#: lib/memex_web/templates/user_settings/edit.html.heex:89
+#: lib/memex_web/templates/user_settings/edit.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "current password"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:62
+#: lib/memex_web/live/invite_live/index.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "disable"
 msgstr ""
@@ -127,12 +132,12 @@ msgstr ""
 msgid "document your processes, attaching contexts to each step"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.ex:34
+#: lib/memex_web/live/invite_live/index.ex:33
 #, elixir-autogen, elixir-format
 msgid "edit invite"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:29
+#: lib/memex_web/templates/user_settings/edit.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "email"
 msgstr ""
@@ -142,13 +147,13 @@ msgstr ""
 msgid "email unconfirmed"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:62
+#: lib/memex_web/live/invite_live/index.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "enable"
 msgstr ""
 
-#: lib/memex_web/templates/user_registration/new.html.heex:32
+#: lib/memex_web/templates/user_registration/new.html.heex:36
-#: lib/memex_web/templates/user_settings/edit.html.heex:129
+#: lib/memex_web/templates/user_settings/edit.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "english"
 msgstr ""
@@ -158,12 +163,12 @@ msgstr ""
 msgid "features"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:135
+#: lib/memex_web/live/home_live.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "get involved!"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:156
+#: lib/memex_web/live/home_live.html.heex:159
 #, elixir-autogen, elixir-format
 msgid "help translate"
 msgstr ""
@@ -173,18 +178,18 @@ msgstr ""
 msgid "instance information"
 msgstr ""
 
-#: lib/memex_web/components/invite_card.ex:42
+#: lib/memex_web/components/invite_card.ex:32
 #, elixir-autogen, elixir-format
 msgid "invite disabled"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:112
+#: lib/memex_web/live/home_live.html.heex:115
 #, elixir-autogen, elixir-format
 msgid "invite only"
 msgstr ""
 
-#: lib/memex_web/components/topbar.ex:73
+#: lib/memex_web/components/topbar.ex:74
-#: lib/memex_web/live/invite_live/index.ex:42
+#: lib/memex_web/live/invite_live/index.ex:41
 #: lib/memex_web/live/invite_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "invites"
@@ -200,12 +205,12 @@ msgstr ""
 msgid "multi-user:"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.ex:38
+#: lib/memex_web/live/invite_live/index.ex:37
 #, elixir-autogen, elixir-format
 msgid "new invite"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:73
+#: lib/memex_web/templates/user_settings/edit.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "new password"
 msgstr ""
@@ -261,22 +266,22 @@ msgstr ""
 msgid "provide context around a single topic and hotlink to your notes"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:111
+#: lib/memex_web/live/home_live.html.heex:114
 #, elixir-autogen, elixir-format
 msgid "public signups"
 msgstr ""
 
-#: lib/memex_web/controllers/user_registration_controller.ex:32
+#: lib/memex_web/controllers/user_registration_controller.ex:34
 #, elixir-autogen, elixir-format
 msgid "register"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:108
+#: lib/memex_web/live/home_live.html.heex:110
 #, elixir-autogen, elixir-format
 msgid "registration:"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:167
+#: lib/memex_web/live/home_live.html.heex:170
 #, elixir-autogen, elixir-format
 msgid "report bugs or request features"
 msgstr ""
@@ -296,12 +301,11 @@ msgstr ""
 msgid "select privacy"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:77
+#: lib/memex_web/live/invite_live/index.html.heex:79
 #, elixir-autogen, elixir-format
 msgid "set unlimited"
 msgstr ""
 
-#: lib/memex_web/controllers/user_settings_controller.ex:10
 #: lib/memex_web/templates/user_settings/edit.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "settings"
@@ -321,17 +325,17 @@ msgstr ""
 msgid "tags"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:114
+#: lib/memex_web/live/invite_live/index.html.heex:120
 #, elixir-autogen, elixir-format
 msgid "users"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:118
+#: lib/memex_web/live/home_live.html.heex:121
 #, elixir-autogen, elixir-format
 msgid "version:"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:145
+#: lib/memex_web/live/home_live.html.heex:148
 #, elixir-autogen, elixir-format
 msgid "view the source code"
 msgstr ""
@@ -450,20 +454,24 @@ msgstr ""
 
 #: lib/memex_web/components/topbar.ex:23
 #: lib/memex_web/live/home_live.html.heex:3
-#: lib/memex_web/templates/error/error.html.heex:8
 #: lib/memex_web/templates/layout/root.html.heex:8
 #: lib/memex_web/templates/layout/root.html.heex:9
-#: lib/memex_web/views/layout_view.ex:15
+#: lib/memex_web/views/layout_view.ex:11
 #, elixir-autogen, elixir-format
 msgid "memEx"
 msgstr ""
 
+#: lib/memex_web/live/home_live.html.heex:41
+#, elixir-autogen, elixir-format
+msgid "read more on how to use %{name}"
+msgstr ""
+
 #: lib/memex_web/live/faq_live.html.heex:11
 #, elixir-autogen, elixir-format
 msgid "what is this?"
 msgstr ""
 
-#: lib/memex_web/live/pipeline_live/show.html.heex:67
+#: lib/memex_web/live/pipeline_live/show.html.heex:68
 #, elixir-autogen, elixir-format
 msgid "%{position}. %{title}"
 msgstr ""
@@ -488,12 +496,12 @@ msgstr ""
 msgid "add step to %{slug}"
 msgstr ""
 
-#: lib/memex_web/live/pipeline_live/show.html.heex:61
+#: lib/memex_web/live/pipeline_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "no steps"
 msgstr ""
 
-#: lib/memex_web/live/pipeline_live/show.html.heex:56
+#: lib/memex_web/live/pipeline_live/show.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "steps:"
 msgstr ""
@@ -598,7 +606,7 @@ msgstr ""
 msgid "zettelkasten"
 msgstr ""
 
-#: lib/memex_web/views/layout_view.ex:11
+#: lib/memex_web/views/layout_view.ex:10
 #, elixir-autogen, elixir-format
 msgid "memEx | %{title}"
 msgstr ""
@@ -628,7 +636,7 @@ msgstr ""
 msgid "while memEx fully supports multiple users, each memEx instance should be treated as a single cohesive and collaborative document."
 msgstr ""
 
-#: lib/memex_web/templates/user_registration/new.html.heex:28
+#: lib/memex_web/templates/user_registration/new.html.heex:32
 #, elixir-autogen, elixir-format, fuzzy
 msgid "language"
 msgstr ""
@@ -643,22 +651,12 @@ msgstr ""
 msgid "user registered on%{registered_datetime}"
 msgstr ""
 
-#: lib/memex_web/components/invite_card.ex:37
+#: lib/memex_web/components/invite_card.ex:22
+#, elixir-autogen, elixir-format
+msgid "uses left: %{uses_left}"
+msgstr ""
+
+#: lib/memex_web/components/invite_card.ex:27
 #, elixir-autogen, elixir-format
 msgid "uses left: unlimited"
 msgstr ""
-
-#: lib/memex_web/live/home_live.html.heex:41
-#, elixir-autogen, elixir-format, fuzzy
-msgid "read more on how to use memEx"
-msgstr ""
-
-#: lib/memex_web/components/invite_card.ex:32
-#, elixir-autogen, elixir-format, fuzzy
-msgid "uses left: %{uses_left_count}"
-msgstr ""
-
-#: lib/memex_web/components/invite_card.ex:52
-#, elixir-autogen, elixir-format
-msgid "uses: %{uses_count}"
-msgstr ""

priv/gettext/de/LC_MESSAGES/errors.po

@@ -10,6 +10,11 @@ msgid ""
 msgstr ""
 "Language: de\n"
 
+#: lib/memex_web/controllers/user_settings_controller.ex:84
+#, elixir-autogen, elixir-format
+msgid "Email change link is invalid or it has expired."
+msgstr ""
+
 #: lib/memex_web/templates/error/error.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Error"
@@ -20,8 +25,9 @@ msgstr ""
 msgid "Invalid email or password"
 msgstr ""
 
-#: lib/memex_web/templates/user_reset_password/edit.html.heex:14
+#: lib/memex_web/templates/user_registration/new.html.heex:15
-#: lib/memex_web/templates/user_settings/edit.html.heex:67
+#: lib/memex_web/templates/user_reset_password/edit.html.heex:15
+#: lib/memex_web/templates/user_settings/edit.html.heex:64
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
@@ -31,23 +37,33 @@ msgstr ""
 msgid "Reset password link is invalid or it has expired."
 msgstr ""
 
-#: lib/memex_web/controllers/user_registration_controller.ex:22
+#: lib/memex_web/controllers/user_registration_controller.ex:24
-#: lib/memex_web/controllers/user_registration_controller.ex:51
+#: lib/memex_web/controllers/user_registration_controller.ex:55
 #, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr ""
 
-#: lib/memex_web/controllers/user_registration_controller.ex:12
+#: lib/memex_web/controllers/user_registration_controller.ex:14
-#: lib/memex_web/controllers/user_registration_controller.ex:41
+#: lib/memex_web/controllers/user_registration_controller.ex:45
 #, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
 
+#: lib/memex_web/controllers/user_settings_controller.ex:99
+#, elixir-autogen, elixir-format
+msgid "Unable to delete user"
+msgstr ""
+
 #: lib/memex_web/controllers/user_confirmation_controller.ex:54
 #, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
 msgstr ""
 
+#: lib/memex_web/live/invite_live/index.ex:18
+#, elixir-autogen, elixir-format
+msgid "You are not authorized to view this page"
+msgstr ""
+
 #: lib/memex_web/controllers/user_auth.ex:177
 #, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page."
@@ -59,28 +75,28 @@ msgstr ""
 msgid "You must confirm your account and log in to access this page."
 msgstr ""
 
-#: lib/memex/accounts/user.ex:144
+#: lib/memex/accounts/user.ex:139
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr ""
 
-#: lib/memex/accounts/user.ex:165
+#: lib/memex/accounts/user.ex:160
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr ""
 
-#: lib/memex/accounts/user.ex:202
+#: lib/memex/accounts/user.ex:197
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr ""
 
-#: lib/memex/accounts/user.ex:99
+#: lib/memex/accounts/user.ex:95
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:23
+#: lib/memex_web/templates/user_settings/edit.html.heex:21
-#: lib/memex_web/templates/user_settings/edit.html.heex:123
+#: lib/memex_web/templates/user_settings/edit.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "oops, something went wrong! Please check the errors below"
 msgstr ""
@@ -121,28 +137,3 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "invalid format: only numbers, letters and hyphen are accepted. tags must be comma-delimited"
 msgstr ""
-
-#: lib/memex_web/templates/user_registration/new.html.heex:13
-#, elixir-autogen, elixir-format, fuzzy
-msgid "oops, something went wrong! please check the errors below."
-msgstr ""
-
-#: lib/memex_web/controllers/user_registration_controller.ex:70
-#, elixir-autogen, elixir-format, fuzzy
-msgid "sorry, this invite was not found or expired"
-msgstr ""
-
-#: lib/memex_web/live/invite_live/index.ex:19
-#, elixir-autogen, elixir-format, fuzzy
-msgid "you are not authorized to view this page"
-msgstr ""
-
-#: lib/memex_web/controllers/user_settings_controller.ex:84
-#, elixir-autogen, elixir-format, fuzzy
-msgid "email change link is invalid or it has expired."
-msgstr ""
-
-#: lib/memex_web/controllers/user_settings_controller.ex:99
-#, elixir-autogen, elixir-format, fuzzy
-msgid "unable to delete user"
-msgstr ""

priv/gettext/de/LC_MESSAGES/prompts.po

@@ -15,31 +15,56 @@ msgstr ""
 msgid "%{email} confirmed successfully."
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.ex:54
+#: lib/memex_web/live/invite_live/form_component.ex:62
+#, elixir-autogen, elixir-format
+msgid "%{invite_name} created successfully"
+msgstr ""
+
+#: lib/memex_web/live/invite_live/index.ex:53
 #, elixir-autogen, elixir-format
 msgid "%{invite_name} deleted succesfully"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.ex:115
+#: lib/memex_web/live/invite_live/index.ex:114
 #, elixir-autogen, elixir-format
 msgid "%{invite_name} disabled succesfully"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.ex:91
+#: lib/memex_web/live/invite_live/index.ex:90
 #, elixir-autogen, elixir-format
 msgid "%{invite_name} enabled succesfully"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.ex:69
+#: lib/memex_web/live/invite_live/index.ex:68
 #, elixir-autogen, elixir-format
 msgid "%{invite_name} updated succesfully"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.ex:140
+#: lib/memex_web/live/invite_live/form_component.ex:42
+#, elixir-autogen, elixir-format
+msgid "%{invite_name} updated successfully"
+msgstr ""
+
+#: lib/memex_web/live/invite_live/index.ex:139
 #, elixir-autogen, elixir-format
 msgid "%{user_email} deleted succesfully"
 msgstr ""
 
+#: lib/memex_web/controllers/user_settings_controller.ex:29
+#, elixir-autogen, elixir-format
+msgid "A link to confirm your email change has been sent to the new address."
+msgstr ""
+
+#: lib/memex_web/live/invite_live/index.ex:127
+#, elixir-autogen, elixir-format
+msgid "Copied to clipboard"
+msgstr ""
+
+#: lib/memex_web/controllers/user_settings_controller.ex:77
+#, elixir-autogen, elixir-format
+msgid "Email changed successfully."
+msgstr ""
+
 #: lib/memex_web/controllers/user_confirmation_controller.ex:23
 #, elixir-autogen, elixir-format
 msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
@@ -55,53 +80,73 @@ msgstr ""
 msgid "Password reset successfully."
 msgstr ""
 
-#: lib/memex_web/live/invite_live/form_component.html.heex:31
+#: lib/memex_web/controllers/user_settings_controller.ex:49
+#, elixir-autogen, elixir-format
+msgid "Password updated successfully."
+msgstr ""
+
+#: lib/memex_web/controllers/user_registration_controller.ex:73
+#, elixir-autogen, elixir-format
+msgid "Please check your email to verify your account"
+msgstr ""
+
+#: lib/memex_web/live/invite_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:136
+#: lib/memex_web/controllers/user_settings_controller.ex:95
+#, elixir-autogen, elixir-format
+msgid "Your account has been deleted"
+msgstr ""
+
+#: lib/memex_web/templates/user_settings/edit.html.heex:133
 #, elixir-autogen, elixir-format
 msgid "are you sure you want to change your language?"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:97
+#: lib/memex_web/live/invite_live/index.html.heex:102
-#: lib/memex_web/live/invite_live/index.html.heex:125
+#: lib/memex_web/live/invite_live/index.html.heex:132
 #, elixir-autogen, elixir-format
 msgid "are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:47
+#: lib/memex_web/live/invite_live/index.html.heex:48
 #, elixir-autogen, elixir-format
 msgid "are you sure you want to delete the invite for %{invite_name}?"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:155
+#: lib/memex_web/templates/user_settings/edit.html.heex:152
 #, elixir-autogen, elixir-format
 msgid "are you sure you want to delete your account?"
 msgstr ""
 
-#: lib/memex_web/components/topbar.ex:90
+#: lib/memex_web/components/topbar.ex:92
 #, elixir-autogen, elixir-format
 msgid "are you sure you want to log out?"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:72
+#: lib/memex_web/live/invite_live/index.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "are you sure you want to make %{invite_name} unlimited?"
 msgstr ""
 
-#: lib/memex_web/live/context_live/index.html.heex:45
+#: lib/memex_web/live/context_live/index.html.heex:46
-#: lib/memex_web/live/context_live/show.html.heex:38
+#: lib/memex_web/live/context_live/show.html.heex:37
-#: lib/memex_web/live/note_live/index.html.heex:45
+#: lib/memex_web/live/note_live/index.html.heex:46
-#: lib/memex_web/live/note_live/show.html.heex:38
+#: lib/memex_web/live/note_live/show.html.heex:34
-#: lib/memex_web/live/pipeline_live/index.html.heex:45
+#: lib/memex_web/live/pipeline_live/index.html.heex:46
 #: lib/memex_web/live/pipeline_live/show.html.heex:46
-#: lib/memex_web/live/pipeline_live/show.html.heex:115
+#: lib/memex_web/live/pipeline_live/show.html.heex:116
 #, elixir-autogen, elixir-format
 msgid "are you sure?"
 msgstr ""
 
+#: lib/memex_web/live/home_live.html.heex:95
+#, elixir-autogen, elixir-format
+msgid "register to setup %{name}"
+msgstr ""
+
 #: lib/memex_web/controllers/user_session_controller.ex:23
 #, elixir-autogen, elixir-format, fuzzy
 msgid "logged out successfully."
@@ -111,48 +156,3 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "language updated successfully."
 msgstr ""
-
-#: lib/memex_web/live/home_live.html.heex:95
-#, elixir-autogen, elixir-format, fuzzy
-msgid "register to setup memEx"
-msgstr ""
-
-#: lib/memex_web/live/invite_live/form_component.ex:80
-#, elixir-autogen, elixir-format, fuzzy
-msgid "%{name} created successfully"
-msgstr ""
-
-#: lib/memex_web/live/invite_live/form_component.ex:62
-#, elixir-autogen, elixir-format, fuzzy
-msgid "%{name} updated successfully"
-msgstr ""
-
-#: lib/memex_web/live/invite_live/index.ex:128
-#, elixir-autogen, elixir-format, fuzzy
-msgid "copied to clipboard"
-msgstr ""
-
-#: lib/memex_web/controllers/user_registration_controller.ex:65
-#, elixir-autogen, elixir-format, fuzzy
-msgid "please check your email to verify your account"
-msgstr ""
-
-#: lib/memex_web/controllers/user_settings_controller.ex:29
-#, elixir-autogen, elixir-format, fuzzy
-msgid "a link to confirm your email change has been sent to the new address."
-msgstr ""
-
-#: lib/memex_web/controllers/user_settings_controller.ex:77
-#, elixir-autogen, elixir-format, fuzzy
-msgid "email changed successfully."
-msgstr ""
-
-#: lib/memex_web/controllers/user_settings_controller.ex:49
-#, elixir-autogen, elixir-format, fuzzy
-msgid "password updated successfully."
-msgstr ""
-
-#: lib/memex_web/controllers/user_settings_controller.ex:95
-#, elixir-autogen, elixir-format, fuzzy
-msgid "your account has been deleted"
-msgstr ""

priv/gettext/default.pot

@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:86
+#: lib/memex_web/live/invite_live/index.html.heex:90
 #, elixir-autogen, elixir-format
 msgid "Admins"
 msgstr ""
@@ -20,17 +20,17 @@ msgstr ""
 msgid "Confirm your account"
 msgstr ""
 
-#: lib/memex_web/templates/user_session/new.html.heex:25
+#: lib/memex_web/templates/user_session/new.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/form_component.html.heex:21
+#: lib/memex_web/live/invite_live/form_component.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
 
-#: lib/memex_web/templates/layout/live.html.heex:43
+#: lib/memex_web/templates/layout/live.html.heex:40
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr ""
@@ -40,14 +40,19 @@ msgstr ""
 msgid "Reset your password"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/form_component.html.heex:25
+#: lib/memex_web/controllers/user_settings_controller.ex:10
+#, elixir-autogen, elixir-format
+msgid "Settings"
+msgstr ""
+
+#: lib/memex_web/live/invite_live/form_component.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Uses left"
 msgstr ""
 
-#: lib/memex_web/live/context_live/show.html.heex:19
+#: lib/memex_web/live/context_live/show.html.heex:17
-#: lib/memex_web/live/note_live/show.html.heex:19
+#: lib/memex_web/live/note_live/show.html.heex:17
-#: lib/memex_web/live/pipeline_live/show.html.heex:27
+#: lib/memex_web/live/pipeline_live/show.html.heex:26
 #, elixir-autogen, elixir-format
 msgid "Visibility: %{visibility}"
 msgstr ""
@@ -67,7 +72,7 @@ msgstr ""
 msgid "built with sharing and collaboration in mind"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:80
+#: lib/memex_web/templates/user_settings/edit.html.heex:78
 #, elixir-autogen, elixir-format
 msgid "confirm new password"
 msgstr ""
@@ -95,13 +100,13 @@ msgstr ""
 msgid "convenient:"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:33
+#: lib/memex_web/templates/user_settings/edit.html.heex:32
-#: lib/memex_web/templates/user_settings/edit.html.heex:89
+#: lib/memex_web/templates/user_settings/edit.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "current password"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:62
+#: lib/memex_web/live/invite_live/index.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "disable"
 msgstr ""
@@ -116,12 +121,12 @@ msgstr ""
 msgid "document your processes, attaching contexts to each step"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.ex:34
+#: lib/memex_web/live/invite_live/index.ex:33
 #, elixir-autogen, elixir-format
 msgid "edit invite"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:29
+#: lib/memex_web/templates/user_settings/edit.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "email"
 msgstr ""
@@ -131,13 +136,13 @@ msgstr ""
 msgid "email unconfirmed"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:62
+#: lib/memex_web/live/invite_live/index.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "enable"
 msgstr ""
 
-#: lib/memex_web/templates/user_registration/new.html.heex:32
+#: lib/memex_web/templates/user_registration/new.html.heex:36
-#: lib/memex_web/templates/user_settings/edit.html.heex:129
+#: lib/memex_web/templates/user_settings/edit.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "english"
 msgstr ""
@@ -147,12 +152,12 @@ msgstr ""
 msgid "features"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:135
+#: lib/memex_web/live/home_live.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "get involved!"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:156
+#: lib/memex_web/live/home_live.html.heex:159
 #, elixir-autogen, elixir-format
 msgid "help translate"
 msgstr ""
@@ -162,18 +167,18 @@ msgstr ""
 msgid "instance information"
 msgstr ""
 
-#: lib/memex_web/components/invite_card.ex:42
+#: lib/memex_web/components/invite_card.ex:32
 #, elixir-autogen, elixir-format
 msgid "invite disabled"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:112
+#: lib/memex_web/live/home_live.html.heex:115
 #, elixir-autogen, elixir-format
 msgid "invite only"
 msgstr ""
 
-#: lib/memex_web/components/topbar.ex:73
+#: lib/memex_web/components/topbar.ex:74
-#: lib/memex_web/live/invite_live/index.ex:42
+#: lib/memex_web/live/invite_live/index.ex:41
 #: lib/memex_web/live/invite_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "invites"
@@ -189,12 +194,12 @@ msgstr ""
 msgid "multi-user:"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.ex:38
+#: lib/memex_web/live/invite_live/index.ex:37
 #, elixir-autogen, elixir-format
 msgid "new invite"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:73
+#: lib/memex_web/templates/user_settings/edit.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "new password"
 msgstr ""
@@ -250,22 +255,22 @@ msgstr ""
 msgid "provide context around a single topic and hotlink to your notes"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:111
+#: lib/memex_web/live/home_live.html.heex:114
 #, elixir-autogen, elixir-format
 msgid "public signups"
 msgstr ""
 
-#: lib/memex_web/controllers/user_registration_controller.ex:32
+#: lib/memex_web/controllers/user_registration_controller.ex:34
 #, elixir-autogen, elixir-format
 msgid "register"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:108
+#: lib/memex_web/live/home_live.html.heex:110
 #, elixir-autogen, elixir-format
 msgid "registration:"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:167
+#: lib/memex_web/live/home_live.html.heex:170
 #, elixir-autogen, elixir-format
 msgid "report bugs or request features"
 msgstr ""
@@ -285,12 +290,11 @@ msgstr ""
 msgid "select privacy"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:77
+#: lib/memex_web/live/invite_live/index.html.heex:79
 #, elixir-autogen, elixir-format
 msgid "set unlimited"
 msgstr ""
 
-#: lib/memex_web/controllers/user_settings_controller.ex:10
 #: lib/memex_web/templates/user_settings/edit.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "settings"
@@ -310,17 +314,17 @@ msgstr ""
 msgid "tags"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:114
+#: lib/memex_web/live/invite_live/index.html.heex:120
 #, elixir-autogen, elixir-format
 msgid "users"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:118
+#: lib/memex_web/live/home_live.html.heex:121
 #, elixir-autogen, elixir-format
 msgid "version:"
 msgstr ""
 
-#: lib/memex_web/live/home_live.html.heex:145
+#: lib/memex_web/live/home_live.html.heex:148
 #, elixir-autogen, elixir-format
 msgid "view the source code"
 msgstr ""
@@ -439,20 +443,24 @@ msgstr ""
 
 #: lib/memex_web/components/topbar.ex:23
 #: lib/memex_web/live/home_live.html.heex:3
-#: lib/memex_web/templates/error/error.html.heex:8
 #: lib/memex_web/templates/layout/root.html.heex:8
 #: lib/memex_web/templates/layout/root.html.heex:9
-#: lib/memex_web/views/layout_view.ex:15
+#: lib/memex_web/views/layout_view.ex:11
 #, elixir-autogen, elixir-format
 msgid "memEx"
 msgstr ""
 
+#: lib/memex_web/live/home_live.html.heex:41
+#, elixir-autogen, elixir-format
+msgid "read more on how to use %{name}"
+msgstr ""
+
 #: lib/memex_web/live/faq_live.html.heex:11
 #, elixir-autogen, elixir-format
 msgid "what is this?"
 msgstr ""
 
-#: lib/memex_web/live/pipeline_live/show.html.heex:67
+#: lib/memex_web/live/pipeline_live/show.html.heex:68
 #, elixir-autogen, elixir-format
 msgid "%{position}. %{title}"
 msgstr ""
@@ -477,12 +485,12 @@ msgstr ""
 msgid "add step to %{slug}"
 msgstr ""
 
-#: lib/memex_web/live/pipeline_live/show.html.heex:61
+#: lib/memex_web/live/pipeline_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "no steps"
 msgstr ""
 
-#: lib/memex_web/live/pipeline_live/show.html.heex:56
+#: lib/memex_web/live/pipeline_live/show.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "steps:"
 msgstr ""
@@ -587,7 +595,7 @@ msgstr ""
 msgid "zettelkasten"
 msgstr ""
 
-#: lib/memex_web/views/layout_view.ex:11
+#: lib/memex_web/views/layout_view.ex:10
 #, elixir-autogen, elixir-format
 msgid "memEx | %{title}"
 msgstr ""
@@ -617,7 +625,7 @@ msgstr ""
 msgid "while memEx fully supports multiple users, each memEx instance should be treated as a single cohesive and collaborative document."
 msgstr ""
 
-#: lib/memex_web/templates/user_registration/new.html.heex:28
+#: lib/memex_web/templates/user_registration/new.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "language"
 msgstr ""
@@ -632,22 +640,12 @@ msgstr ""
 msgid "user registered on%{registered_datetime}"
 msgstr ""
 
-#: lib/memex_web/components/invite_card.ex:37
+#: lib/memex_web/components/invite_card.ex:22
+#, elixir-autogen, elixir-format
+msgid "uses left: %{uses_left}"
+msgstr ""
+
+#: lib/memex_web/components/invite_card.ex:27
 #, elixir-autogen, elixir-format
 msgid "uses left: unlimited"
 msgstr ""
-
-#: lib/memex_web/live/home_live.html.heex:41
-#, elixir-autogen, elixir-format
-msgid "read more on how to use memEx"
-msgstr ""
-
-#: lib/memex_web/components/invite_card.ex:32
-#, elixir-autogen, elixir-format
-msgid "uses left: %{uses_left_count}"
-msgstr ""
-
-#: lib/memex_web/components/invite_card.ex:52
-#, elixir-autogen, elixir-format
-msgid "uses: %{uses_count}"
-msgstr ""

priv/gettext/errors.pot

@@ -10,6 +10,11 @@
 msgid ""
 msgstr ""
 
+#: lib/memex_web/controllers/user_settings_controller.ex:84
+#, elixir-autogen, elixir-format
+msgid "Email change link is invalid or it has expired."
+msgstr ""
+
 #: lib/memex_web/templates/error/error.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Error"
@@ -20,8 +25,9 @@ msgstr ""
 msgid "Invalid email or password"
 msgstr ""
 
-#: lib/memex_web/templates/user_reset_password/edit.html.heex:14
+#: lib/memex_web/templates/user_registration/new.html.heex:15
-#: lib/memex_web/templates/user_settings/edit.html.heex:67
+#: lib/memex_web/templates/user_reset_password/edit.html.heex:15
+#: lib/memex_web/templates/user_settings/edit.html.heex:64
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
@@ -31,23 +37,33 @@ msgstr ""
 msgid "Reset password link is invalid or it has expired."
 msgstr ""
 
-#: lib/memex_web/controllers/user_registration_controller.ex:22
+#: lib/memex_web/controllers/user_registration_controller.ex:24
-#: lib/memex_web/controllers/user_registration_controller.ex:51
+#: lib/memex_web/controllers/user_registration_controller.ex:55
 #, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr ""
 
-#: lib/memex_web/controllers/user_registration_controller.ex:12
+#: lib/memex_web/controllers/user_registration_controller.ex:14
-#: lib/memex_web/controllers/user_registration_controller.ex:41
+#: lib/memex_web/controllers/user_registration_controller.ex:45
 #, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
 
+#: lib/memex_web/controllers/user_settings_controller.ex:99
+#, elixir-autogen, elixir-format
+msgid "Unable to delete user"
+msgstr ""
+
 #: lib/memex_web/controllers/user_confirmation_controller.ex:54
 #, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
 msgstr ""
 
+#: lib/memex_web/live/invite_live/index.ex:18
+#, elixir-autogen, elixir-format
+msgid "You are not authorized to view this page"
+msgstr ""
+
 #: lib/memex_web/controllers/user_auth.ex:177
 #, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page."
@@ -59,28 +75,28 @@ msgstr ""
 msgid "You must confirm your account and log in to access this page."
 msgstr ""
 
-#: lib/memex/accounts/user.ex:144
+#: lib/memex/accounts/user.ex:139
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr ""
 
-#: lib/memex/accounts/user.ex:165
+#: lib/memex/accounts/user.ex:160
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr ""
 
-#: lib/memex/accounts/user.ex:202
+#: lib/memex/accounts/user.ex:197
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr ""
 
-#: lib/memex/accounts/user.ex:99
+#: lib/memex/accounts/user.ex:95
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:23
+#: lib/memex_web/templates/user_settings/edit.html.heex:21
-#: lib/memex_web/templates/user_settings/edit.html.heex:123
+#: lib/memex_web/templates/user_settings/edit.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "oops, something went wrong! Please check the errors below"
 msgstr ""
@@ -121,28 +137,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "invalid format: only numbers, letters and hyphen are accepted. tags must be comma-delimited"
 msgstr ""
-
-#: lib/memex_web/templates/user_registration/new.html.heex:13
-#, elixir-autogen, elixir-format
-msgid "oops, something went wrong! please check the errors below."
-msgstr ""
-
-#: lib/memex_web/controllers/user_registration_controller.ex:70
-#, elixir-autogen, elixir-format
-msgid "sorry, this invite was not found or expired"
-msgstr ""
-
-#: lib/memex_web/live/invite_live/index.ex:19
-#, elixir-autogen, elixir-format
-msgid "you are not authorized to view this page"
-msgstr ""
-
-#: lib/memex_web/controllers/user_settings_controller.ex:84
-#, elixir-autogen, elixir-format
-msgid "email change link is invalid or it has expired."
-msgstr ""
-
-#: lib/memex_web/controllers/user_settings_controller.ex:99
-#, elixir-autogen, elixir-format
-msgid "unable to delete user"
-msgstr ""

priv/gettext/prompts.pot

@@ -15,31 +15,56 @@ msgstr ""
 msgid "%{email} confirmed successfully."
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.ex:54
+#: lib/memex_web/live/invite_live/form_component.ex:62
+#, elixir-autogen, elixir-format
+msgid "%{invite_name} created successfully"
+msgstr ""
+
+#: lib/memex_web/live/invite_live/index.ex:53
 #, elixir-autogen, elixir-format
 msgid "%{invite_name} deleted succesfully"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.ex:115
+#: lib/memex_web/live/invite_live/index.ex:114
 #, elixir-autogen, elixir-format
 msgid "%{invite_name} disabled succesfully"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.ex:91
+#: lib/memex_web/live/invite_live/index.ex:90
 #, elixir-autogen, elixir-format
 msgid "%{invite_name} enabled succesfully"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.ex:69
+#: lib/memex_web/live/invite_live/index.ex:68
 #, elixir-autogen, elixir-format
 msgid "%{invite_name} updated succesfully"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.ex:140
+#: lib/memex_web/live/invite_live/form_component.ex:42
+#, elixir-autogen, elixir-format
+msgid "%{invite_name} updated successfully"
+msgstr ""
+
+#: lib/memex_web/live/invite_live/index.ex:139
 #, elixir-autogen, elixir-format
 msgid "%{user_email} deleted succesfully"
 msgstr ""
 
+#: lib/memex_web/controllers/user_settings_controller.ex:29
+#, elixir-autogen, elixir-format
+msgid "A link to confirm your email change has been sent to the new address."
+msgstr ""
+
+#: lib/memex_web/live/invite_live/index.ex:127
+#, elixir-autogen, elixir-format
+msgid "Copied to clipboard"
+msgstr ""
+
+#: lib/memex_web/controllers/user_settings_controller.ex:77
+#, elixir-autogen, elixir-format
+msgid "Email changed successfully."
+msgstr ""
+
 #: lib/memex_web/controllers/user_confirmation_controller.ex:23
 #, elixir-autogen, elixir-format
 msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
@@ -55,53 +80,73 @@ msgstr ""
 msgid "Password reset successfully."
 msgstr ""
 
-#: lib/memex_web/live/invite_live/form_component.html.heex:31
+#: lib/memex_web/controllers/user_settings_controller.ex:49
+#, elixir-autogen, elixir-format
+msgid "Password updated successfully."
+msgstr ""
+
+#: lib/memex_web/controllers/user_registration_controller.ex:73
+#, elixir-autogen, elixir-format
+msgid "Please check your email to verify your account"
+msgstr ""
+
+#: lib/memex_web/live/invite_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:136
+#: lib/memex_web/controllers/user_settings_controller.ex:95
+#, elixir-autogen, elixir-format
+msgid "Your account has been deleted"
+msgstr ""
+
+#: lib/memex_web/templates/user_settings/edit.html.heex:133
 #, elixir-autogen, elixir-format
 msgid "are you sure you want to change your language?"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:97
+#: lib/memex_web/live/invite_live/index.html.heex:102
-#: lib/memex_web/live/invite_live/index.html.heex:125
+#: lib/memex_web/live/invite_live/index.html.heex:132
 #, elixir-autogen, elixir-format
 msgid "are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:47
+#: lib/memex_web/live/invite_live/index.html.heex:48
 #, elixir-autogen, elixir-format
 msgid "are you sure you want to delete the invite for %{invite_name}?"
 msgstr ""
 
-#: lib/memex_web/templates/user_settings/edit.html.heex:155
+#: lib/memex_web/templates/user_settings/edit.html.heex:152
 #, elixir-autogen, elixir-format
 msgid "are you sure you want to delete your account?"
 msgstr ""
 
-#: lib/memex_web/components/topbar.ex:90
+#: lib/memex_web/components/topbar.ex:92
 #, elixir-autogen, elixir-format
 msgid "are you sure you want to log out?"
 msgstr ""
 
-#: lib/memex_web/live/invite_live/index.html.heex:72
+#: lib/memex_web/live/invite_live/index.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "are you sure you want to make %{invite_name} unlimited?"
 msgstr ""
 
-#: lib/memex_web/live/context_live/index.html.heex:45
+#: lib/memex_web/live/context_live/index.html.heex:46
-#: lib/memex_web/live/context_live/show.html.heex:38
+#: lib/memex_web/live/context_live/show.html.heex:37
-#: lib/memex_web/live/note_live/index.html.heex:45
+#: lib/memex_web/live/note_live/index.html.heex:46
-#: lib/memex_web/live/note_live/show.html.heex:38
+#: lib/memex_web/live/note_live/show.html.heex:34
-#: lib/memex_web/live/pipeline_live/index.html.heex:45
+#: lib/memex_web/live/pipeline_live/index.html.heex:46
 #: lib/memex_web/live/pipeline_live/show.html.heex:46
-#: lib/memex_web/live/pipeline_live/show.html.heex:115
+#: lib/memex_web/live/pipeline_live/show.html.heex:116
 #, elixir-autogen, elixir-format
 msgid "are you sure?"
 msgstr ""
 
+#: lib/memex_web/live/home_live.html.heex:95
+#, elixir-autogen, elixir-format
+msgid "register to setup %{name}"
+msgstr ""
+
 #: lib/memex_web/controllers/user_session_controller.ex:23
 #, elixir-autogen, elixir-format
 msgid "logged out successfully."
@@ -111,48 +156,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "language updated successfully."
 msgstr ""
-
-#: lib/memex_web/live/home_live.html.heex:95
-#, elixir-autogen, elixir-format
-msgid "register to setup memEx"
-msgstr ""
-
-#: lib/memex_web/live/invite_live/form_component.ex:80
-#, elixir-autogen, elixir-format
-msgid "%{name} created successfully"
-msgstr ""
-
-#: lib/memex_web/live/invite_live/form_component.ex:62
-#, elixir-autogen, elixir-format
-msgid "%{name} updated successfully"
-msgstr ""
-
-#: lib/memex_web/live/invite_live/index.ex:128
-#, elixir-autogen, elixir-format
-msgid "copied to clipboard"
-msgstr ""
-
-#: lib/memex_web/controllers/user_registration_controller.ex:65
-#, elixir-autogen, elixir-format
-msgid "please check your email to verify your account"
-msgstr ""
-
-#: lib/memex_web/controllers/user_settings_controller.ex:29
-#, elixir-autogen, elixir-format
-msgid "a link to confirm your email change has been sent to the new address."
-msgstr ""
-
-#: lib/memex_web/controllers/user_settings_controller.ex:77
-#, elixir-autogen, elixir-format
-msgid "email changed successfully."
-msgstr ""
-
-#: lib/memex_web/controllers/user_settings_controller.ex:49
-#, elixir-autogen, elixir-format
-msgid "password updated successfully."
-msgstr ""
-
-#: lib/memex_web/controllers/user_settings_controller.ex:95
-#, elixir-autogen, elixir-format
-msgid "your account has been deleted"
-msgstr ""

priv/repo/migrations/20230204191547_record_invites.exs

@@ -1,11 +0,0 @@
-defmodule Memex.Repo.Migrations.RecordInvites do
-  use Ecto.Migration
-
-  def change do
-    alter table(:users) do
-      add :invite_id, references(:invites, type: :binary_id)
-    end
-
-    rename table(:invites), :user_id, to: :created_by_id
-  end
-end

test/memex/accounts/invites_text.exs

@@ -1,176 +0,0 @@
-defmodule Memex.InvitesTest do
-  @moduledoc """
-  This module tests the Memex.Accounts.Invites context
-  """
-
-  use Memex.DataCase
-  alias Ecto.Changeset
-  alias Memex.Accounts
-  alias Memex.Accounts.{Invite, Invites}
-
-  @moduletag :invites_test
-
-  @valid_attrs %{
-    "name" => "some name"
-  }
-  @invalid_attrs %{
-    "name" => nil,
-    "token" => nil
-  }
-
-  describe "invites" do
-    setup do
-      current_user = admin_fixture()
-      {:ok, invite} = Invites.create_invite(current_user, @valid_attrs)
-      [invite: invite, current_user: current_user]
-    end
-
-    test "list_invites/0 returns all invites", %{invite: invite, current_user: current_user} do
-      assert Invites.list_invites(current_user) == [invite]
-    end
-
-    test "get_invite!/1 returns the invite with given id",
-         %{invite: invite, current_user: current_user} do
-      assert Invites.get_invite!(invite.id, current_user) == invite
-    end
-
-    test "valid_invite_token? returns for valid and invalid invite tokens",
-         %{invite: %{token: token}} do
-      refute Invites.valid_invite_token?(nil)
-      refute Invites.valid_invite_token?("")
-      assert Invites.valid_invite_token?(token)
-    end
-
-    test "valid_invite_token? does not return true for a disabled invite by token",
-         %{invite: %{token: token} = invite, current_user: current_user} do
-      assert Invites.valid_invite_token?(token)
-
-      {:ok, _invite} = Invites.update_invite(invite, %{uses_left: 1}, current_user)
-      {:ok, _invite} = Invites.use_invite(token)
-
-      refute Invites.valid_invite_token?(token)
-    end
-
-    test "get_use_count/2 returns the correct invite usage",
-         %{invite: %{token: token} = invite, current_user: current_user} do
-      assert 0 == Invites.get_use_count(invite, current_user)
-
-      assert {:ok, _user} =
-               Accounts.register_user(
-                 %{"email" => unique_user_email(), "password" => valid_user_password()},
-                 token
-               )
-
-      assert 1 == Invites.get_use_count(invite, current_user)
-
-      assert {:ok, _user} =
-               Accounts.register_user(
-                 %{"email" => unique_user_email(), "password" => valid_user_password()},
-                 token
-               )
-
-      assert 2 == Invites.get_use_count(invite, current_user)
-    end
-
-    test "use_invite/1 successfully uses an unlimited invite",
-         %{invite: %{token: token} = invite, current_user: current_user} do
-      {:ok, invite} = Invites.update_invite(invite, %{uses_left: nil}, current_user)
-      assert {:ok, ^invite} = Invites.use_invite(token)
-      assert {:ok, ^invite} = Invites.use_invite(token)
-      assert {:ok, ^invite} = Invites.use_invite(token)
-    end
-
-    test "use_invite/1 successfully decrements an invite",
-         %{invite: %{token: token} = invite, current_user: current_user} do
-      {:ok, _invite} = Invites.update_invite(invite, %{uses_left: 10}, current_user)
-      assert {:ok, %{uses_left: 9}} = Invites.use_invite(token)
-      assert {:ok, %{uses_left: 8}} = Invites.use_invite(token)
-      assert {:ok, %{uses_left: 7}} = Invites.use_invite(token)
-    end
-
-    test "use_invite/1 successfully disactivates an invite",
-         %{invite: %{token: token} = invite, current_user: current_user} do
-      {:ok, _invite} = Invites.update_invite(invite, %{uses_left: 1}, current_user)
-      assert {:ok, %{uses_left: 0, disabled_at: disabled_at}} = Invites.use_invite(token)
-      assert not is_nil(disabled_at)
-    end
-
-    test "use_invite/1 does not work on disactivated invite",
-         %{invite: %{token: token} = invite, current_user: current_user} do
-      {:ok, _invite} = Invites.update_invite(invite, %{uses_left: 1}, current_user)
-      {:ok, _invite} = Invites.use_invite(token)
-      assert {:error, :invalid_token} = Invites.use_invite(token)
-    end
-
-    test "create_invite/1 with valid data creates an unlimited invite",
-         %{current_user: current_user} do
-      assert {:ok, %Invite{} = invite} =
-               Invites.create_invite(current_user, %{
-                 "name" => "some name"
-               })
-
-      assert invite.name == "some name"
-    end
-
-    test "create_invite/1 with valid data creates a limited invite",
-         %{current_user: current_user} do
-      assert {:ok, %Invite{} = invite} =
-               Invites.create_invite(current_user, %{
-                 "name" => "some name",
-                 "uses_left" => 10
-               })
-
-      assert invite.name == "some name"
-      assert invite.uses_left == 10
-    end
-
-    test "create_invite/1 with invalid data returns error changeset",
-         %{current_user: current_user} do
-      assert {:error, %Changeset{}} = Invites.create_invite(current_user, @invalid_attrs)
-    end
-
-    test "update_invite/2 can set an invite to be limited",
-         %{invite: invite, current_user: current_user} do
-      assert {:ok, %Invite{} = new_invite} =
-               Invites.update_invite(
-                 invite,
-                 %{"name" => "some updated name", "uses_left" => 5},
-                 current_user
-               )
-
-      assert new_invite.name == "some updated name"
-      assert new_invite.uses_left == 5
-    end
-
-    test "update_invite/2 can set an invite to be unlimited",
-         %{invite: invite, current_user: current_user} do
-      {:ok, invite} = Invites.update_invite(invite, %{"uses_left" => 5}, current_user)
-
-      assert {:ok, %Invite{} = new_invite} =
-               Invites.update_invite(
-                 invite,
-                 %{"name" => "some updated name", "uses_left" => nil},
-                 current_user
-               )
-
-      assert new_invite.name == "some updated name"
-      assert new_invite.uses_left |> is_nil()
-    end
-
-    test "update_invite/2 with invalid data returns error changeset",
-         %{invite: invite, current_user: current_user} do
-      assert {:error, %Changeset{}} = Invites.update_invite(invite, @invalid_attrs, current_user)
-      assert invite == Invites.get_invite!(invite.id, current_user)
-    end
-
-    test "delete_invite/1 deletes the invite", %{invite: invite, current_user: current_user} do
-      assert {:ok, %Invite{}} = Invites.delete_invite(invite, current_user)
-      assert_raise Ecto.NoResultsError, fn -> Invites.get_invite!(invite.id, current_user) end
-    end
-
-    test "delete_invite!/1 deletes the invite", %{invite: invite, current_user: current_user} do
-      assert %Invite{} = Invites.delete_invite!(invite, current_user)
-      assert_raise Ecto.NoResultsError, fn -> Invites.get_invite!(invite.id, current_user) end
-    end
-  end
-end

test/memex/accounts_test.exs

@@ -6,12 +6,10 @@ defmodule Memex.AccountsTest do
   use Memex.DataCase
   alias Ecto.Changeset
   alias Memex.Accounts
-  alias Memex.Accounts.{Invites, User, UserToken}
+  alias Memex.Accounts.{User, UserToken}
 
   @moduletag :accounts_test
 
-  doctest Accounts, import: true
-
   describe "get_user_by_email/1" do
     test "does not return the user if the email does not exist" do
       refute Accounts.get_user_by_email("unknown@example.com")
@@ -102,17 +100,6 @@ defmodule Memex.AccountsTest do
       assert is_nil(user.confirmed_at)
       assert is_nil(user.password)
     end
-
-    test "records used invite during registration" do
-      {:ok, %{id: invite_id, token: token}} =
-        admin_fixture() |> Invites.create_invite(%{"name" => "my invite"})
-
-      assert {:ok, %{invite_id: ^invite_id}} =
-               Accounts.register_user(
-                 %{"email" => unique_user_email(), "password" => valid_user_password()},
-                 token
-               )
-    end
   end
 
   describe "change_user_registration/2" do
@@ -316,7 +303,7 @@ defmodule Memex.AccountsTest do
     end
 
     test "deletes all tokens for the given user", %{user: user} do
-      _session_token = Accounts.generate_user_session_token(user)
+      _ = Accounts.generate_user_session_token(user)
 
       {:ok, _} =
         Accounts.update_user_password(user, valid_user_password(), %{
@@ -513,7 +500,7 @@ defmodule Memex.AccountsTest do
     end
 
     test "deletes all tokens for the given user", %{user: user} do
-      _session_token = Accounts.generate_user_session_token(user)
+      _ = Accounts.generate_user_session_token(user)
       {:ok, _} = Accounts.reset_user_password(user, %{"password" => "new valid password"})
       refute Repo.get_by(UserToken, user_id: user.id)
     end

test/memex/invites_text.exs

@@ -0,0 +1,76 @@
+defmodule Memex.InvitesTest do
+  @moduledoc """
+  This module tests the Invites context
+  """
+
+  use Memex.DataCase
+  alias Ecto.Changeset
+  alias Memex.{Invites, Invites.Invite}
+
+  @moduletag :invites_test
+
+  @valid_attrs %{
+    "name" => "some name",
+    "token" => "some token"
+  }
+  @update_attrs %{
+    "name" => "some updated name",
+    "token" => "some updated token"
+  }
+  @invalid_attrs %{
+    "name" => nil,
+    "token" => nil
+  }
+
+  describe "invites" do
+    setup do
+      current_user = admin_fixture()
+      {:ok, invite} = Invites.create_invite(current_user, @valid_attrs)
+      [invite: invite, current_user: current_user]
+    end
+
+    test "list_invites/0 returns all invites", %{invite: invite, current_user: current_user} do
+      assert Invites.list_invites(current_user) == [invite]
+    end
+
+    test "get_invite!/1 returns the invite with given id",
+         %{invite: invite, current_user: current_user} do
+      assert Invites.get_invite!(invite.id, current_user) == invite
+    end
+
+    test "create_invite/1 with valid data creates a invite",
+         %{current_user: current_user} do
+      assert {:ok, %Invite{} = invite} = Invites.create_invite(current_user, @valid_attrs)
+      assert invite.name == "some name"
+    end
+
+    test "create_invite/1 with invalid data returns error changeset",
+         %{current_user: current_user} do
+      assert {:error, %Changeset{}} = Invites.create_invite(current_user, @invalid_attrs)
+    end
+
+    test "update_invite/2 with valid data updates the invite",
+         %{invite: invite, current_user: current_user} do
+      assert {:ok, %Invite{} = new_invite} =
+               Invites.update_invite(invite, @update_attrs, current_user)
+
+      assert new_invite.name == "some updated name"
+      assert new_invite.token == new_invite.token
+    end
+
+    test "update_invite/2 with invalid data returns error changeset",
+         %{invite: invite, current_user: current_user} do
+      assert {:error, %Changeset{}} = Invites.update_invite(invite, @invalid_attrs, current_user)
+      assert invite == Invites.get_invite!(invite.id, current_user)
+    end
+
+    test "delete_invite/1 deletes the invite", %{invite: invite, current_user: current_user} do
+      assert {:ok, %Invite{}} = Invites.delete_invite(invite, current_user)
+      assert_raise Ecto.NoResultsError, fn -> Invites.get_invite!(invite.id, current_user) end
+    end
+
+    test "change_invite/1 returns a invite changeset", %{invite: invite} do
+      assert %Changeset{} = Invites.change_invite(invite)
+    end
+  end
+end

test/memex_web/controllers/export_controller_test.exs

@@ -8,7 +8,14 @@ defmodule MemexWeb.ExportControllerTest do
 
   @moduletag :export_controller_test
 
-  setup [:register_and_log_in_user]
+  setup %{conn: conn} do
+    current_user = user_fixture() |> confirm_user()
+
+    [
+      current_user: current_user,
+      conn: conn |> log_in_user(current_user)
+    ]
+  end
 
   defp add_data(%{current_user: current_user}) do
     note = note_fixture(current_user)

test/memex_web/controllers/user_auth_test.exs

@@ -116,7 +116,7 @@ defmodule MemexWeb.UserAuthTest do
     end
 
     test "does not authenticate if data is missing", %{conn: conn, current_user: current_user} do
-      _session_token = Accounts.generate_user_session_token(current_user)
+      _ = Accounts.generate_user_session_token(current_user)
       conn = UserAuth.fetch_current_user(conn, [])
       refute get_session(conn, :user_token)
       refute conn.assigns.current_user

test/memex_web/controllers/user_confirmation_controller_test.exs

@@ -5,7 +5,8 @@ defmodule MemexWeb.UserConfirmationControllerTest do
 
   use MemexWeb.ConnCase, async: true
   import MemexWeb.Gettext
-  alias Memex.{Accounts, Repo}
+  alias Memex.Accounts
+  alias Memex.Repo
 
   @moduletag :user_confirmation_controller_test
 

test/memex_web/controllers/user_registration_controller_test.exs

@@ -33,7 +33,7 @@ defmodule MemexWeb.UserRegistrationControllerTest do
         })
 
       assert get_session(conn, :phoenix_flash) == %{
-               "info" => dgettext("prompts", "please check your email to verify your account")
+               "info" => dgettext("prompts", "Please check your email to verify your account")
              }
 
       assert redirected_to(conn) =~ "/"

test/memex_web/controllers/user_settings_controller_test.exs

@@ -15,7 +15,7 @@ defmodule MemexWeb.UserSettingsControllerTest do
     test "renders settings page", %{conn: conn} do
       conn = get(conn, Routes.user_settings_path(conn, :edit))
       response = html_response(conn, 200)
-      assert response =~ gettext("settings")
+      assert response =~ gettext("Settings")
     end
 
     test "redirects if user is not logged in" do
@@ -27,7 +27,7 @@ defmodule MemexWeb.UserSettingsControllerTest do
 
   describe "PUT /users/settings (change password form)" do
     test "updates the user password and resets tokens",
-         %{conn: conn, current_user: current_user} do
+         %{conn: conn, user: user} do
       new_password_conn =
         put(conn, Routes.user_settings_path(conn, :update), %{
           "action" => "update_password",
@@ -42,9 +42,9 @@ defmodule MemexWeb.UserSettingsControllerTest do
       assert get_session(new_password_conn, :user_token) != get_session(conn, :user_token)
 
       assert get_flash(new_password_conn, :info) =~
-               dgettext("actions", "password updated successfully")
+               dgettext("actions", "Password updated successfully")
 
-      assert Accounts.get_user_by_email_and_password(current_user.email, "new valid password")
+      assert Accounts.get_user_by_email_and_password(user.email, "new valid password")
     end
 
     test "does not update password on invalid data", %{conn: conn} do
@@ -70,7 +70,7 @@ defmodule MemexWeb.UserSettingsControllerTest do
 
   describe "PUT /users/settings (change email form)" do
     @tag :capture_log
-    test "updates the user email", %{conn: conn, current_user: current_user} do
+    test "updates the user email", %{conn: conn, user: user} do
       conn =
         put(conn, Routes.user_settings_path(conn, :update), %{
           "action" => "update_email",
@@ -83,10 +83,10 @@ defmodule MemexWeb.UserSettingsControllerTest do
       assert get_flash(conn, :info) =~
                dgettext(
                  "prompts",
-                 "a link to confirm your email change has been sent to the new address."
+                 "A link to confirm your email change has been sent to the new address."
                )
 
-      assert Accounts.get_user_by_email(current_user.email)
+      assert Accounts.get_user_by_email(user.email)
     end
 
     test "does not update email on invalid data", %{conn: conn} do
@@ -105,14 +105,14 @@ defmodule MemexWeb.UserSettingsControllerTest do
   end
 
   describe "GET /users/settings/confirm_email/:token" do
-    setup %{current_user: current_user} do
+    setup %{user: user} do
       email = unique_user_email()
 
       token =
         extract_user_token(fn url ->
           Accounts.deliver_update_email_instructions(
-            %{current_user | email: email},
+            %{user | email: email},
-            current_user.email,
+            user.email,
             url
           )
         end)
@@ -121,28 +121,28 @@ defmodule MemexWeb.UserSettingsControllerTest do
     end
 
     test "updates the user email once",
-         %{conn: conn, current_user: current_user, token: token, email: email} do
+         %{conn: conn, user: user, token: token, email: email} do
       conn = get(conn, Routes.user_settings_path(conn, :confirm_email, token))
       assert redirected_to(conn) == Routes.user_settings_path(conn, :edit)
-      assert get_flash(conn, :info) =~ dgettext("prompts", "email changed successfully")
+      assert get_flash(conn, :info) =~ dgettext("prompts", "Email changed successfully")
-      refute Accounts.get_user_by_email(current_user.email)
+      refute Accounts.get_user_by_email(user.email)
       assert Accounts.get_user_by_email(email)
 
       conn = get(conn, Routes.user_settings_path(conn, :confirm_email, token))
       assert redirected_to(conn) == Routes.user_settings_path(conn, :edit)
 
       assert get_flash(conn, :error) =~
-               dgettext("errors", "email change link is invalid or it has expired")
+               dgettext("errors", "Email change link is invalid or it has expired")
     end
 
-    test "does not update email with invalid token", %{conn: conn, current_user: current_user} do
+    test "does not update email with invalid token", %{conn: conn, user: user} do
       conn = get(conn, Routes.user_settings_path(conn, :confirm_email, "oops"))
       assert redirected_to(conn) == Routes.user_settings_path(conn, :edit)
 
       assert get_flash(conn, :error) =~
-               dgettext("errors", "email change link is invalid or it has expired")
+               dgettext("errors", "Email change link is invalid or it has expired")
 
-      assert Accounts.get_user_by_email(current_user.email)
+      assert Accounts.get_user_by_email(user.email)
     end
 
     test "redirects if user is not logged in", %{token: token} do

test/memex_web/live/context_live_test.exs

@@ -23,8 +23,8 @@ defmodule MemexWeb.ContextLiveTest do
     "visibility" => nil
   }
 
-  defp create_context(%{current_user: current_user}) do
+  defp create_context(%{user: user}) do
-    [context: context_fixture(current_user)]
+    [context: context_fixture(user)]
   end
 
   describe "Index" do
@@ -57,7 +57,7 @@ defmodule MemexWeb.ContextLiveTest do
              |> form("#context-form", context: @invalid_attrs)
              |> render_change() =~ "can't be blank"
 
-      {:ok, _live, html} =
+      {:ok, _, html} =
         index_live
         |> form("#context-form", context: @create_attrs)
         |> render_submit()
@@ -79,7 +79,7 @@ defmodule MemexWeb.ContextLiveTest do
              |> form("#context-form", context: @invalid_attrs)
              |> render_change() =~ "can't be blank"
 
-      {:ok, _live, html} =
+      {:ok, _, html} =
         index_live
         |> form("#context-form", context: @update_attrs)
         |> render_submit()
@@ -122,7 +122,7 @@ defmodule MemexWeb.ContextLiveTest do
       assert html =~ "can't be blank"
       assert html =~ "tags must be comma-delimited"
 
-      {:ok, _live, html} =
+      {:ok, _, html} =
         show_live
         |> form("#context-form", context: Map.put(@update_attrs, "slug", context.slug))
         |> render_submit()
@@ -148,16 +148,13 @@ defmodule MemexWeb.ContextLiveTest do
   describe "show with note" do
     setup [:register_and_log_in_user]
 
-    setup %{current_user: current_user} do
+    setup %{user: user} do
-      %{slug: note_slug} = note = note_fixture(current_user)
+      %{slug: note_slug} = note = note_fixture(user)
 
       [
         note: note,
         context:
-          context_fixture(
+          context_fixture(%{content: "example with backlink to [[#{note_slug}]] note"}, user)
-            %{content: "example with backlink to [[#{note_slug}]] note"},
-            current_user
-          )
       ]
     end
 

test/memex_web/live/invite_live_test.exs

@@ -6,7 +6,7 @@ defmodule MemexWeb.InviteLiveTest do
   use MemexWeb.ConnCase
   import Phoenix.LiveViewTest
   import MemexWeb.Gettext
-  alias Memex.Accounts.Invites
+  alias Memex.Invites
 
   @moduletag :invite_live_test
   @create_attrs %{"name" => "some name"}
@@ -16,9 +16,9 @@ defmodule MemexWeb.InviteLiveTest do
   describe "Index" do
     setup [:register_and_log_in_user]
 
-    setup %{current_user: current_user} do
+    setup %{user: user} do
-      {:ok, invite} = Invites.create_invite(current_user, @create_attrs)
+      {:ok, invite} = Invites.create_invite(user, @create_attrs)
-      %{invite: invite, current_user: current_user}
+      %{invite: invite, user: user}
     end
 
     test "lists all invites", %{conn: conn, invite: invite} do
@@ -40,7 +40,7 @@ defmodule MemexWeb.InviteLiveTest do
       #        |> form("#invite-form", invite: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _live, html} =
+      {:ok, _, html} =
         index_live
         |> form("#invite-form", invite: @create_attrs)
         |> render_submit()
@@ -64,7 +64,7 @@ defmodule MemexWeb.InviteLiveTest do
       #        |> form("#invite-form", invite: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _live, html} =
+      {:ok, _, html} =
         index_live
         |> form("#invite-form", invite: @update_attrs)
         |> render_submit()

test/memex_web/live/note_live_test.exs

@@ -24,8 +24,8 @@ defmodule MemexWeb.NoteLiveTest do
     "visibility" => nil
   }
 
-  defp create_note(%{current_user: current_user}) do
+  defp create_note(%{user: user}) do
-    [note: note_fixture(current_user)]
+    [note: note_fixture(user)]
   end
 
   describe "Index" do
@@ -62,7 +62,7 @@ defmodule MemexWeb.NoteLiveTest do
       assert html =~ "can't be blank"
       assert html =~ "tags must be comma-delimited"
 
-      {:ok, _live, html} =
+      {:ok, _, html} =
         index_live
         |> form("#note-form", note: @create_attrs)
         |> render_submit()
@@ -84,7 +84,7 @@ defmodule MemexWeb.NoteLiveTest do
              |> form("#note-form", note: @invalid_attrs)
              |> render_change() =~ "can't be blank"
 
-      {:ok, _live, html} =
+      {:ok, _, html} =
         index_live
         |> form("#note-form", note: @update_attrs)
         |> render_submit()
@@ -123,7 +123,7 @@ defmodule MemexWeb.NoteLiveTest do
              |> form("#note-form", note: @invalid_attrs)
              |> render_change() =~ "can't be blank"
 
-      {:ok, _live, html} =
+      {:ok, _, html} =
         show_live
         |> form("#note-form", note: Map.put(@update_attrs, "slug", note.slug))
         |> render_submit()
@@ -149,13 +149,13 @@ defmodule MemexWeb.NoteLiveTest do
   describe "show with note" do
     setup [:register_and_log_in_user]
 
-    setup %{current_user: current_user} do
+    setup %{user: user} do
-      %{slug: note_slug} = note = note_fixture(current_user)
+      %{slug: note_slug} = note = note_fixture(user)
 
       [
         note: note,
         backlinked_note:
-          note_fixture(%{content: "example with backlink to [[#{note_slug}]] note"}, current_user)
+          note_fixture(%{content: "example with backlink to [[#{note_slug}]] note"}, user)
       ]
     end
 

test/memex_web/live/pipeline_live_test.exs

@@ -34,8 +34,8 @@ defmodule MemexWeb.PipelineLiveTest do
     "title" => nil
   }
 
-  defp create_pipeline(%{current_user: current_user}) do
+  defp create_pipeline(%{user: user}) do
-    [pipeline: pipeline_fixture(current_user)]
+    [pipeline: pipeline_fixture(user)]
   end
 
   describe "Index" do
@@ -68,7 +68,7 @@ defmodule MemexWeb.PipelineLiveTest do
              |> form("#pipeline-form", pipeline: @invalid_attrs)
              |> render_change() =~ "can't be blank"
 
-      {:ok, _live, html} =
+      {:ok, _, html} =
         index_live
         |> form("#pipeline-form", pipeline: @create_attrs)
         |> render_submit()
@@ -90,7 +90,7 @@ defmodule MemexWeb.PipelineLiveTest do
              |> form("#pipeline-form", pipeline: @invalid_attrs)
              |> render_change() =~ "can't be blank"
 
-      {:ok, _live, html} =
+      {:ok, _, html} =
         index_live
         |> form("#pipeline-form", pipeline: @update_attrs)
         |> render_submit()
@@ -136,7 +136,7 @@ defmodule MemexWeb.PipelineLiveTest do
       assert html =~ "can't be blank"
       assert html =~ "tags must be comma-delimited"
 
-      {:ok, _live, html} =
+      {:ok, _, html} =
         show_live
         |> form("#pipeline-form", pipeline: Map.put(@update_attrs, "slug", pipeline.slug))
         |> render_submit()
@@ -181,9 +181,9 @@ defmodule MemexWeb.PipelineLiveTest do
   describe "show with a step" do
     setup [:register_and_log_in_user, :create_pipeline]
 
-    setup %{pipeline: pipeline, current_user: current_user} do
+    setup %{pipeline: pipeline, user: user} do
       [
-        step: step_fixture(0, pipeline, current_user)
+        step: step_fixture(0, pipeline, user)
       ]
     end
 
@@ -236,11 +236,11 @@ defmodule MemexWeb.PipelineLiveTest do
   describe "show with multiple steps" do
     setup [:register_and_log_in_user, :create_pipeline]
 
-    setup %{pipeline: pipeline, current_user: current_user} do
+    setup %{pipeline: pipeline, user: user} do
       [
-        first_step: step_fixture(%{title: "first step"}, 0, pipeline, current_user),
+        first_step: step_fixture(%{title: "first step"}, 0, pipeline, user),
-        second_step: step_fixture(%{title: "second step"}, 1, pipeline, current_user),
+        second_step: step_fixture(%{title: "second step"}, 1, pipeline, user),
-        third_step: step_fixture(%{title: "third step"}, 2, pipeline, current_user)
+        third_step: step_fixture(%{title: "third step"}, 2, pipeline, user)
       ]
     end
 

test/memex_web/views/error_view_test.exs

@@ -5,11 +5,12 @@ defmodule MemexWeb.ErrorViewTest do
 
   use MemexWeb.ConnCase, async: true
   import MemexWeb.Gettext
-  # Bring render/3 and render_to_string/3 for testing custom views
-  import Phoenix.View
 
   @moduletag :error_view_test
 
+  # Bring render/3 and render_to_string/3 for testing custom views
+  import Phoenix.View
+
   test "renders 404.html" do
     assert render_to_string(MemexWeb.ErrorView, "404.html", []) =~
              dgettext("errors", "not found")

test/support/conn_case.ex

@@ -23,12 +23,10 @@ defmodule MemexWeb.ConnCase do
   using do
     quote do
       # Import conveniences for testing with connections
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
+      import Plug.Conn
+      import Phoenix.ConnTest
       import Memex.Fixtures
       import MemexWeb.ConnCase
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
-      import Phoenix.ConnTest
-      import Plug.Conn
 
       alias MemexWeb.Router.Helpers, as: Routes
 
@@ -52,10 +50,10 @@ defmodule MemexWeb.ConnCase do
   test context.
   """
   @spec register_and_log_in_user(%{conn: Plug.Conn.t()}) ::
-          %{conn: Plug.Conn.t(), current_user: User.t()}
+          %{conn: Plug.Conn.t(), user: User.t()}
   def register_and_log_in_user(%{conn: conn}) do
-    current_user = user_fixture() |> confirm_user()
+    user = user_fixture() |> confirm_user()
-    %{conn: log_in_user(conn, current_user), current_user: current_user}
+    %{conn: log_in_user(conn, user), user: user}
   end
 
   @spec confirm_user(User.t()) :: User.t()

test/support/data_case.ex

@@ -22,8 +22,10 @@ defmodule Memex.DataCase do
       alias Memex.Repo
 
       import Ecto
-      import Ecto.{Changeset, Query}
+      import Ecto.Changeset
-      import Memex.{DataCase, Fixtures}
+      import Ecto.Query
+      import Memex.DataCase
+      import Memex.Fixtures
     end
   end
 
@@ -43,7 +45,7 @@ defmodule Memex.DataCase do
   """
   def errors_on(changeset) do
     Ecto.Changeset.traverse_errors(changeset, fn {message, opts} ->
-      Regex.replace(~r"%{(\w+)}", message, fn _capture, key ->
+      Regex.replace(~r"%{(\w+)}", message, fn _, key ->
         opts |> Keyword.get(String.to_existing_atom(key), key) |> to_string()
       end)
     end)

test/support/fixtures.ex

@@ -29,7 +29,7 @@ defmodule Memex.Fixtures do
     })
     |> Accounts.register_user()
     |> unwrap_ok_tuple()
-    |> User.role_changeset(:admin)
+    |> User.role_changeset("admin")
     |> Repo.update!()
   end