diff --git a/lib/frenzy_web/controllers/feed_controller.ex b/lib/frenzy_web/controllers/feed_controller.ex index 177e9ca..efca412 100644 --- a/lib/frenzy_web/controllers/feed_controller.ex +++ b/lib/frenzy_web/controllers/feed_controller.ex @@ -48,7 +48,7 @@ defmodule FrenzyWeb.FeedController do feed_url: feed_url }) - {:ok, feed} = Repo.insert(changeset) + {:ok, _feed} = Repo.insert(changeset) conn |> put_flash(:info, "Feed created") @@ -67,7 +67,7 @@ defmodule FrenzyWeb.FeedController do end def edit(conn, _params) do - feed = conn.assigns[:feed] |> Repo.preload([:pipeline_stages]) + feed = conn.assigns[:feed] stages = Enum.sort_by(feed.pipeline_stages, fn stage -> stage.index end) render(conn, "edit.html", %{ @@ -77,7 +77,7 @@ defmodule FrenzyWeb.FeedController do end def update(conn, %{"feed" => feed_params}) do - feed = conn.assigns[:feed] |> Repo.preload(:filter) + feed = conn.assigns[:feed] changeset = Feed.changeset(feed, feed_params) {:ok, feed} = Repo.update(changeset) redirect(conn, to: Routes.feed_path(Endpoint, :show, feed.id)) @@ -90,21 +90,21 @@ defmodule FrenzyWeb.FeedController do end def enable_filter(conn, _params) do - feed = conn.assigns[:feed] |> Repo.preload(:filter) + feed = conn.assigns[:feed] changeset = Feed.changeset(feed, %{filter_enabled: true}) Repo.update(changeset) redirect(conn, to: Routes.feed_path(Endpoint, :show, feed.id)) end def disable_filter(conn, _params) do - feed = conn.assigns[:feed] |> Repo.preload(:filter) + feed = conn.assigns[:feed] changeset = Feed.changeset(feed, %{filter_enabled: false}) Repo.update(changeset) redirect(conn, to: Routes.feed_path(Endpoint, :show, feed.id)) end def refresh(conn, _params) do - feed = conn.assigns[:feed] |> Repo.preload(:filter) + feed = conn.assigns[:feed] feed = Frenzy.UpdateFeeds.refresh(Frenzy.UpdateFeeds, feed) redirect(conn, to: Routes.feed_path(Endpoint, :show, feed.id)) end diff --git a/lib/frenzy_web/controllers/filter_controller.ex b/lib/frenzy_web/controllers/filter_controller.ex deleted file mode 100644 index 690bda1..0000000 --- a/lib/frenzy_web/controllers/filter_controller.ex +++ /dev/null @@ -1,42 +0,0 @@ -defmodule FrenzyWeb.FilterController do - use FrenzyWeb, :controller - alias Frenzy.{Repo, Feed, Filter, Rule} - alias FrenzyWeb.Router.Helpers, as: Routes - alias FrenzyWeb.Endpoint - import Ecto.Query - - def edit(conn, %{"id" => id}) do - filter = Repo.get(Filter, id) |> Repo.preload(:rules) - changeset = Filter.changeset(filter, %{}) - render(conn, "edit.html", changeset: changeset) - end - - def update(conn, %{"id" => id, "filter" => filter_params}) do - filter = Repo.get(Filter, id) |> Repo.preload(:rules) - changeset = Filter.changeset(filter, filter_params) - Repo.update(changeset) - redirect(conn, to: Routes.filter_path(Endpoint, :edit, id)) - end - - def add_rule(conn, %{"id" => id}) do - filter = Repo.get(Filter, id) - - changeset = - Ecto.build_assoc(filter, :rules, %{ - property: "title", - mode: "contains_string", - param: "", - weight: 5 - }) - - Repo.insert(changeset) - - redirect(conn, to: Routes.filter_path(Endpoint, :edit, id)) - end - - def remove_rule(conn, %{"id" => id, "rule_id" => rule_id}) do - rule = Repo.get(Rule, rule_id) - Repo.delete(rule) - redirect(conn, to: Routes.filter_path(Endpoint, :edit, id)) - end -end diff --git a/lib/frenzy_web/router.ex b/lib/frenzy_web/router.ex index a17d98f..f110ca5 100644 --- a/lib/frenzy_web/router.ex +++ b/lib/frenzy_web/router.ex @@ -60,10 +60,6 @@ defmodule FrenzyWeb.Router do get "/feeds/:feed_id/pipelines/new", PipelineController, :new post "/feeds/:feed_id/pipelines/create", PipelineController, :create - resources "/filters", FilterController, only: [:edit, :update] - post "/filters/:id/add_rule", FilterController, :add_rule - post "/filters/:id/remove_rule", FilterController, :remove_rule - resources "/items", ItemController, only: [:show] post "/items/:id/read", ItemController, :read post "/items/:id/unread", ItemController, :unread diff --git a/lib/frenzy_web/templates/filter/edit.html.eex b/lib/frenzy_web/templates/filter/edit.html.eex deleted file mode 100644 index c6841ad..0000000 --- a/lib/frenzy_web/templates/filter/edit.html.eex +++ /dev/null @@ -1,75 +0,0 @@ -

Filter

-<%= form_for @changeset, Routes.filter_path(@conn, :update, @changeset.data.id), fn form -> %> -
- -
- <%= select form, :mode, [{"Accept", :accept}, {"Reject", :reject}], class: "form-control" %> -
-
-
- -
- <%= number_input form, :score, class: "form-control" %> -
-
- -
-
-

Rules

- - - - - - - - - - - - - <%= inputs_for form, :rules, fn p -> %> - - - - - - - - <% end %> - -
PropertyModeParamWeight
- <%= select p, :property, [{"URL", :url}, {"Title", :title}, {"Author", :author}, {"Content", :content}], class: "form-control" %> - - <%= select p, :mode, [{"contains", :contains_string}, {"matches regex", :matches_regex}], class: "form-control" %> - - <%= text_input p, :param, class: "form-control" %> - - <%= number_input p, :weight, class: "form-control" %> - - <%# when nesting form tags, the first nested one seems to get removed %> - <%# not the first nested one in each row, but the first nested one overall %> - <%# so we include a dummy form with display: none that gets stripped from the first row %> - <%# but is present and invisible in subsequent rows %> -
- <%= form_tag Routes.filter_path(@conn, :remove_rule, @changeset.data.id, [rule_id: p.data.id]), method: :post do %> - <%= submit "Delete", class: "btn btn-danger" %> - <% end %> -
- -
-
- <%= form_tag Routes.filter_path(@conn, :add_rule, @changeset.data.id), method: :post do %> - <%= submit "Add Rule", class: "btn btn-secondary" %> - <% end %> -
-
-
-
- -
-
- <%= submit "Update Filter", class: "btn btn-primary" %> -
-
-<% end %> \ No newline at end of file diff --git a/lib/frenzy_web/templates/filter/rules.html.eex b/lib/frenzy_web/templates/filter/rules.html.eex deleted file mode 100644 index e69de29..0000000 diff --git a/lib/frenzy_web/views/filter_view.ex b/lib/frenzy_web/views/filter_view.ex deleted file mode 100644 index 36a3a84..0000000 --- a/lib/frenzy_web/views/filter_view.ex +++ /dev/null @@ -1,3 +0,0 @@ -defmodule FrenzyWeb.FilterView do - use FrenzyWeb, :view -end