santiment · tspenov · Nov 8, 2023 · Nov 8, 2023
diff --git a/lib/sanbase_web/controllers/custom_admin_controller.ex b/lib/sanbase_web/controllers/custom_admin_controller.ex
@@ -2,7 +2,7 @@ defmodule SanbaseWeb.CustomAdminController do
   use SanbaseWeb, :controller
 
   def index(conn, _params) do
-    render(conn, "index.html",
+    render(conn, :index,
       search_value: "",
       routes: [
         {"Users", ~p"/admin2/users"},

diff --git a/lib/sanbase_web/sanbase_web.ex b/lib/sanbase_web/sanbase_web.ex
@@ -41,31 +41,16 @@ defmodule SanbaseWeb do
 
   def controller do
     quote do
-      use Phoenix.Controller, namespace: SanbaseWeb
+      use Phoenix.Controller,
+        formats: [:html, :json],
+        layouts: [html: SanbaseWeb.Layouts]
 
       import Plug.Conn
       import SanbaseWeb.Gettext
-      import Phoenix.LiveView.Controller
-
-      alias SanbaseWeb.Router.Helpers, as: Routes
       unquote(verified_routes())
     end
   end
 
-  # In order to migrate to the new controller we need to rework /admin2 and /admin2/reports
-  # def controller do
-  #   quote do
-  #     use Phoenix.Controller,
-  #       formats: [:html, :json],
-  #       layouts: [html: SanbaseWeb.Layouts]
-
-  #     import Plug.Conn
-  #     import SanbaseWeb.Gettext
-
-  #     unquote(verified_routes())
-  #   end
-  # end
-
   def live_view do
     quote do
       use Phoenix.LiveView,

diff --git a/...web/templates/custom_admin/index.html.eex → ...mplates/custom_admin_html/index.html.heex b/...web/templates/custom_admin/index.html.eex → ...mplates/custom_admin_html/index.html.heex
@@ -7,7 +7,7 @@
       </div>
       <%= for {name, path} <- @routes do %>
         <nav class="mt-10">
-          <%= link name, to: path, class: "flex items-center px-6 py-2 mt-4 duration-200 border-l-4 border-gray-900 text-gray-500 hover:bg-gray-600 hover:bg-opacity-25 hover:text-gray-100" %></span>
+          <span><%= link name, to: path, class: "flex items-center px-6 py-2 mt-4 duration-200 border-l-4 border-gray-900 text-gray-500 hover:bg-gray-600 hover:bg-opacity-25 hover:text-gray-100" %></span>
         </nav>
       <% end %>
     </div>

diff --git a/...e_web/templates/custom_plan/edit.html.eex → .../templates/custom_plan_html/edit.html.eex b/...e_web/templates/custom_plan/edit.html.eex → .../templates/custom_plan_html/edit.html.eex
diff --git a/.../templates/custom_plan/edit_form.html.eex → ...lates/custom_plan_html/edit_form.html.eex b/.../templates/custom_plan/edit_form.html.eex → ...lates/custom_plan_html/edit_form.html.eex
diff --git a/...e_web/templates/custom_plan/form.html.eex → .../templates/custom_plan_html/form.html.eex b/...e_web/templates/custom_plan/form.html.eex → .../templates/custom_plan_html/form.html.eex
diff --git a/..._web/templates/custom_plan/index.html.eex → ...templates/custom_plan_html/index.html.eex b/..._web/templates/custom_plan/index.html.eex → ...templates/custom_plan_html/index.html.eex
diff --git a/...se_web/templates/custom_plan/new.html.eex → ...b/templates/custom_plan_html/new.html.eex b/...se_web/templates/custom_plan/new.html.eex → ...b/templates/custom_plan_html/new.html.eex
diff --git a/...e_web/templates/custom_plan/show.html.eex → .../templates/custom_plan_html/show.html.eex b/...e_web/templates/custom_plan/show.html.eex → .../templates/custom_plan_html/show.html.eex
diff --git a/...anbase_web/templates/report/edit.html.eex → ...e_web/templates/report_html/edit.html.eex b/...anbase_web/templates/report/edit.html.eex → ...e_web/templates/report_html/edit.html.eex
diff --git a/...e_web/templates/report/edit_form.html.eex → .../templates/report_html/edit_form.html.eex b/...e_web/templates/report/edit_form.html.eex → .../templates/report_html/edit_form.html.eex
diff --git a/...anbase_web/templates/report/form.html.eex → ...e_web/templates/report_html/form.html.eex b/...anbase_web/templates/report/form.html.eex → ...e_web/templates/report_html/form.html.eex
diff --git a/...nbase_web/templates/report/index.html.eex → ..._web/templates/report_html/index.html.eex b/...nbase_web/templates/report/index.html.eex → ..._web/templates/report_html/index.html.eex
diff --git a/...sanbase_web/templates/report/new.html.eex → ...se_web/templates/report_html/new.html.eex b/...sanbase_web/templates/report/new.html.eex → ...se_web/templates/report_html/new.html.eex
diff --git a/...anbase_web/templates/report/show.html.eex → ...e_web/templates/report_html/show.html.eex b/...anbase_web/templates/report/show.html.eex → ...e_web/templates/report_html/show.html.eex
diff --git a/...b/templates/sheets_template/edit.html.eex → ...plates/sheets_template_html/edit.html.eex b/...b/templates/sheets_template/edit.html.eex → ...plates/sheets_template_html/edit.html.eex
diff --git a/...plates/sheets_template/edit_form.html.eex → ...s/sheets_template_html/edit_form.html.eex b/...plates/sheets_template/edit_form.html.eex → ...s/sheets_template_html/edit_form.html.eex
diff --git a/...b/templates/sheets_template/form.html.eex → ...plates/sheets_template_html/form.html.eex b/...b/templates/sheets_template/form.html.eex → ...plates/sheets_template_html/form.html.eex
diff --git a/.../templates/sheets_template/index.html.eex → ...lates/sheets_template_html/index.html.eex b/.../templates/sheets_template/index.html.eex → ...lates/sheets_template_html/index.html.eex
diff --git a/...eb/templates/sheets_template/new.html.eex → ...mplates/sheets_template_html/new.html.eex b/...eb/templates/sheets_template/new.html.eex → ...mplates/sheets_template_html/new.html.eex
diff --git a/...b/templates/sheets_template/show.html.eex → ...plates/sheets_template_html/show.html.eex b/...b/templates/sheets_template/show.html.eex → ...plates/sheets_template_html/show.html.eex
diff --git a/...sanbase_web/templates/user/index.html.eex → ...e_web/templates/user_html/index.html.heex b/...sanbase_web/templates/user/index.html.eex → ...e_web/templates/user_html/index.html.heex
diff --git a/...sanbase_web/templates/user/show.html.heex → ...se_web/templates/user_html/show.html.heex b/...sanbase_web/templates/user/show.html.heex → ...se_web/templates/user_html/show.html.heex
diff --git a/...nbase_web/templates/webinar/edit.html.eex → ..._web/templates/webinar_html/edit.html.eex b/...nbase_web/templates/webinar/edit.html.eex → ..._web/templates/webinar_html/edit.html.eex
diff --git a/..._web/templates/webinar/edit_form.html.eex → ...templates/webinar_html/edit_form.html.eex b/..._web/templates/webinar/edit_form.html.eex → ...templates/webinar_html/edit_form.html.eex
diff --git a/...nbase_web/templates/webinar/form.html.eex → ..._web/templates/webinar_html/form.html.eex b/...nbase_web/templates/webinar/form.html.eex → ..._web/templates/webinar_html/form.html.eex
diff --git a/...base_web/templates/webinar/index.html.eex → ...web/templates/webinar_html/index.html.eex b/...base_web/templates/webinar/index.html.eex → ...web/templates/webinar_html/index.html.eex
diff --git a/...anbase_web/templates/webinar/new.html.eex → ...e_web/templates/webinar_html/new.html.eex b/...anbase_web/templates/webinar/new.html.eex → ...e_web/templates/webinar_html/new.html.eex
diff --git a/...nbase_web/templates/webinar/show.html.eex → ..._web/templates/webinar_html/show.html.eex b/...nbase_web/templates/webinar/show.html.eex → ..._web/templates/webinar_html/show.html.eex
diff --git a/lib/sanbase_web/views/custom_admin_html.ex b/lib/sanbase_web/views/custom_admin_html.ex
@@ -0,0 +1,3 @@
+defmodule SanbaseWeb.CustomAdminHTML do
+  use SanbaseWeb, :view
+end
diff --git a/lib/sanbase_web/views/custom_admin_view.ex b/lib/sanbase_web/views/custom_admin_view.ex
diff --git a/lib/sanbase_web/views/custom_plan.ex b/lib/sanbase_web/views/custom_plan.ex
diff --git a/lib/sanbase_web/views/custom_plan_html.ex b/lib/sanbase_web/views/custom_plan_html.ex
@@ -0,0 +1,3 @@
+defmodule SanbaseWeb.CustomPlanHTML do
+  use SanbaseWeb, :view
+end
diff --git a/lib/sanbase_web/views/report_html.ex b/lib/sanbase_web/views/report_html.ex
@@ -0,0 +1,3 @@
+defmodule SanbaseWeb.ReportHTML do
+  use SanbaseWeb, :view
+end
diff --git a/lib/sanbase_web/views/report_view.ex b/lib/sanbase_web/views/report_view.ex
diff --git a/lib/sanbase_web/views/sheets_template_html.ex b/lib/sanbase_web/views/sheets_template_html.ex
@@ -0,0 +1,3 @@
+defmodule SanbaseWeb.SheetsTemplateHTML do
+  use SanbaseWeb, :view
+end
diff --git a/lib/sanbase_web/views/sheets_template_view.ex b/lib/sanbase_web/views/sheets_template_view.ex
diff --git a/lib/sanbase_web/views/user_view.ex b/lib/sanbase_web/views/user_view.ex
diff --git a/lib/sanbase_web/views/user_view_html.ex b/lib/sanbase_web/views/user_view_html.ex
@@ -0,0 +1,3 @@
+defmodule SanbaseWeb.UserHTML do
+  use SanbaseWeb, :view
+end
diff --git a/lib/sanbase_web/views/webinar.ex b/lib/sanbase_web/views/webinar.ex
diff --git a/lib/sanbase_web/views/webinar_html.ex b/lib/sanbase_web/views/webinar_html.ex
@@ -0,0 +1,3 @@
+defmodule SanbaseWeb.WebinarHTML do
+  use SanbaseWeb, :view
+end