Adjustments

.build.yml

@@ -1,34 +1,6 @@
-image: debian/stable
-packages:
-  - build-essential
-  - git
-  - elixir
-  - erlang
-secrets:
-  - bc0d4073-54cf-45ae-9542-6dd201b189e4
-sources:
-  - git@git.broccoli.town:dp/wish
+image: alpine/edge
 tasks:
-  - setup: |
-      cd wish
-      mix local.hex --force
-      mix local.rebar --force
-      mix deps.get
-  - test: |
-      cd wish
-      mix test
-  - deploy: |
-      if [ $GIT_REF = "refs/heads/ci" ]; then
-        curl -L https://fly.io/install.sh | sh
-        export FLYCTL_INSTALL="/home/build/.fly"
-        export PATH="$FLYCTL_INSTALL/bin:$PATH"
-
-        set +x
-        export FLY_ACCESS_TOKEN=$(cat ~/.fly_secret_key)
-        set -x
-
-        cd wish
-        flyctl status
-      else
-        echo "nothing to do"
-      fi
+  - say-hello: |
+      echo hello
+  - say-world: |
+      echo world

lib/wish/wishlist/item.ex

@@ -10,7 +10,7 @@ defmodule Wish.Wishlist.Item do
     field :desire, :integer
     field :image_url, :string
     field :price, :integer
-    field :visible, :boolean, default: true
+    field :visible, :boolean
 
     timestamps(type: :utc_datetime)
   end

lib/wish_web/live/home_live/details.html.heex

@@ -1,4 +1,4 @@
-<.link href={~p"/"}>
+<.link patch={~p"/"}>
   <.icon name="hero-arrow-left" /> Back to list
 </.link>
 

lib/wish_web/live/home_live/index.ex

@@ -5,13 +5,7 @@ defmodule WishWeb.HomeLive.Index do
   use Phoenix.Component
 
   @impl true
-  def mount(_params, session, socket) do
-    grid? =
-      case Map.get(session, "user_display", "grid") do
-        "grid" -> true
-        _ -> false
-      end
-
+  def mount(_params, _session, socket) do
     items =
       if socket.assigns.current_user do
         Wishlist.list_visible_items()
@@ -19,12 +13,7 @@ defmodule WishWeb.HomeLive.Index do
         Wishlist.list_available_items()
       end
 
-    {:ok, assign(socket, :items, items) |> assign(:grid, grid?) |> assign(:hidden, false)}
-  end
-
-  @impl true
-  def handle_event("toggle_view_state", _, socket) do
-    {:noreply, assign(socket, :grid, !socket.assigns.grid)}
+    {:ok, assign(socket, :items, items) |> assign(:hidden, false)}
   end
 
   @impl true
