From 6126acfcefe5c2420ffeaf158330adfedac3940c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 27 Oct 2017 15:43:06 +0300
Subject: [PATCH] Move css/js files to wwwroot for web module.

---
 src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj |  7 ++++++-
 .../AbpDesk/Blogging/AbpDeskMongoBlogModule.cs         | 10 +++++++++-
 .../Areas/Blog/Views/Posts/Index.cshtml                |  2 +-
 src/AbpDesk/AbpDesk.MongoBlog/compilerconfig.json      |  4 ++--
 .../modules/mongoblog/views/posts/index.css}           |  0
 .../modules/mongoblog/views/posts/index.min.css}       |  0
 .../modules/mongoblog/views/posts/index.scss}          |  0
 7 files changed, 18 insertions(+), 5 deletions(-)
 rename src/AbpDesk/AbpDesk.MongoBlog/{Areas/Blog/Views/Posts/Index.css => wwwroot/modules/mongoblog/views/posts/index.css} (100%)
 rename src/AbpDesk/AbpDesk.MongoBlog/{Areas/Blog/Views/Posts/Index.min.css => wwwroot/modules/mongoblog/views/posts/index.min.css} (100%)
 rename src/AbpDesk/AbpDesk.MongoBlog/{Areas/Blog/Views/Posts/Index.scss => wwwroot/modules/mongoblog/views/posts/index.scss} (100%)

diff --git a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj
index 499829b3e9..c64df8bb26 100644
--- a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj
+++ b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj
@@ -12,7 +12,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Areas\**\*.*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
+    <EmbeddedResource Include="Areas\Blog\Controllers\PostsController.cs" />
+    <EmbeddedResource Include="Areas\Blog\Views\Posts\Index.cshtml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="wwwroot\modules\mongoblog\views\posts\index.scss" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs
index 1235c09010..bbd03a6de5 100644
--- a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs
+++ b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs
@@ -29,10 +29,18 @@ namespace AbpDesk.Blogging
                 options.Sources.Add(
                     new EmbeddedFileSet(
                         "/Areas/",
-                        GetType().GetTypeInfo().Assembly,
+                        GetType().Assembly,
                         "Areas"
                         )
                     );
+
+                options.Sources.Add(
+                    new EmbeddedFileSet(
+                        "/",
+                        GetType().Assembly,
+                        "wwwroot" //TODO: This is not tested yet!
+                    )
+                );
             });
 
             services.AddAssemblyOf<AbpDeskMongoBlogModule>();
diff --git a/src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.cshtml b/src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.cshtml
index 7c97a9306f..2933a5458c 100644
--- a/src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.cshtml
+++ b/src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.cshtml
@@ -3,7 +3,7 @@
 <h2>Blog Posts</h2>
 
 @section styles {
-    <link rel="stylesheet" type="text/css" href="~/Areas/Blog/Views/Posts/Index.css" />
+    <link rel="stylesheet" type="text/css" href="~/modules/mongoblog/views/posts/Index.css" />
 }
 
 <ul class="blog-post-list">
diff --git a/src/AbpDesk/AbpDesk.MongoBlog/compilerconfig.json b/src/AbpDesk/AbpDesk.MongoBlog/compilerconfig.json
index 9d51e91a28..4e91f1a415 100644
--- a/src/AbpDesk/AbpDesk.MongoBlog/compilerconfig.json
+++ b/src/AbpDesk/AbpDesk.MongoBlog/compilerconfig.json
@@ -1,6 +1,6 @@
 [
   {
-    "outputFile": "Areas/Blog/Views/Posts/Index.css",
-    "inputFile": "Areas/Blog/Views/Posts/Index.scss"
+    "outputFile": "wwwroot/modules/mongoblog/views/posts/index.css",
+    "inputFile": "wwwroot/modules/mongoblog/views/posts/index.scss"
   }
 ]
\ No newline at end of file
diff --git a/src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.css b/src/AbpDesk/AbpDesk.MongoBlog/wwwroot/modules/mongoblog/views/posts/index.css
similarity index 100%
rename from src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.css
rename to src/AbpDesk/AbpDesk.MongoBlog/wwwroot/modules/mongoblog/views/posts/index.css
diff --git a/src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.min.css b/src/AbpDesk/AbpDesk.MongoBlog/wwwroot/modules/mongoblog/views/posts/index.min.css
similarity index 100%
rename from src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.min.css
rename to src/AbpDesk/AbpDesk.MongoBlog/wwwroot/modules/mongoblog/views/posts/index.min.css
diff --git a/src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.scss b/src/AbpDesk/AbpDesk.MongoBlog/wwwroot/modules/mongoblog/views/posts/index.scss
similarity index 100%
rename from src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.scss
rename to src/AbpDesk/AbpDesk.MongoBlog/wwwroot/modules/mongoblog/views/posts/index.scss