fix import content

Author: bluzky

lib/chubi_web/admin_router.ex

@@ -40,6 +40,7 @@ defmodule ChubiWeb.AdminRouter do
 
     get("/settings/set_theme", SettingController, :set_theme)
     get("/settings/export", SettingController, :export_content)
+    get("/settings/select_import", SettingController, :select_import)
     post("/settings/import", SettingController, :import_content)
   end
 end

lib/chubi_web/controllers/admin/.#setting_controller.ex

@@ -1,5 +1,5 @@
 defmodule ChubiWeb.Admin.SettingController do
-  use ChubiWeb, :controller
+  use ChubiWeb, :admin_controller
   alias Chubi.Content
 
   def set_theme(conn, %{"theme" => theme}) do
@@ -41,12 +41,15 @@ defmodule ChubiWeb.Admin.SettingController do
   end
 
   def select_import(conn, _) do
+    render(conn, "select_import.html")
   end
 
-  def import_content(conn, %{%{path: path} => file}) do
-    with {:ok, files} <- :zip.extract(path, [:memory]) do
+  def import_content(conn, %{"file" => %{path: path}}) do
+    with {:ok, files} <- :zip.extract(String.to_charlist(path), [:memory]) do
       rs =
-        Enum.map(files, fn {_filename, content} ->
+        Enum.map(files, fn {file_path, content} ->
+          file_path = to_string(file_path)
+
           attrs =
             case Path.extname(file_path) do
               ".md" -> %{"content" => content, "format" => "markdown"}
@@ -63,12 +66,16 @@ defmodule ChubiWeb.Admin.SettingController do
       success = Enum.filter(rs, &(elem(&1, 0) == :ok))
 
       conn
-      |> put_flash(:error, gettext("Cannot import content"))
-      |> redirect(to: Routes.setting_path(conn, :select_import))
+      |> put_flash(
+        :info,
+        gettext("%{success}/%{total} is imported", %{success: length(success), total: length(rs)})
+      )
+      |> redirect(to: Routes.post_path(conn, :index))
     else
-      conn
-      |> put_flash(:error, gettext("Cannot import content"))
-      |> redirect(to: Routes.setting_path(conn, :select_import))
+      err ->
+        conn
+        |> put_flash(:error, gettext("Cannot import content"))
+        |> redirect(to: Routes.setting_path(conn, :select_import))
     end
   end
 end

lib/chubi_web/controllers/admin/setting_controller.ex

@@ -0,0 +1,24 @@
+<%=  if message = get_flash(@conn, :error) do %>
+  <div class="alert alert-icon alert-danger border-danger alert-dismissible fade show" role="alert">
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true"></span>
+    </button> <i class="fe fe-x-circle list-icon"></i>  <%= message %>
+  </div>
+<% end %>
+
+<%=  if message = get_flash(@conn, :info) do %>
+  <div class="alert alert-icon alert-info border-info alert-dismissible fade show" role="alert">
+    <button type="button" class="close" data-dismiss="alert"><span></span>
+    </button> <i class="fe fe-info list-icon"></i>  <%= message %></div>
+<% end %>
+
+<%=  if message = get_flash(@conn, :success) do %>
+  <div class="alert alert-icon alert-success border-info alert-dismissible fade show" role="alert">
+    <button type="button" class="close" data-dismiss="alert"><span></span>
+    </button> <i class="fe fe-check-circle list-icon"></i>  <%= message %></div>
+<% end %>
+
+<%=  if message = get_flash(@conn, :warning) do %>
+  <div class="alert alert-icon alert-warning border-info alert-dismissible fade show" role="alert">
+    <button type="button" class="close" data-dismiss="alert"><span></span>
+    </button> <i class="fe fe-alert-triangle list-icon"></i>  <%= message %></div>
+<% end %>

lib/chubi_web/templates/admin/layout/_alert.html.eex

@@ -37,7 +37,7 @@
             <a href="javascript:void(0)" class="nav-link" data-toggle="dropdown"><i class="fe fe-settings"></i> <%= gettext "Settings" %></a>
             <div class="dropdown-menu dropdown-menu-arrow" x-placement="bottom-start">
               <a href="<%= Routes.setting_path(@conn, :export_content) %>" class="dropdown-item "><%= gettext "Export" %></a>
-              <a href="import" class="dropdown-item "><%= gettext "Import" %></a>
+              <a href="<%= Routes.setting_path(@conn, :select_import) %>" class="dropdown-item "><%= gettext "Import" %></a>
             </div>
           </li>
 

lib/chubi_web/templates/admin/layout/_navigation.html.eex

@@ -35,6 +35,9 @@
         <div class="flex-grow-1" >
 
           <div class="" style="height: 100%;">
+            <div class="m-3">
+              <%=  render "_alert.html", assigns %>
+            </div>
             <%= render @view_module, @view_template, assigns %>
           </div>
 

lib/chubi_web/templates/admin/layout/app.html.eex

@@ -0,0 +1,22 @@
+<div class="container">
+  <div class="row row-cards row-deck mt-md-5">
+    <div class="col-md-8 offset-md-2">
+      <div class="card profile">
+        <div class="card-body p-6 clearfix">
+          <h2 class="fw-bold mb-0 text-primary"><%= gettext("Select ZIP file content") %></h2>
+
+          <form method="post" class="mt-5" action="<%= Routes.setting_path(@conn, :import_content) %>" enctype="multipart/form-data">
+            <div class="form-group">
+              <input type="hidden" name="_csrf_token" value="<%= Plug.CSRFProtection.get_csrf_token() %>" >
+              <input type="file" name="file" >
+            </div>
+            <button class="btn btn-primary"> <i class="fe fe-flash mr-1"></i> <%= gettext("Import") %></button>
+          </form>
+
+        </div>
+      </div>
+    </div>
+
+  </div>
+</div>
+

lib/chubi_web/templates/admin/setting/select_import.html.eex

@@ -0,0 +1,3 @@
+defmodule ChubiWeb.Admin.SettingView do
+  use ChubiWeb, :admin_view
+end