@@ -62,7 +51,7 @@ defmodule WishWeb.HomeLive.Index do
     ~H"""
     <div
       id={"dropdown-#{@item.id}"}
-      class="absolute z-10 w-40 bg-purple-100 origin-top right-0 whitespace-nowrap border border-black"
+      class="absolute z-10 w-auto bg-purple-100 origin-top right-0 whitespace-nowrap border border-black"
       phx-click-away={JS.hide()}
       hidden
     >

lib/wish_web/live/home_live/index.html.heex

@@ -1,19 +1,7 @@
 <.header>
   Daniel's Wishlist
-  <:actions>
-    <.button phx-click={
-      JS.push("toggle_view_state")
-      |> JS.dispatch("toggle_view_state", detail: %{"grid" => !@grid})
-    }>
-      <%= if @grid do %>
-        List View
-      <% else %>
-        Grid View
-      <% end %>
-    </.button>
-  </:actions>
   <:actions :if={!@current_user}>
-    <.button phx-click={JS.push("toggle_hidden_items")}>
+    <.button phx-click={JS.push("toggle_hidden_items")} id="showhide-button" phx-throttle="300">
       <%= if @hidden do %>
         Hide
       <% else %>
@@ -24,81 +12,16 @@
   </:actions>
 </.header>
 
-<%= if @grid do %>
-  <div class="grid grid-cols-3 gap-4 mt-4" id="items-grid">
-    <div
-      :for={item <- @items}
-      phx-click={JS.navigate(~p"/details/#{item}")}
-      class="p-3 bg-purple-200 hover:bg-purple-300 active:bg-purple-400 border-2 border-black
-            hover:shadow-sharp hover:-translate-x-0.5 hover:-translate-y-0.5 transition
-            cursor-pointer"
-    >
-      <div class="aspect-square relative flex flex-col justify-center bg-white border border-black">
-        <img
-          :if={item.image_url}
-          src={item.image_url}
-          alt={item.title}
-          height="224"
-          width="224"
-          class="rounded"
-        />
-        <%= if item.received && !@current_user do %>
-          <div class="bg-red-400 text-white absolute w-full h-7 bottom-0">
-            <.icon name="hero-check-circle" />Received
-          </div>
-        <% end %>
-      </div>
-      <div class="flex flex-row justify-between mt-1 font-display">
-        <%= item.title %>
-        <div phx-click={JS.toggle(to: "#dropdown-#{item.id}")} class="relative">
-          <div class="w-7 h-7 rounded-full hover:bg-purple-400 active:bg-purple-500">
-            <.icon name="hero-ellipsis-vertical" class="w-full h-full" />
-          </div>
-          <.dropdown item={item} />
-        </div>
-      </div>
-      <%= if item.price do %>
-        <div>
-          <div class="text-sm opacity-60">
-            Price:
-          </div>
-          <div class="text-sm">
-            ~£<%= item.price %>
-          </div>
-        </div>
-      <% end %>
-      <div>
-        <div class="text-sm opacity-60">
-          Priority:
-        </div>
-        <span>
-          <%= for _ <- 1..item.desire do %>
-            <.icon name="hero-star" class="bg-red-500 text-red-500" />
-          <% end %>
-        </span>
-      </div>
-      <%= if item.description do %>
-        <div>
-          <div class="text-sm opacity-60">
-            Description:
-          </div>
-          <div>
-            <%= item.description %>
-          </div>
-        </div>
-      <% end %>
-    </div>
-  </div>
-<% else %>
 <div class="flex flex-col mt-4 space-y-4">
   <div
     :for={item <- @items}
-      class="grid grid-cols-6 grid-rows-4 gap-3 h-56 p-3 bg-purple-200 hover:bg-purple-300 active:bg-purple-400 border-2 border-black
-            hover:shadow-sharp hover:-translate-x-0.5 hover:-translate-y-0.5 transition
-            cursor-pointer"
+    class="grid grid-cols-12 gap-3 p-3 bg-purple-200
+      hover:bg-purple-300 active:bg-purple-400 border-2 border-black
+      hover:shadow-sharp hover:-translate-x-0.5 hover:-translate-y-0.5
+      transition cursor-pointer"
     phx-click={JS.navigate(~p"/details/#{item}")}
   >
-      <div class="relative col-span-2 flex flex-col justify-center max-h-full h-full row-span-4 bg-white border border-black">
+    <div class="relative col-span-4 flex flex-col justify-center max-h-full h-full bg-white border border-black">
       <img :if={item.image_url} src={item.image_url} alt={item.title} class="max-h-full" />
       <%= if item.received && !@current_user do %>
         <div class="absolute bg-red-400 text-xs text-white w-full h-7 bottom-0">
@@ -106,16 +29,10 @@
         </div>
       <% end %>
     </div>
-      <div class="col-span-3 text-lg font-display">
+    <div class="col-span-7 flex flex-col">
+      <div class="text-lg font-display">
         <%= item.title %>
       </div>
-      <div phx-click={JS.toggle(to: "#dropdown-#{item.id}")} class="relative">
-        <.icon
-          name="hero-ellipsis-vertical"
-          class="w-7 h-7 rounded-full hover:bg-purple-400 active:bg-purple-500"
-        />
-        <.dropdown item={item} />
-      </div>
       <%= if item.price do %>
         <div class="col-span-3">
           <div class="text-sm opacity-60">
@@ -147,5 +64,14 @@
         </span>
       </div>
     </div>
+    <div class="col-span-1">
+      <div phx-click={JS.toggle(to: "#dropdown-#{item.id}")} class="relative float-right mt-1">
+        <.icon
+          name="hero-ellipsis-vertical"
+          class="w-7 h-7 rounded-full hover:bg-purple-400 active:bg-purple-500"
+        />
+        <.dropdown item={item} />
+      </div>
+    </div>
+  </div>
 </div>
-<% end %>

lib/wish_web/live/item_live/index.html.heex

@@ -10,20 +10,14 @@
 <.table
   id="items"
   rows={@streams.items}
-  row_click={fn {_id, item} -> JS.patch(~p"/items/#{item}/show/edit") end}
+  row_click={fn {_id, item} -> JS.navigate(~p"/items/#{item}/show/edit") end}
 >
   <:col :let={{_id, item}} label="Title"><%= item.title %></:col>
   <:col :let={{_id, item}} label="Description"><%= item.description %></:col>
   <:col :let={{_id, item}} label="Price"><%= item.price %></:col>
   <:col :let={{_id, item}} label="Desire"><%= item.desire %></:col>
-  <:action :let={{_id, item}}>
-    <div class="sr-only">
-      <.link patch={~p"/items/#{item.id}/show/edit"}>Edit</.link>
-    </div>
-  </:action>
   <:action :let={{id, item}}>
     <.link
-      id={"delete-#{id}"}
       phx-click={JS.push("delete", value: %{id: item.id}) |> hide("##{id}")}
       data-confirm="Are you sure?"
     >

lib/wish_web/live/item_live/show.ex

@@ -40,12 +40,9 @@ defmodule WishWeb.ItemLive.Show do
   defp save_item(socket, :edit, item_params) do
     case Wishlist.update_item(socket.assigns.item, item_params) do
       {:ok, item} ->
-        changeset = Wishlist.change_item(item)
-
         {:noreply,
          socket
          |> assign(:item, item)
-         |> assign_form(changeset)
          |> put_flash(:info, "Item updated successfully")}
 
       {:error, %Ecto.Changeset{} = changeset} ->

lib/wish_web/router.ex

@@ -60,7 +60,7 @@ defmodule WishWeb.Router do
 
     live_session :redirect_if_user_is_authenticated,
       on_mount: [{WishWeb.UserAuth, :redirect_if_user_is_authenticated}] do
-      live "/users/register", UserRegistrationLive, :new
+      # live "/users/register", UserRegistrationLive, :new
       live "/users/log_in", UserLoginLive, :new
       live "/users/reset_password", UserForgotPasswordLive, :new
       live "/users/reset_password/:token", UserResetPasswordLive, :edit

test/wish_web/controllers/page_controller_test.exs

@@ -0,0 +1,8 @@
+defmodule WishWeb.PageControllerTest do
+  use WishWeb.ConnCase
+
+  test "GET /", %{conn: conn} do
+    conn = get(conn, ~p"/")
+    assert html_response(conn, 200) =~ "Peace of mind from prototype to production"
+  end
+end

test/wish_web/live/home_live_test.exs

@@ -1,26 +0,0 @@
-defmodule WishWeb.HomeLiveTest do
-  use WishWeb.ConnCase
-
-  import Phoenix.LiveViewTest
-  import Wish.WishlistFixtures
-  import Wish.AccountsFixtures
-
-  defp create_item(_) do
-    item = item_fixture()
-    %{item: item}
-  end
-
-  describe "Index" do
-    setup [:create_item]
-
-    test "lists all items", %{conn: conn, item: item} do
-      {:ok, _index_live, html} =
-        conn
-        |> log_in_user(user_fixture())
-        |> live(~p"/")
-
-      assert html =~ "Daniel's Wishlist"
-      assert html =~ item.description
-    end
-  end
-end

test/wish_web/live/item_live_test.exs

@@ -3,21 +3,10 @@ defmodule WishWeb.ItemLiveTest do
 
   import Phoenix.LiveViewTest
   import Wish.WishlistFixtures
-  import Wish.AccountsFixtures
 
-  @create_attrs %{
-    description: "some description",
-    title: "some title",
-    url: "some url",
-    desire: 2
-  }
-  @update_attrs %{
-    description: "some updated description",
-    title: "some updated title",
-    url: "some updated url",
-    desire: 3
-  }
-  @invalid_attrs %{description: nil, title: nil, url: nil, desire: nil}
+  @create_attrs %{description: "some description", title: "some title", url: "some url", received: true, desire: 42}
+  @update_attrs %{description: "some updated description", title: "some updated title", url: "some updated url", received: false, desire: 43}
+  @invalid_attrs %{description: nil, title: nil, url: nil, received: false, desire: nil}
 
   defp create_item(_) do
     item = item_fixture()
@@ -28,20 +17,14 @@ defmodule WishWeb.ItemLiveTest do
     setup [:create_item]
 
     test "lists all items", %{conn: conn, item: item} do
-      {:ok, _index_live, html} =
-        conn
-        |> log_in_user(user_fixture())
-        |> live(~p"/items")
+      {:ok, _index_live, html} = live(conn, ~p"/items")
 
       assert html =~ "Listing Items"
       assert html =~ item.description
     end
 
     test "saves new item", %{conn: conn} do
-      {:ok, index_live, _html} =
-        conn
-        |> log_in_user(user_fixture())
-        |> live(~p"/items")
+      {:ok, index_live, _html} = live(conn, ~p"/items")
 
       assert index_live |> element("a", "New Item") |> render_click() =~
                "New Item"
@@ -63,75 +46,66 @@ defmodule WishWeb.ItemLiveTest do
       assert html =~ "some description"
     end
 
-    # test "updates item in listing", %{conn: conn, item: item} do
-    # {:ok, index_live, _html} =
-    # conn
-    # |> log_in_user(user_fixture())
-    # |> live(~p"/items")
-    # 
-    # index_live
-    # |> element("#items-#{item.id} a", "Edit")
-    # |> render_click()
-    # 
-    # assert_patch(index_live, ~p"/items/#{item}/show/edit")
-    # 
-    # assert index_live
-    # |> form("#item-form", item: @invalid_attrs)
-    # |> render_change() =~ "can't be blank"
-    # 
-    # assert index_live
-    # |> form("#item-form", item: @update_attrs)
-    # |> render_submit()
-    # 
-    # assert_patch(index_live, ~p"/items")
-    # 
-    # html = render(index_live)
-    # assert html =~ "Item updated successfully"
-    # assert html =~ "some updated description"
-    # end
+    test "updates item in listing", %{conn: conn, item: item} do
+      {:ok, index_live, _html} = live(conn, ~p"/items")
 
-    test "deletes item in listing", %{conn: conn, item: item} do
-      {:ok, index_live, _html} =
-        conn
-        |> log_in_user(user_fixture())
-        |> live(~p"/items")
+      assert index_live |> element("#items-#{item.id} a", "Edit") |> render_click() =~
+               "Edit Item"
+
+      assert_patch(index_live, ~p"/items/#{item}/edit")
 
       assert index_live
-             |> element("#delete-items-#{item.id}")
-             |> render_click()
+             |> form("#item-form", item: @invalid_attrs)
+             |> render_change() =~ "can't be blank"
 
+      assert index_live
+             |> form("#item-form", item: @update_attrs)
+             |> render_submit()
+
+      assert_patch(index_live, ~p"/items")
+
+      html = render(index_live)
+      assert html =~ "Item updated successfully"
+      assert html =~ "some updated description"
+    end
+
+    test "deletes item in listing", %{conn: conn, item: item} do
+      {:ok, index_live, _html} = live(conn, ~p"/items")
+
+      assert index_live |> element("#items-#{item.id} a", "Delete") |> render_click()
       refute has_element?(index_live, "#items-#{item.id}")
     end
   end
 
-  describe "Edit" do
+  describe "Show" do
     setup [:create_item]
 
     test "displays item", %{conn: conn, item: item} do
-      {:ok, _show_live, html} =
-        conn
-        |> log_in_user(user_fixture())
-        |> live(~p"/items/#{item}/show/edit")
+      {:ok, _show_live, html} = live(conn, ~p"/items/#{item}")
 
-      assert html =~ "Edit Item"
+      assert html =~ "Show Item"
       assert html =~ item.description
     end
 
     test "updates item within modal", %{conn: conn, item: item} do
-      {:ok, edit_live, _html} =
-        conn
-        |> log_in_user(user_fixture())
-        |> live(~p"/items/#{item}/show/edit")
+      {:ok, show_live, _html} = live(conn, ~p"/items/#{item}")
 
-      assert edit_live
+      assert show_live |> element("a", "Edit") |> render_click() =~
+               "Edit Item"
+
+      assert_patch(show_live, ~p"/items/#{item}/show/edit")
+
+      assert show_live
              |> form("#item-form", item: @invalid_attrs)
              |> render_change() =~ "can't be blank"
 
-      assert edit_live
+      assert show_live
              |> form("#item-form", item: @update_attrs)
              |> render_submit()
 
-      html = render(edit_live)
+      assert_patch(show_live, ~p"/items/#{item}")
+
+      html = render(show_live)
       assert html =~ "Item updated successfully"
       assert html =~ "some updated description"
     end

test/wish_web/live/user_forgot_password_live_test.exs

@@ -12,6 +12,7 @@ defmodule WishWeb.UserForgotPasswordLiveTest do
       {:ok, lv, html} = live(conn, ~p"/users/reset_password")
 
       assert html =~ "Forgot your password?"
+      assert has_element?(lv, ~s|a[href="#{~p"/users/register"}"]|, "Register")
       assert has_element?(lv, ~s|a[href="#{~p"/users/log_in"}"]|, "Log in")
     end
 

test/wish_web/live/user_login_live_test.exs

@@ -9,6 +9,7 @@ defmodule WishWeb.UserLoginLiveTest do
       {:ok, _lv, html} = live(conn, ~p"/users/log_in")
 
       assert html =~ "Log in"
+      assert html =~ "Register"
       assert html =~ "Forgot your password?"
     end
 
@@ -57,6 +58,18 @@ defmodule WishWeb.UserLoginLiveTest do
   end
 
   describe "login navigation" do
+    test "redirects to registration page when the Register button is clicked", %{conn: conn} do
+      {:ok, lv, _html} = live(conn, ~p"/users/log_in")
+
+      {:ok, _login_live, login_html} =
+        lv
+        |> element(~s|main a:fl-contains("Sign up")|)
+        |> render_click()
+        |> follow_redirect(conn, ~p"/users/register")
+
+      assert login_html =~ "Register"
+    end
+
     test "redirects to forgot password page when the Forgot Password button is clicked", %{
       conn: conn
     } do

test/wish_web/live/user_reset_password_live_test.exs

@@ -99,5 +99,20 @@ defmodule WishWeb.UserResetPasswordLiveTest do
 
       assert conn.resp_body =~ "Log in"
     end
+
+    test "redirects to password reset page when the Register button is clicked", %{
+      conn: conn,
+      token: token
+    } do
+      {:ok, lv, _html} = live(conn, ~p"/users/reset_password/#{token}")
+
+      {:ok, conn} =
+        lv
+        |> element(~s|main a:fl-contains("Register")|)
+        |> render_click()
+        |> follow_redirect(conn, ~p"/users/register")
+
+      assert conn.resp_body =~ "Register"
+    end
   end
 end