[gh315] Update - 2

nimblehq · Mar 10, 2023 · e0f71d3 · e0f71d3
1 parent 8285a95
commit e0f71d3
Show file tree

Hide file tree

Showing 15 changed files with 478 additions and 476 deletions.
diff --git a/lib/nimble_template/addons/variants/phoenix/api/config.ex b/lib/nimble_template/addons/variants/phoenix/api/config.ex
@@ -15,7 +15,7 @@ defmodule NimbleTemplate.Addons.Phoenix.Api.Config do
       # For production, don't forget to configure the url host
       # to something meaningful, Phoenix uses this information
       # when generating URLs.
-      #
+
       # Note we also include the path to a cache manifest
       # containing the digested version of static files. This
       # manifest is generated by the `mix phx.digest` task,

diff --git a/lib/nimble_template/addons/variants/phoenix/api/error_view.ex b/lib/nimble_template/addons/variants/phoenix/api/error_view.ex
@@ -5,42 +5,46 @@ defmodule NimbleTemplate.Addons.Phoenix.Api.ErrorView do
 
   @impl true
   def do_apply!(%Project{} = project, _opts) do
-    project
-    |> delete_files!()
-    |> copy_files!()
-  end
-
-  defp delete_files!(%Project{web_path: web_path} = project) do
-    File.rm!("#{web_path}/views/error_helpers.ex")
-
-    project
-  end
-
-  defp copy_files!(
-         %Project{
-           base_module: base_module,
-           web_module: web_module,
-           web_path: web_path,
-           web_test_path: web_test_path
-         } = project
-       ) do
-    binding = [
-      web_module: web_module,
-      base_module: base_module
-    ]
-
-    files = [
-      {:eex, "lib/otp_app_web/views/error_helpers.ex.eex", "#{web_path}/views/error_helpers.ex"},
-      {:eex, "lib/otp_app_web/views/api/error_view.ex.eex", "#{web_path}/views/api/error_view.ex"},
-      {:eex, "test/otp_app_web/views/error_helpers_test.exs",
-       "#{web_test_path}/views/error_helpers_test.exs"},
-      {:eex, "test/otp_app_web/views/api/error_view_test.exs",
-       "#{web_test_path}/views/api/error_view_test.exs"},
-      {:eex, "test/support/view_case.ex.eex", "test/support/view_case.ex"}
-    ]
-
-    Generator.copy_file!(files, binding)
-
+    # TODO: Revisit on the next PR
     project
   end
+  # def do_apply!(%Project{} = project, _opts) do
+  #   project
+  #   |> delete_files!()
+  #   |> copy_files!()
+  # end
+
+  # defp delete_files!(%Project{web_path: web_path} = project) do
+  #   File.rm!("#{web_path}/views/error_helpers.ex")
+
+  #   project
+  # end
+
+  # defp copy_files!(
+  #        %Project{
+  #          base_module: base_module,
+  #          web_module: web_module,
+  #          web_path: web_path,
+  #          web_test_path: web_test_path
+  #        } = project
+  #      ) do
+  #   binding = [
+  #     web_module: web_module,
+  #     base_module: base_module
+  #   ]
+
+  #   files = [
+  #     {:eex, "lib/otp_app_web/views/error_helpers.ex.eex", "#{web_path}/views/error_helpers.ex"},
+  #     {:eex, "lib/otp_app_web/views/api/error_view.ex.eex", "#{web_path}/views/api/error_view.ex"},
+  #     {:eex, "test/otp_app_web/views/error_helpers_test.exs",
+  #      "#{web_test_path}/views/error_helpers_test.exs"},
+  #     {:eex, "test/otp_app_web/views/api/error_view_test.exs",
+  #      "#{web_test_path}/views/api/error_view_test.exs"},
+  #     {:eex, "test/support/view_case.ex.eex", "test/support/view_case.ex"}
+  #   ]
+
+  #   Generator.copy_file!(files, binding)
+
+  #   project
+  # end
 end
diff --git a/lib/nimble_template/addons/variants/phoenix/api/fallback_controller.ex b/lib/nimble_template/addons/variants/phoenix/api/fallback_controller.ex
@@ -31,24 +31,26 @@ defmodule NimbleTemplate.Addons.Phoenix.Api.FallbackController do
       """
         def controller do
           quote do
-            use Phoenix.Controller, namespace: #{web_module}
+            use Phoenix.Controller,
+              formats: [:html, :json],
+              layouts: [html: #{web_module}.Layouts]
 
             import Plug.Conn
             import #{web_module}.Gettext
 
             alias #{web_module}.ParamsValidator
-            alias #{web_module}.Router.Helpers, as: Routes
       """,
       """
         def controller do
           quote do
-            use Phoenix.Controller, namespace: #{web_module}
+            use Phoenix.Controller,
+              formats: [:html, :json],
+              layouts: [html: #{web_module}.Layouts]
 
             import Plug.Conn
             import #{web_module}.Gettext
 
             alias #{web_module}.ParamsValidator
-            alias #{web_module}.Router.Helpers, as: Routes
 
             action_fallback #{web_module}.Api.FallbackController
       """

diff --git a/lib/nimble_template/addons/variants/phoenix/api/params_validation.ex b/lib/nimble_template/addons/variants/phoenix/api/params_validation.ex
@@ -19,22 +19,24 @@ defmodule NimbleTemplate.Addons.Phoenix.Api.ParamsValidation do
       """
         def controller do
           quote do
-            use Phoenix.Controller, namespace: #{web_module}
+            use Phoenix.Controller,
+              formats: [:html, :json],
+              layouts: [html: #{web_module}.Layouts]
 
             import Plug.Conn
             import #{web_module}.Gettext
-            alias #{web_module}.Router.Helpers, as: Routes
       """,
       """
         def controller do
           quote do
-            use Phoenix.Controller, namespace: #{web_module}
+            use Phoenix.Controller,
+              formats: [:html, :json],
+              layouts: [html: #{web_module}.Layouts]
 
             import Plug.Conn
             import #{web_module}.Gettext
 
             alias #{web_module}.ParamsValidator
-            alias #{web_module}.Router.Helpers, as: Routes
       """
     )
 

diff --git a/lib/nimble_template/addons/variants/phoenix/oban.ex b/lib/nimble_template/addons/variants/phoenix/oban.ex
@@ -102,7 +102,7 @@ defmodule NimbleTemplate.Addons.Phoenix.Oban do
     Generator.inject_content!(
       "config/test.exs",
       """
-      config :logger, level: :warn
+      config :logger, level: :warning
       """,
       """