#{playlist.description}
- #Visit: #{playlist.title} on #{Application.get_env(:rauversion, :domain)}
- # """ - # - # IO.write(fd, text) - # charlist = String.to_charlist(text) - # IO.write(fd, charlist) - ## File.close(fd) ## close file? - # - # file_entry = [source: {:file, file_path}, path: "/#{playlist.slug}/#{playlist.slug}.html"] + {:ok, fd, file_path} = Temp.open("my-file") + + text = """ +#{playlist.description}
+ +Visit: #{playlist.title} on #{Application.get_env(:rauversion, :domain)}
+ """ + + IO.write(fd, text) + # File.close(fd) ## close file? + + file_entry = [source: {:file, file_path}, path: "/#{playlist.slug}/#{playlist.slug}.html"] entries = Enum.map(playlist.track_playlists, fn item -> @@ -65,7 +65,7 @@ defmodule Rauversion.AlbumPurchaseOrders.AlbumPurchaseOrder do ] end) - # entries = entries ++ [file_entry] + entries = entries ++ [file_entry] cover = Rauversion.BlobUtils.blob_proxy_url(playlist, :cover) diff --git a/lib/rauversion/auto_context.ex b/lib/rauversion/auto_context.ex new file mode 100644 index 00000000..f98b0f91 --- /dev/null +++ b/lib/rauversion/auto_context.ex @@ -0,0 +1,39 @@ +defmodule Rauversion.AutoContext do + defmacro __using__(opts) do + quote bind_quoted: [opts: opts] do + import Ecto.Query, warn: false + alias Rauversion.Repo + + def list do + Repo.all(unquote(opts)) + end + + def get!(id), do: Repo.get!(unquote(opts), id) + + def create(attrs \\ %{}) do + %unquote(opts){} + |> unquote(opts).changeset(attrs) + |> Repo.insert() + end + + def update(%unquote(opts){} = connected_account, attrs) do + connected_account + |> unquote(opts).changeset(attrs) + |> Repo.update() + end + + def delete(%unquote(opts){} = connected_account) do + Repo.delete(connected_account) + end + + def change( + %unquote(opts){} = connected_account, + attrs \\ %{} + ) do + unquote(opts).changeset(connected_account, attrs) + end + + defoverridable list: 0, get!: 1, create: 1, update: 2, delete: 1, change: 1 + end + end +end diff --git a/lib/rauversion/connected_accounts.ex b/lib/rauversion/connected_accounts.ex new file mode 100644 index 00000000..3fb0bb4b --- /dev/null +++ b/lib/rauversion/connected_accounts.ex @@ -0,0 +1,131 @@ +defmodule Rauversion.ConnectedAccounts do + @moduledoc """ + The ConnectedAccounts context. + """ + + # import Ecto.Query, warn: false + # alias Rauversion.Repo + + # alias Rauversion.ConnectedAccounts.ConnectedAccount + + use Rauversion.AutoContext, Rauversion.ConnectedAccounts.ConnectedAccount + + def attach_existing_account(from, username) do + case Rauversion.Accounts.get_user_by_username(username) do + %Rauversion.Accounts.User{} = user -> + __MODULE__.create(%{inviter_id: from.id, user_id: user}) + + _ -> + IO.puts("non") + end + end + + def attach_new_account(from, user_params) do + case Rauversion.Accounts.create_user(user_params) do + user -> + __MODULE__.create(%{inviter_id: from.id, user_id: user}) + + nil -> + nil + end + end + + @doc """ + Returns the list of connected_account. + + ## Examples + + iex> list_connected_account() + [%ConnectedAccount{}, ...] + + """ + + # def list_connected_account do + # Repo.all(ConnectedAccount) + # end + + @doc """ + Gets a single connected_account. + + Raises `Ecto.NoResultsError` if the Connected account does not exist. + + ## Examples + + iex> get_connected_account!(123) + %ConnectedAccount{} + + iex> get_connected_account!(456) + ** (Ecto.NoResultsError) + + """ + + # def get_connected_account!(id), do: Repo.get!(ConnectedAccount, id) + + @doc """ + Creates a connected_account. + + ## Examples + + iex> create_connected_account(%{field: value}) + {:ok, %ConnectedAccount{}} + + iex> create_connected_account(%{field: bad_value}) + {:error, %Ecto.Changeset{}} + + """ + + # def create_connected_account(attrs \\ %{}) do + # %ConnectedAccount{} + # |> ConnectedAccount.changeset(attrs) + # |> Repo.insert() + # end + + @doc """ + Updates a connected_account. + + ## Examples + + iex> update_connected_account(connected_account, %{field: new_value}) + {:ok, %ConnectedAccount{}} + + iex> update_connected_account(connected_account, %{field: bad_value}) + {:error, %Ecto.Changeset{}} + + """ + + # def update_connected_account(%ConnectedAccount{} = connected_account, attrs) do + # connected_account + # |> ConnectedAccount.changeset(attrs) + # |> Repo.update() + # end + + @doc """ + Deletes a connected_account. + + ## Examples + + iex> delete_connected_account(connected_account) + {:ok, %ConnectedAccount{}} + + iex> delete_connected_account(connected_account) + {:error, %Ecto.Changeset{}} + + """ + + # def delete_connected_account(%ConnectedAccount{} = connected_account) do + # Repo.delete(connected_account) + # end + + @doc """ + Returns an `%Ecto.Changeset{}` for tracking connected_account changes. + + ## Examples + + iex> change_connected_account(connected_account) + %Ecto.Changeset{data: %ConnectedAccount{}} + + """ + # def change_connected_account(%ConnectedAccount{} = connected_account, attrs \\ %{}) do + # ConnectedAccount.changeset(connected_account, attrs) + # end +end diff --git a/lib/rauversion/connected_accounts/connected_account.ex b/lib/rauversion/connected_accounts/connected_account.ex new file mode 100644 index 00000000..f52beeea --- /dev/null +++ b/lib/rauversion/connected_accounts/connected_account.ex @@ -0,0 +1,23 @@ +defmodule Rauversion.ConnectedAccounts.ConnectedAccount do + use Ecto.Schema + import Ecto.Changeset + + schema "connected_accounts" do + field :state, :string, default: "pending" + # field :parent_id, :id + # field :user_id, :id + + belongs_to :inviter, Rauversion.Accounts.User, foreign_key: :parent_id + belongs_to :user, Rauversion.Accounts.User, foreign_key: :user_id + + timestamps() + end + + @doc false + def changeset(connected_account, attrs) do + connected_account + |> cast(attrs, [:state, :parent_id, :user_id]) + |> validate_required([:state]) + |> unsafe_validate_unique([:parent_id, :user_id], Rauversion.Repo) + end +end diff --git a/lib/rauversion/connected_accounts/existing_artist.ex b/lib/rauversion/connected_accounts/existing_artist.ex new file mode 100644 index 00000000..754f2001 --- /dev/null +++ b/lib/rauversion/connected_accounts/existing_artist.ex @@ -0,0 +1,24 @@ +defmodule Rauversion.ConnectedAccounts.ExistingArtist do + use Ecto.Schema + import Ecto.Changeset + + embedded_schema do + field :username, :string + field :ticket_id, :id + end + + def changeset(struct, attrs) do + struct + |> cast(attrs, [:username, :ticket_id]) + |> validate_required([:username, :ticket_id]) + + # |> validate_email() + end + + defp validate_email(changeset) do + changeset + |> validate_required([:email]) + |> validate_format(:email, ~r/^[^\s]+@[^\s]+$/, message: "must have the @ sign and no spaces") + |> validate_length(:email, max: 160) + end +end diff --git a/lib/rauversion/connected_accounts/new_artist.ex b/lib/rauversion/connected_accounts/new_artist.ex new file mode 100644 index 00000000..0aad8640 --- /dev/null +++ b/lib/rauversion/connected_accounts/new_artist.ex @@ -0,0 +1,41 @@ +defmodule Rauversion.ConnectedAccounts.NewArtist do + use Ecto.Schema + import Ecto.Changeset + + embedded_schema do + field :username, :string + field :genre, :string + field :hidden, :string + end + + # Artist name + # Location + # e.g. Seattle, WA + # Genre + # select one + # Your genre selection determines where your music appears in Bandcamp Discover. It’s OK if you don’t fit perfectly within one of these – just use the genre tag field, below, to provide more granularity. + + # Genre tags + # URL http:// + # .com + # You can point your own URL/custom domain here later. + + # Hide artist + # You can hide and unhide artists later, too. + # Photo + + def changeset(struct, attrs) do + struct + |> cast(attrs, [:username, :genre, :hidden]) + |> validate_required([:username]) + + # |> validate_email() + end + + defp validate_email(changeset) do + changeset + |> validate_required([:email]) + |> validate_format(:email, ~r/^[^\s]+@[^\s]+$/, message: "must have the @ sign and no spaces") + |> validate_length(:email, max: 160) + end +end diff --git a/lib/rauversion/track_purchase_orders/track_purchase_order.ex b/lib/rauversion/track_purchase_orders/track_purchase_order.ex index 14917de1..74f893f0 100644 --- a/lib/rauversion/track_purchase_orders/track_purchase_order.ex +++ b/lib/rauversion/track_purchase_orders/track_purchase_order.ex @@ -68,21 +68,22 @@ defmodule Rauversion.TrackPurchaseOrders.TrackPurchaseOrder do ] end - # {:ok, fd, file_path} = Temp.open("my-file") - # - # text = """ - ##{track.description}
- #Visit: #{track.title} on #{Application.get_env(:rauversion, :domain)}
- # """ - # - # charlist = String.to_charlist(text) - # IO.write(fd, charlist) - ## File.close(fd) ## close file? - # - # file_entry = [source: {:file, file_path}, path: "/#{track.slug}/track.slug.html"] - # - # entries_group = entries_group ++ [file_entry] + {:ok, fd, file_path} = Temp.open("my-file") + + text = """ +#{track.description}
+ +Visit: #{track.title} on #{Application.get_env(:rauversion, :domain)}
+ """ + + IO.write(fd, text) + # File.close(fd) ## close file? + + file_entry = [source: {:file, file_path}, path: "/#{track.slug}/track.slug.html"] + + entries_group = entries_group ++ [file_entry] IO.inspect(entries_group) entries_group end diff --git a/lib/rauversion_web.ex b/lib/rauversion_web.ex index d7c98715..db3b9dd2 100644 --- a/lib/rauversion_web.ex +++ b/lib/rauversion_web.ex @@ -55,7 +55,7 @@ defmodule RauversionWeb do use PhoenixMetaTags.TagView - on_mount RauversionWeb.RestoreLocale + on_mount(RauversionWeb.RestoreLocale) alias RauversionWeb.Router.Helpers, as: Routes unquote(view_helpers()) diff --git a/lib/rauversion_web/active_storage/representations/proxy_controller.ex b/lib/rauversion_web/active_storage/representations/proxy_controller.ex index 1d296887..25c2dd92 100644 --- a/lib/rauversion_web/active_storage/representations/proxy_controller.ex +++ b/lib/rauversion_web/active_storage/representations/proxy_controller.ex @@ -15,7 +15,7 @@ defmodule RauversionWeb.ActiveStorage.Representations.ProxyController do use RauversionWeb, :controller - action_fallback RauversionWeb.FallbackController + action_fallback(RauversionWeb.FallbackController) # def show # http_cache_forever public: true do @@ -64,7 +64,13 @@ defmodule RauversionWeb.ActiveStorage.Representations.ProxyController do chunk(conn, chunk_data) end) - {:ok, conn} = downloaded_stream - conn + case downloaded_stream do + {:ok, conn} -> + conn + + e -> + IO.inspect(e) + conn + end end end diff --git a/lib/rauversion_web/controllers/label_auth_controller.ex b/lib/rauversion_web/controllers/label_auth_controller.ex new file mode 100644 index 00000000..fef060aa --- /dev/null +++ b/lib/rauversion_web/controllers/label_auth_controller.ex @@ -0,0 +1,57 @@ +defmodule RauversionWeb.LabelAuthController do + use RauversionWeb, :controller + alias Rauversion.Accounts + + def add(conn, %{"username" => username}) do + user = Accounts.get_user_by_username(username) + + case RauversionWeb.UserAuth.fetch_current_user(conn, []) do + %{assigns: %{current_user: current_user}} -> + case Rauversion.Accounts.is_child_of?(current_user, user.id) do + %Rauversion.ConnectedAccounts.ConnectedAccount{} = connected_account -> + connected_account = connected_account |> Rauversion.Repo.preload(:user) + + conn + |> RauversionWeb.UserAuth.log_in_user_conn(connected_account.user) + |> put_session(:parent_user, current_user.id) + |> redirect(to: "/#{user.username}") + + _a -> + conn + |> put_flash(:error, gettext("not allowed")) + |> redirect(to: "/#{current_user.username}") + end + + _ -> + conn + |> put_flash(:error, gettext("not allowed")) + |> RauversionWeb.UserAuth.log_in_user(user) + end + end + + # back to parent + def back(conn, %{"username" => username}) do + user = Accounts.get_user_by_username(username) + + case RauversionWeb.UserAuth.fetch_current_user(conn, []) do + %{assigns: %{current_user: current_user}} -> + case Rauversion.Accounts.is_child_of?(user, current_user.id) do + %Rauversion.ConnectedAccounts.ConnectedAccount{} = _connected_account -> + conn + |> RauversionWeb.UserAuth.log_in_user_conn(user) + |> put_session(:parent_user, nil) + |> redirect(to: "/#{user.username}") + + _ -> + conn + |> put_flash(:error, gettext("not allowed")) + |> redirect(to: "/#{current_user.username}") + end + + _ -> + conn + |> put_flash(:error, gettext("not allowed")) + |> redirect(to: "/#{user.username}") + end + end +end diff --git a/lib/rauversion_web/controllers/user_auth.ex b/lib/rauversion_web/controllers/user_auth.ex index 4b1a5365..59e26732 100644 --- a/lib/rauversion_web/controllers/user_auth.ex +++ b/lib/rauversion_web/controllers/user_auth.ex @@ -38,6 +38,19 @@ defmodule RauversionWeb.UserAuth do |> redirect(to: user_return_to || signed_in_path(conn)) end + def log_in_user_conn(conn, user, params \\ %{}) do + token = Accounts.generate_user_session_token(user) + user_return_to = get_session(conn, :user_return_to) + + conn + |> renew_session() + |> put_session(:user_token, token) + |> put_session(:live_socket_id, "users_sessions:#{Base.url_encode64(token)}") + |> maybe_write_remember_me_cookie(token, params) + |> fetch_flash() + |> put_flash(:info, "Logged in successfully.") + end + defp maybe_write_remember_me_cookie(conn, token, %{"remember_me" => "true"}) do put_resp_cookie(conn, @remember_me_cookie, token, @remember_me_options) end diff --git a/lib/rauversion_web/live/account_connect_live/existing_user.ex b/lib/rauversion_web/live/account_connect_live/existing_user.ex new file mode 100644 index 00000000..91dc7e34 --- /dev/null +++ b/lib/rauversion_web/live/account_connect_live/existing_user.ex @@ -0,0 +1,136 @@ +defmodule RauversionWeb.AccountConnectLive.ExistingUser do + use RauversionWeb, :live_component + alias Rauversion.{Accounts, Repo} + + @impl true + def handle_event("search", params, socket) do + page = 0 + + artists = + Accounts.artists() + |> Accounts.latests() + |> Accounts.search_by_username(params["search"]) + |> Accounts.not_in(socket.assigns.current_user.id) + |> Repo.paginate(page: page, page_size: 12) + + {:noreply, socket |> assign(:collection, artists)} + end + + @impl true + def handle_event("select-artist", %{"artist" => artist}, socket) do + selected_artist = Rauversion.Accounts.get_user!(artist) + + {:noreply, + socket + |> assign(:selected_artist, selected_artist) + |> assign(:collection, [])} + end + + @impl true + def handle_event("confirm", _, socket) do + # TODO: do the theng + case Rauversion.ConnectedAccounts.create(%{ + parent_id: socket.assigns.current_user.id, + user_id: socket.assigns.selected_artist.id + }) do + {:ok, _ac} -> + {:noreply, + socket + |> put_flash(:info, "Artist linked successfully") + |> push_patch(to: "/#{socket.assigns.current_user.username}/artists")} + + {:error, changeset} -> + errors = convert_changeset_errors(changeset) + {:noreply, socket |> assign(:errors, errors)} + end + end + + @impl true + def handle_event("cancel", _, socket) do + {:noreply, socket |> assign(:errors, nil) |> assign(:selected_artist, nil)} + end + + def convert_changeset_errors(_changeset) do + out = "errors connecting the account" + + out + end + + @impl true + def render(assigns) do + ~H""" +Please search for an existing artist.
+ + + + <%= for artist <- @collection do %> ++ <%= gettext("%{name} is selected", name: @selected_artist.username) %> +
+ ++ <%= gettext("Please confirm in order to send the connect invitation request to the artist.") %> +
+ +<%= @errors %>
+Please specify an account to add.
+ +<%= gettext("or drag and drop") %>
@@ -76,8 +78,10 @@ defmodule RauversionWeb.TrackLive.UploadFormComponent do <% end %> <%= for {_ref, msg, } <- @uploads.audio.errors do %> - <%= Phoenix.Naming.humanize(msg) %> - <% end %> +diff --git a/lib/rauversion_web/live/track_live/form_component.ex b/lib/rauversion_web/live/track_live/form_component.ex index 1adc34aa..0c2b9839 100644 --- a/lib/rauversion_web/live/track_live/form_component.ex +++ b/lib/rauversion_web/live/track_live/form_component.ex @@ -101,7 +101,7 @@ defmodule RauversionWeb.TrackLive.FormComponent do {:noreply, response |> put_flash(:info, "Track updated successfully") - |> push_redirect(to: socket.assigns.return_to)} + |> push_patch(to: socket.assigns.return_to)} {:error, response} -> {:noreply, response} diff --git a/lib/rauversion_web/live/usersettings_live/components/email_form.ex b/lib/rauversion_web/live/user_settings_live/components/email_form.ex similarity index 98% rename from lib/rauversion_web/live/usersettings_live/components/email_form.ex rename to lib/rauversion_web/live/user_settings_live/components/email_form.ex index 56b2a479..6110f1b9 100644 --- a/lib/rauversion_web/live/usersettings_live/components/email_form.ex +++ b/lib/rauversion_web/live/user_settings_live/components/email_form.ex @@ -1,4 +1,4 @@ -defmodule RauversionWeb.UsersettingsLive.EmailForm do +defmodule RauversionWeb.UserSettingsLive.EmailForm do use RauversionWeb, :live_component def render(%{changeset: _changeset} = assigns) do diff --git a/lib/rauversion_web/live/usersettings_live/components/integrations_form.ex b/lib/rauversion_web/live/user_settings_live/components/integrations_form.ex similarity index 98% rename from lib/rauversion_web/live/usersettings_live/components/integrations_form.ex rename to lib/rauversion_web/live/user_settings_live/components/integrations_form.ex index 8f173e31..27bb558b 100644 --- a/lib/rauversion_web/live/usersettings_live/components/integrations_form.ex +++ b/lib/rauversion_web/live/user_settings_live/components/integrations_form.ex @@ -1,4 +1,4 @@ -defmodule RauversionWeb.UsersettingsLive.IntegrationsForm do +defmodule RauversionWeb.UserSettingsLive.IntegrationsForm do use RauversionWeb, :live_component alias Rauversion.Repo diff --git a/lib/rauversion_web/live/usersettings_live/components/invitations.ex b/lib/rauversion_web/live/user_settings_live/components/invitations.ex similarity index 94% rename from lib/rauversion_web/live/usersettings_live/components/invitations.ex rename to lib/rauversion_web/live/user_settings_live/components/invitations.ex index dbe0b717..0dad0712 100644 --- a/lib/rauversion_web/live/usersettings_live/components/invitations.ex +++ b/lib/rauversion_web/live/user_settings_live/components/invitations.ex @@ -1,4 +1,4 @@ -defmodule RauversionWeb.UsersettingsLive.Invitations do +defmodule RauversionWeb.UserSettingsLive.Invitations do use RauversionWeb, :live_component alias Rauversion.Accounts @@ -28,26 +28,26 @@ defmodule RauversionWeb.UsersettingsLive.Invitations do {:noreply, socket |> put_flash(:info, gettext("Invitation sent successfully")) - |> push_redirect(to: "/users/settings/invitations")} + |> push_navigate(to: "/users/settings/invitations")} {:error, %Ecto.Changeset{} = changeset} -> {:noreply, assign(socket, :changeset, changeset) |> put_flash(:error, gettext("Error, Invitation was not sent")) - |> push_redirect(to: "/users/settings/invitations")} + |> push_navigate(to: "/users/settings/invitations")} _ -> {:noreply, socket |> put_flash(:error, gettext("There was something wrong sending this invitation")) - |> push_redirect(to: "/users/settings/invitations")} + |> push_navigate(to: "/users/settings/invitations")} end _user -> {:noreply, socket |> put_flash(:error, gettext("Invitation not sent, this person already exists")) - |> push_redirect(to: "/users/settings/invitations")} + |> push_navigate(to: "/users/settings/invitations")} end end diff --git a/lib/rauversion_web/live/user_settings_live/components/label_form.ex b/lib/rauversion_web/live/user_settings_live/components/label_form.ex new file mode 100644 index 00000000..7257b66f --- /dev/null +++ b/lib/rauversion_web/live/user_settings_live/components/label_form.ex @@ -0,0 +1,82 @@ +defmodule RauversionWeb.UserSettingsLive.LabelForm do + use RauversionWeb, :live_component + + def render(%{changeset: _changeset} = assigns) do + ~H""" +
<%= gettext("Oops, something went wrong! Please check the errors below.") %>
++ <%= gettext("When enabled the account will became a label.") %> +
++ Welcome to Rauversion, a music streaming platform that offers a unique opportunity for music labels to showcase their artists and connect with a global audience. + If you're interested in becoming a label on Rauversion, we invite you to apply for a label account. +
+ + + ++ As a label on Rauversion, you'll have access to a range of tools and features that allow you to promote your artists, + track their performance, and connect with fans around the world. Our platform is designed to make it easy for labels to reach new audiences and build their brands online. + + To apply for a label account, please fill out our application form and provide some basic information about your label and the artists you represent. We'll review your application and + get back to you as soon as possible with next steps. +
++ Thank you for your interest in Rauversion, and we look forward to working with you to bring great music to the world! +
+ <% end %> +