fix style issues
This commit is contained in:
		@@ -218,7 +218,7 @@ defmodule Cannery.Accounts do
 | 
			
		||||
 | 
			
		||||
    with {:ok, query} <- UserToken.verify_change_email_token_query(token, context),
 | 
			
		||||
         %UserToken{sent_to: email} <- Repo.one(query),
 | 
			
		||||
         {:ok, _} <- Repo.transaction(user_email_multi(user, email, context)) do
 | 
			
		||||
         {:ok, _result} <- Repo.transaction(user_email_multi(user, email, context)) do
 | 
			
		||||
      :ok
 | 
			
		||||
    else
 | 
			
		||||
      _error_tuple -> :error
 | 
			
		||||
 
 | 
			
		||||
@@ -136,7 +136,7 @@ defmodule Cannery.Accounts.User do
 | 
			
		||||
    |> cast(attrs, [:email])
 | 
			
		||||
    |> validate_email()
 | 
			
		||||
    |> case do
 | 
			
		||||
      %{changes: %{email: _}} = changeset -> changeset
 | 
			
		||||
      %{changes: %{email: _email}} = changeset -> changeset
 | 
			
		||||
      %{} = changeset -> add_error(changeset, :email, dgettext("errors", "did not change"))
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 
 | 
			
		||||
@@ -150,7 +150,7 @@ defmodule Cannery.Accounts.UserToken do
 | 
			
		||||
    from t in __MODULE__, where: t.user_id == ^user.id
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def user_and_contexts_query(user, [_ | _] = contexts) do
 | 
			
		||||
  def user_and_contexts_query(user, [_first | _rest] = contexts) do
 | 
			
		||||
    from t in __MODULE__, where: t.user_id == ^user.id and t.context in ^contexts
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
 
 | 
			
		||||
@@ -40,7 +40,7 @@ defmodule CanneryWeb.UserResetPasswordController do
 | 
			
		||||
  # leaked token giving the user access to the account.
 | 
			
		||||
  def update(conn, %{"user" => user_params}) do
 | 
			
		||||
    case Accounts.reset_user_password(conn.assigns.user, user_params) do
 | 
			
		||||
      {:ok, _} ->
 | 
			
		||||
      {:ok, _socket} ->
 | 
			
		||||
        conn
 | 
			
		||||
        |> put_flash(:info, dgettext("prompts", "Password reset successfully."))
 | 
			
		||||
        |> redirect(to: ~p"/users/log_in")
 | 
			
		||||
 
 | 
			
		||||
@@ -72,7 +72,7 @@ defmodule CanneryWeb.PackLive.Show do
 | 
			
		||||
        %{"id" => id},
 | 
			
		||||
        %{assigns: %{pack: %{id: pack_id}, current_user: current_user}} = socket
 | 
			
		||||
      ) do
 | 
			
		||||
    {:ok, _} =
 | 
			
		||||
    {:ok, _shot_record} =
 | 
			
		||||
      ActivityLog.get_shot_record!(id, current_user)
 | 
			
		||||
      |> ActivityLog.delete_shot_record(current_user)
 | 
			
		||||
 | 
			
		||||
@@ -136,7 +136,7 @@ defmodule CanneryWeb.PackLive.Show do
 | 
			
		||||
 | 
			
		||||
          :actions ->
 | 
			
		||||
            ~H"""
 | 
			
		||||
            <div class="px-4 py-2 space-x-4 flex justify-center items-center">
 | 
			
		||||
            <div class="flex justify-center items-center px-4 py-2 space-x-4">
 | 
			
		||||
              <.link
 | 
			
		||||
                patch={~p"/ammo/show/#{@pack}/edit/#{@shot_record}"}
 | 
			
		||||
                class="text-primary-600 link"
 | 
			
		||||
 
 | 
			
		||||
@@ -91,7 +91,7 @@ defmodule CanneryWeb.RangeLive.Index do
 | 
			
		||||
 | 
			
		||||
  @impl true
 | 
			
		||||
  def handle_event("delete", %{"id" => id}, %{assigns: %{current_user: current_user}} = socket) do
 | 
			
		||||
    {:ok, _} =
 | 
			
		||||
    {:ok, _shot_record} =
 | 
			
		||||
      ActivityLog.get_shot_record!(id, current_user)
 | 
			
		||||
      |> ActivityLog.delete_shot_record(current_user)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -310,7 +310,7 @@ defmodule Cannery.AccountsTest do
 | 
			
		||||
    test "deletes all tokens for the given user", %{user: user} do
 | 
			
		||||
      _session_token = Accounts.generate_user_session_token(user)
 | 
			
		||||
 | 
			
		||||
      {:ok, _} =
 | 
			
		||||
      {:ok, _user} =
 | 
			
		||||
        Accounts.update_user_password(user, valid_user_password(), %{
 | 
			
		||||
          password: "new valid password"
 | 
			
		||||
        })
 | 
			
		||||
 
 | 
			
		||||
@@ -57,8 +57,8 @@ defmodule Cannery.Fixtures do
 | 
			
		||||
      |> Atom.to_string()
 | 
			
		||||
      |> Email.generate_email(Accounts.get_user!(user_id), attrs)
 | 
			
		||||
 | 
			
		||||
    [_, html_token | _] = email.html_body |> String.split("[TOKEN]")
 | 
			
		||||
    [_, text_token | _] = email.text_body |> String.split("[TOKEN]")
 | 
			
		||||
    [_prefix, html_token | _suffix] = email.html_body |> String.split("[TOKEN]")
 | 
			
		||||
    [_prefix, text_token | _suffix] = email.text_body |> String.split("[TOKEN]")
 | 
			
		||||
    ^text_token = html_token
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user