diff --git a/assets/js/app.js b/assets/js/app.js
index 8c02de5..296541d 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -12,4 +12,20 @@ import "../css/app.scss"
// import {Socket} from "phoenix"
// import socket from "./socket"
//
-import "phoenix_html"
\ No newline at end of file
+import "phoenix_html"
+import {Socket} from "phoenix"
+import LiveSocket from "phoenix_live_view"
+
+let csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute("content")
+let liveSocket = new LiveSocket("/live", Socket, {params: {_csrf_token: csrfToken}})
+
+// Connect if there are any LiveViews on the page
+liveSocket.connect()
+
+// Expose liveSocket on window for web console debug logs and latency simulation:
+// >> liveSocket.enableDebug()
+// >> liveSocket.enableLatencySim(1000)
+// The latency simulator is enabled for the duration of the browser session.
+// Call disableLatencySim() to disable:
+// >> liveSocket.disableLatencySim()
+window.liveSocket = liveSocket
diff --git a/assets/js/socket.js b/assets/js/socket.js
deleted file mode 100644
index 09929ab..0000000
--- a/assets/js/socket.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// NOTE: The contents of this file will only be executed if
-// you uncomment its entry in "assets/js/app.js".
-
-// To use Phoenix channels, the first step is to import Socket,
-// and connect at the socket path in "lib/web/endpoint.ex".
-//
-// Pass the token on params as below. Or remove it
-// from the params if you are not using authentication.
-import {Socket} from "phoenix"
-
-let socket = new Socket("/socket", {params: {token: window.userToken}})
-
-// When you connect, you'll often need to authenticate the client.
-// For example, imagine you have an authentication plug, `MyAuth`,
-// which authenticates the session and assigns a `:current_user`.
-// If the current user exists you can assign the user's token in
-// the connection for use in the layout.
-//
-// In your "lib/web/router.ex":
-//
-// pipeline :browser do
-// ...
-// plug MyAuth
-// plug :put_user_token
-// end
-//
-// defp put_user_token(conn, _) do
-// if current_user = conn.assigns[:current_user] do
-// token = Phoenix.Token.sign(conn, "user socket", current_user.id)
-// assign(conn, :user_token, token)
-// else
-// conn
-// end
-// end
-//
-// Now you need to pass this token to JavaScript. You can do so
-// inside a script tag in "lib/web/templates/layout/app.html.eex":
-//
-//
-//
-// You will need to verify the user token in the "connect/3" function
-// in "lib/web/channels/user_socket.ex":
-//
-// def connect(%{"token" => token}, socket, _connect_info) do
-// # max_age: 1209600 is equivalent to two weeks in seconds
-// case Phoenix.Token.verify(socket, "user socket", token, max_age: 1209600) do
-// {:ok, user_id} ->
-// {:ok, assign(socket, :user, user_id)}
-// {:error, reason} ->
-// :error
-// end
-// end
-//
-// Finally, connect to the socket:
-socket.connect()
-
-// Now that you are connected, you can join channels with a topic:
-let channel = socket.channel("topic:subtopic", {})
-channel.join()
- .receive("ok", resp => { console.log("Joined successfully", resp) })
- .receive("error", resp => { console.log("Unable to join", resp) })
-
-export default socket
diff --git a/assets/package-lock.json b/assets/package-lock.json
index 39606c4..297f510 100644
--- a/assets/package-lock.json
+++ b/assets/package-lock.json
@@ -5336,6 +5336,9 @@
"phoenix_html": {
"version": "file:../deps/phoenix_html"
},
+ "phoenix_live_view": {
+ "version": "file:../deps/phoenix_live_view"
+ },
"picomatch": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
diff --git a/assets/package.json b/assets/package.json
index f433fd5..5235a74 100644
--- a/assets/package.json
+++ b/assets/package.json
@@ -8,7 +8,8 @@
},
"dependencies": {
"phoenix": "file:../deps/phoenix",
- "phoenix_html": "file:../deps/phoenix_html"
+ "phoenix_html": "file:../deps/phoenix_html",
+ "phoenix_live_view": "file:../deps/phoenix_live_view"
},
"devDependencies": {
"@babel/core": "^7.0.0",
diff --git a/lib/planner/tasks.ex b/lib/planner/tasks.ex
new file mode 100644
index 0000000..be99db1
--- /dev/null
+++ b/lib/planner/tasks.ex
@@ -0,0 +1,39 @@
+defmodule Planner.Tasks do
+ import Ecto.Query
+ alias Planner.Repo
+ alias Planner.Tasks.Task
+
+ def add_task(attrs) do
+ %Task{}
+ |> Task.changeset(attrs)
+ |> Repo.insert()
+ end
+
+ def list_all_tasks, do: Repo.all(Task)
+
+ def list_unfinished_tasks do
+ from(
+ t in Task,
+ where: is_nil(t.finished_at)
+ )
+ |> Repo.all()
+ end
+
+ def change_task(%Task{} = task) do
+ task
+ |> Task.changeset(%{})
+ end
+
+ def get_task!(id), do: Repo.get!(Task, id)
+
+ def delete_task_by_id!(id) do
+ get_task!(id)
+ |> Repo.delete()
+ end
+
+ def finish_task_by_id!(id) do
+ get_task!(id)
+ |> Task.finish_task()
+ |> Repo.update()
+ end
+end
diff --git a/lib/planner/tasks/task.ex b/lib/planner/tasks/task.ex
new file mode 100644
index 0000000..33a4e44
--- /dev/null
+++ b/lib/planner/tasks/task.ex
@@ -0,0 +1,30 @@
+defmodule Planner.Tasks.Task do
+ use Ecto.Schema
+ import Ecto.Changeset
+
+ @primary_key {:id, :binary_id, autogenerate: true}
+ @foreign_key_type :binary_id
+ schema "tasks" do
+ field(:value, :string)
+ field(:filed_at, :naive_datetime)
+ field(:finished_at, :naive_datetime)
+ field(:due_at, :naive_datetime)
+
+ timestamps()
+ end
+
+ @doc false
+ def changeset(task, attrs) do
+ task
+ |> cast(attrs, [:value, :filed_at, :finished_at, :due_at])
+ |> validate_required([:value])
+ |> validate_length(:value, min: 3)
+ end
+
+ @doc false
+ def finish_task(task) do
+ now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
+ # TODO, this should check if `finished_at` is not nil, first
+ change(task, finished_at: now)
+ end
+end
diff --git a/lib/planner_web.ex b/lib/planner_web.ex
index fa002c3..4b94e96 100644
--- a/lib/planner_web.ex
+++ b/lib/planner_web.ex
@@ -23,6 +23,7 @@ defmodule PlannerWeb do
import Plug.Conn
import PlannerWeb.Gettext
+ import Phoenix.LiveView.Controller
alias PlannerWeb.Router.Helpers, as: Routes
end
end
@@ -35,18 +36,37 @@ defmodule PlannerWeb do
# Import convenience functions from controllers
import Phoenix.Controller, only: [get_flash: 1, get_flash: 2, view_module: 1]
+ import Phoenix.LiveView.Helpers
# Include shared imports and aliases for views
unquote(view_helpers())
end
end
+ def live_view do
+ quote do
+ use Phoenix.LiveView,
+ layout: {PlannerWeb.LayoutView, "live.html"}
+
+ unquote(view_helpers())
+ end
+ end
+
+ def live_component do
+ quote do
+ use Phoenix.LiveComponent
+
+ unquote(view_helpers())
+ end
+ end
+
def router do
quote do
use Phoenix.Router
import Plug.Conn
import Phoenix.Controller
+ import Phoenix.LiveView.Router
end
end
diff --git a/lib/planner_web/controllers/page_controller.ex b/lib/planner_web/controllers/page_controller.ex
deleted file mode 100644
index e5120ad..0000000
--- a/lib/planner_web/controllers/page_controller.ex
+++ /dev/null
@@ -1,7 +0,0 @@
-defmodule PlannerWeb.PageController do
- use PlannerWeb, :controller
-
- def index(conn, _params) do
- render(conn, "index.html")
- end
-end
diff --git a/lib/planner_web/live/landing_live.ex b/lib/planner_web/live/landing_live.ex
new file mode 100644
index 0000000..04e0e74
--- /dev/null
+++ b/lib/planner_web/live/landing_live.ex
@@ -0,0 +1,83 @@
+defmodule PlannerWeb.LandingLive do
+ use Phoenix.LiveView, layout: {PlannerWeb.LayoutView, "live.html"}
+ use Phoenix.HTML
+
+ import PlannerWeb.ErrorHelpers
+
+ alias Planner.Tasks
+ alias Planner.Tasks.Task
+
+ def mount(_params, _session, socket) do
+ socket =
+ socket
+ # |> put_flash(:info, "hello world")
+ |> assign(:new_task_changeset, Tasks.change_task(%Task{}))
+ |> assign(:tasks, Tasks.list_unfinished_tasks())
+
+ {:ok, socket}
+ end
+
+ def render(assigns) do
+ ~L"""
+ <%= f = form_for(@new_task_changeset, "#", [phx_submit: :save_new_task]) %>
+ <%= label f, :value, "New Task" %>
+ <%= text_input f, :value %>
+ <%= error_tag f, :value %>
+
+ <%= submit "Create" %>
+
+
+
+
+