-
-Claper turns your presentations into an interactive, engaging and exciting experience.
-
-Claper has a two-sided mission:
-- The first one is to help these people presenting an idea or a message by giving them the opportunity to make their presentation unique and to have real-time feedback from their audience.
-- The second one is to help each participant to take their place, to be an actor in the presentation, in the meeting and to feel important and useful.
-
-Supported languages: 🇬🇧 English, 🇫🇷 French, 🇩🇪 German.
-
-
-
-
-[contributors-shield]: https://img.shields.io/github/contributors/ClaperCo/Claper.svg?style=for-the-badge
-[forks-shield]: https://img.shields.io/github/forks/ClaperCo/Claper.svg?style=for-the-badge
-[stars-shield]: https://img.shields.io/github/stars/ClaperCo/Claper.svg?style=for-the-badge
-[issues-shield]: https://img.shields.io/github/issues/ClaperCo/Claper.svg?style=for-the-badge
-[license-shield]: https://img.shields.io/github/license/ClaperCo/Claper.svg?style=for-the-badge
diff --git a/guides/introduction/storage.md b/guides/introduction/storage.md
deleted file mode 100644
index f0bc9e33..00000000
--- a/guides/introduction/storage.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Presentation storage
-
-You can configure different storage options for your presentations. By default, Claper uses the local storage.
-
-Each presentation has a unique hash that is generated in two steps, first with `:erlang.phash2("#{code}-#{name}")` and then `:erlang.phash2("#{hash}-#{System.system_time(:second)}")`.
-
-## Local storage
-
-The local storage is the default storage option. It stores the presentations in the `priv/static/uploads/[hash]` folder.
-
-You can change the directory where the presentations are stored by changing the `PRESENTATION_STORAGE_DIR` variable in the `.env` file.
-
-The `uploads` folder will be created automatically if it doesn't exist.
-
-## S3 storage
-
-You can use S3 storage to store your presentations.
-
-When user upload a new presentation, the destination file is uploaded to S3 in your bucket in `presentations/[hash]` and the local file is deleted.
diff --git a/guides/usage/features.md b/guides/usage/features.md
deleted file mode 100644
index 94271f94..00000000
--- a/guides/usage/features.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# Features
-
-The main goal of Claper is to provide a simple and easy to use integrate feedback during your presentations.
-
-We don't want to add a lot of features but instead focusing on the core features that are needed to provide a good feedback experience.
-
-## Questions and Answers
-
-Users can send instant message during the presentation and interact to others messages with emoji reactions.
-
-
-
-You can choose to be anoynmous or use your own name before sending a message.
-
-You can also pin a message to the screen to highlight it and only show pinned messages.
-
-## Polls
-
-You can add polls during your presentation. Users can vote to the poll and see the results in real time.
-
-When you create a new presentation, click on **Present/Customize**, select the slide where you want to add poll and click **Add interaction**.
-
-During your presentation, enable **Active poll results** on the dashboard to see the poll results in real time.
-
-You can choose between single choice and multiple choice polls.
-
-
-
-## Forms
-
-You can also add forms during your presentation. Users can fill the form and you can see all submissions in real time.
-
-When you create a new presentation, click on **Present/Customize**, select the slide where you want to add form and click **Add interaction**.
-
-After your presentation, you can export all the submissions in CSV format.
-
-## Web content
-
-Any web content like Youtube, Slideshare, Google Slides, etc. can be embedded in your presentation.
-
-When you create a new presentation, click on **Present/Customize**, select the slide where you want to add embed and click **Add interaction**.
-
-You can choose to show the embed in the attendee side, so your audience can see the embed content during your presentation.
-
-## Moderation tools
-
-You can moderate the messages during your presentation. You can delete messages or ban users from the dashboard.
-
-Banning the user will prevent him to send messages during the presentation and is based on a token that is stored in the browser. If the user clear his cookies, he will be able to send messages again.
-
-
-
-### Control your presentation
-
-You have several settings to control your presentation like avoiding anonymous chat messages, disabling the chat, showing poll results on the screen or instructions to join your Clapper event.
-
-## Facilitators
-
-You can add users as facilitators to your presentation. Facilitators can moderate the messages from the dashboard but cannot deleted or edit your presentation.
-
-## Reports
-
-When the presentation is over, you can access to the report with all the messages and reactions and other statistics about the presentation engagement.
\ No newline at end of file
diff --git a/guides/usage/howto.md b/guides/usage/howto.md
deleted file mode 100644
index 05aad292..00000000
--- a/guides/usage/howto.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# How-to
-
-## Preparations
-The first thing you need to have is your **Powerpoint or Keynote presentation**.
-
-Do you plan to add a poll or ask questions?
-
-Plan slides that will include interactions, for example for a poll, a slide with the title of your poll. Each interaction will be linked to a slide in your presentation.
-
-When everything is ready, you must **save/export your presentation in PDF or PPT/PPTX format**. It is recommended to use PDF format, which will guarantee you a final rendering identical to the original.
-
-You now have your exported presentation and ready to be imported into Claper.
-
-## Using Claper
-**Log in to your Claper account** and create a new presentation.
-
-**Upload your file** then choose a **name** for your event, a **code** that will allow your attendees to join the event and a start and end date.
-Your attendees will not be able to join the event before the start date and will not be able to join it after the end date.
-
-Note that at the end of your presentation, you will have access to your **statistical report** in order to know the engagement rate and other useful metrics.
-
-
-
-Before saving, you can add facilitators with their email. They will only be able to moderate your presentation and project it. Your presentation will appear in their dashboard after they log in.
-
-**The first step is finished**, wait a few minutes for your file to be processed.
-
-**It's time to add interactions!**
-
-You can add interactions during your presentation or prepare them ahead of time.
-
-Click on **Present/Customize**, you will find all the slides of your presentation.
-
-
-
-Below each slide, you can add interactions that will be available when the slide is active.
-
-
-
-
-
-In the **right side** you will have access to all posts, which is useful for moderators who can moderate posts by deleting them or banning disruptive attendees.
-
-At the **bottom right** you will be able to view the instructions with the QR to join your meeting, _it's best to activate it at the beginning of the presentation before you start talking_.
-
-You also have the option to display messages from your attendees and the result of the current poll.
-
-## Presenting
-
-**You are finally ready to start!**
-
-That's what the **Start** button in the top right corner is for. This will open a new window that will be used during your presentation.
-
-**To go into full screen mode, press the F key.**
-
-To control your presentation, use the moderation screen, you can also control your presentation on your phone if you are logged in with your account.
-
-You are finally ready to interact effectively with your audience!
\ No newline at end of file
diff --git a/lib/claper/accounts.ex b/lib/claper/accounts.ex
index fa59fd54..655b8e19 100644
--- a/lib/claper/accounts.ex
+++ b/lib/claper/accounts.ex
@@ -108,6 +108,19 @@ defmodule Claper.Accounts do
User.email_changeset(user, attrs)
end
+ @doc """
+ Returns an `%Ecto.Changeset{}` for changing the user preferences.
+
+ ## Examples
+
+ iex> change_user_preferences(user)
+ %Ecto.Changeset{data: %User{}}
+
+ """
+ def change_user_preferences(user, attrs \\ %{}) do
+ User.preferences_changeset(user, attrs)
+ end
+
@doc """
Emulates that the email will change without actually changing
it in the database.
@@ -177,12 +190,26 @@ defmodule Claper.Accounts do
end
end
+ @doc """
+ Updates the user preferences.
+ ## Examples
+ iex> update_user_preferences(user, %{locale: "en})
+ {:ok, %User{}}
+ iex> update_user_preferences(user, %{locale: "invalid})
+ {:error, %Ecto.Changeset{}}
+ """
+ def update_user_preferences(user, attrs \\ %{}) do
+ user
+ |> User.preferences_changeset(attrs)
+ |> Repo.update()
+ end
+
@doc """
Delivers the magic link email to the given user.
## Examples
- iex> deliver_magic_link(user, &Routes.user_confirmation_url(conn, :confirm_magic, &1))
+ iex> deliver_magic_link(user, &url(~p"/users/magic/&1"))
{:ok, %{to: ..., body: ...}}
"""
@@ -423,4 +450,8 @@ defmodule Claper.Accounts do
UserToken.user_magic_and_contexts_query(token.sent_to, ["magic"])
)
end
+
+ def delete(user) do
+ Repo.delete(user)
+ end
end
diff --git a/lib/claper/accounts/user.ex b/lib/claper/accounts/user.ex
index d55a8ad9..53bed30b 100644
--- a/lib/claper/accounts/user.ex
+++ b/lib/claper/accounts/user.ex
@@ -10,6 +10,7 @@ defmodule Claper.Accounts.User do
field :hashed_password, :string, redact: true
field :is_admin, :boolean
field :confirmed_at, :naive_datetime
+ field :locale, :string
has_many :events, Claper.Events.Event
@@ -23,6 +24,11 @@ defmodule Claper.Accounts.User do
|> validate_password(opts)
end
+ def preferences_changeset(user, attrs) do
+ user
+ |> cast(attrs, [:locale])
+ end
+
defp validate_email(changeset) do
changeset
|> validate_required([:email])
diff --git a/lib/claper/events.ex b/lib/claper/events.ex
index e52d59b1..8672f9db 100644
--- a/lib/claper/events.ex
+++ b/lib/claper/events.ex
@@ -20,7 +20,7 @@ defmodule Claper.Events do
"""
def list_events(user_id, preload \\ []) do
- from(e in Event, where: e.user_id == ^user_id, order_by: [desc: e.expired_at])
+ from(e in Event, where: e.user_id == ^user_id, order_by: [desc: e.inserted_at])
|> Repo.all()
|> Repo.preload(preload)
end
@@ -140,7 +140,7 @@ defmodule Claper.Events do
def get_event_with_code!(code, preload \\ []) do
now = NaiveDateTime.utc_now()
- from(e in Event, where: e.code == ^code and e.expired_at > ^now)
+ from(e in Event, where: e.code == ^code and (is_nil(e.expired_at) or e.expired_at > ^now))
|> Repo.one!()
|> Repo.preload(preload)
end
@@ -148,7 +148,7 @@ defmodule Claper.Events do
def get_event_with_code(code, preload \\ []) do
now = DateTime.utc_now()
- from(e in Event, where: e.code == ^code and e.expired_at > ^now)
+ from(e in Event, where: e.code == ^code and (is_nil(e.expired_at) or e.expired_at > ^now))
|> Repo.one()
|> Repo.preload(preload)
end
@@ -234,7 +234,7 @@ defmodule Claper.Events do
end
@doc """
- Updates a event.
+ Updates an event.
## Examples
@@ -258,6 +258,28 @@ defmodule Claper.Events do
end
end
+ @doc """
+ Terminates an event.
+
+ ## Examples
+
+ iex> terminate_event(event)
+ {:ok, %Event{}}
+
+ """
+ def terminate_event(%Event{} = event) do
+ event
+ |> Event.update_changeset(%{expired_at: NaiveDateTime.utc_now()})
+ |> Repo.update()
+ |> case do
+ {:ok, event} ->
+ broadcast({:ok, event, event.uuid}, :event_terminated)
+
+ {:error, changeset} ->
+ {:error, %{changeset | action: :update}}
+ end
+ end
+
@doc """
Import interactions from another event
@@ -421,4 +443,16 @@ defmodule Claper.Events do
def change_activity_leader(%ActivityLeader{} = activity_leader, attrs \\ %{}) do
ActivityLeader.changeset(activity_leader, attrs)
end
+
+ defp broadcast({:error, _reason} = error, _event), do: error
+
+ defp broadcast({:ok, e, event_uuid}, event) do
+ Phoenix.PubSub.broadcast(
+ Claper.PubSub,
+ "event:#{event_uuid}",
+ {event, event_uuid}
+ )
+
+ {:ok, e}
+ end
end
diff --git a/lib/claper/events/event.ex b/lib/claper/events/event.ex
index 0009463e..2a0b7e5a 100644
--- a/lib/claper/events/event.ex
+++ b/lib/claper/events/event.ex
@@ -10,8 +10,6 @@ defmodule Claper.Events.Event do
field :started_at, :naive_datetime
field :expired_at, :naive_datetime
- field :date_range, :string, virtual: true
-
has_many :posts, Claper.Posts.Post
has_many :leaders, Claper.Events.ActivityLeader, on_replace: :delete
@@ -30,21 +28,19 @@ defmodule Claper.Events.Event do
:code,
:started_at,
:expired_at,
- :date_range,
:audience_peak
])
|> cast_assoc(:presentation_file)
|> cast_assoc(:leaders)
- |> validate_required([:code])
- |> validate_date_range
+ |> validate_required([:code, :name])
end
def create_changeset(event, attrs) do
event
- |> cast(attrs, [:name, :code, :user_id, :started_at, :expired_at, :date_range])
+ |> cast(attrs, [:name, :code, :user_id, :started_at, :expired_at])
|> cast_assoc(:presentation_file)
|> cast_assoc(:leaders)
- |> validate_required([:code, :started_at, :expired_at])
+ |> validate_required([:code, :started_at])
|> downcase_code
end
@@ -56,38 +52,12 @@ defmodule Claper.Events.Event do
)
end
- defp validate_date_range(changeset) do
- date_range = get_change(changeset, :date_range)
-
- if date_range != nil do
- splited = date_range |> String.split(" - ")
-
- if splited |> Enum.count() == 2 do
- changeset
- |> put_change(:started_at, Enum.at(splited, 0))
- |> put_change(:expired_at, Enum.at(splited, 1))
- else
- add_error(changeset, :date_range, "invalid date range")
- end
- else
- start_date = get_change(changeset, :started_at)
- end_date = get_change(changeset, :expired_at)
-
- if start_date != nil && end_date != nil do
- changeset
- |> put_change(:date_range, "#{start_date} - #{end_date}")
- else
- changeset
- end
- end
- end
-
def update_changeset(event, attrs) do
event
- |> cast(attrs, [:name, :code, :started_at, :expired_at, :date_range, :audience_peak])
+ |> cast(attrs, [:name, :code, :started_at, :expired_at, :audience_peak])
|> cast_assoc(:presentation_file)
|> cast_assoc(:leaders)
- |> validate_required([:code, :started_at, :expired_at])
+ |> validate_required([:code, :started_at])
|> downcase_code
end
@@ -105,4 +75,8 @@ defmodule Claper.Events.Event do
def started?(event) do
NaiveDateTime.compare(NaiveDateTime.utc_now(), event.started_at) == :gt
end
+
+ def finished?(event) do
+ event.expired_at && NaiveDateTime.compare(NaiveDateTime.utc_now(), event.expired_at) == :gt
+ end
end
diff --git a/lib/claper/forms.ex b/lib/claper/forms.ex
index 210d8d8d..635a6892 100644
--- a/lib/claper/forms.ex
+++ b/lib/claper/forms.ex
@@ -238,13 +238,14 @@ defmodule Claper.Forms do
[%FormSubmit{}, ...]
"""
- def list_form_submits(presentation_file_id) do
+ def list_form_submits(presentation_file_id, preload \\ []) do
from(fs in FormSubmit,
join: f in Form,
on: f.id == fs.form_id,
where: f.presentation_file_id == ^presentation_file_id
)
|> Repo.all()
+ |> Repo.preload(preload)
end
@doc """
diff --git a/lib/claper/posts.ex b/lib/claper/posts.ex
index 0b31f469..9691288f 100644
--- a/lib/claper/posts.ex
+++ b/lib/claper/posts.ex
@@ -24,6 +24,28 @@ defmodule Claper.Posts do
|> Repo.preload(preload)
end
+ @doc """
+ Get event posts which are questions
+
+ """
+ def list_questions(event_id, preload \\ [], sort \\ :date) do
+ query =
+ from(p in Post,
+ join: e in assoc(p, :event),
+ where: e.uuid == ^event_id and like(p.body, "%?%")
+ )
+
+ query =
+ case sort do
+ :likes -> from(p in query, order_by: [desc: p.like_count])
+ _ -> from(p in query, order_by: [asc: p.id])
+ end
+
+ query
+ |> Repo.all()
+ |> Repo.preload(preload)
+ end
+
@doc """
Get only the pinned event posts.
"""
diff --git a/lib/claper/presentations/presentation_state.ex b/lib/claper/presentations/presentation_state.ex
index d384f2bb..dd1ef7c4 100644
--- a/lib/claper/presentations/presentation_state.ex
+++ b/lib/claper/presentations/presentation_state.ex
@@ -9,6 +9,8 @@ defmodule Claper.Presentations.PresentationState do
field :join_screen_visible, :boolean
field :chat_enabled, :boolean
field :anonymous_chat_enabled, :boolean
+ field :message_reaction_enabled, :boolean, default: true
+ field :show_poll_results_enabled, :boolean, default: true
field :banned, {:array, :string}, default: []
field :show_only_pinned, :boolean, default: false
@@ -29,7 +31,9 @@ defmodule Claper.Presentations.PresentationState do
:presentation_file_id,
:chat_enabled,
:anonymous_chat_enabled,
- :show_only_pinned
+ :show_only_pinned,
+ :message_reaction_enabled,
+ :show_poll_results_enabled
])
|> validate_required([])
end
diff --git a/lib/claper/stats.ex b/lib/claper/stats.ex
index 31459128..ea38a5cb 100644
--- a/lib/claper/stats.ex
+++ b/lib/claper/stats.ex
@@ -16,11 +16,14 @@ defmodule Claper.Stats do
def total_vote_count(presentation_file_id) do
from(p in Claper.Polls.Poll,
- join: o in Claper.Polls.PollOpt,
- on: o.poll_id == p.id,
+ join: pv in Claper.Polls.PollVote,
+ on: pv.poll_id == p.id,
where: p.presentation_file_id == ^presentation_file_id,
- group_by: o.poll_id,
- select: sum(o.vote_count)
+ group_by: p.presentation_file_id,
+ select:
+ count(
+ fragment("DISTINCT COALESCE(?, CAST(? AS varchar))", pv.attendee_identifier, pv.user_id)
+ )
)
|> Repo.all()
end
diff --git a/lib/claper/tasks/converter.ex b/lib/claper/tasks/converter.ex
index ca2b4d20..2420c31b 100644
--- a/lib/claper/tasks/converter.ex
+++ b/lib/claper/tasks/converter.ex
@@ -43,8 +43,6 @@ defmodule Claper.Tasks.Converter do
Remove the presentation files directory
"""
def clear(hash) do
- IO.puts("Clearing #{hash}...")
-
if get_presentation_storage() == "local" do
File.rm_rf(
Path.join([
@@ -65,7 +63,7 @@ defmodule Claper.Tasks.Converter do
defp file_to_pdf(:ppt, path, file) do
Porcelain.exec(
- "libreoffice",
+ get_libreoffice_binary(),
[
"--headless",
"--invisible",
@@ -80,7 +78,7 @@ defmodule Claper.Tasks.Converter do
defp file_to_pdf(:pptx, path, file) do
Porcelain.exec(
- "libreoffice",
+ get_libreoffice_binary(),
[
"--headless",
"--invisible",
@@ -207,4 +205,11 @@ defmodule Claper.Tasks.Converter do
defp get_resolution do
Application.get_env(:claper, :presentations) |> Keyword.get(:resolution)
end
+
+ defp get_libreoffice_binary do
+ case :os.type() do
+ {:unix, :darwin} -> "soffice"
+ _ -> "libreoffice"
+ end
+ end
end
diff --git a/lib/claper_web.ex b/lib/claper_web.ex
index a866b3a1..5ebb91b8 100644
--- a/lib/claper_web.ex
+++ b/lib/claper_web.ex
@@ -17,13 +17,16 @@ defmodule ClaperWeb do
and import those modules here.
"""
+ def static_paths, do: ~w(assets fonts .well-known images favicon.ico robots.txt)
+
def controller do
quote do
use Phoenix.Controller, namespace: ClaperWeb
import Plug.Conn
import ClaperWeb.Gettext
- alias ClaperWeb.Router.Helpers, as: Routes
+
+ unquote(verified_routes())
end
end
@@ -71,7 +74,9 @@ defmodule ClaperWeb do
def view_component do
quote do
- use Phoenix.HTML
+ import Phoenix.HTML
+ import Phoenix.HTML.Form
+ use PhoenixHTMLHelpers
use Phoenix.Component
import ClaperWeb.ErrorHelpers
alias Phoenix.LiveView.JS
@@ -89,7 +94,9 @@ defmodule ClaperWeb do
defp view_helpers do
quote do
# Use all HTML functionality (forms, tags, etc)
- use Phoenix.HTML
+ import Phoenix.HTML
+ import Phoenix.HTML.Form
+ use PhoenixHTMLHelpers
# Import LiveView and .heex helpers (live_render, live_patch, <.form>, etc)
import Phoenix.LiveView.Helpers
@@ -101,7 +108,17 @@ defmodule ClaperWeb do
import ClaperWeb.ErrorHelpers
import ClaperWeb.Gettext
- alias ClaperWeb.Router.Helpers, as: Routes
+
+ unquote(verified_routes())
+ end
+ end
+
+ def verified_routes do
+ quote do
+ use Phoenix.VerifiedRoutes,
+ endpoint: ClaperWeb.Endpoint,
+ router: ClaperWeb.Router,
+ statics: ClaperWeb.static_paths()
end
end
diff --git a/lib/claper_web/controllers/stat_controller.ex b/lib/claper_web/controllers/stat_controller.ex
index 64f4a5a6..81ed3ef9 100644
--- a/lib/claper_web/controllers/stat_controller.ex
+++ b/lib/claper_web/controllers/stat_controller.ex
@@ -5,22 +5,22 @@ defmodule ClaperWeb.StatController do
def export(conn, %{"form_id" => form_id}) do
form = Forms.get_form!(form_id, [:form_submits])
- csv_data = csv_content(form.form_submits |> Enum.map(& &1.response))
+ headers = form.fields |> Enum.map(& &1.name)
+ csv_data = headers |> csv_content(form.form_submits |> Enum.map(& &1.response))
conn
|> put_resp_content_type("text/csv")
- |> put_resp_header("content-disposition", "attachment; filename=\"export.csv\"")
+ |> put_resp_header("content-disposition", "attachment; filename=\"#{form.title}.csv\"")
|> put_root_layout(false)
|> send_resp(200, csv_data)
end
- defp csv_content(records) do
- records
- |> Enum.map(fn record ->
- record
- |> Map.new(fn {k, v} -> {String.to_atom(k), v} end)
- |> Map.values()
- end)
+ defp csv_content(headers, records) do
+ data =
+ records
+ |> Enum.map(&(&1 |> Map.values()))
+
+ ([headers] ++ data)
|> CSV.encode()
|> Enum.to_list()
|> to_string()
diff --git a/lib/claper_web/controllers/user_auth.ex b/lib/claper_web/controllers/user_auth.ex
index 1f525d26..5fb26fe2 100644
--- a/lib/claper_web/controllers/user_auth.ex
+++ b/lib/claper_web/controllers/user_auth.ex
@@ -2,12 +2,12 @@ defmodule ClaperWeb.UserAuth do
@moduledoc """
Plug for user authentication.
"""
+ use ClaperWeb, :controller
import Plug.Conn
import Phoenix.Controller
alias Claper.Accounts
- alias ClaperWeb.Router.Helpers, as: Routes
# Make the remember me cookie valid for 60 days.
# If you want bump or reduce this value, also change
@@ -137,13 +137,13 @@ defmodule ClaperWeb.UserAuth do
conn
else
conn
- # |> redirect(to: Routes.user_registration_path(conn, :confirm))
+ # |> redirect(to: ~p"/users/register/confirm")
end
else
conn
|> put_flash(:error, "You must log in to access this page.")
|> maybe_store_return_to()
- |> redirect(to: Routes.user_session_path(conn, :new))
+ |> redirect(to: ~p"/users/log_in")
|> halt()
end
end
diff --git a/lib/claper_web/controllers/user_confirmation_controller.ex b/lib/claper_web/controllers/user_confirmation_controller.ex
index 0fd9c891..a1980ae0 100644
--- a/lib/claper_web/controllers/user_confirmation_controller.ex
+++ b/lib/claper_web/controllers/user_confirmation_controller.ex
@@ -11,7 +11,7 @@ defmodule ClaperWeb.UserConfirmationController do
if user = Accounts.get_user_by_email(email) do
Accounts.deliver_user_confirmation_instructions(
user,
- &Routes.user_confirmation_url(conn, :update, &1)
+ &url(~p"/users/confirm/#{&1}")
)
end
diff --git a/lib/claper_web/controllers/user_registration_controller.ex b/lib/claper_web/controllers/user_registration_controller.ex
index 65fe14b4..2e9c6ece 100644
--- a/lib/claper_web/controllers/user_registration_controller.ex
+++ b/lib/claper_web/controllers/user_registration_controller.ex
@@ -26,7 +26,7 @@ defmodule ClaperWeb.UserRegistrationController do
# {:ok, _} =
# Accounts.deliver_user_confirmation_instructions(
# user,
- # &Routes.user_confirmation_url(conn, :update, &1)
+ # &url(~p"/users/confirm/#{&1}")
# )
conn
diff --git a/lib/claper_web/controllers/user_reset_password_controller.ex b/lib/claper_web/controllers/user_reset_password_controller.ex
index 2f35249c..d4d44081 100644
--- a/lib/claper_web/controllers/user_reset_password_controller.ex
+++ b/lib/claper_web/controllers/user_reset_password_controller.ex
@@ -15,7 +15,7 @@ defmodule ClaperWeb.UserResetPasswordController do
if user = Accounts.get_user_by_email(email) do
Accounts.deliver_user_reset_password_instructions(
user,
- &Routes.user_reset_password_url(conn, :edit, &1)
+ &url(~p"/users/reset_password/#{&1}")
)
end
diff --git a/lib/claper_web/controllers/user_session_controller.ex b/lib/claper_web/controllers/user_session_controller.ex
index c6485e06..1de54e70 100644
--- a/lib/claper_web/controllers/user_session_controller.ex
+++ b/lib/claper_web/controllers/user_session_controller.ex
@@ -10,10 +10,10 @@ defmodule ClaperWeb.UserSessionController do
end
# def create(conn, %{"user" => %{"email" => email}} = _user_params) do
- # Accounts.deliver_magic_link(email, &Routes.user_confirmation_url(conn, :confirm_magic, &1))
+ # Accounts.deliver_magic_link(email, &url(~p"/users/magic/#{&1}"))
# conn
- # |> redirect(to: Routes.user_registration_path(conn, :confirm, %{email: email}))
+ # |> redirect(to: ~p"/users/register/confirm?#{[%{email: email}]}")
# end
def create(conn, %{"user" => user_params}) do
%{"email" => email, "password" => password} = user_params
diff --git a/lib/claper_web/controllers/user_settings_controller.ex b/lib/claper_web/controllers/user_settings_controller.ex
index 6bc6d124..97e2bdcb 100644
--- a/lib/claper_web/controllers/user_settings_controller.ex
+++ b/lib/claper_web/controllers/user_settings_controller.ex
@@ -18,7 +18,7 @@ defmodule ClaperWeb.UserSettingsController do
Accounts.deliver_update_email_instructions(
applied_user,
user.email,
- &Routes.user_settings_url(conn, :confirm_email, &1)
+ &url(~p"/users/settings/confirm_email/#{&1}")
)
conn
@@ -26,7 +26,7 @@ defmodule ClaperWeb.UserSettingsController do
:info,
"A link to confirm your email change has been sent to the new address."
)
- |> redirect(to: Routes.user_settings_show_path(conn, :show))
+ |> redirect(to: ~p"/users/settings")
{:error, changeset} ->
render(conn, "edit.html", email_changeset: changeset)
@@ -38,12 +38,12 @@ defmodule ClaperWeb.UserSettingsController do
:ok ->
conn
|> put_flash(:info, "Email changed successfully.")
- |> redirect(to: Routes.user_settings_show_path(conn, :show))
+ |> redirect(to: ~p"/users/settings")
:error ->
conn
|> put_flash(:error, "Email change link is invalid or it has expired.")
- |> redirect(to: Routes.user_settings_show_path(conn, :show))
+ |> redirect(to: ~p"/users/settings")
end
end
diff --git a/lib/claper_web/endpoint.ex b/lib/claper_web/endpoint.ex
index d9a213c9..63ae0bea 100644
--- a/lib/claper_web/endpoint.ex
+++ b/lib/claper_web/endpoint.ex
@@ -10,7 +10,12 @@ defmodule ClaperWeb.Endpoint do
signing_salt: "Tg18Y2zU"
]
- socket "/live", Phoenix.LiveView.Socket, websocket: [connect_info: [session: @session_options]]
+ socket "/live", Phoenix.LiveView.Socket,
+ websocket: [
+ connect_info: [
+ session: {__MODULE__, :runtime_opts, []}
+ ]
+ ]
# Serve at "/" the static files from "priv/static" directory.
#
@@ -20,8 +25,7 @@ defmodule ClaperWeb.Endpoint do
at: "/",
from: :claper,
gzip: false,
- only:
- ~w(assets fonts .well-known images favicon.ico robots.txt loaderio-eb3b956a176cdd4f54eb8570ce8bbb06.txt)
+ only: ClaperWeb.static_paths()
plug Plug.Static,
at: "/uploads",
@@ -51,6 +55,18 @@ defmodule ClaperWeb.Endpoint do
plug Plug.MethodOverride
plug Plug.Head
- plug Plug.Session, @session_options
+
+ plug(:runtime_session)
+
plug ClaperWeb.Router
+
+ def runtime_session(conn, _opts) do
+ Plug.run(conn, [{Plug.Session, runtime_opts()}])
+ end
+
+ def runtime_opts() do
+ @session_options
+ |> Keyword.put(:same_site, Application.get_env(:claper, __MODULE__)[:same_site_cookie])
+ |> Keyword.put(:secure, Application.get_env(:claper, __MODULE__)[:secure_cookie])
+ end
end
diff --git a/lib/claper_web/live/embed_live/form_component.ex b/lib/claper_web/live/embed_live/form_component.ex
index 28fdb0ce..fcf4dee8 100644
--- a/lib/claper_web/live/embed_live/form_component.ex
+++ b/lib/claper_web/live/embed_live/form_component.ex
@@ -20,7 +20,7 @@ defmodule ClaperWeb.EmbedLive.FormComponent do
embed = Embeds.get_embed!(id)
{:ok, _} = Embeds.delete_embed(socket.assigns.event_uuid, embed)
- {:noreply, socket |> push_redirect(to: socket.assigns.return_to)}
+ {:noreply, socket |> push_navigate(to: socket.assigns.return_to)}
end
@impl true
@@ -47,7 +47,7 @@ defmodule ClaperWeb.EmbedLive.FormComponent do
{:ok, _embed} ->
{:noreply,
socket
- |> push_redirect(to: socket.assigns.return_to)}
+ |> push_navigate(to: socket.assigns.return_to)}
{:error, %Ecto.Changeset{} = changeset} ->
{:noreply, assign(socket, :changeset, changeset)}
@@ -65,7 +65,7 @@ defmodule ClaperWeb.EmbedLive.FormComponent do
{:noreply,
socket
|> maybe_change_current_embed(embed)
- |> push_redirect(to: socket.assigns.return_to)}
+ |> push_navigate(to: socket.assigns.return_to)}
{:error, %Ecto.Changeset{} = changeset} ->
{:noreply, assign(socket, changeset: changeset)}
diff --git a/lib/claper_web/live/event_live/event_card_component.ex b/lib/claper_web/live/event_live/event_card_component.ex
index 688da1ce..6b88c799 100644
--- a/lib/claper_web/live/event_live/event_card_component.ex
+++ b/lib/claper_web/live/event_live/event_card_component.ex
@@ -1,6 +1,8 @@
defmodule ClaperWeb.EventLive.EventCardComponent do
use ClaperWeb, :live_component
+ alias Claper.Events.Event
+
def render(assigns) do
assigns =
assigns
@@ -15,17 +17,19 @@ defmodule ClaperWeb.EventLive.EventCardComponent do
<%= @event.name %>
- <%= gettext("In progress") %> -
+ <%= if Event.started?(@event) && !Event.finished?(@event) do %> +
+
+
+ <%= gettext("Live") %>
+
<% end %>
- <%= if NaiveDateTime.compare(@current_time, @event.started_at) == :lt do %>
+ <%= if !Event.started?(@event) && !Event.finished?(@event) do %>
<%= gettext("Incoming") %>
<% end %> - <%= if NaiveDateTime.compare(@current_time, @event.expired_at) == :gt do %> + <%= if Event.finished?(@event) do %><%= gettext("Finished") %>
@@ -44,150 +48,227 @@ defmodule ClaperWeb.EventLive.EventCardComponent do class="flex items-center text-sm text-gray-500 space-x-1" phx-update="ignore" > -
- <%= if NaiveDateTime.compare(@current_time, @event.started_at) == :gt and NaiveDateTime.compare(@current_time, @event.expired_at) == :lt do %>
- - <%= gettext("Finish on") %> - -
- <% end %> - <%= if NaiveDateTime.compare(@current_time, @event.started_at) == :lt do %> -- <%= gettext("Starting on") %> - -
- <% end %> - <%= if NaiveDateTime.compare(@current_time, @event.expired_at) == :gt do %> -- <%= gettext("Finished on") %> - -
- <% end %> +
+ + <%= gettext("Starting on") %> + +
++ <%= gettext("Finished on") %> + +
- 
- 
- 
- 