From 0715da85b8cf0df7b16e82b2edf61247d6cfee29 Mon Sep 17 00:00:00 2001 From: Inhji Date: Thu, 9 Mar 2023 07:27:39 +0100 Subject: [PATCH] clean up user_image --- lib/chiya/accounts.ex | 2 -- lib/chiya_web/live/user_settings_live.ex | 10 +++++----- lib/chiya_web/uploaders/user_image.ex | 14 ++------------ 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/lib/chiya/accounts.ex b/lib/chiya/accounts.ex index 0d89b29..88959e1 100644 --- a/lib/chiya/accounts.ex +++ b/lib/chiya/accounts.ex @@ -236,9 +236,7 @@ defmodule Chiya.Accounts do Updates the user image. """ def update_user_image(user, attrs) do - IO.inspect(attrs) changeset = change_user_image(user, attrs) - IO.inspect(changeset) Repo.update(changeset) end diff --git a/lib/chiya_web/live/user_settings_live.ex b/lib/chiya_web/live/user_settings_live.ex index a34b8de..ae0bad8 100644 --- a/lib/chiya_web/live/user_settings_live.ex +++ b/lib/chiya_web/live/user_settings_live.ex @@ -7,7 +7,10 @@ defmodule ChiyaWeb.UserSettingsLive do ~H""" <.header>Change Avatar - + <.simple_form for={@image_form} @@ -84,6 +87,7 @@ defmodule ChiyaWeb.UserSettingsLive do """ end + @impl true def mount(%{"token" => token}, _session, socket) do socket = case Accounts.update_user_email(socket.assigns.current_user, token) do @@ -131,15 +135,11 @@ defmodule ChiyaWeb.UserSettingsLive do @impl Phoenix.LiveView def handle_event("update_image", _params, socket) do - IO.inspect("update_image") user = socket.assigns.current_user - IO.inspect(user) uploaded_files = consume_uploaded_entries(socket, :avatar, fn %{path: path}, _entry -> - IO.inspect(path) {:ok, _user} = Accounts.update_user_image(user, %{user_image: path}) - IO.inspect("SUCCESS") {:ok, path} end) diff --git a/lib/chiya_web/uploaders/user_image.ex b/lib/chiya_web/uploaders/user_image.ex index df11f53..c29ea87 100644 --- a/lib/chiya_web/uploaders/user_image.ex +++ b/lib/chiya_web/uploaders/user_image.ex @@ -8,9 +8,8 @@ defmodule Chiya.Uploaders.UserImage do @versions [:original, :thumb, :thumb_dithered] # Whitelist file extensions: - def validate({file, _}) do - _file_extension = file.file_name |> Path.extname() |> String.downcase() - + def validate({_file, _}) do + # _file_extension = file.file_name |> Path.extname() |> String.downcase() # case Enum.member?(~w(.jpg .jpeg .gif .png), file_extension) do # true -> :ok # false -> {:error, "invalid file type"} @@ -46,13 +45,4 @@ defmodule Chiya.Uploaders.UserImage do # def default_url(version, scope) do # "/images/avatars/default_#{version}.png" # end - - # Specify custom headers for s3 objects - # Available options are [:cache_control, :content_disposition, - # :content_encoding, :content_length, :content_type, - # :expect, :expires, :storage_class, :website_redirect_location] - # - # def s3_object_headers(version, {file, scope}) do - # [content_type: MIME.from_path(file.file_name)] - # end end