Restructured the application - moved all data related code to Data pr…

…oject. Moved all WebSite related code into WebApp. Made sure it still compiles and runs fine.
jkaleta · Mar 10, 2018 · d32e952227c1f079500856eef2455928e59e2347 · d32e952
1 parent f6a9fdc
commit d32e952227c1f079500856eef2455928e59e2347
diff --git a/Data/Data.csproj b/Data/Data.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/Data/DataContext.cs b/Data/DataContext.cs
@@ -11,6 +11,6 @@ public MicroBankContext(DbContextOptions options)
 
         // public DbSet<BankAccount> BankAccounts { get; set; }
 
-        public DbSet<Customer> Customers {get; set;}
+        public DbSet<Models.Customer> Customers {get; set;}
     }
 }
diff --git a/...ations/20180128232859_Initial.Designer.cs → ...ations/20180128232859_Initial.Designer.cs b/...ations/20180128232859_Initial.Designer.cs → ...ations/20180128232859_Initial.Designer.cs
diff --git a/Migrations/20180128232859_Initial.cs → Data/Migrations/20180128232859_Initial.cs b/Migrations/20180128232859_Initial.cs → Data/Migrations/20180128232859_Initial.cs
diff --git a/Migrations/MicroBankContextModelSnapshot.cs → ...grations/MicroBankContextModelSnapshot.cs b/Migrations/MicroBankContextModelSnapshot.cs → ...grations/MicroBankContextModelSnapshot.cs
diff --git a/Data/BankAccount.cs → Data/Models/BankAccount.cs b/Data/BankAccount.cs → Data/Models/BankAccount.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace microbank.Data
+namespace microbank.Data.Models
 {
     public class BankAccount
     {

diff --git a/Data/Customer.cs → Data/Models/Customer.cs b/Data/Customer.cs → Data/Models/Customer.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace microbank.Data
+namespace microbank.Data.Models
 {
     public class Customer
     {

diff --git a/Pages/Index.cshtml b/Pages/Index.cshtml
diff --git a/Pages/_ViewImports.cshtml b/Pages/_ViewImports.cshtml
diff --git a/Pages/About.cshtml → WebApp/Pages/About.cshtml b/Pages/About.cshtml → WebApp/Pages/About.cshtml
@@ -1,5 +1,5 @@
 @page
-@model AboutModel
+@model microbank.WebApp.Pages.AboutModel
 @{
     ViewData["Title"] = "About";
 }

diff --git a/Pages/About.cshtml.cs → WebApp/Pages/About.cshtml.cs b/Pages/About.cshtml.cs → WebApp/Pages/About.cshtml.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace microbank.Pages
+namespace microbank.WebApp.Pages
 {
     public class AboutModel : PageModel
     {

diff --git a/Pages/Account/Create.cshtml → WebApp/Pages/Account/Create.cshtml b/Pages/Account/Create.cshtml → WebApp/Pages/Account/Create.cshtml
@@ -1,5 +1,5 @@
 @page
-@model microbank.Pages.Account.CreateModel
+@model microbank.WebApp.Pages.Account.CreateModel
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
 <html>

diff --git a/Pages/Account/Create.cshtml.cs → WebApp/Pages/Account/Create.cshtml.cs b/Pages/Account/Create.cshtml.cs → WebApp/Pages/Account/Create.cshtml.cs
@@ -1,9 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using microbank.Data.Models;
 using microbank.Data;
 
-namespace microbank.Pages.Account
+namespace microbank.WebApp.Pages.Account
 {
     public class CreateModel : PageModel
     {

diff --git a/Pages/Account/List.cshtml → WebApp/Pages/Account/List.cshtml b/Pages/Account/List.cshtml → WebApp/Pages/Account/List.cshtml
@@ -1,5 +1,5 @@
 @page
-@model microbank.Pages.Account.ListModel
+@model microbank.WebApp.Pages.Account.ListModel
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
 <html>

diff --git a/Pages/Account/List.cshtml.cs → WebApp/Pages/Account/List.cshtml.cs b/Pages/Account/List.cshtml.cs → WebApp/Pages/Account/List.cshtml.cs
@@ -2,10 +2,11 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using microbank.Data;
+using microbank.Data.Models;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace microbank.Pages.Account
+namespace microbank.WebApp.Pages.Account
 {
     public class ListModel : PageModel
     {

diff --git a/Pages/Contact.cshtml → WebApp/Pages/Contact.cshtml b/Pages/Contact.cshtml → WebApp/Pages/Contact.cshtml
@@ -1,5 +1,5 @@
 @page
-@model ContactModel
+@model microbank.WebApp.Pages.ContactModel
 @{
     ViewData["Title"] = "Contact";
 }

diff --git a/Pages/Contact.cshtml.cs → WebApp/Pages/Contact.cshtml.cs b/Pages/Contact.cshtml.cs → WebApp/Pages/Contact.cshtml.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace microbank.Pages
+namespace microbank.WebApp.Pages
 {
     public class ContactModel : PageModel
     {

diff --git a/Pages/Error.cshtml → WebApp/Pages/Error.cshtml b/Pages/Error.cshtml → WebApp/Pages/Error.cshtml
@@ -1,5 +1,5 @@
 @page
-@model ErrorModel
+@model microbank.WebApp.Pages.ErrorModel
 @{
     ViewData["Title"] = "Error";
 }

diff --git a/Pages/Error.cshtml.cs → WebApp/Pages/Error.cshtml.cs b/Pages/Error.cshtml.cs → WebApp/Pages/Error.cshtml.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace microbank.Pages
+namespace microbank.WebApp.Pages
 {
     public class ErrorModel : PageModel
     {

diff --git a/WebApp/Pages/Index.cshtml b/WebApp/Pages/Index.cshtml
@@ -0,0 +1,8 @@
+@page
+@model microbank.WebApp.Pages.IndexModel
+@{
+    ViewData["Title"] = "Micro Bank";
+}
+
+
+
diff --git a/Pages/Index.cshtml.cs → WebApp/Pages/Index.cshtml.cs b/Pages/Index.cshtml.cs → WebApp/Pages/Index.cshtml.cs
@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace microbank.Pages
+namespace microbank.WebApp.Pages
 {
     public class IndexModel : PageModel
     {

diff --git a/Pages/_Layout.cshtml → WebApp/Pages/_Layout.cshtml b/Pages/_Layout.cshtml → WebApp/Pages/_Layout.cshtml
diff --git a/Pages/_ValidationScriptsPartial.cshtml → ...pp/Pages/_ValidationScriptsPartial.cshtml b/Pages/_ValidationScriptsPartial.cshtml → ...pp/Pages/_ValidationScriptsPartial.cshtml
diff --git a/WebApp/Pages/_ViewImports.cshtml b/WebApp/Pages/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using microbank.WebApp
+@namespace microbank.WebApp.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/Pages/_ViewStart.cshtml → WebApp/Pages/_ViewStart.cshtml b/Pages/_ViewStart.cshtml → WebApp/Pages/_ViewStart.cshtml
diff --git a/Program.cs → WebApp/Program.cs b/Program.cs → WebApp/Program.cs
diff --git a/Startup.cs → WebApp/Startup.cs b/Startup.cs → WebApp/Startup.cs
@@ -24,27 +24,27 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            var builder = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile("appsettings.json");
+            services.AddMvc();
 
-            var connectionStringConfig = builder.Build();
-            var connectionString = connectionStringConfig.GetConnectionString("microbank_connection");
+            var connectionString = _getConnectionString();
+
+            _migrateDatabase(connectionString);
 
-            var injectedConnectionString = Environment.GetEnvironmentVariable("SQLSERVER_CONNECTION_STRING");
-
-            services.AddMvc();
+            services.AddDbContext<MicroBankContext>(options => options.UseSqlServer(connectionString));
+        }
 
+        private static void _migrateDatabase(string connectionString)
+        {
             var optionsBuilder = new DbContextOptionsBuilder();
             optionsBuilder.UseSqlServer(connectionString);
-            using(var context = new MicroBankContext(optionsBuilder.Options)){
-                //context.Database.Migrate();
-            }
 
-            services.AddDbContext<MicroBankContext>(options => options.UseSqlServer(injectedConnectionString));
+            using (var context = new MicroBankContext(optionsBuilder.Options))
+            {
+                context.Database.Migrate();
+            }
         }
 
-       // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
             if (env.IsDevelopment())
@@ -60,5 +60,23 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 
             app.UseMvc();
         }
+
+        private string _getConnectionString(){
+            // Get connection string from injected env variable
+            // fallback to the connection string from appconfig
+            var injectedConnectionString = Environment.GetEnvironmentVariable("SQLSERVER_CONNECTION_STRING");
+
+            if(!string.IsNullOrWhiteSpace(injectedConnectionString))
+                return injectedConnectionString;
+
+            var builder = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json");
+
+            var connectionStringConfig = builder.Build();
+            var connectionString = connectionStringConfig.GetConnectionString("microbank_connection");
+
+            return connectionString;
+        }
     }
 }
diff --git a/microbank.csproj → WebApp/WebApp.csproj b/microbank.csproj → WebApp/WebApp.csproj
@@ -1,15 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.Web" DefaultTargets="Publish">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <PublishDir>$(OutDir)_PublishedWebsites\NetCoreWebApp\</PublishDir>
+    <PublishDir>$(OutDir)..\_PublishedWebsites\NetCoreWebApp\</PublishDir>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.1" />
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />    
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.1" />
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.1" />
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <ProjectReference Include="..\Data\Data.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/appsettings.Development.json → WebApp/appsettings.Development.json b/appsettings.Development.json → WebApp/appsettings.Development.json
diff --git a/appsettings.json → WebApp/appsettings.json b/appsettings.json → WebApp/appsettings.json
diff --git a/bundleconfig.json → WebApp/bundleconfig.json b/bundleconfig.json → WebApp/bundleconfig.json
diff --git a/wwwroot/css/site.css → WebApp/wwwroot/css/site.css b/wwwroot/css/site.css → WebApp/wwwroot/css/site.css
diff --git a/wwwroot/css/site.min.css → WebApp/wwwroot/css/site.min.css b/wwwroot/css/site.min.css → WebApp/wwwroot/css/site.min.css
diff --git a/wwwroot/favicon.ico → WebApp/wwwroot/favicon.ico b/wwwroot/favicon.ico → WebApp/wwwroot/favicon.ico
diff --git a/wwwroot/images/banner1.svg → WebApp/wwwroot/images/banner1.svg b/wwwroot/images/banner1.svg → WebApp/wwwroot/images/banner1.svg
diff --git a/wwwroot/images/banner2.svg → WebApp/wwwroot/images/banner2.svg b/wwwroot/images/banner2.svg → WebApp/wwwroot/images/banner2.svg
diff --git a/wwwroot/images/banner3.svg → WebApp/wwwroot/images/banner3.svg b/wwwroot/images/banner3.svg → WebApp/wwwroot/images/banner3.svg
diff --git a/wwwroot/images/banner4.svg → WebApp/wwwroot/images/banner4.svg b/wwwroot/images/banner4.svg → WebApp/wwwroot/images/banner4.svg
diff --git a/wwwroot/js/site.js → WebApp/wwwroot/js/site.js b/wwwroot/js/site.js → WebApp/wwwroot/js/site.js
diff --git a/wwwroot/js/site.min.js → WebApp/wwwroot/js/site.min.js b/wwwroot/js/site.min.js → WebApp/wwwroot/js/site.min.js
diff --git a/wwwroot/lib/bootstrap/.bower.json → WebApp/wwwroot/lib/bootstrap/.bower.json b/wwwroot/lib/bootstrap/.bower.json → WebApp/wwwroot/lib/bootstrap/.bower.json
diff --git a/wwwroot/lib/bootstrap/LICENSE → WebApp/wwwroot/lib/bootstrap/LICENSE b/wwwroot/lib/bootstrap/LICENSE → WebApp/wwwroot/lib/bootstrap/LICENSE
diff --git a/...ib/bootstrap/dist/css/bootstrap-theme.css → ...ib/bootstrap/dist/css/bootstrap-theme.css b/...ib/bootstrap/dist/css/bootstrap-theme.css → ...ib/bootstrap/dist/css/bootstrap-theme.css
diff --git a/...ootstrap/dist/css/bootstrap-theme.css.map → ...ootstrap/dist/css/bootstrap-theme.css.map b/...ootstrap/dist/css/bootstrap-theme.css.map → ...ootstrap/dist/css/bootstrap-theme.css.map
diff --git a/...trap/dist/css/bootstrap-theme.min.css.map → ...trap/dist/css/bootstrap-theme.min.css.map b/...trap/dist/css/bootstrap-theme.min.css.map → ...trap/dist/css/bootstrap-theme.min.css.map
diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css b/wwwroot/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css
diff --git a/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map b/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map b/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map
diff --git a/...st/fonts/glyphicons-halflings-regular.eot → ...st/fonts/glyphicons-halflings-regular.eot b/...st/fonts/glyphicons-halflings-regular.eot → ...st/fonts/glyphicons-halflings-regular.eot
diff --git a/...st/fonts/glyphicons-halflings-regular.svg → ...st/fonts/glyphicons-halflings-regular.svg b/...st/fonts/glyphicons-halflings-regular.svg → ...st/fonts/glyphicons-halflings-regular.svg
diff --git a/...st/fonts/glyphicons-halflings-regular.ttf → ...st/fonts/glyphicons-halflings-regular.ttf b/...st/fonts/glyphicons-halflings-regular.ttf → ...st/fonts/glyphicons-halflings-regular.ttf
diff --git a/...t/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff b/...t/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff
diff --git a/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2 b/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2
diff --git a/wwwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js b/wwwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/wwwroot/lib/bootstrap/dist/js/npm.js → WebApp/wwwroot/lib/bootstrap/dist/js/npm.js b/wwwroot/lib/bootstrap/dist/js/npm.js → WebApp/wwwroot/lib/bootstrap/dist/js/npm.js
diff --git a/...jquery-validation-unobtrusive/.bower.json → ...jquery-validation-unobtrusive/.bower.json b/...jquery-validation-unobtrusive/.bower.json → ...jquery-validation-unobtrusive/.bower.json
diff --git a/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js b/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js
diff --git a/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js b/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js
diff --git a/wwwroot/lib/jquery-validation/.bower.json → ...wwwroot/lib/jquery-validation/.bower.json b/wwwroot/lib/jquery-validation/.bower.json → ...wwwroot/lib/jquery-validation/.bower.json
diff --git a/wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md b/wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js b/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js
diff --git a/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js b/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js
diff --git a/wwwroot/lib/jquery/.bower.json → WebApp/wwwroot/lib/jquery/.bower.json b/wwwroot/lib/jquery/.bower.json → WebApp/wwwroot/lib/jquery/.bower.json
diff --git a/wwwroot/lib/jquery/LICENSE.txt → WebApp/wwwroot/lib/jquery/LICENSE.txt b/wwwroot/lib/jquery/LICENSE.txt → WebApp/wwwroot/lib/jquery/LICENSE.txt
diff --git a/wwwroot/lib/jquery/dist/jquery.js → WebApp/wwwroot/lib/jquery/dist/jquery.js b/wwwroot/lib/jquery/dist/jquery.js → WebApp/wwwroot/lib/jquery/dist/jquery.js
diff --git a/wwwroot/lib/jquery/dist/jquery.min.map → ...pp/wwwroot/lib/jquery/dist/jquery.min.map b/wwwroot/lib/jquery/dist/jquery.min.map → ...pp/wwwroot/lib/jquery/dist/jquery.min.map