From 62592b4056da8a141d3c93f963d7d0d075bf0320 Mon Sep 17 00:00:00 2001
From: Ivan Razumov <razumov.i87@gmail.com>
Date: Fri, 15 Feb 2019 20:37:30 +0300
Subject: [PATCH] refs #154 Moved Mix.env to config

---
 config/config.exs                                       | 1 +
 examples/example-phx-1_3/config/config.exs              | 4 +++-
 examples/example-phx-1_3/lib/example_phx/application.ex | 2 +-
 lib/thesis/notifications.ex                             | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/config.exs b/config/config.exs
index 7600d96..081c329 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -2,5 +2,6 @@ use Mix.Config
 
 config :thesis, store: Thesis.EctoStore
 config :thesis, Thesis.EctoStore, repo: MyApp.Repo
+config :thesis, env: Mix.env
 
 import_config "#{Mix.env}.exs"
diff --git a/examples/example-phx-1_3/config/config.exs b/examples/example-phx-1_3/config/config.exs
index 251077b..558a114 100644
--- a/examples/example-phx-1_3/config/config.exs
+++ b/examples/example-phx-1_3/config/config.exs
@@ -9,6 +9,8 @@ use Mix.Config
 config :example_phx,
   ecto_repos: [ExamplePhx.Repo]
 
+config :example_phx, env: Mix.env
+
 # Configures the endpoint
 config :example_phx, ExamplePhxWeb.Endpoint,
   url: [host: "localhost"],
@@ -43,4 +45,4 @@ config :thesis, :notifications,
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
-import_config "#{Mix.env}.exs"
\ No newline at end of file
+import_config "#{Mix.env}.exs"
diff --git a/examples/example-phx-1_3/lib/example_phx/application.ex b/examples/example-phx-1_3/lib/example_phx/application.ex
index df1627f..a4ecf79 100644
--- a/examples/example-phx-1_3/lib/example_phx/application.ex
+++ b/examples/example-phx-1_3/lib/example_phx/application.ex
@@ -14,7 +14,7 @@ defmodule ExamplePhx.Application do
       supervisor(ExamplePhxWeb.Endpoint, [])
       # Start your own worker by calling: ExamplePhx.Worker.start_link(arg1, arg2, arg3)
       # worker(ExamplePhx.Worker, [arg1, arg2, arg3]),
-    ] ++ env_children(Mix.env)
+    ] ++ env_children(Application.get_env(:example_phx, :env))
 
     # See https://hexdocs.pm/elixir/Supervisor.html
     # for other strategies and supported options
diff --git a/lib/thesis/notifications.ex b/lib/thesis/notifications.ex
index 2f5c537..edad4c1 100644
--- a/lib/thesis/notifications.ex
+++ b/lib/thesis/notifications.ex
@@ -37,7 +37,7 @@ defmodule Thesis.Notifications do
       "other" => []
     }
     |> notifications_from_host_app(conn, notifications())
-    |> notifications_regarding_env(Mix.env)
+    |> notifications_regarding_env(Application.get_env(:thesis, :env))
     |> notifications_regarding_page(conn.assigns[:thesis_page])
   end