mirrors/bonfire-app
1
0
Fork 0
mirror of https://github.com/bonfire-networks/bonfire-app.git synced 2024-05-14 23:22:40 +00:00
Code Issues Projects Releases Wiki Activity

Renamed modules

Browse source
This commit is contained in:
Mayel de Borniol 2022-05-04 14:13:47 +12:00
parent d9f40bcda9
commit d4c5d8c738
59 changed files with 159 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/test.yaml vendored
View file

@ -73,7 +73,7 @@ jobs:
# - name: Remove mix.lock
# run: rm mix.lock
- name: Prepare environment
run: make pre-init
run: make pre-run
- name: Install dependencies
run: mix deps.get
- name: Update Bonfire extensions to latest git versions
@ -149,7 +149,7 @@ jobs:
- name: Install rebar
run: mix local.rebar --force
- name: Prepare environment
run: make pre-init
run: make pre-run
- name: Install dependencies
run: mix deps.get
- name: Update Bonfire extensions to latest git versions

4
Makefile
View file

@ -69,7 +69,7 @@ pre-init:
@cp -n $(CONFIG_PATH)/templates/not_secret.env $(CONFIG_PATH)/dev/secrets.env | true
@cp -n $(CONFIG_PATH)/templates/not_secret.env $(CONFIG_PATH)/prod/secrets.env | true
pre-run:
pre-run: pre-init
@mkdir -p forks/
@mkdir -p data/uploads/
@mkdir -p priv/static/data
@ -77,7 +77,7 @@ pre-run:
@mkdir -p data/search/dev
@chmod 700 .erlang.cookie
init: pre-init pre-run
init: pre-run
@$(call setup_env)
@echo "Light that fire... $(APP_NAME) with $(FLAVOUR) flavour in $(MIX_ENV) - docker:$(WITH_DOCKER) - $(APP_VSN) - $(APP_BUILD) - $(FLAVOUR_PATH)"
@make --no-print-directory pre-init

2
flavours/classic/config/activity_pub.exs
View file

@ -1,7 +1,7 @@
import Config
config :activity_pub, :adapter, Bonfire.Federate.ActivityPub.Adapter
config :activity_pub, :repo, Bonfire.Repo
config :activity_pub, :repo, Bonfire.Common.Repo
config :nodeinfo, :adapter, Bonfire.Federate.ActivityPub.NodeinfoAdapter

8
flavours/classic/config/activity_pub_test.exs
View file

@ -1,15 +1,15 @@
import Config
config :activity_pub, :test_repo, Bonfire.Repo
config :activity_pub, :repo, Bonfire.Repo
config :activity_pub, :test_repo, Bonfire.Common.Repo
config :activity_pub, :repo, Bonfire.Common.Repo
config :activity_pub, :endpoint_module, Bonfire.Web.Endpoint
config :activity_pub, :adapter, Bonfire.Federate.ActivityPub.Adapter
config :activity_pub, ecto_repos: [Bonfire.Repo]
config :activity_pub, ecto_repos: [Bonfire.Common.Repo]
config :activity_pub, Oban,
repo: Bonfire.Repo,
repo: Bonfire.Common.Repo,
queues: false
config :activity_pub, :instance,

4
flavours/classic/config/bonfire_common.exs
View file

@ -6,11 +6,11 @@ config :bonfire_common,
otp_app: :bonfire
# internationalisation
config :bonfire_common, Bonfire.Web.Cldr,
config :bonfire_common, Bonfire.Common.Localise.Cldr,
default_locale: default_locale,
locales: ["fr", "en", "es"], # locales that will be made available on top of those for which gettext localisation files are available
providers: [Cldr.Language],
gettext: Bonfire.Web.Gettext,
gettext: Bonfire.Common.Localise.Gettext,
data_dir: "./priv/cldr",
add_fallback_locales: true,
# precompile_number_formats: ["¤¤#,##0.##"],

18
flavours/classic/config/bonfire_open_id.exs
View file

@ -4,8 +4,24 @@ config :bonfire_open_id,
templates_path: "lib"
config :boruta, Boruta.Oauth,
repo: Bonfire.Repo,
repo: Bonfire.Common.Repo,
issuer: "https://bonfirenetworks.org",
contexts: [
resource_owners: Bonfire.OpenID.Integration
]
# config :bonfire_open_id, :openid_connect_providers,
# bonfire_cafe: [
# discovery_document_uri: "https://bonfire.cafe/.well-known/openid-configuration",
# client_id: "CLIENT_ID",
# client_secret: "CLIENT_SECRET",
# redirect_uri: "https://myinstance.net/",
# response_type: "code",
# scope: "identity data:public"
# ]
if Mix.env()==:test do
config :bonfire_open_id, :oauth_module, Boruta.OauthMock
config :bonfire_open_id, :openid_module, Boruta.OpenidMock
end

12
flavours/classic/config/config.exs
View file

