Watch video - work in progress p160

dharnitski · Sep 18, 2016 · 92e8340 · 92e8340
1 parent 36b5bf6
commit 92e8340
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 17 deletions.
diff --git a/test/controllers/user_controller_test.exs b/test/controllers/user_controller_test.exs
@@ -36,4 +36,22 @@ defmodule Rumbl.UserControllerTest do
     #assert String.contains?(conn.resp_body, user.name)
     #assert String.contains?(conn.resp_body, other_user.name)
   end
+
+  @tag login_as: "max"
+  test "shows chosen resource", %{user: owner, conn: conn} do
+    conn = get conn, user_path(conn, :show, owner)
+    assert html_response(conn, 200) =~ "Showing User"
+  end
+
+  test "renders form for new resources", %{conn: conn} do
+    conn = get conn, user_path(conn, :new)
+    assert html_response(conn, 200) =~ "New User"
+  end
+
+  test "creates resource and redirects when data is valid", %{conn: conn} do
+    conn = post conn, user_path(conn, :create), user: @valid_attrs
+    assert redirected_to(conn) == user_path(conn, :index)
+    #assert Repo.get_by(User, @valid_attrs)
+  end
+
 end
diff --git a/test/controllers/watch_controller_test.exs b/test/controllers/watch_controller_test.exs
@@ -0,0 +1,14 @@
+defmodule Rumbl.WatchControllerTest do
+  use Rumbl.ConnCase
+  alias Rumbl.Video
+
+  @valid_attrs %{url: "http://youtu.be", title: "vid", description: "a vid"}
+
+  test "shows chosen resource", %{conn: conn} do
+    user = insert_user(username: "username")
+    video = insert_video(user, @valid_attrs)
+    conn = get conn, watch_path(conn, :show, video)
+    assert html_response(conn, 200) =~ "Annotations"
+  end
+
+end
diff --git a/web/controllers/watch_controller.ex b/web/controllers/watch_controller.ex
@@ -0,0 +1,9 @@
+defmodule Rumbl.WatchController do
+  use Rumbl.Web, :controller
+  alias Rumbl.Video
+
+  def show(conn, %{"id" => id}) do
+    video = Repo.get!(Video, id)
+    render conn, "show.html", video: video
+  end
+end
diff --git a/web/router.ex b/web/router.ex
@@ -19,6 +19,7 @@ defmodule Rumbl.Router do
 
     resources "/users", UserController, only: [:index, :show, :new, :create]
     resources "/sessions", SessionController, only: [:new, :create, :delete]
+    get "/watch/:id", WatchController, :show
     get "/", PageController, :index
   end
 

diff --git a/web/templates/layout/app.html.eex b/web/templates/layout/app.html.eex
@@ -14,20 +14,21 @@
   <body>
     <div class="container">
       <div class="header">
-             <ol class="breadcrumb text-right">
-               <%= if @current_user do %>
-                 <li><%= @current_user.username %></li>
-                 <li>
-                   <%= link "Log out", to: session_path(@conn, :delete, @current_user),
-                                       method: "delete" %>
-                 </li>
-               <% else %>
-                 <li><%= link "Register", to: user_path(@conn, :new) %></li>
-                 <li><%= link "Log in", to: session_path(@conn, :new) %></li>
-               <% end %>
-             </ol>
-             <span class="logo"></span>
-           </div>
+        <ol class="breadcrumb text-right">
+          <%= if @current_user do %>
+            <li><%= @current_user.username %></li>
+            <li><%= link "My Videos", to: video_path(@conn, :index) %></li>
+            <li>
+              <%= link "Log out", to: session_path(@conn, :delete, @current_user),
+                  method: "delete" %>
+            </li>
+          <% else %>
+            <li><%= link "Register", to: user_path(@conn, :new) %></li>
+            <li><%= link "Log in", to: session_path(@conn, :new) %></li>
+          <% end %>
+        </ol>
+        <span class="logo"></span>
+      </div>
 
       <p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p>
       <p class="alert alert-danger" role="alert"><%= get_flash(@conn, :error) %></p>

diff --git a/web/templates/video/index.html.eex b/web/templates/video/index.html.eex
@@ -20,9 +20,13 @@
       <td><%= video.description %></td>
 
       <td class="text-right">
-        <%= link "Show", to: video_path(@conn, :show, video), class: "btn btn-default btn-xs" %>
-        <%= link "Edit", to: video_path(@conn, :edit, video), class: "btn btn-default btn-xs" %>
-        <%= link "Delete", to: video_path(@conn, :delete, video), method: :delete, data: [confirm: "Are you sure?"], class: "btn btn-danger btn-xs" %>
+        <%= link "Watch", to: watch_path(@conn, :show, video),
+          class: "btn btn-default btn-xs" %>
+        <%= link "Edit", to: video_path(@conn, :edit, video),
+          class: "btn btn-default btn-xs" %>
+        <%= link "Delete", to: video_path(@conn, :delete, video),
+          method: :delete, data: [confirm: "Are you sure?"],
+          class: "btn btn-danger btn-xs" %>
       </td>
     </tr>
 <% end %>

diff --git a/web/templates/watch/show.html.eex b/web/templates/watch/show.html.eex
@@ -0,0 +1,22 @@
+<h2><%= @video.title %></h2>
+<div class="row">
+  <div class="col-sm-7">
+    <%= content_tag :div, id: "video", data: [id: @video.id, player_id: player_id(@video)] do %>
+    <% end %>
+  </div>
+  <div class="col-sm-5">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h3 class="panel-title">Annotations</h3>
+      </div>
+      <div id="msg-container" class="panel-body annotations">
+      </div>
+      <div class="panel-footer">
+        <textarea id="msg-input" rows="3" class="form-control"
+          placeholder="Comment..."></textarea>
+        <button id="msg-submit" class="btn btn-primary form-control"
+          type="submit">Post</button>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/web/views/watch_view.ex b/web/views/watch_view.ex
@@ -0,0 +1,9 @@
+defmodule Rumbl.WatchView do
+  use Rumbl.Web, :view
+
+  def player_id(video) do
+    ~r/^.*(?:youtu.be\/|v\/|e\/|u\/\w+\/|embed\/|v=)(?<id>[^#\&\?]*).*/
+    |> Regex.named_captures(video.url)
+    |> get_in(["id"])
+  end
+end