diff --git a/src/MusicStore.Spa/Client/Site.less b/src/MusicStore.Spa/Client/Site.less deleted file mode 100644 index 889ec01c0d..0000000000 --- a/src/MusicStore.Spa/Client/Site.less +++ /dev/null @@ -1,88 +0,0 @@ -@import '../bower_components/bootstrap/less/bootstrap.less'; - -@font-face { - font-family: 'Glyphicons Halflings'; - src: url('../lib/bootstrap/fonts/glyphicons-halflings-regular.eot'); - src: url('../lib/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../lib/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../lib/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../lib/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); -} - -[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak { - display: none !important; -} - -.nav, .pagination, .carousel, .panel-title a { - cursor: pointer; -} - -body { - padding-top: 50px; - padding-bottom: 20px; -} - -/* Set padding to keep content from hitting the edges */ -.body-content { - padding-left: 15px; - padding-right: 15px; -} - -/* Set width on the form input elements since they're 100% wide by default */ -input, -select, -textarea { - /*max-width: 280px;*/ -} - -/* styles for validation helpers */ -.field-validation-error { - color: #b94a48; -} - -.field-validation-valid { - display: none; -} - -input.input-validation-error { - border: 1px solid #b94a48; -} - -input[type="checkbox"].input-validation-error { - border: 0 none; -} - -.validation-summary-errors { - color: #b94a48; -} - -.validation-summary-valid { - display: none; -} - - -/* Music Store additions */ - -ul#album-list li { - height: 160px; -} - -ul#album-list li img:hover { - box-shadow: 1px 1px 7px #777; -} - -ul#album-list li img { - max-width: 100px; - max-height: 100px; - box-shadow: 1px 1px 5px #999; - border: none; - padding: 0; -} - -ul#album-list li a, ul#album-details li a { - text-decoration:none; -} - -ul#album-list li a:hover { - background: none; - -webkit-text-shadow: 1px 1px 2px #bbb; - text-shadow: 1px 1px 2px #bbb; - color: #363430; -} \ No newline at end of file diff --git a/src/MusicStore.Spa/Client/favicon.ico b/src/MusicStore.Spa/Client/favicon.ico deleted file mode 100644 index a3a799985c..0000000000 Binary files a/src/MusicStore.Spa/Client/favicon.ico and /dev/null differ diff --git a/src/MusicStore.Spa/Client/images/home-showcase.png b/src/MusicStore.Spa/Client/images/home-showcase.png deleted file mode 100644 index 258c19d3cd..0000000000 Binary files a/src/MusicStore.Spa/Client/images/home-showcase.png and /dev/null differ diff --git a/src/MusicStore.Spa/Client/images/logo.png b/src/MusicStore.Spa/Client/images/logo.png deleted file mode 100644 index d334c86256..0000000000 Binary files a/src/MusicStore.Spa/Client/images/logo.png and /dev/null differ diff --git a/src/MusicStore.Spa/Client/images/logo.svg b/src/MusicStore.Spa/Client/images/logo.svg deleted file mode 100644 index ec3cd6aa5b..0000000000 --- a/src/MusicStore.Spa/Client/images/logo.svg +++ /dev/null @@ -1,303 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/MusicStore.Spa/Client/images/placeholder.png b/src/MusicStore.Spa/Client/images/placeholder.png deleted file mode 100644 index 1f73dbb43d..0000000000 Binary files a/src/MusicStore.Spa/Client/images/placeholder.png and /dev/null differ diff --git a/src/MusicStore.Spa/Client/images/placeholder.svg b/src/MusicStore.Spa/Client/images/placeholder.svg deleted file mode 100644 index 07d58202df..0000000000 --- a/src/MusicStore.Spa/Client/images/placeholder.svg +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/MusicStore.Spa/Startup.cs b/src/MusicStore.Spa/Startup.cs index 78196eb8e4..58a40c256d 100644 --- a/src/MusicStore.Spa/Startup.cs +++ b/src/MusicStore.Spa/Startup.cs @@ -16,40 +16,45 @@ namespace MusicStore.Spa { public class Startup { - public void Configure(IApplicationBuilder app) + public Startup() { - var configuration = new Configuration() - .AddJsonFile("Config.json") - .AddEnvironmentVariables(); + Configuration = new Configuration() + .AddJsonFile("Config.json") + .AddEnvironmentVariables(); + } - app.UsePerRequestServices(services => + public IConfiguration Configuration { get; set; } + + public void ConfigureServices(IServiceCollection services) + { + // Add options accessors to the service container + services.ConfigureOptions(options => { - // Add options accessors to the service container - services.SetupOptions(options => - { - options.DefaultAdminUserName = configuration.Get("DefaultAdminUsername"); - options.DefaultAdminPassword = configuration.Get("DefaultAdminPassword"); - options.UseSqlServer(configuration.Get("Data:IdentityConnection:ConnectionString")); - }); - - services.SetupOptions(options => - options.UseSqlServer(configuration.Get("Data:DefaultConnection:ConnectionString"))); - - // Add MVC services to the service container - services.AddMvc(); - - // Add EF services to the service container - services.AddEntityFramework() - .AddSqlServer(); - - // Add Identity services to the services container - services.AddDefaultIdentity(configuration); - - // Add application services to the service container - services.AddScoped(); - services.AddTransient(typeof(IHtmlHelper<>), typeof(AngularHtmlHelper<>)); + options.DefaultAdminUserName = Configuration.Get("DefaultAdminUsername"); + options.DefaultAdminPassword = Configuration.Get("DefaultAdminPassword"); + options.UseSqlServer(Configuration.Get("Data:IdentityConnection:ConnectionString")); }); + services.ConfigureOptions(options => + options.UseSqlServer(Configuration.Get("Data:DefaultConnection:ConnectionString"))); + + // Add MVC services to the service container + services.AddMvc(); + + // Add EF services to the service container + services.AddEntityFramework() + .AddSqlServer(); + + // Add Identity services to the services container + services.AddDefaultIdentity(Configuration); + + // Add application services to the service container + services.AddScoped(); + services.AddTransient(typeof(IHtmlHelper<>), typeof(AngularHtmlHelper<>)); + } + + public void Configure(IApplicationBuilder app) + { // Initialize the sample data SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices).Wait(); SampleData.InitializeIdentityDatabaseAsync(app.ApplicationServices).Wait();