@ -15,8 +15,8 @@ config :bonfire,
flavour: flavour,
flavour_path: flavour_path,
app_name: System.get_env("APP_NAME", "Bonfire"),
repo_module: Bonfire.Repo,
web_module: Bonfire.Web,
repo_module: Bonfire.Common.Repo,
web_module: Bonfire.UI.Common.Web,
endpoint_module: Bonfire.Web.Endpoint,
mailer_module: Bonfire.Mailer,
default_web_namespace: Bonfire.UI.Social.Web,
@ -47,13 +47,13 @@ config :phoenix, :json_library, Jason
config :phoenix_gon, :json_library, Jason
config :ecto_sparkles, :otp_app, :bonfire
config :bonfire, :ecto_repos, [Bonfire.Repo]
config :bonfire, Bonfire.Repo,
config :bonfire, :ecto_repos, [Bonfire.Common.Repo]
config :bonfire, Bonfire.Common.Repo,
types: Bonfire.PostgresTypes, # point to the appropriate definition to support any Postgres extensions used by your Bonfire flavour or extensions
# priv: flavour_path <> "/repo",
log: false
config :ecto_sparkles, :otp_app, :bonfire
config :ecto_shorts, repo: Bonfire.Repo, error_module: EctoShorts.Actions.Error
config :ecto_shorts, repo: Bonfire.Common.Repo, error_module: EctoShorts.Actions.Error
# ecto query filtering
# config :query_elf, :id_types, [:id, :binary_id, Pointers.ULID]
@ -66,7 +66,7 @@ config :surface, :compiler,
warn_on_undefined_props: false
config :bonfire, Oban,
repo: Bonfire.Repo,
repo: Bonfire.Common.Repo,
plugins: [Oban.Plugins.Pruner],
queues: [
federator_incoming: 50,

4
flavours/classic/config/deps.git
View file

@ -25,8 +25,8 @@ bonfire_search = "https://github.com/bonfire-networks/bonfire_search#main"
bonfire_social = "https://github.com/bonfire-networks/bonfire_social#main"
bonfire_tag = "https://github.com/bonfire-networks/bonfire_tag#main"
# bonfire_taxonomy_seeder = "https://github.com/bonfire-networks/bonfire_taxonomy_seeder#main"
bonfire_ui_social = "https://github.com/bonfire-networks/bonfire_ui_social#main"
# bonfire_ui_coordination = "https://github.com/bonfire-networks/bonfire_ui_coordination#main"
bonfire_ui_common = "https://github.com/bonfire-networks/bonfire_ui_common#main"
bonfire_ui_social = "https://github.com/bonfire-networks/bonfire_ui_social#main"# bonfire_ui_coordination = "https://github.com/bonfire-networks/bonfire_ui_coordination#main"
# bonfire_ui_reflow = "https://github.com/bonfire-networks/bonfire_ui_reflow#main"
# bonfire_ui_valueflows = "https://github.com/bonfire-networks/bonfire_ui_valueflows#main"
# bonfire_valueflows = "https://github.com/bonfire-networks/bonfire_valueflows#main"

2
flavours/classic/config/deps.js.sh
View file

@ -2,7 +2,7 @@
# any extensions/deps with a package.json in their /assets directory
# space seperated
DEPS='bonfire_common bonfire_ui_social bonfire_editor_ck bonfire_editor_quill'
DEPS='bonfire_ui_common bonfire_ui_social bonfire_editor_ck bonfire_editor_quill'
chmod +x ./priv/deps.js.sh
./priv/deps.js.sh "$DEPS"

6
flavours/classic/config/deps_hooks.js
View file

@ -4,9 +4,9 @@ let ExtensionHooks = {};
// NOTE: during development you may want to change 'deps' in the path to 'forks', but remember to change it back before committing!
// TODO: make this more configurable? ie. don't import disabled extensions
import { ChangeLocaleHooks } from "./../../../deps/bonfire_common/assets/js/change_locale"
import { InputSelectHooks } from "./../../../deps/bonfire_common/assets/js/input_select"
import { NotificationsHooks } from "./../../../deps/bonfire_common/assets/js/notifications"
import { ChangeLocaleHooks } from "./../../../deps/bonfire_ui_common/assets/js/change_locale"
import { InputSelectHooks } from "./../../../deps/bonfire_ui_common/assets/js/input_select"
import { NotificationsHooks } from "./../../../deps/bonfire_ui_common/assets/js/notifications"
import { ThemeHooks } from "./../../../deps/bonfire_ui_social/assets/js/theme"
import { EditorCkHooks } from "./../../../deps/bonfire_editor_ck/assets/js/extension"
import { EditorQuillHooks } from "./../../../deps/bonfire_editor_quill/assets/js/extension"

2
flavours/classic/config/dev.exs
View file

@ -3,7 +3,7 @@ import Config
config :bonfire,
default_pagination_limit: 5 # low limit so it is easier to test
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
database: System.get_env("POSTGRES_DB", "bonfire_dev"),
# show_sensitive_data_on_connection_error: true,
pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10")

2
flavours/classic/config/prod.exs
View file

@ -17,5 +17,5 @@ config :logger, level: :info
config :bonfire, Bonfire.Web.Endpoint, server: true
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
priv: "priv/repo" # in releases migrations are not in a flavour-specific directory

8
flavours/classic/config/runtime.exs
View file

@ -17,10 +17,10 @@ System.get_env("DATABASE_URL") || System.get_env("POSTGRES_PASSWORD") || System.
"""
if System.get_env("DATABASE_URL") do
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
url: System.get_env("DATABASE_URL")
else
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
# ssl: true,
username: System.get_env("POSTGRES_USER", "postgres"),
password: System.get_env("POSTGRES_PASSWORD", "postgres"),
@ -71,7 +71,7 @@ config :bonfire, Bonfire.Web.Endpoint,
# start prod-only config
if config_env() == :prod do
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
# ssl: true,
database: System.get_env("POSTGRES_DB", "bonfire"),
pool_size: String.to_integer(System.get_env("POOL_SIZE", "10")),
@ -89,7 +89,7 @@ end # prod only config
# start prod and dev only config
if config_env() != :test do
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
slow_query_ms: String.to_integer(System.get_env("SLOW_QUERY_MS", "100"))

4
flavours/classic/config/test.exs
View file

@ -29,7 +29,7 @@ db = "bonfire_test#{System.get_env("MIX_TEST_PARTITION")}"
# The MIX_TEST_PARTITION environment variable can be used
# to provide built-in test partitioning in CI environment.
# Run `mix help test` for more information.
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
pool: Ecto.Adapters.SQL.Sandbox,
pool_size: 60,
# show_sensitive_data_on_connection_error: true,
@ -49,7 +49,7 @@ config :pbkdf2_elixir, :rounds, 1
config :mix_test_interactive,
clear: true
config :paginator, ecto_repos: [Bonfire.Repo]
config :paginator, ecto_repos: [Bonfire.Common.Repo]
config :paginator, Paginator.Repo,
pool: Ecto.Adapters.SQL.Sandbox,
username: System.get_env("POSTGRES_USER", "postgres"),

2
flavours/cooperation/config/activity_pub.exs
View file

@ -1,7 +1,7 @@
import Config
config :activity_pub, :adapter, Bonfire.Federate.ActivityPub.Adapter
config :activity_pub, :repo, Bonfire.Repo
config :activity_pub, :repo, Bonfire.Common.Repo
config :nodeinfo, :adapter, Bonfire.Federate.ActivityPub.NodeinfoAdapter

8
flavours/cooperation/config/activity_pub_test.exs
View file

@ -1,15 +1,15 @@
import Config
config :activity_pub, :test_repo, Bonfire.Repo
config :activity_pub, :repo, Bonfire.Repo
config :activity_pub, :test_repo, Bonfire.Common.Repo
config :activity_pub, :repo, Bonfire.Common.Repo
config :activity_pub, :endpoint_module, Bonfire.Web.Endpoint
config :activity_pub, :adapter, Bonfire.Federate.ActivityPub.Adapter
config :activity_pub, ecto_repos: [Bonfire.Repo]
config :activity_pub, ecto_repos: [Bonfire.Common.Repo]
config :activity_pub, Oban,
repo: Bonfire.Repo,
repo: Bonfire.Common.Repo,
queues: false
config :activity_pub, :instance,

4
flavours/cooperation/config/bonfire_common.exs
View file

@ -6,11 +6,11 @@ config :bonfire_common,
otp_app: :bonfire
# internationalisation
config :bonfire_common, Bonfire.Web.Cldr,
config :bonfire_common, Bonfire.Common.Localise.Cldr,
default_locale: default_locale,
locales: ["fr", "en", "es"], # locales that will be made available on top of those for which gettext localisation files are available
providers: [Cldr.Language],
gettext: Bonfire.Web.Gettext,
gettext: Bonfire.Common.Localise.Gettext,
data_dir: "./priv/cldr",
add_fallback_locales: true,
# precompile_number_formats: ["¤¤#,##0.##"],

2
flavours/cooperation/config/bonfire_open_id.exs
View file

@ -4,7 +4,7 @@ config :bonfire_open_id,
templates_path: "lib"
config :boruta, Boruta.Oauth,
repo: Bonfire.Repo,
repo: Bonfire.Common.Repo,
issuer: "https://bonfirenetworks.org",
contexts: [
resource_owners: Bonfire.OpenID.Integration

10
flavours/cooperation/config/config.exs
View file

@ -15,8 +15,8 @@ config :bonfire,
flavour: flavour,
flavour_path: flavour_path,
app_name: System.get_env("APP_NAME", "Bonfire"),
repo_module: Bonfire.Repo,
web_module: Bonfire.Web,
repo_module: Bonfire.Common.Repo,
web_module: Bonfire.UI.Common.Web,
endpoint_module: Bonfire.Web.Endpoint,
mailer_module: Bonfire.Mailer,
default_web_namespace: Bonfire.UI.Social.Web,
@ -43,8 +43,8 @@ config :phoenix, :json_library, Jason
config :phoenix_gon, :json_library, Jason
config :ecto_sparkles, :otp_app, :bonfire
config :bonfire, :ecto_repos, [Bonfire.Repo]
config :bonfire, Bonfire.Repo,
config :bonfire, :ecto_repos, [Bonfire.Common.Repo]
config :bonfire, Bonfire.Common.Repo,
types: Bonfire.Geolocate.PostgresTypes,
priv: flavour_path <> "/repo"
@ -56,7 +56,7 @@ config :logger, :console,
metadata: [:request_id]
config :bonfire, Oban,
repo: Bonfire.Repo,
repo: Bonfire.Common.Repo,
plugins: [Oban.Plugins.Pruner],
queues: [
federator_incoming: 50,

1
flavours/cooperation/config/deps.git
View file

@ -14,6 +14,7 @@ pointers = "https://github.com/bonfire-networks/pointers#main"
pointers_ulid = "https://github.com/bonfire-networks/pointers_ulid#main"
nodeinfo = "https://github.com/bonfire-networks/nodeinfo#main"
# surface = "https://github.com/bonfire-networks/surface"
bonfire_ui_common = "https://github.com/bonfire-networks/bonfire_ui_common#main"
bonfire_ui_social = "https://github.com/bonfire-networks/bonfire_ui_social#main"
bonfire_quantify = "https://github.com/bonfire-networks/bonfire_quantify#main"
bonfire_geolocate = "https://github.com/bonfire-networks/bonfire_geolocate#main"

2
flavours/cooperation/config/deps.js.sh
View file

@ -4,7 +4,7 @@
# NOTE: any LV Hooks should also be added to ./deps_hooks.js
// TODO: make this more configurable? ie. autogenerate from active extensions with JS assets
DEPS='bonfire_common bonfire_ui_social bonfire_editor_ck bonfire_editor_quill bonfire_geolocate bonfire_ui_kanban'
DEPS='bonfire_ui_common bonfire_ui_social bonfire_editor_ck bonfire_editor_quill bonfire_geolocate bonfire_ui_kanban'
chmod +x ./priv/deps.js.sh
./priv/deps.js.sh "$DEPS"

6
flavours/cooperation/config/deps_hooks.js
View file

@ -4,9 +4,9 @@ let ExtensionHooks = {};
// NOTE: during development you may want to change 'deps' in the path to 'forks', but remember to change it back before committing!
// TODO: make this more configurable? ie. don't import disabled extensions
import { ChangeLocaleHooks } from "./../../../deps/bonfire_common/assets/js/change_locale"
import { InputSelectHooks } from "./../../../deps/bonfire_common/assets/js/input_select"
import { NotificationsHooks } from "./../../../deps/bonfire_common/assets/js/notifications"
import { ChangeLocaleHooks } from "./../../../deps/bonfire_ui_common/assets/js/change_locale"
import { InputSelectHooks } from "./../../../deps/bonfire_ui_common/assets/js/input_select"
import { NotificationsHooks } from "./../../../deps/bonfire_ui_common/assets/js/notifications"
import { ThemeHooks } from "./../../../deps/bonfire_ui_social/assets/js/theme"
import { EditorCkHooks } from "./../../../deps/bonfire_editor_ck/assets/js/extension"
import { EditorQuillHooks } from "./../../../deps/bonfire_editor_quill/assets/js/extension"

2
flavours/cooperation/config/dev.exs
View file

@ -1,6 +1,6 @@
import Config
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
database: System.get_env("POSTGRES_DB", "bonfire_dev"),
# show_sensitive_data_on_connection_error: true,
pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10")

2
flavours/cooperation/config/prod.exs
View file

@ -17,5 +17,5 @@ config :logger, level: :info
config :bonfire, Bonfire.Web.Endpoint, server: true
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
priv: "priv/repo" # in releases migrations are not in a flavour-specific directory

8
flavours/cooperation/config/runtime.exs
View file

@ -17,10 +17,10 @@ System.get_env("DATABASE_URL") || System.get_env("POSTGRES_PASSWORD") || System.
"""
if System.get_env("DATABASE_URL") do
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
url: System.get_env("DATABASE_URL")
else
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
# ssl: true,
username: System.get_env("POSTGRES_USER", "postgres"),
password: System.get_env("POSTGRES_PASSWORD", "postgres"),
@ -67,7 +67,7 @@ config :bonfire, Bonfire.Web.Endpoint,
# start prod-only config
if config_env() == :prod do
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
# ssl: true,
database: System.get_env("POSTGRES_DB", "bonfire"),
pool_size: String.to_integer(System.get_env("POOL_SIZE", "10")),
@ -85,7 +85,7 @@ end # prod only config
# start prod and dev only config
if config_env() != :test do
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
slow_query_ms: String.to_integer(System.get_env("SLOW_QUERY_MS", "100"))

4
flavours/cooperation/config/test.exs
View file

@ -22,7 +22,7 @@ db = "bonfire_test#{System.get_env("MIX_TEST_PARTITION")}"
# The MIX_TEST_PARTITION environment variable can be used
# to provide built-in test partitioning in CI environment.
# Run `mix help test` for more information.
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
pool: Ecto.Adapters.SQL.Sandbox,
pool_size: 60,
# show_sensitive_data_on_connection_error: true,
@ -45,7 +45,7 @@ config :pbkdf2_elixir, :rounds, 1
config :mix_test_interactive,
clear: true
config :paginator, ecto_repos: [Bonfire.Repo]
config :paginator, ecto_repos: [Bonfire.Common.Repo]
config :paginator, Paginator.Repo,
pool: Ecto.Adapters.SQL.Sandbox,
username: System.get_env("POSTGRES_USER", "postgres"),

2
flavours/haha/config/activity_pub.exs
View file

@ -1,7 +1,7 @@
import Config
config :activity_pub, :adapter, Bonfire.Federate.ActivityPub.Adapter
config :activity_pub, :repo, Bonfire.Repo
config :activity_pub, :repo, Bonfire.Common.Repo
config :nodeinfo, :adapter, Bonfire.Federate.ActivityPub.NodeinfoAdapter

8
flavours/haha/config/activity_pub_test.exs
View file

@ -1,15 +1,15 @@
import Config
config :activity_pub, :test_repo, Bonfire.Repo
config :activity_pub, :repo, Bonfire.Repo
config :activity_pub, :test_repo, Bonfire.Common.Repo
config :activity_pub, :repo, Bonfire.Common.Repo
config :activity_pub, :endpoint_module, Bonfire.Web.Endpoint
config :activity_pub, :adapter, Bonfire.Federate.ActivityPub.Adapter
config :activity_pub, ecto_repos: [Bonfire.Repo]
config :activity_pub, ecto_repos: [Bonfire.Common.Repo]
config :activity_pub, Oban,
repo: Bonfire.Repo,
repo: Bonfire.Common.Repo,
queues: false
config :activity_pub, :instance,

4
flavours/haha/config/bonfire_common.exs
View file

@ -6,11 +6,11 @@ config :bonfire_common,
otp_app: :bonfire
# internationalisation
config :bonfire_common, Bonfire.Web.Cldr,
config :bonfire_common, Bonfire.Common.Localise.Cldr,
default_locale: default_locale,
locales: ["fr", "en", "es"], # locales that will be made available on top of those for which gettext localisation files are available
providers: [Cldr.Language],
gettext: Bonfire.Web.Gettext,
gettext: Bonfire.Common.Localise.Gettext,
data_dir: "./priv/cldr",
add_fallback_locales: true,
# precompile_number_formats: ["¤¤#,##0.##"],

10
flavours/haha/config/config.exs
View file

@ -15,8 +15,8 @@ config :bonfire,
flavour: flavour,
flavour_path: flavour_path,
app_name: System.get_env("APP_NAME", "Bonfire"),
repo_module: Bonfire.Repo,
web_module: Bonfire.Web,
repo_module: Bonfire.Common.Repo,
web_module: Bonfire.UI.Common.Web,
endpoint_module: Bonfire.Web.Endpoint,
mailer_module: Bonfire.Mailer,
default_web_namespace: Bonfire.UI.Social.Web,
@ -42,8 +42,8 @@ config :bonfire, Bonfire.Web.Endpoint,
config :phoenix, :json_library, Jason
config :phoenix_gon, :json_library, Jason
config :bonfire, :ecto_repos, [Bonfire.Repo]
config :bonfire, Bonfire.Repo,
config :bonfire, :ecto_repos, [Bonfire.Common.Repo]
config :bonfire, Bonfire.Common.Repo,
types: Bonfire.Geolocate.PostgresTypes,
priv: flavour_path <> "/repo"
@ -55,7 +55,7 @@ config :logger, :console,
metadata: [:request_id]
config :bonfire, Oban,
repo: Bonfire.Repo,
repo: Bonfire.Common.Repo,
plugins: [Oban.Plugins.Pruner],
queues: [
federator_incoming: 50,

1
flavours/haha/config/deps.git
View file

@ -12,6 +12,7 @@ pointers = "https://github.com/bonfire-networks/pointers#main"
pointers_ulid = "https://github.com/bonfire-networks/pointers_ulid#main"
nodeinfo = "https://github.com/bonfire-networks/nodeinfo#main"
# surface = "https://github.com/bonfire-networks/surface"
bonfire_ui_common = "https://github.com/bonfire-networks/bonfire_ui_common#main"
bonfire_ui_social = "https://github.com/bonfire-networks/bonfire_ui_social#main"
# bonfire_quantify = "https://github.com/bonfire-networks/bonfire_quantify#main"
# bonfire_geolocate = "https://github.com/bonfire-networks/bonfire_geolocate#main"

2
flavours/haha/config/dev.exs
View file

@ -1,6 +1,6 @@
import Config
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
database: System.get_env("POSTGRES_DB", "bonfire_dev"),
# show_sensitive_data_on_connection_error: true,
pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10")

2
flavours/haha/config/hooks.js
View file

@ -3,7 +3,7 @@ let ExtensionHooks = {};
// TODO: make this more configurable? ie. don't import disabled extensions
import { ThemeHooks } from "./../../../assets/js/theme"
import { CommonHooks } from "./../../../deps/bonfire_common/assets/js/extension"
import { CommonHooks } from "./../../../deps/bonfire_ui_common/assets/js/extension"
import { InputSelectHooks } from "./../../../assets/js/input_select"
import { EditorCkHooks } from "./../../../deps/bonfire_editor_ck/assets/js/extension"
import { NotificationsHooks } from "./../../../assets/js/notifications"

2
flavours/haha/config/prod.exs
View file

@ -17,5 +17,5 @@ config :logger, level: :info
config :bonfire, Bonfire.Web.Endpoint, server: true
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
priv: "priv/repo" # in releases migrations are not in a flavour-specific directory

8
flavours/haha/config/runtime.exs
View file

@ -17,10 +17,10 @@ System.get_env("DATABASE_URL") || System.get_env("POSTGRES_PASSWORD") || System.
"""
if System.get_env("DATABASE_URL") do
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
url: System.get_env("DATABASE_URL")
else
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
# ssl: true,
username: System.get_env("POSTGRES_USER", "postgres"),
password: System.get_env("POSTGRES_PASSWORD", "postgres"),
@ -67,7 +67,7 @@ config :bonfire, Bonfire.Web.Endpoint,
# start prod-only config
if config_env() == :prod do
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
# ssl: true,
database: System.get_env("POSTGRES_DB", "bonfire"),
pool_size: String.to_integer(System.get_env("POOL_SIZE", "10")),
@ -85,7 +85,7 @@ end # prod only config
# start prod and dev only config
if config_env() != :test do
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
slow_query_ms: String.to_integer(System.get_env("SLOW_QUERY_MS", "100"))

4
flavours/haha/config/test.exs
View file

@ -22,7 +22,7 @@ db = "bonfire_test#{System.get_env("MIX_TEST_PARTITION")}"
# The MIX_TEST_PARTITION environment variable can be used
# to provide built-in test partitioning in CI environment.
# Run `mix help test` for more information.
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
pool: Ecto.Adapters.SQL.Sandbox,
pool_size: 60,
# show_sensitive_data_on_connection_error: true,
@ -45,7 +45,7 @@ config :pbkdf2_elixir, :rounds, 1
config :mix_test_interactive,
clear: true
config :paginator, ecto_repos: [Bonfire.Repo]
config :paginator, ecto_repos: [Bonfire.Common.Repo]
config :paginator, Paginator.Repo,
pool: Ecto.Adapters.SQL.Sandbox,
username: System.get_env("POSTGRES_USER", "postgres"),

2
flavours/reflow/config/activity_pub.exs
View file

@ -1,7 +1,7 @@
import Config
config :activity_pub, :adapter, Bonfire.Federate.ActivityPub.Adapter
config :activity_pub, :repo, Bonfire.Repo
config :activity_pub, :repo, Bonfire.Common.Repo
config :activity_pub, :env, Mix.env()
config :nodeinfo, :adapter, Bonfire.Federate.ActivityPub.NodeinfoAdapter

8
flavours/reflow/config/activity_pub_test.exs
View file

@ -1,15 +1,15 @@
import Config
config :activity_pub, :test_repo, Bonfire.Repo
config :activity_pub, :repo, Bonfire.Repo
config :activity_pub, :test_repo, Bonfire.Common.Repo
config :activity_pub, :repo, Bonfire.Common.Repo
config :activity_pub, :endpoint_module, Bonfire.Web.Endpoint
config :activity_pub, :adapter, Bonfire.Federate.ActivityPub.Adapter
config :activity_pub, ecto_repos: [Bonfire.Repo]
config :activity_pub, ecto_repos: [Bonfire.Common.Repo]
config :activity_pub, Oban,
repo: Bonfire.Repo,
repo: Bonfire.Common.Repo,
queues: false
config :activity_pub, :instance,

4
flavours/reflow/config/bonfire_common.exs
View file

@ -6,11 +6,11 @@ config :bonfire_common,
otp_app: :bonfire
# internationalisation
config :bonfire_common, Bonfire.Web.Cldr,
config :bonfire_common, Bonfire.Common.Localise.Cldr,
default_locale: default_locale,
locales: ["fr", "en", "es"], # locales that will be made available on top of those for which gettext localisation files are available
providers: [Cldr.Language],
gettext: Bonfire.Web.Gettext,
gettext: Bonfire.Common.Localise.Gettext,
data_dir: "./priv/cldr",
add_fallback_locales: true,
# precompile_number_formats: ["¤¤#,##0.##"],

10
flavours/reflow/config/config.exs
View file

@ -15,8 +15,8 @@ config :bonfire,
flavour: flavour,
flavour_path: flavour_path,
app_name: System.get_env("APP_NAME", "Bonfire"),
repo_module: Bonfire.Repo,
web_module: Bonfire.Web,
repo_module: Bonfire.Common.Repo,
web_module: Bonfire.UI.Common.Web,
endpoint_module: Bonfire.Web.Endpoint,
mailer_module: Bonfire.Mailer,
default_web_namespace: Bonfire.UI.Social.Web,
@ -43,8 +43,8 @@ config :phoenix, :json_library, Jason
config :phoenix_gon, :json_library, Jason
config :ecto_sparkles, :otp_app, :bonfire
config :bonfire, :ecto_repos, [Bonfire.Repo]
config :bonfire, Bonfire.Repo,
config :bonfire, :ecto_repos, [Bonfire.Common.Repo]
config :bonfire, Bonfire.Common.Repo,
types: Bonfire.Geolocate.PostgresTypes,
priv: flavour_path <> "/repo"
@ -56,7 +56,7 @@ config :logger, :console,
metadata: [:request_id]
config :bonfire, Oban,
repo: Bonfire.Repo,
repo: Bonfire.Common.Repo,
plugins: [Oban.Plugins.Pruner],
queues: [
federator_incoming: 50,

1
flavours/reflow/config/deps.git
View file

@ -14,6 +14,7 @@ pointers = "https://github.com/bonfire-networks/pointers#main"
pointers_ulid = "https://github.com/bonfire-networks/pointers_ulid#main"
nodeinfo = "https://github.com/bonfire-networks/nodeinfo#main"
# surface = "https://github.com/bonfire-networks/surface"
bonfire_ui_common = "https://github.com/bonfire-networks/bonfire_ui_common#main"
bonfire_ui_social = "https://github.com/bonfire-networks/bonfire_ui_social#main"
bonfire_quantify = "https://github.com/bonfire-networks/bonfire_quantify#main"
bonfire_geolocate = "https://github.com/bonfire-networks/bonfire_geolocate#main"

2
flavours/reflow/config/deps.js.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh
# add more modules separated by $IFS
DEPS='bonfire_common bonfire_ui_social bonfire_editor_ck bonfire_geolocate'
DEPS='bonfire_ui_common bonfire_ui_social bonfire_editor_ck bonfire_geolocate'
chmod +x ./priv/deps.js.sh
./priv/deps.js.sh "$DEPS"

6
flavours/reflow/config/deps_hooks.js
View file

@ -4,9 +4,9 @@ let ExtensionHooks = {};
// NOTE: during development you may want to change 'deps' in the path to 'forks', but remember to change it back before committing!
// TODO: make this more configurable? ie. don't import disabled extensions
import { ChangeLocaleHooks } from "./../../../deps/bonfire_common/assets/js/change_locale"
import { InputSelectHooks } from "./../../../deps/bonfire_common/assets/js/input_select"
import { NotificationsHooks } from "./../../../deps/bonfire_common/assets/js/notifications"
import { ChangeLocaleHooks } from "./../../../deps/bonfire_ui_common/assets/js/change_locale"
import { InputSelectHooks } from "./../../../deps/bonfire_ui_common/assets/js/input_select"
import { NotificationsHooks } from "./../../../deps/bonfire_ui_common/assets/js/notifications"
import { ThemeHooks } from "./../../../deps/bonfire_ui_social/assets/js/theme"
import { EditorCkHooks } from "./../../../deps/bonfire_editor_ck/assets/js/extension"
import { GeolocateHooks } from "./../../../deps/bonfire_geolocate/assets/js/extension"

2
flavours/reflow/config/dev.exs
View file

@ -1,6 +1,6 @@
import Config
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
database: System.get_env("POSTGRES_DB", "bonfire_dev"),
# show_sensitive_data_on_connection_error: true,
pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10")

2
flavours/reflow/config/prod.exs
View file

@ -16,5 +16,5 @@ config :logger, level: :info
config :bonfire, Bonfire.Web.Endpoint, server: true
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
priv: "priv/repo" # in releases migrations are not in a flavour-specific directory

8
flavours/reflow/config/runtime.exs
View file

@ -17,10 +17,10 @@ System.get_env("DATABASE_URL") || System.get_env("POSTGRES_PASSWORD") || System.
"""
if System.get_env("DATABASE_URL") do
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
url: System.get_env("DATABASE_URL")
else
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
# ssl: true,
username: System.get_env("POSTGRES_USER", "postgres"),
password: System.get_env("POSTGRES_PASSWORD", "postgres"),
@ -70,7 +70,7 @@ if config_env() == :prod do
config :logger, level: String.to_atom(System.get_env("LOG_LEVEL", "info"))
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
# ssl: true,
database: System.get_env("POSTGRES_DB", "bonfire"),
pool_size: String.to_integer(System.get_env("POOL_SIZE", "10")),
@ -87,7 +87,7 @@ config :sentry, server_name: System.get_env("SENTRY_NAME") || host
# start prod and dev only config
if config_env() != :test do
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
slow_query_ms: String.to_integer(System.get_env("SLOW_QUERY_MS", "100"))

4
flavours/reflow/config/test.exs
View file

@ -22,7 +22,7 @@ db = "bonfire_test#{System.get_env("MIX_TEST_PARTITION")}"
# The MIX_TEST_PARTITION environment variable can be used
# to provide built-in test partitioning in CI environment.
# Run `mix help test` for more information.
config :bonfire, Bonfire.Repo,
config :bonfire, Bonfire.Common.Repo,
pool: Ecto.Adapters.SQL.Sandbox,
pool_size: 60,
# show_sensitive_data_on_connection_error: true,
@ -58,7 +58,7 @@ config :pbkdf2_elixir, :rounds, 1
config :mix_test_interactive,
clear: true
config :paginator, ecto_repos: [Bonfire.Repo]
config :paginator, ecto_repos: [Bonfire.Common.Repo]
config :paginator, Paginator.Repo,
pool: Ecto.Adapters.SQL.Sandbox,
username: System.get_env("POSTGRES_USER", "postgres"),

1
flavours/upcycle/config/deps.git
View file

@ -49,6 +49,7 @@ bonfire_data_assort = "https://github.com/bonfire-networks/bonfire_data_assort#m
# surface_catalogue = "https://github.com/surface-ui/surface_catalogue" # Testing a UI component library
bonfire_editor_ck = "https://github.com/bonfire-networks/bonfire_editor_ck#main"
bonfire_invite_links= "https://github.com/bonfire-networks/bonfire_invite_links#main"
bonfire_ui_common = "https://github.com/bonfire-networks/bonfire_ui_common#main"
bonfire_ui_social = "https://github.com/bonfire-networks/bonfire_ui_social#main"
# bonfire_ui_social = "https://gitlab.com/msoe.edu/sdl/y22sdl/sdl-upcycle/bonfire_ui_social#upcycle"
bonfire_upcycle = "https://gitlab.com/bonfire-networks/bonfire_upcycle#master"

2
flavours/upcycle/config/deps.js.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
# any extensions/deps with a package.json in their /assets directory
DEPS='bonfire_common bonfire_ui_social bonfire_editor_ck bonfire_geolocate'
DEPS='bonfire_ui_common bonfire_ui_social bonfire_editor_ck bonfire_geolocate'
chmod +x ./priv/deps.js.sh
./priv/deps.js.sh "$DEPS"

6
flavours/upcycle/config/deps_hooks.js
View file

@ -4,9 +4,9 @@ let ExtensionHooks = {};
// NOTE: during development you may want to change 'deps' in the path to 'forks', but remember to change it back before committing!
// TODO: make this more configurable? ie. don't import disabled extensions
import { ChangeLocaleHooks } from "./../../../deps/bonfire_common/assets/js/change_locale"
import { InputSelectHooks } from "./../../../deps/bonfire_common/assets/js/input_select"
import { NotificationsHooks } from "./../../../deps/bonfire_common/assets/js/notifications"
import { ChangeLocaleHooks } from "./../../../deps/bonfire_ui_common/assets/js/change_locale"
import { InputSelectHooks } from "./../../../deps/bonfire_ui_common/assets/js/input_select"
import { NotificationsHooks } from "./../../../deps/bonfire_ui_common/assets/js/notifications"
import { ThemeHooks } from "./../../../deps/bonfire_ui_social/assets/js/theme"
import { EditorCkHooks } from "./../../../deps/bonfire_editor_ck/assets/js/extension"
import { GeolocateHooks } from "./../../../deps/bonfire_geolocate/assets/js/extension"

2
lib/application.ex
View file

@ -35,7 +35,7 @@ defmodule Bonfire.Application do
@apps_before [
Bonfire.Web.Telemetry, # Metrics
Bonfire.Repo, # Database
Bonfire.Common.Repo, # Database
EctoSparkles.AutoMigrator,
Bonfire.Me.Settings.LoadConfig, # load instance Settings from DB into Config
{Phoenix.PubSub, [name: Bonfire.PubSub, adapter: Phoenix.PubSub.PG2]}, # PubSub

17
lib/web/home/home_live.ex
View file

@ -2,16 +2,17 @@ defmodule Bonfire.Web.HomeLive do
@moduledoc """
The main instance home page, mainly for guests visiting the instance
"""
use Bonfire.Web, {:surface_view, [layout: {Bonfire.UI.Social.Web.LayoutView, "without_sidebar.html"}]}
alias Bonfire.Web.LivePlugs
use Bonfire.UI.Common.Web, {:surface_view, [layout: {Bonfire.UI.Social.Web.LayoutView, "without_sidebar.html"}]}
alias Bonfire.Me.Web.LivePlugs
alias Bonfire.Common.Utils
def mount(params, session, socket) do
LivePlugs.live_plug params, session, socket, [
live_plug params, session, socket, [
LivePlugs.LoadCurrentAccount,
LivePlugs.LoadCurrentUser,
LivePlugs.StaticChanged,
LivePlugs.Csrf, LivePlugs.Locale,
Bonfire.UI.Common.LivePlugs.StaticChanged,
Bonfire.UI.Common.LivePlugs.Csrf,
Bonfire.UI.Common.LivePlugs.Locale,
&mounted/3,
]
end
@ -37,8 +38,8 @@ defmodule Bonfire.Web.HomeLive do
end
defdelegate handle_params(params, attrs, socket), to: Bonfire.Common.LiveHandlers
def handle_event(action, attrs, socket), do: Bonfire.Common.LiveHandlers.handle_event(action, attrs, socket, __MODULE__)
def handle_info(info, socket), do: Bonfire.Common.LiveHandlers.handle_info(info, socket, __MODULE__)
defdelegate handle_params(params, attrs, socket), to: Bonfire.UI.Common.LiveHandlers
def handle_event(action, attrs, socket), do: Bonfire.UI.Common.LiveHandlers.handle_event(action, attrs, socket, __MODULE__)
def handle_info(info, socket), do: Bonfire.UI.Common.LiveHandlers.handle_info(info, socket, __MODULE__)
end

26
lib/web/router.ex
View file

@ -1,5 +1,5 @@
defmodule Bonfire.Web.Router do
use Bonfire.Web, :router
use Bonfire.UI.Common.Web, :router
# use Plug.ErrorHandler
alias Bonfire.Common.Config
@ -9,8 +9,8 @@ defmodule Bonfire.Web.Router do
end
pipeline :load_current_auth do
plug Bonfire.Web.Plugs.LoadCurrentAccount
plug Bonfire.Web.Plugs.LoadCurrentUser
plug Bonfire.Me.Web.Plugs.LoadCurrentAccount
plug Bonfire.Me.Web.Plugs.LoadCurrentUser
end
pipeline :browser do
@ -19,33 +19,33 @@ defmodule Bonfire.Web.Router do
plug PhoenixGon.Pipeline,
assets: Map.new(Config.get(:js_config, []))
plug Cldr.Plug.SetLocale,
default: Bonfire.Web.Localise.default_locale,
default: Bonfire.Common.Localise.default_locale,
apps: [:cldr, :gettext],
from: [:session, :cookie, :accept_language],
gettext: Bonfire.Web.Gettext,
cldr: Bonfire.Web.Cldr
gettext: Bonfire.Common.Localise.Gettext,
cldr: Bonfire.Common.Localise.Cldr
plug :fetch_live_flash
plug :protect_from_forgery
plug :put_secure_browser_headers
plug Bonfire.Web.Plugs.ActivityPub
plug Bonfire.UI.Common.Plugs.ActivityPub # detect Accept headers to serve JSON or HTML
plug :load_current_auth
# plug Bonfire.Web.Plugs.Locale # TODO: skip guessing a locale if the user has one in preferences
# plug Bonfire.Me.Web.Plugs.Locale # TODO: skip guessing a locale if the user has one in preferences
end
pipeline :guest_only do
plug Bonfire.Web.Plugs.GuestOnly
plug Bonfire.Me.Web.Plugs.GuestOnly
end
pipeline :account_required do
plug Bonfire.Web.Plugs.AccountRequired
plug Bonfire.Me.Web.Plugs.AccountRequired
end
pipeline :user_required do
plug Bonfire.Web.Plugs.UserRequired
plug Bonfire.Me.Web.Plugs.UserRequired
end
pipeline :admin_required do
plug Bonfire.Web.Plugs.AdminRequired
plug Bonfire.Me.Web.Plugs.AdminRequired
end
@ -141,7 +141,7 @@ defmodule Bonfire.Web.Router do
pipe_through :admin_required
live_dashboard "/admin/system",
ecto_repos: [Bonfire.Repo],
ecto_repos: [Bonfire.Common.Repo],
ecto_psql_extras_options: [long_running_queries: [threshold: "400 milliseconds"]],
metrics: Bonfire.Web.Telemetry,
# metrics: FlamegraphsWeb.Telemetry,

2
lib/web/web_telemetry.ex
View file

@ -60,7 +60,7 @@ defmodule Bonfire.Web.Telemetry do
[
# A module, function and arguments to be invoked periodically.
# This function must call :telemetry.execute/3 and a metric must be added above.
# {Bonfire.Web, :count_users, []}
# {Bonfire.UI.Common.Web, :count_users, []}
]
end
end

2
mix.exs
View file

@ -71,7 +71,7 @@ defmodule Bonfire.MixProject do
groups_for_modules: [
"Data schemas": ~r/^Bonfire.Data.?/,
"UI extensions": ~r/^Bonfire.UI.?/,
"Bonfire utilities": [~r/^Bonfire.API?/, ~r/^Bonfire.GraphQL?/, ~r/^Bonfire.Repo?/, ~r/^Bonfire.Web?/, ~r/^Bonfire.Boundaries?/, ~r/^Bonfire.Common?/, ~r/^Bonfire.Ecto?/, ~r/^Bonfire.Epics?/, ~r/^Bonfire.Fail?/, ~r/^Bonfire.Files?/, ~r/^Bonfire.Mailer?/],
"Bonfire utilities": [~r/^Bonfire.API?/, ~r/^Bonfire.GraphQL?/, ~r/^Bonfire.Web?/, ~r/^Bonfire.Boundaries?/, ~r/^Bonfire.Common?/, ~r/^Bonfire.Ecto?/, ~r/^Bonfire.Epics?/, ~r/^Bonfire.Fail?/, ~r/^Bonfire.Files?/, ~r/^Bonfire.Mailer?/],
"Feature extensions": [~r/^Bonfire.?/, ~r/^ValueFlows.?/],
"Utilities": ~r/.?/,
],

3
mix.lock
View file

@ -40,6 +40,7 @@
"bonfire_search": {:git, "https://github.com/bonfire-networks/bonfire_search", "083f6a0a57d34d3c53c0adcba158eeb7157ee8fe", [branch: "main"]},
"bonfire_social": {:git, "https://github.com/bonfire-networks/bonfire_social", "38b124c9b597a6bd5e0c3c8a24a900c5ffbe1613", [branch: "main"]},
"bonfire_tag": {:git, "https://github.com/bonfire-networks/bonfire_tag", "e892756d2ea337bd16ca0a55ca55b81a18ce902d", [branch: "main"]},
"bonfire_ui_common": {:git, "https://github.com/bonfire-networks/bonfire_ui_common", "7a473e1b96e97ab67c3a1373028429678c830934", [branch: "main"]},
"bonfire_ui_coordination": {:git, "https://github.com/bonfire-networks/bonfire_ui_coordination", "24adf40595bf8e74d81b59c76951ddcff15afb86", [branch: "main"]},
"bonfire_ui_kanban": {:git, "https://github.com/bonfire-networks/bonfire_ui_kanban", "70a6dada52663a5d0caf4eb17f20c591aeb5daf8", [branch: "main"]},
"bonfire_ui_social": {:git, "https://github.com/bonfire-networks/bonfire_ui_social", "50f4ab6995014b21f01e89a95eb80063a8a87fa8", [branch: "main"]},
@ -104,7 +105,7 @@
"html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
"html_sanitize_ex": {:hex, :html_sanitize_ex, "1.4.2", "c479398b6de798c03eb5d04a0a9a9159d73508f83f6590a00b8eacba3619cf4c", [:mix], [{:mochiweb, "~> 2.15", [hex: :mochiweb, repo: "hexpm", optional: false]}], "hexpm", "aef6c28585d06a9109ad591507e508854c5559561f950bbaea773900dd369b0e"},
"http_signatures": {:git, "https://git.pleroma.social/pleroma/http_signatures.git", "293d77bb6f4a67ac8bde1428735c3b42f22cbb30", [ref: "293d77bb6f4a67ac8bde1428735c3b42f22cbb30"]},
"httpoison": {:hex, :httpoison, "1.2.0", "2702ed3da5fd7a8130fc34b11965c8cfa21ade2f232c00b42d96d4967c39a3a3", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "712d9b1dfde2470ed000dff4b2faddaf56d038e5ac1944abc0a81c901a368391"},
"httpoison": {:hex, :httpoison, "1.8.1", "df030d96de89dad2e9983f92b0c506a642d4b1f4a819c96ff77d12796189c63e", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "35156a6d678d6d516b9229e208942c405cf21232edd632327ecfaf4fd03e79e0"},
"hut": {:hex, :hut, "1.3.0", "71f2f054e657c03f959cf1acc43f436ea87580696528ca2a55c8afb1b06c85e7", [:"erlang.mk", :rebar, :rebar3], [], "hexpm", "7e15d28555d8a1f2b5a3a931ec120af0753e4853a4c66053db354f35bf9ab563"},
"idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
"inflex": {:hex, :inflex, "2.1.0", "a365cf0821a9dacb65067abd95008ca1b0bb7dcdd85ae59965deef2aa062924c", [:mix], [], "hexpm", "14c17d05db4ee9b6d319b0bff1bdf22aa389a25398d1952c7a0b5f3d93162dd8"},

3
test/support/conn_case.ex
View file

@ -22,6 +22,9 @@ defmodule Bonfire.ConnCase do
# Import conveniences for testing with connections
import Plug.Conn
import Phoenix.ConnTest
import Bonfire.UI.Common.Testing.Helpers
import Phoenix.LiveViewTest
import Bonfire.ConnCase
import Bonfire.Test.ConnHelpers

2
test/support/data_case.ex
View file

@ -18,7 +18,7 @@ defmodule Bonfire.DataCase do
using do
quote do
alias Bonfire.Repo
alias Bonfire.Common.Repo
import Ecto
import Ecto.Changeset

4
test/test_helper.exs
View file

@ -14,10 +14,10 @@ ExUnit.start(
# Mix.Task.run("ecto.create")
# Mix.Task.run("ecto.migrate")
# Ecto.Adapters.SQL.Sandbox.mode(Bonfire.Repo, :manual)
# Ecto.Adapters.SQL.Sandbox.mode(Bonfire.Common.Repo, :manual)
# if System.get_env("START_SERVER") !="true" do
Ecto.Adapters.SQL.Sandbox.mode(Bonfire.Repo, :auto)
Ecto.Adapters.SQL.Sandbox.mode(Bonfire.Common.Repo, :auto)
# end
# ExUnit.after_suite(fn results ->