diff --git a/flavours/classic/config/bonfire_ui.exs b/flavours/classic/config/bonfire_ui.exs index 8ad8b4d1e7..db6f92301c 100755 --- a/flavours/classic/config/bonfire_ui.exs +++ b/flavours/classic/config/bonfire_ui.exs @@ -129,6 +129,15 @@ More details at https://bonfirenetworks.org", section: Bonfire.Pages.Web.EditSectionLive ] +config :bonfire, + # used by ActivityLive - TODO: autogenerate? + verb_families: [ + reply: ["Reply", "Respond"], + create: ["Create", "Write"], + react: ["Like", "Boost", "Flag", "Tag"], + simple_action: ["Assign", "Label", "Schedule"] + ] + config :surface_catalogue, title: "Bonfire UI", subtitle: "Surface Components Documentation & Examples" diff --git a/lib/mix/mixer.ex b/lib/mix/mixer.ex index e8a3f0e08f..e9874bbd84 100644 --- a/lib/mix/mixer.ex +++ b/lib/mix/mixer.ex @@ -346,13 +346,14 @@ if not Code.ensure_loaded?(Bonfire.Mixer) do # end def compilers(_) do + # [:tria] ++ Mix.compilers() end def catalogues(_env) do [ "deps/surface/priv/catalogue", - dep_path("bonfire_ui_social") <> "/priv/catalogue" + dep_path("bonfire_ui_common") <> "/priv/catalogue" ] end end diff --git a/mix.exs b/mix.exs index bc8f5b4511..85afee1d6f 100755 --- a/mix.exs +++ b/mix.exs @@ -15,6 +15,9 @@ defmodule Bonfire.Umbrella.MixProject do if @use_umbrella?, do: IO.puts("NOTE: Running as umbrella...") @extra_deps [ + # compilation + # {:tria, github: "hissssst/tria"}, + ## password hashing - builtin vs nif {:pbkdf2_elixir, "~> 2.0", only: [:dev, :test]}, {:argon2_elixir, "~> 3.0", only: [:prod]}, @@ -186,6 +189,7 @@ defmodule Bonfire.Umbrella.MixProject do test_paths: Mixer.test_paths(config()), # test_deps: Mixer.deps(config(), :test) |> IO.inspect(), required_deps: config()[:deps_prefixes][:required], + # consolidate_protocols: false, # for Tria compilers: Mixer.compilers(Mix.env()), start_permanent: Mix.env() == :prod, aliases: aliases(),