- <%= text_input f, :address_query, class: "input input-primary input-sm md:input-md", phx_throttle: "500", value: @address_query %>
- <%= hidden_input f, :address_id, value: 0 %>
+
+ <%= text_input f, :address_query, class: "input input-primary input-sm md:input-md", phx_debounce: "500", value: @address_query,
+ phx_change: :address_search, onClick: "showResults();", onBlur: "hideResults();" %>
+ <%= hidden_input f, :address_id, value: 0, id: "addressID" %>
+
+
+ <%= if @address_results do %>
+
+ <%= for r <- @address_results do %>
+ - <.link id={r[:id]} mapbox_id={r[:mapbox_id]} class="address_result" onMouseDown={"selectAddressSearchResult('" <> r[:id] <> "');"}>
+ <%= r[:name] %>
+ <% end %>
+
+ <% end %>
diff --git a/friends/lib/friends_web/live/edit.ex b/friends/lib/friends_web/live/edit.ex
index 2160ab2..fa024b3 100644
--- a/friends/lib/friends_web/live/edit.ex
+++ b/friends/lib/friends_web/live/edit.ex
@@ -7,13 +7,22 @@ defmodule FriendsWeb.FriendsLive.Edit do
alias Friends.{Friend, Places}
+ def mount(%{}, token, socket) do
+ friend = Friend.new()
+
+ {:ok,
+ socket
+ |> assign(:live_action, socket.assigns.live_action)
+ |> assign_current_user(token |> Map.get("user_token"))
+ |> assign(:friend, friend)
+ |> title("Welcome")
+ |> assign(:changeset, %Friend{} |> Friend.changeset())}
+ end
+
def mount(%{"slug" => slug} = _attrs, token, socket) do
live_action = socket.assigns.live_action || false
friend = Friend.get_by_slug(slug)
- editable = friend |> Friend.can_be_edited_by(socket.assigns[:current_user])
-
- # address_viewbox = Places.Search.query()
if(live_action) do
{:ok,
@@ -21,16 +30,17 @@ defmodule FriendsWeb.FriendsLive.Edit do
|> assign(:live_action, live_action)
|> assign_current_user(token |> Map.get("user_token"))
|> assign(:friend, friend)
+ |> assign(:action, Routes.friends_path(socket, :update))
|> title(friend.name <> " - " <> (live_action |> titlecase))
|> assign(:changeset, %Friend{} |> Friend.changeset())
- |> assign(:action, editable)
- |> assign(:address_query, nil)}
+ |> assign(:address_query, nil)
+ |> assign(:address_results, nil)}
else
{:ok, socket |> redirect(to: Routes.friends_show_path(socket, :overview, friend.slug))}
end
end
- def handle_params(%{"slug" => slug} = attrs, _url, socket) do
+ def handle_params(%{"slug" => slug} = _attrs, _url, socket) do
live_action = socket.assigns.live_action || false
friend = Friend.get_by_slug(slug)
@@ -39,11 +49,26 @@ defmodule FriendsWeb.FriendsLive.Edit do
{:noreply,
socket
|> assign_friend(friend)
+ |> assign(:action, Routes.friends_path(socket, :update))
|> assign(:live_action, live_action)
+ |> assign(:address_query, nil)
+ |> assign(:address_results, nil)
|> title(friend.name <> " - " <> (live_action |> titlecase))
|> assign(:editable, editable)}
end
+ def handle_params(_attrs, _token, socket) do
+ friend = Friend.new()
+
+ {:noreply,
+ socket
+ |> assign_friend(friend)
+ |> assign(:live_action, socket.assigns.live_action)
+ |> assign(:address_query, nil)
+ |> assign(:action, Routes.friends_path(socket, :update))
+ |> title("Welcome")}
+ end
+
def handle_event("validate", %{"friend" => form_params}, %{assigns: %{friend: friend}} = socket) do
id = form_params["id"]
name = form_params["name"]
@@ -81,23 +106,26 @@ defmodule FriendsWeb.FriendsLive.Edit do
def handle_event(
"save",
%{"friend" => form_params},
- %{assigns: %{changeset: changeset}} = socket
+ %{assigns: %{changeset: _changeset}} = socket
) do
name = form_params["name"]
nickname = form_params["nickname"]
born = form_params["born"]
email = form_params["email"]
phone = form_params["phone"] |> format_phone
- id = form_params["id"]
+ slug = form_params["slug"] || name |> to_slug
+ id = form_params["id"] || :new
+ address_id = form_params["address_id"]
new_params = %{
id: id,
name: name,
nickname: nickname,
- slug: name |> to_slug,
+ slug: slug,
born: born,
phone: phone,
- email: email
+ email: email,
+ address_id: address_id
}
updated_friend = Friend.create_or_update(new_params)
@@ -109,17 +137,21 @@ defmodule FriendsWeb.FriendsLive.Edit do
|> put_flash(:info, "Saved #{updated_friend |> first_name}!")
|> assign(:new_friend, new_changeset)
|> assign(:friend, updated_friend)
- |> push_patch(to: "/friend/#{updated_friend.slug}")
+ |> push_navigate(to: "/friend/#{updated_friend.slug}")
}
end
- # Handle deleting a friend
- def handle_event("delete", %{"friend_id" => friend_id}, socket) do
- friend = Friend.get_by_id(friend_id)
+ def handle_event("address_search", %{"friend" => %{"address_query" => query}}, socket) do
+ results = Places.Search.autocomplete(query) |> Enum.map(&Places.Search.display_address/1)
- {:noreply,
- socket
- |> put_flash(:error, "Deleted '#{friend.name}'.")
- |> push_navigate(to: "/")}
+ if query == "" do
+ {:noreply, socket |> assign(:address_results, nil)}
+ else
+ {:noreply, socket |> assign(:address_results, results)}
+ end
+ end
+
+ def handle_event(event, unsigned_params, socket) do
+ {:noreply, socket}
end
end
diff --git a/friends/lib/friends_web/router.ex b/friends/lib/friends_web/router.ex
index 8ca52d9..515f5fa 100644
--- a/friends/lib/friends_web/router.ex
+++ b/friends/lib/friends_web/router.ex
@@ -73,6 +73,8 @@ defmodule FriendsWeb.Router do
post "/confirm", UserConfirmationController, :create
get "/confirm/:token", UserConfirmationController, :edit
post "/confirm/:token", UserConfirmationController, :update
+
+ live "/welcome", FriendsLive.Edit, :welcome
end
# Routes that require the user be authenticated:
@@ -104,13 +106,13 @@ defmodule FriendsWeb.Router do
end
# Edit modes (require being logged in and having a profile)
- scope "/friend/update/", FriendsWeb do
+ scope "/edit/", FriendsWeb do
pipe_through [:browser, :require_authenticated_user, :capture_profile]
+ post "/", FriendsController, :update
+
live "/:slug/overview", FriendsLive.Edit, :overview
live "/:slug/timeline", FriendsLive.Edit, :timeline
live "/:slug/relationships", FriendsLive.Edit, :relationships
-
- post "/:slug/update", FriendsController, :update
end
end
diff --git a/friends/test/friends_web/controllers/friends_live_test.exs b/friends/test/friends_web/controllers/friends_live_test.exs
index 966a857..db04c21 100644
--- a/friends/test/friends_web/controllers/friends_live_test.exs
+++ b/friends/test/friends_web/controllers/friends_live_test.exs
@@ -9,9 +9,14 @@ defmodule FriendsWeb.FriendsLiveTest do
} = friend_fixture(%{email: user_fixture().email}) |> Friends.Friend.assign_user()
end
- describe "GET '/friends/:slug'" do
+ describe "GET '/friend/:slug'" do
+ test "redirects if live_action not specified", %{conn: conn, friend: friend} do
+ conn = conn |> get("/friend/#{friend.slug}/")
+ assert redirected_to(conn) == Routes.friends_show_path(conn, :overview, friend.slug)
+ end
+
test "shows the friend overview", %{conn: conn, friend: friend} do
- conn = conn |> get("/friends/#{friend.slug}")
+ conn = conn |> get("/friend/#{friend.slug}/overview")
assert html_response(conn, 200) =~ friend.name
end
end