diff --git a/.gitignore b/.gitignore index a52b016..5f377ae 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ obj/ *.user -/ForneverMind/app/ +/ForneverMind/wwwroot/app/ diff --git a/.gitmodules b/.gitmodules index 6643903..64c15f8 100644 --- 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 index d6806b2..6eab8f4 100644 --- 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 index ecb98b8..0fe93e2 100644 --- 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 index 4b72738..878705a 100644 --- 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 index 52dc03d..61d5b0a 100644 --- a/ForneverMind/views/_Layout.cshtml +++ b/ForneverMind/views/_Layout.cshtml @@ -3,8 +3,7 @@ F. von Never — @ViewBag.Title - + diff --git a/ForneverMind/images/2013-09-01-exception-diagram.png b/ForneverMind/wwwroot/images/2013-09-01-exception-diagram.png similarity index 100% rename from ForneverMind/images/2013-09-01-exception-diagram.png rename to ForneverMind/wwwroot/images/2013-09-01-exception-diagram.png diff --git a/ForneverMind/images/2015-03-22-spyxx-tree.png b/ForneverMind/wwwroot/images/2015-03-22-spyxx-tree.png similarity index 100% rename from ForneverMind/images/2015-03-22-spyxx-tree.png rename to ForneverMind/wwwroot/images/2015-03-22-spyxx-tree.png diff --git a/ForneverMind/images/2015-11-22-monodevelop-add-in-manager.png b/ForneverMind/wwwroot/images/2015-11-22-monodevelop-add-in-manager.png similarity index 100% rename from ForneverMind/images/2015-11-22-monodevelop-add-in-manager.png rename to ForneverMind/wwwroot/images/2015-11-22-monodevelop-add-in-manager.png diff --git a/ForneverMind/images/2015-11-22-monodevelop-add-packages.png b/ForneverMind/wwwroot/images/2015-11-22-monodevelop-add-packages.png similarity index 100% rename from ForneverMind/images/2015-11-22-monodevelop-add-packages.png rename to ForneverMind/wwwroot/images/2015-11-22-monodevelop-add-packages.png diff --git a/ForneverMind/images/2015-11-22-monodevelop-resource-properties.png b/ForneverMind/wwwroot/images/2015-11-22-monodevelop-resource-properties.png similarity index 100% rename from ForneverMind/images/2015-11-22-monodevelop-resource-properties.png rename to ForneverMind/wwwroot/images/2015-11-22-monodevelop-resource-properties.png diff --git a/ForneverMind/images/2015-11-22-perspex-application.png b/ForneverMind/wwwroot/images/2015-11-22-perspex-application.png similarity index 100% rename from ForneverMind/images/2015-11-22-perspex-application.png rename to ForneverMind/wwwroot/images/2015-11-22-perspex-application.png diff --git a/ForneverMind/images/2016-06-04-publish-settings.png b/ForneverMind/wwwroot/images/2016-06-04-publish-settings.png similarity index 100% rename from ForneverMind/images/2016-06-04-publish-settings.png rename to ForneverMind/wwwroot/images/2016-06-04-publish-settings.png diff --git a/ForneverMind/images/2016-06-04-web-deploy-package.png b/ForneverMind/wwwroot/images/2016-06-04-web-deploy-package.png similarity index 100% rename from ForneverMind/images/2016-06-04-web-deploy-package.png rename to ForneverMind/wwwroot/images/2016-06-04-web-deploy-package.png diff --git a/ForneverMind/images/2017-02-12-dotmemory.png b/ForneverMind/wwwroot/images/2017-02-12-dotmemory.png similarity index 100% rename from ForneverMind/images/2017-02-12-dotmemory.png rename to ForneverMind/wwwroot/images/2017-02-12-dotmemory.png diff --git a/ForneverMind/talks/modern-programming b/ForneverMind/wwwroot/talks/modern-programming similarity index 100% rename from ForneverMind/talks/modern-programming rename to ForneverMind/wwwroot/talks/modern-programming diff --git a/ForneverMind/talks/net-core-slides b/ForneverMind/wwwroot/talks/net-core-slides similarity index 100% rename from ForneverMind/talks/net-core-slides rename to ForneverMind/wwwroot/talks/net-core-slides