diff --git a/lib/labelmaker_web/constants.ex b/lib/labelmaker_web/constants.ex index 885e61c..0a9b911 100644 --- a/lib/labelmaker_web/constants.ex +++ b/lib/labelmaker_web/constants.ex @@ -1,8 +1,8 @@ defmodule LabelmakerWeb.Constants do @defaults %{ + align: "center", color: "black", font: "Helvetica", - align: "center", height: "", label: "", label_too_long: false, diff --git a/lib/labelmaker_web/controllers/label_controller.ex b/lib/labelmaker_web/controllers/label_controller.ex index 11d4834..6c83ef4 100644 --- a/lib/labelmaker_web/controllers/label_controller.ex +++ b/lib/labelmaker_web/controllers/label_controller.ex @@ -20,8 +20,8 @@ defmodule LabelmakerWeb.LabelController do unless File.exists?(filepath) do basic_settings(options) - |> size_settings(options) |> outline_settings(options) + |> size_settings(options) |> final_settings(options) |> generate_image() end @@ -51,11 +51,11 @@ defmodule LabelmakerWeb.LabelController do ] end - defp size_settings(args, %{align: align, height: height, width: width} = options) do + defp size_settings(args, %{align: alignment, height: height, width: width} = options) do args ++ [ "-gravity", - align, + Tools.process_gravity(alignment), "-size", "#{width}x#{height}", "caption:#{String.slice(options.label, 0, Constants.max_label_length())}" @@ -87,9 +87,6 @@ defmodule LabelmakerWeb.LabelController do defp generate_image(args) do File.mkdir_p!(@label_dir) - # IO.puts("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-") - # IO.inspect(args) - {_, 0} = System.cmd("magick", args) end end diff --git a/lib/labelmaker_web/live/components/radio_component.ex b/lib/labelmaker_web/live/components/radio_component.ex index f7f2135..7a1a570 100644 --- a/lib/labelmaker_web/live/components/radio_component.ex +++ b/lib/labelmaker_web/live/components/radio_component.ex @@ -1,39 +1,40 @@ defmodule LabelmakerWeb.RadioComponent do use Phoenix.Component - # props: class, is_dm, settings, options attr :class, :string, default: "" attr :selected, :string, required: true attr :options, :list, required: true - - # class="mt-1 block w-full rounded border border-gray-300 px-3 py-2 bg-secondary-light text-fg-light dark:bg-secondary-dark dark:text-fg-dark dark:border-gray-600 focus:ring-primary" + attr :event_name, :string, required: true def radio_component(assigns) do ~H"""