Merge pull request #102 from zven21/feat/phx-1.5-upgrade

Feat/phx 1.5 upgrade
zven21 · Sep 10, 2020 · fd7f130 · fd7f130
2 parents bf0fbab + 8ec6f2d
commit fd7f130
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 52 deletions.
diff --git a/config/config.exs b/config/config.exs
@@ -14,8 +14,9 @@ config :mipha, MiphaWeb.Endpoint,
   url: [host: "localhost"],
   secret_key_base: "Gbwl1EqAtjdYfG5movSWszQHvrppYxDbg/7xegRJSakWiTTl6ypdMpNgNct3LiDx",
   render_errors: [view: MiphaWeb.ErrorView, accepts: ~w(html json)],
-  pubsub: [name: Mipha.PubSub,
-           adapter: Phoenix.PubSub.PG2]
+  pubsub_server: Mipha.PubSub
+  # pubsub: [name: Mipha.PubSub,
+  #          adapter: Phoenix.PubSub.PG2]
 
 # Configures Elixir's Logger
 config :logger, :console,
@@ -50,6 +51,9 @@ config :sentry,
 config :turbo_ecto, Turbo.Ecto,
   repo: Mipha.Repo
 
+
+config :phoenix, :json_library, Jason
+
 config :gettext, :default_locale, "zh"
 
 # Import environment specific config. This must remain at the bottom

diff --git a/lib/mipha/application.ex b/lib/mipha/application.ex
@@ -12,6 +12,7 @@ defmodule Mipha.Application do
     children = [
       # Start the Ecto repository
       supervisor(Mipha.Repo, []),
+      {Phoenix.PubSub, name: Mipha.PubSub},
       # Start the endpoint when the application starts
       supervisor(MiphaWeb.Endpoint, []),
       supervisor(MiphaWeb.Presence, []),

diff --git a/lib/mipha_web/templates/layout/admin.html.eex b/lib/mipha_web/templates/layout/admin.html.eex
@@ -16,7 +16,7 @@
     <div class="container">
       <%= render "_flash.html", assigns %>
       <main role="main">
-        <%= render @view_module, @view_template, assigns %>
+        <%= @inner_content %>
       </main>
     </div>
     <script src="<%= static_path(@conn, "/js/admin.js") %>"></script>

diff --git a/lib/mipha_web/templates/layout/app.html.eex b/lib/mipha_web/templates/layout/app.html.eex
@@ -19,7 +19,7 @@
     <% end %>
     <%= render "_flash.html", assigns %>
     <div id="main" class="main-container container">
-      <%= render @view_module, @view_template, assigns %>
+      <%= @inner_content %>
     </div>
     <%= render "_footer.html", assigns %>
 

diff --git a/lib/mipha_web/templates/layout/email.html.eex b/lib/mipha_web/templates/layout/email.html.eex
@@ -2,6 +2,6 @@
   <head>
   </head>
   <body>
-    <%= render @view_module, @view_template, assigns %>
+    <%= @inner_content %>
   </body>
-</html>
+</html>
diff --git a/mix.exs b/mix.exs
@@ -40,24 +40,25 @@ defmodule Mipha.Mixfile do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      {:phoenix, "~> 1.4.6"},
-      {:phoenix_pubsub, "~> 1.1"},
+      {:phoenix, "~> 1.5.1"},
+      {:phoenix_pubsub, "~> 2.0"},
       {:phoenix_ecto, "~> 4.0"},
       {:ecto_sql, "~> 3.0"},
       {:postgrex, ">= 0.0.0"},
       {:phoenix_html, "~> 2.10"},
       {:phoenix_live_reload, "~> 1.0", only: :dev},
       {:gettext, "~> 0.11"},
+      {:jason, "~> 1.1"},
       {:plug_cowboy, "~> 2.0"},
       {:plug, "~> 1.7"},
-      {:credo, "~> 0.10.2", only: [:dev, :test], runtime: false},
+      {:credo, "~> 1.0"},
       {:comeonin, "~> 4.1"},
       {:bcrypt_elixir, "~> 1.0"},
       {:ueberauth, "~> 0.5.0"},
       {:ueberauth_identity, "~> 0.2.3"},
       {:ueberauth_github, "~> 0.7.0"},
       {:faker, "~> 0.10.0"},
-      {:earmark, "~> 1.3.0"},
+      {:earmark, "~> 1.2.6"},
       {:html_sanitize_ex, "~> 1.3"},
       {:timex, "~> 3.3"},
       {:ecto_enum, "~> 1.1"},
@@ -66,7 +67,6 @@ defmodule Mipha.Mixfile do
       {:bamboo, "~> 1.0"},
       {:bamboo_smtp, "~> 1.5"},
       {:cachex, "~> 3.3.0"},
-      {:jason, "~> 1.1"},
       {:poison, "~> 4.0", override: true},
       {:captcha, github: "zven21/elixir-captcha"},
       {:turbo_ecto, github: "zven21/turbo_ecto"},

diff --git a/mix.lock b/mix.lock
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
@@ -18,7 +18,8 @@ defmodule MiphaWeb.ConnCase do
   using do
     quote do
       # Import conveniences for testing with connections
-      use Phoenix.ConnTest
+      import Plug.Conn
+      import Phoenix.ConnTest
 
       alias Mipha.Repo
       import Ecto