diff --git a/app/.credo.exs b/.credo.exs similarity index 100% rename from app/.credo.exs rename to .credo.exs diff --git a/app/.formatter.exs b/.formatter.exs similarity index 100% rename from app/.formatter.exs rename to .formatter.exs diff --git a/.gitignore b/.gitignore index 4618033..6615d35 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,7 @@ /.db/ /.vagrant/ /.direnv/ +/deps/ +/_build/ +/priv/static/assets/ +/priv/static/cache_manifest.json diff --git a/app/.gitignore b/app/.gitignore index 9884e59..73fdfd5 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,12 +1,6 @@ -# The directory Mix will write compiled artifacts to. -/_build/ - # If you run "mix test --cover", coverage assets end up here. /cover/ -# The directory Mix downloads your dependencies sources to. -/deps/ - # Where 3rd-party dependencies like ExDoc output generated docs. /doc/ @@ -25,12 +19,6 @@ erl_crash.dump # Ignore package tarball (built via "mix hex.build"). prymn-*.tar -# Ignore assets that are produced by build tools. -/priv/static/assets/ - -# Ignore digested assets cache. -/priv/static/cache_manifest.json - # In case you use Node.js/npm, you want to ignore these. npm-debug.log /assets/node_modules/ diff --git a/app/config/config.exs b/app/config/config.exs index 4fd0283..8dc1dcd 100644 --- a/app/config/config.exs +++ b/app/config/config.exs @@ -34,9 +34,9 @@ config :esbuild, version: "0.17.11", default: [ args: - ~w(js/app.js --bundle --target=es2017 --outdir=../priv/static/assets --external:/fonts/* --external:/images/*), + ~w(js/app.js --bundle --target=es2017 --outdir=../../priv/static/assets --external:/fonts/* --external:/images/*), cd: Path.expand("../assets", __DIR__), - env: %{"NODE_PATH" => Path.expand("../deps", __DIR__)} + env: %{"NODE_PATH" => Path.expand("../../deps", __DIR__)} ] # Configure tailwind (the version is required) @@ -46,7 +46,7 @@ config :tailwind, args: ~w( --config=tailwind.config.js --input=css/app.css - --output=../priv/static/assets/app.css + --output=../../priv/static/assets/app.css ), cd: Path.expand("../assets", __DIR__) ] diff --git a/app/mix.exs b/mix.exs similarity index 91% rename from app/mix.exs rename to mix.exs index 1abb90e..b320237 100644 --- a/app/mix.exs +++ b/mix.exs @@ -8,6 +8,7 @@ defmodule Prymn.MixProject do elixir: "~> 1.15", compilers: [:proto | Mix.compilers()], elixirc_paths: elixirc_paths(Mix.env()), + config_path: Path.expand("app/config/config.exs", __DIR__), start_permanent: Mix.env() == :prod, aliases: aliases(), deps: deps() @@ -25,8 +26,8 @@ defmodule Prymn.MixProject do end # Specifies which paths to compile per environment. - defp elixirc_paths(:test), do: ["lib", "test/support"] - defp elixirc_paths(_), do: ["lib"] + defp elixirc_paths(:test), do: ["app/lib", "app/test/support"] + defp elixirc_paths(_), do: ["app/lib"] # Specifies your project dependencies. # @@ -62,7 +63,7 @@ defmodule Prymn.MixProject do {:tailwind_formatter, "~> 0.3.6", runtime: Mix.env() == :dev}, {:phoenix_live_reload, "~> 1.2", only: :dev}, {:dialyxir, "~> 1.4", only: [:dev], runtime: false}, - {:prymn_proto_compiler, path: "../proto_compiler", runtime: false} + {:prymn_proto_compiler, path: "proto_compiler", runtime: false} ] end diff --git a/app/mix.lock b/mix.lock similarity index 100% rename from app/mix.lock rename to mix.lock diff --git a/app/priv/gettext/en/LC_MESSAGES/errors.po b/priv/gettext/en/LC_MESSAGES/errors.po similarity index 100% rename from app/priv/gettext/en/LC_MESSAGES/errors.po rename to priv/gettext/en/LC_MESSAGES/errors.po diff --git a/app/priv/gettext/errors.pot b/priv/gettext/errors.pot similarity index 100% rename from app/priv/gettext/errors.pot rename to priv/gettext/errors.pot diff --git a/app/priv/repo/migrations/.formatter.exs b/priv/repo/migrations/.formatter.exs similarity index 100% rename from app/priv/repo/migrations/.formatter.exs rename to priv/repo/migrations/.formatter.exs diff --git a/app/priv/repo/migrations/20230609164352_create_servers.exs b/priv/repo/migrations/20230609164352_create_servers.exs similarity index 100% rename from app/priv/repo/migrations/20230609164352_create_servers.exs rename to priv/repo/migrations/20230609164352_create_servers.exs diff --git a/app/priv/repo/migrations/20230727164710_create_users_auth_tables.exs b/priv/repo/migrations/20230727164710_create_users_auth_tables.exs similarity index 100% rename from app/priv/repo/migrations/20230727164710_create_users_auth_tables.exs rename to priv/repo/migrations/20230727164710_create_users_auth_tables.exs diff --git a/app/priv/repo/seeds.exs b/priv/repo/seeds.exs similarity index 100% rename from app/priv/repo/seeds.exs rename to priv/repo/seeds.exs diff --git a/app/priv/static/favicon.ico b/priv/static/favicon.ico similarity index 100% rename from app/priv/static/favicon.ico rename to priv/static/favicon.ico diff --git a/app/priv/static/images/logo.svg b/priv/static/images/logo.svg similarity index 100% rename from app/priv/static/images/logo.svg rename to priv/static/images/logo.svg diff --git a/app/priv/static/robots.txt b/priv/static/robots.txt similarity index 100% rename from app/priv/static/robots.txt rename to priv/static/robots.txt diff --git a/proto_compiler/lib/mix/tasks/compile.proto.ex b/proto_compiler/lib/mix/tasks/compile.proto.ex index 7d2ed4a..8348507 100644 --- a/proto_compiler/lib/mix/tasks/compile.proto.ex +++ b/proto_compiler/lib/mix/tasks/compile.proto.ex @@ -5,8 +5,8 @@ defmodule Mix.Tasks.Compile.Proto do @impl true def run(_args) do - output = "./lib/prymn_proto" - sources = Path.wildcard("../proto/*.proto") + output = "./app/lib/prymn_proto" + sources = Path.wildcard("proto/*.proto") targets = Path.wildcard(output <> "/*.pb.ex") if Mix.Utils.stale?(sources, targets) do @@ -27,7 +27,7 @@ defmodule Mix.Tasks.Compile.Proto do "--elixir_out=plugins=grpc:" <> output, "--elixir_opt=package_prefix=prymn_proto", "-I", - "../proto" + "proto" ] ++ sources ) end