#43: move static files to wwwroot

ForNeVeR · Apr 16, 2017 · c287e39 · c287e39
1 parent 46133d9
commit c287e39
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,4 @@ obj/
 
 *.user
 
-/ForneverMind/app/
+/ForneverMind/wwwroot/app/
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "ForneverMind/talks/modern-programming"]
-	path = ForneverMind/talks/modern-programming
+	path = ForneverMind/wwwroot/talks/modern-programming
 	url = https://github.com/ForNeVeR/modern-programming.git
 [submodule "ForneverMind/talks/net-core-slides"]
-	path = ForneverMind/talks/net-core-slides
+	path = ForneverMind/wwwroot/talks/net-core-slides
 	url = https://github.com/ForNeVeR/net-core-slides.git
diff --git a/ForneverMind.Frontend/webpack.config.js b/ForneverMind.Frontend/webpack.config.js
@@ -1,7 +1,7 @@
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
 const path = require('path');
 
-const outputPath = path.join(__dirname, '..', 'ForneverMind', 'app');
+const outputPath = path.join(__dirname, '..', 'ForneverMind', 'wwwroot', 'app');
 
 module.exports = {
     resolve: { extensions: ['', '.js', '.less'] },

diff --git a/ForneverMind/KestrelInterop.fs b/ForneverMind/KestrelInterop.fs
@@ -20,7 +20,8 @@ module ApplicationBuilder =
 
 module WebHost =
     let private root = Directory.GetCurrentDirectory()
-    let create () = WebHostBuilder().UseContentRoot(root).UseKestrel()
+    let private webRoot = Path.Combine(root, "wwwroot")
+    let create () = WebHostBuilder().UseContentRoot(root).UseWebRoot(webRoot).UseKestrel()
     let bindTo urls (b:IWebHostBuilder) = b.UseUrls urls
     let configure ({ application = application; logging = logging }) (b:IWebHostBuilder) =
         b.ConfigureLogging(Action<_> logging)

diff --git a/ForneverMind/Program.fs b/ForneverMind/Program.fs
@@ -19,9 +19,7 @@ let private createRouter (builder : IApplicationBuilder) =
     routesModule.Router
 
 let private useStaticFiles (app : IApplicationBuilder) =
-    app.UseStaticFiles("/app")
-        .UseStaticFiles("/images")
-        .UseStaticFiles("/talks")
+    app.UseStaticFiles()
 
 let private configureApplication app =
     let router = createRouter app

diff --git a/ForneverMind/views/_Layout.cshtml b/ForneverMind/views/_Layout.cshtml
@@ -3,8 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <title>F. von Never — @ViewBag.Title</title>
-    <!--<base href="System.Configuration.ConfigurationManager.AppSettings["BaseUrl"]"/>
-    TODO[F]: Fix base url determination here. -->
+    <base href="/"/>
     <link rel="alternate" type="application/rss+xml" href="./rss.xml" title="RSS Feed"/>
     <link rel="stylesheet" type="text/css" href="app/app.css"/>
     <script src="app/app.js" async></script>

diff --git a/...d/images/2013-09-01-exception-diagram.png → ...t/images/2013-09-01-exception-diagram.png b/...d/images/2013-09-01-exception-diagram.png → ...t/images/2013-09-01-exception-diagram.png
diff --git a/...everMind/images/2015-03-22-spyxx-tree.png → .../wwwroot/images/2015-03-22-spyxx-tree.png b/...everMind/images/2015-03-22-spyxx-tree.png → .../wwwroot/images/2015-03-22-spyxx-tree.png
diff --git a/...2015-11-22-monodevelop-add-in-manager.png → ...2015-11-22-monodevelop-add-in-manager.png b/...2015-11-22-monodevelop-add-in-manager.png → ...2015-11-22-monodevelop-add-in-manager.png
diff --git a/...s/2015-11-22-monodevelop-add-packages.png → ...s/2015-11-22-monodevelop-add-packages.png b/...s/2015-11-22-monodevelop-add-packages.png → ...s/2015-11-22-monodevelop-add-packages.png
diff --git a/...11-22-monodevelop-resource-properties.png → ...11-22-monodevelop-resource-properties.png b/...11-22-monodevelop-resource-properties.png → ...11-22-monodevelop-resource-properties.png
diff --git a/...images/2015-11-22-perspex-application.png → ...images/2015-11-22-perspex-application.png b/...images/2015-11-22-perspex-application.png → ...images/2015-11-22-perspex-application.png
diff --git a/...nd/images/2016-06-04-publish-settings.png → ...ot/images/2016-06-04-publish-settings.png b/...nd/images/2016-06-04-publish-settings.png → ...ot/images/2016-06-04-publish-settings.png
diff --git a/.../images/2016-06-04-web-deploy-package.png → .../images/2016-06-04-web-deploy-package.png b/.../images/2016-06-04-web-deploy-package.png → .../images/2016-06-04-web-deploy-package.png
diff --git a/ForneverMind/images/2017-02-12-dotmemory.png → ...d/wwwroot/images/2017-02-12-dotmemory.png b/ForneverMind/images/2017-02-12-dotmemory.png → ...d/wwwroot/images/2017-02-12-dotmemory.png
diff --git a/ForneverMind/talks/modern-programming → ...everMind/wwwroot/talks/modern-programming b/ForneverMind/talks/modern-programming → ...everMind/wwwroot/talks/modern-programming
diff --git a/ForneverMind/talks/net-core-slides → ForneverMind/wwwroot/talks/net-core-slides b/ForneverMind/talks/net-core-slides → ForneverMind/wwwroot/talks/net-core-slides