Added users page and user viewing
This commit is contained in:
@@ -6,14 +6,22 @@ defmodule MixerWeb.PageController do
|
||||
end
|
||||
|
||||
def index(conn, _params) do
|
||||
render_spa(conn, nil)
|
||||
render_spa(conn, %{page: "feed", tweet_id: nil, user_id: nil})
|
||||
end
|
||||
|
||||
def show(conn, %{"tweet_id" => tweet_id}) do
|
||||
render_spa(conn, tweet_id)
|
||||
render_spa(conn, %{page: "tweet", tweet_id: tweet_id, user_id: nil})
|
||||
end
|
||||
|
||||
defp render_spa(conn, tweet_id) do
|
||||
def users_index(conn, _params) do
|
||||
render_spa(conn, %{page: "users", tweet_id: nil, user_id: nil})
|
||||
end
|
||||
|
||||
def user_show(conn, %{"user_id" => user_id}) do
|
||||
render_spa(conn, %{page: "user-detail", tweet_id: nil, user_id: user_id})
|
||||
end
|
||||
|
||||
defp render_spa(conn, %{page: page, tweet_id: tweet_id, user_id: user_id}) do
|
||||
asset_host = Application.get_env(:waffle, :asset_host, "http://localhost:3900")
|
||||
bucket = Application.get_env(:waffle, :bucket, "mixer-bucket")
|
||||
|
||||
@@ -22,7 +30,9 @@ defmodule MixerWeb.PageController do
|
||||
|> render(:index,
|
||||
current_user: conn.assigns[:current_user],
|
||||
media_host: "#{asset_host}/#{bucket}",
|
||||
tweet_id: tweet_id
|
||||
page: page,
|
||||
tweet_id: tweet_id,
|
||||
user_id: user_id
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -2,5 +2,7 @@
|
||||
data-current-user-id={if @current_user, do: @current_user.id, else: ""}
|
||||
data-current-user-email={if @current_user, do: @current_user.email, else: ""}
|
||||
data-asset-host={@media_host}
|
||||
data-tweet-id={@tweet_id || ""}>
|
||||
data-page={@page}
|
||||
data-tweet-id={@tweet_id || ""}
|
||||
data-user-id={@user_id || ""}>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user