Migrate from channel to phoenix live view.
Move phoenix config to ui project. Sync progress on page load.
This commit is contained in:
parent
e888f1330b
commit
ad24ec96ac
26 changed files with 120 additions and 164 deletions
|
@ -10,6 +10,12 @@ If you have found the source code before finding the geocache, consider it a hin
|
|||
- [Nerves](https://hexdocs.pm/nerves/installation.html)
|
||||
- [Phoenix](https://hexdocs.pm/phoenix/installation.html)
|
||||
|
||||
## dev
|
||||
- Run `epmd` in the background so it can function as a distributed system with the pi.
|
||||
- Run `cd ui && mix deps.get` to install Elixir dependencies.
|
||||
- Run `cd assets && npm install && cd ..` to install npm dependencies.
|
||||
- Run `mix phx.server` to start the server.
|
||||
|
||||
## Building
|
||||
```bash
|
||||
cd ui/ && export SECRET_KEY_BASE="$(mix phx.gen.secret | tail -1)"
|
||||
|
|
|
@ -26,13 +26,6 @@ config :shoehorn,
|
|||
|
||||
config :logger, backends: [RingLogger]
|
||||
|
||||
config :phoenix, :json_library, Jason
|
||||
import_config("target.exs")
|
||||
|
||||
config :morse, :progress_socket, UiWeb.UserSocket
|
||||
|
||||
if Mix.target() != :host do
|
||||
"target.exs"
|
||||
else
|
||||
"host.exs"
|
||||
end
|
||||
|> import_config()
|
||||
import_config("../../ui/config/config.exs")
|
||||
|
|
|
@ -37,18 +37,6 @@ config :nerves_init_gadget,
|
|||
node_name: node_name,
|
||||
node_host: :mdns_domain
|
||||
|
||||
config :ui, UiWeb.Endpoint,
|
||||
url: [host: "www.geokunis2.nl"],
|
||||
http: [port: 80],
|
||||
secret_key_base: "HEY05EB1dFVSu6KykKHuS4rQPQzSHv4F7mGVB/gnDLrIu75wE/ytBXy2TaL3A6RA",
|
||||
root: Path.dirname(__DIR__),
|
||||
server: true,
|
||||
render_errors: [view: UiWeb.ErrorView, accepts: ~w(html json)],
|
||||
pubsub: [name: Nerves.PubSub, adapter: Phoenix.PubSub.PG2],
|
||||
code_reloader: false
|
||||
|
||||
config :morse, :relay_pin, 17
|
||||
|
||||
if File.exists?("config/secrets.exs") do
|
||||
import_config "secrets.exs"
|
||||
end
|
||||
|
|
|
@ -9,33 +9,8 @@ defmodule Firmware.Application do
|
|||
# See https://hexdocs.pm/elixir/Supervisor.html
|
||||
# for other strategies and supported options
|
||||
opts = [strategy: :one_for_one, name: Firmware.Supervisor]
|
||||
children =
|
||||
[
|
||||
# Children for all targets
|
||||
# Starts a worker by calling: Firmware.Worker.start_link(arg)
|
||||
# {Firmware.Worker, arg},
|
||||
] ++ children(target())
|
||||
children = []
|
||||
|
||||
Supervisor.start_link(children, opts)
|
||||
end
|
||||
|
||||
# List all child processes to be supervised
|
||||
def children(:host) do
|
||||
{:ok, _} = Node.start(:"host@0.0.0.0")
|
||||
Node.set_cookie(:tastycookie)
|
||||
true = Node.connect(:"esrom@esrom.lan")
|
||||
[]
|
||||
end
|
||||
|
||||
def children(_target) do
|
||||
[
|
||||
# Children for all targets except host
|
||||
# Starts a worker by calling: Firmware.Worker.start_link(arg)
|
||||
# {Firmware.Worker, arg},
|
||||
]
|
||||
end
|
||||
|
||||
def target() do
|
||||
Application.get_env(:firmware, :target)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
"ecto": {:hex, :ecto, "3.1.7", "fa21d06ef56cdc2fdaa62574e8c3ba34a2751d44ea34c30bc65f0728421043e5", [:mix], [{:decimal, "~> 1.6", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"},
|
||||
"ecto_sql": {:hex, :ecto_sql, "3.1.6", "1e80e30d16138a729c717f73dcb938590bcdb3a4502f3012414d0cbb261045d8", [:mix], [{:db_connection, "~> 2.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.1.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:mariaex, "~> 0.9.1", [hex: :mariaex, repo: "hexpm", optional: true]}, {:myxql, "~> 0.2.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.14.0 or ~> 0.15.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"elixir_make": {:hex, :elixir_make, "0.6.0", "38349f3e29aff4864352084fc736fa7fa0f2995a819a737554f7ebd28b85aaab", [:mix], [], "hexpm"},
|
||||
"file_system": {:hex, :file_system, "0.2.7", "e6f7f155970975789f26e77b8b8d8ab084c59844d8ecfaf58cbda31c494d14aa", [:mix], [], "hexpm"},
|
||||
"gettext": {:hex, :gettext, "0.17.0", "abe21542c831887a2b16f4c94556db9c421ab301aee417b7c4fbde7fbdbe01ec", [:mix], [], "hexpm"},
|
||||
"jason": {:hex, :jason, "1.1.2", "b03dedea67a99223a2eaf9f1264ce37154564de899fd3d8b9a21b1a6fd64afe7", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"},
|
||||
"mdns": {:hex, :mdns, "1.0.3", "f08414daf5636bf5cd364611e838818e9250c91a3282a817ad9174b03e757401", [:mix], [{:dns, "~> 2.0", [hex: :dns, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
|
@ -37,6 +38,7 @@
|
|||
"phoenix": {:hex, :phoenix, "1.4.9", "746d098e10741c334d88143d3c94cab1756435f94387a63441792e66ec0ee974", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.8.1 or ~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"phoenix_ecto": {:hex, :phoenix_ecto, "4.0.0", "c43117a136e7399ea04ecaac73f8f23ee0ffe3e07acfcb8062fe5f4c9f0f6531", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.9", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"phoenix_html": {:hex, :phoenix_html, "2.13.3", "850e292ff6e204257f5f9c4c54a8cb1f6fbc16ed53d360c2b780a3d0ba333867", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"phoenix_live_reload": {:hex, :phoenix_live_reload, "1.2.1", "274a4b07c4adbdd7785d45a8b0bb57634d0b4f45b18d2c508b26c0344bd59b8f", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.2", "496c303bdf1b2e98a9d26e89af5bba3ab487ba3a3735f74bf1f4064d2a845a3e", [:mix], [], "hexpm"},
|
||||
"plug": {:hex, :plug, "1.8.2", "0bcce1daa420f189a6491f3940cc77ea7fb1919761175c9c3b59800d897440fc", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm"},
|
||||
"plug_cowboy": {:hex, :plug_cowboy, "2.1.0", "b75768153c3a8a9e8039d4b25bb9b14efbc58e9c4a6e6a270abff1cd30cbe320", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
|
|
|
@ -13,6 +13,10 @@ defmodule Morse.Server do
|
|||
GenServer.cast(__MODULE__, {:progress, progress})
|
||||
end
|
||||
|
||||
def progress do
|
||||
GenServer.call(__MODULE__, :progress)
|
||||
end
|
||||
|
||||
@impl true
|
||||
def init(state) do
|
||||
{:ok, state}
|
||||
|
@ -28,13 +32,17 @@ defmodule Morse.Server do
|
|||
end
|
||||
end
|
||||
|
||||
def handle_call(:progress, _from, {_pid, progress} = state) do
|
||||
{:reply, progress, state}
|
||||
end
|
||||
|
||||
@impl true
|
||||
def handle_cast({:progress, new_progress}, {pid, _progress}) do
|
||||
apply(progress_socket(), :broadcast_progress, [new_progress])
|
||||
apply(pubsub(), :broadcast, [Ui.PubSub, "morse_progress", new_progress])
|
||||
{:noreply, {pid, new_progress}}
|
||||
end
|
||||
|
||||
defp progress_socket do
|
||||
Application.fetch_env!(:morse, :progress_socket)
|
||||
defp pubsub do
|
||||
Application.fetch_env!(:morse, :pubsub)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -60,7 +60,7 @@ defmodule Morse.Worker do
|
|||
|> String.to_charlist()
|
||||
end
|
||||
|
||||
case Mix.Nerves.Utils.mix_target() do
|
||||
case Application.get_env(:ui, :target) do
|
||||
:host ->
|
||||
def toggle_lamp(state) do
|
||||
:rpc.call(:"esrom@esrom.lan", Morse.Worker, :toggle_lamp, [state])
|
||||
|
|
|
@ -15,7 +15,7 @@ defmodule Morse.MixProject do
|
|||
def application do
|
||||
[
|
||||
extra_applications: [:logger],
|
||||
env: [morse_message: "...---...", relay_pin: 17],
|
||||
env: [morse_message: "... --- ...", relay_pin: 17],
|
||||
mod: {Morse.Application, []}
|
||||
]
|
||||
end
|
||||
|
|
|
@ -11,7 +11,8 @@ import css from "../css/app.css"
|
|||
//
|
||||
import "phoenix_html"
|
||||
|
||||
// Import local files
|
||||
//
|
||||
// Local files can be imported directly using relative paths, for example:
|
||||
import socket from "./socket"
|
||||
import {Socket} from "phoenix"
|
||||
import LiveSocket from "phoenix_live_view"
|
||||
|
||||
let liveSocket = new LiveSocket("/live", Socket)
|
||||
liveSocket.connect()
|
||||
|
|
|
@ -1,19 +0,0 @@
|
|||
import {Socket} from "phoenix"
|
||||
|
||||
let socket = new Socket("/socket", {params: {token: window.userToken}})
|
||||
|
||||
socket.connect()
|
||||
|
||||
let channel = socket.channel("morse:progress", {})
|
||||
channel.join()
|
||||
.receive("ok", resp => { console.log("Joined successfully", resp) })
|
||||
.receive("error", resp => { console.log("Unable to join", resp) })
|
||||
|
||||
let progressBar = document.getElementById("morse-progress")
|
||||
|
||||
channel.on("update", (content) => {
|
||||
progressBar.value = content["value"]
|
||||
progressBar.innerHTML = content["value"]
|
||||
});
|
||||
|
||||
export default socket
|
3
ui/assets/package-lock.json
generated
3
ui/assets/package-lock.json
generated
|
@ -4515,6 +4515,9 @@
|
|||
"phoenix_html": {
|
||||
"version": "file:../deps/phoenix_html"
|
||||
},
|
||||
"phoenix_live_view": {
|
||||
"version": "file:../deps/phoenix_live_view"
|
||||
},
|
||||
"pify": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
|
||||
|
|
|
@ -7,7 +7,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",
|
||||
|
|
19
ui/config/config.exs
Normal file
19
ui/config/config.exs
Normal file
|
@ -0,0 +1,19 @@
|
|||
use Mix.Config
|
||||
|
||||
config :ui, target: Mix.target()
|
||||
|
||||
config :ui, UiWeb.Endpoint,
|
||||
live_view: [signing_salt: "h4niP0Ovx/wDHjKRBJelcKHsbBUzptcagimD/iSDHMg5r535/A1ad5uAKJjY9ktI"],
|
||||
pubsub: [name: Ui.PubSub, adapter: Phoenix.PubSub.PG2]
|
||||
|
||||
config :phoenix, :json_library, Jason
|
||||
config :phoenix, template_engines: [leex: Phoenix.LiveView.Engine]
|
||||
|
||||
config :morse, :pubsub, Phoenix.PubSub
|
||||
|
||||
if Mix.target() != :host do
|
||||
"target.exs"
|
||||
else
|
||||
"host.exs"
|
||||
end
|
||||
|> import_config()
|
|
@ -4,7 +4,6 @@ config :ui, UiWeb.Endpoint,
|
|||
url: [host: "localhost"],
|
||||
secret_key_base: "FkfuB09FEncz4aAi6hS6w5bsNast+D1P12MckXr5dlRdhtFJrKqgEhvhpTU3qzgh",
|
||||
render_errors: [view: UiWeb.ErrorView, accepts: ~w(html json)],
|
||||
pubsub: [name: Ui.PubSub, adapter: Phoenix.PubSub.PG2],
|
||||
http: [port: 4000],
|
||||
server: true,
|
||||
debug_errors: true,
|
||||
|
@ -18,20 +17,17 @@ config :ui, UiWeb.Endpoint,
|
|||
"--watch-stdin",
|
||||
cd: Path.expand("../assets", __DIR__)
|
||||
]
|
||||
]
|
||||
|
||||
config :ui, UiWeb.Endpoint,
|
||||
],
|
||||
live_reload: [
|
||||
patterns: [
|
||||
~r"priv/static/.*(js|css|png|jpeg|jpg|gif|svg)$",
|
||||
~r"priv/gettext/.*(po)$",
|
||||
~r"lib/ui_web/{live,views}/.*(ex)$",
|
||||
~r"lib/ui_web/templates/.*(eex)$"
|
||||
~r"lib/ui_web/templates/.*(eex)$",
|
||||
~r{lib/ui_web/live/.*(ex)$}
|
||||
]
|
||||
]
|
||||
|
||||
config :logger, :console, format: "[$level] $message\n"
|
||||
|
||||
# Set a higher stacktrace during development. Avoid configuring such
|
||||
# in production as building large stacktraces may be expensive.
|
||||
config :phoenix, :stacktrace_depth, 20
|
12
ui/config/target.exs
Normal file
12
ui/config/target.exs
Normal file
|
@ -0,0 +1,12 @@
|
|||
use Mix.Config
|
||||
|
||||
config :ui, UiWeb.Endpoint,
|
||||
url: [host: "www.geokunis2.nl"],
|
||||
http: [port: 80],
|
||||
secret_key_base: "HEY05EB1dFVSu6KykKHuS4rQPQzSHv4F7mGVB/gnDLrIu75wE/ytBXy2TaL3A6RA",
|
||||
root: Path.dirname(__DIR__),
|
||||
server: true,
|
||||
render_errors: [view: UiWeb.ErrorView, accepts: ~w(html json)],
|
||||
code_reloader: false
|
||||
|
||||
config :morse, :relay_pin, 17
|
|
@ -12,7 +12,7 @@ defmodule Ui.Application do
|
|||
UiWeb.Endpoint
|
||||
# Starts a worker by calling: Ui.Worker.start_link(arg)
|
||||
# {Ui.Worker, arg},
|
||||
]
|
||||
] ++ children(target())
|
||||
|
||||
# See https://hexdocs.pm/elixir/Supervisor.html
|
||||
# for other strategies and supported options
|
||||
|
@ -20,10 +20,23 @@ defmodule Ui.Application do
|
|||
Supervisor.start_link(children, opts)
|
||||
end
|
||||
|
||||
def children(:host) do
|
||||
{:ok, _} = Node.start(:"host@0.0.0.0")
|
||||
Node.set_cookie(:tastycookie)
|
||||
true = Node.connect(:"esrom@esrom.lan")
|
||||
[]
|
||||
end
|
||||
|
||||
def children(_target), do: []
|
||||
|
||||
# Tell Phoenix to update the endpoint configuration
|
||||
# whenever the application is updated.
|
||||
def config_change(changed, _new, removed) do
|
||||
UiWeb.Endpoint.config_change(changed, removed)
|
||||
:ok
|
||||
end
|
||||
|
||||
def target() do
|
||||
Application.get_env(:ui, :target)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -42,6 +42,8 @@ defmodule UiWeb do
|
|||
import UiWeb.ErrorHelpers
|
||||
import UiWeb.Gettext
|
||||
alias UiWeb.Router.Helpers, as: Routes
|
||||
|
||||
import Phoenix.LiveView, only: [live_render: 2, live_render: 3]
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -50,6 +52,7 @@ defmodule UiWeb do
|
|||
use Phoenix.Router
|
||||
import Plug.Conn
|
||||
import Phoenix.Controller
|
||||
import Phoenix.LiveView.Router
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
defmodule UiWeb.MorseProgressChannel do
|
||||
use UiWeb, :channel
|
||||
|
||||
def join(channel_name, _params, socket) do
|
||||
{:ok, %{channel: channel_name}, socket}
|
||||
end
|
||||
end
|
|
@ -1,37 +0,0 @@
|
|||
defmodule UiWeb.UserSocket do
|
||||
use Phoenix.Socket
|
||||
|
||||
## Channels
|
||||
channel "morse:progress", UiWeb.MorseProgressChannel
|
||||
|
||||
# Socket params are passed from the client and can
|
||||
# be used to verify and authenticate a user. After
|
||||
# verification, you can put default assigns into
|
||||
# the socket that will be set for all channels, ie
|
||||
#
|
||||
# {:ok, assign(socket, :user_id, verified_user_id)}
|
||||
#
|
||||
# To deny connection, return `:error`.
|
||||
#
|
||||
# See `Phoenix.Token` documentation for examples in
|
||||
# performing token verification on connect.
|
||||
def connect(_params, socket, _connect_info) do
|
||||
{:ok, socket}
|
||||
end
|
||||
|
||||
# Socket id's are topics that allow you to identify all sockets for a given user:
|
||||
#
|
||||
# def id(socket), do: "user_socket:#{socket.assigns.user_id}"
|
||||
#
|
||||
# Would allow you to broadcast a "disconnect" event and terminate
|
||||
# all active sockets and channels for a given user:
|
||||
#
|
||||
# UiWeb.Endpoint.broadcast("user_socket:#{user.id}", "disconnect", %{})
|
||||
#
|
||||
# Returning `nil` makes this socket anonymous.
|
||||
def id(_socket), do: nil
|
||||
|
||||
def broadcast_progress(progress) do
|
||||
UiWeb.Endpoint.broadcast("morse:progress", "update", %{value: progress})
|
||||
end
|
||||
end
|
|
@ -1,25 +1,17 @@
|
|||
defmodule UiWeb.PageController do
|
||||
use UiWeb, :controller
|
||||
alias Phoenix.LiveView
|
||||
|
||||
def index(conn, _params) do
|
||||
conn |> send_resp(204, "")
|
||||
send_resp(conn, 204, "")
|
||||
end
|
||||
|
||||
def instructions(conn, _params) do
|
||||
conn |> render(:instructions)
|
||||
render(conn, :instructions)
|
||||
end
|
||||
|
||||
def morse(conn, _params) do
|
||||
conn |> render(:morse)
|
||||
LiveView.Controller.live_render(conn, UiWeb.MorseLive, session: %{})
|
||||
end
|
||||
|
||||
def start(conn, _params) do
|
||||
response =
|
||||
case Morse.Server.start_morse() do
|
||||
:ok -> "Started."
|
||||
{:error, :already_started} -> "The process is still in progress..."
|
||||
end
|
||||
|
||||
conn |> text(response)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
defmodule UiWeb.Endpoint do
|
||||
use Phoenix.Endpoint, otp_app: :ui
|
||||
|
||||
socket "/socket", UiWeb.UserSocket,
|
||||
websocket: true,
|
||||
longpoll: false
|
||||
socket "/live", Phoenix.LiveView.Socket
|
||||
|
||||
# Serve at "/" the static files from "priv/static" directory.
|
||||
#
|
||||
|
@ -17,7 +15,6 @@ defmodule UiWeb.Endpoint do
|
|||
|
||||
# Code reloading can be explicitly enabled under the
|
||||
# :code_reloader configuration of your endpoint.
|
||||
IO.inspect code_reloading?
|
||||
if code_reloading? do
|
||||
socket "/phoenix/live_reload/socket", Phoenix.LiveReloader.Socket
|
||||
plug Phoenix.LiveReloader
|
||||
|
|
23
ui/lib/ui_web/live/morse_live.ex
Normal file
23
ui/lib/ui_web/live/morse_live.ex
Normal file
|
@ -0,0 +1,23 @@
|
|||
defmodule UiWeb.MorseLive do
|
||||
use Phoenix.LiveView
|
||||
|
||||
@topic "morse_progress"
|
||||
|
||||
def render(assigns) do
|
||||
UiWeb.PageView.render("morse.html", assigns)
|
||||
end
|
||||
|
||||
def mount(_session, socket) do
|
||||
UiWeb.Endpoint.subscribe(@topic)
|
||||
{:ok, assign(socket, progress: Morse.Server.progress())}
|
||||
end
|
||||
|
||||
def handle_event("start_morse", _value, socket) do
|
||||
Morse.Server.start_morse()
|
||||
{:noreply, socket}
|
||||
end
|
||||
|
||||
def handle_info(progress, socket) do
|
||||
{:noreply, assign(socket, progress: progress)}
|
||||
end
|
||||
end
|
|
@ -5,6 +5,7 @@ defmodule UiWeb.Router do
|
|||
plug :accepts, ["html"]
|
||||
plug :fetch_session
|
||||
plug :fetch_flash
|
||||
plug Phoenix.LiveView.Flash
|
||||
plug :protect_from_forgery
|
||||
plug :put_secure_browser_headers
|
||||
end
|
||||
|
@ -26,6 +27,6 @@ defmodule UiWeb.Router do
|
|||
get "/OB13", PageController, :morse
|
||||
get "/seinlamp", PageController, :morse
|
||||
|
||||
get "/start", PageController, :start
|
||||
# get "/start", PageController, :start
|
||||
end
|
||||
end
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
<h2>nl:<br>Druk op de Start knop hieronder om <span style="color:red">UVW</span><span style="color:blue">XYZ</span> te vinden. Je kunt dan de geocache vinden op N 52° 40.<span style="color:red">UVW</span>' E 004° 53.<span style="color:blue">XYZ</span>'</h2>
|
||||
|
||||
<div id="buttonwrap">
|
||||
<input onclick="start()" value="Start" type="button" class="button">
|
||||
<div id="response-block" style="visibility:hidden">
|
||||
<button phx-click="start_morse" class="button">Start</button>
|
||||
<div id="response-block">
|
||||
<h2>Response status:</h2>
|
||||
<p id="response"></p>
|
||||
<h2>Progress:</h2>
|
||||
<progress id="morse-progress" max="100" value="0">0%</progress>
|
||||
<progress max="100" value="<%= @progress %>"><%= @progress %>%</progress>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -24,22 +24,6 @@
|
|||
</div>
|
||||
|
||||
<script>
|
||||
var responseP = document.getElementById("response");
|
||||
var xhttp = new XMLHttpRequest();
|
||||
|
||||
xhttp.onreadystatechange = function () {
|
||||
if (this.readyState == 4 && this.status == 200) {
|
||||
responseP.innerHTML = this.responseText;
|
||||
}
|
||||
};
|
||||
|
||||
function start() {
|
||||
responseP.innerHTML = "Starting...";
|
||||
document.getElementById("response-block").style.visibility = "visible";
|
||||
xhttp.open("GET", "/start", true);
|
||||
xhttp.send();
|
||||
}
|
||||
|
||||
function givehint() {
|
||||
document.getElementById("givehint").style.visibility = "visible";
|
||||
}
|
|
@ -36,6 +36,7 @@ defmodule Ui.MixProject do
|
|||
{:phoenix_pubsub, "~> 1.1"},
|
||||
{:phoenix_html, "~> 2.11"},
|
||||
{:phoenix_live_reload, "~> 1.2", only: :dev},
|
||||
{:phoenix_live_view, "~> 0.3.1"},
|
||||
{:gettext, "~> 0.11"},
|
||||
{:jason, "~> 1.0"},
|
||||
{:plug_cowboy, "~> 2.0"},
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
"phoenix": {:hex, :phoenix, "1.4.9", "746d098e10741c334d88143d3c94cab1756435f94387a63441792e66ec0ee974", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.8.1 or ~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"phoenix_html": {:hex, :phoenix_html, "2.13.3", "850e292ff6e204257f5f9c4c54a8cb1f6fbc16ed53d360c2b780a3d0ba333867", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"phoenix_live_reload": {:hex, :phoenix_live_reload, "1.2.1", "274a4b07c4adbdd7785d45a8b0bb57634d0b4f45b18d2c508b26c0344bd59b8f", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"phoenix_live_view": {:hex, :phoenix_live_view, "0.3.1", "5474c9e70db4e5bb23c1d1200d9a119ee76b927f3352554d31f5f31eaa1ea568", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.4.9", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.13.2", [hex: :phoenix_html, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.2", "496c303bdf1b2e98a9d26e89af5bba3ab487ba3a3735f74bf1f4064d2a845a3e", [:mix], [], "hexpm"},
|
||||
"plug": {:hex, :plug, "1.8.2", "0bcce1daa420f189a6491f3940cc77ea7fb1919761175c9c3b59800d897440fc", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm"},
|
||||
"plug_cowboy": {:hex, :plug_cowboy, "2.1.0", "b75768153c3a8a9e8039d4b25bb9b14efbc58e9c4a6e6a270abff1cd30cbe320", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
|
|
Loading…
Reference in a new issue