ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix view models namespaces issues. Remove unnecessary design time ordering context provider

Browse Source
This commit is contained in:
Unai Zorrilla Castro 2017-09-14 13:43:41 +02:00
parent 226c03b573
commit 04c90f09f9
9 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Services/Identity/Identity.API/Views/Account/LoggedOut.cshtml
View File

@ -1,4 +1,4 @@
@model Identity.API.Models.AccountViewModels.LoggedOutViewModel
@model Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels.LoggedOutViewModel
<div class="container page-header">
<h1>

2
src/Services/Identity/Identity.API/Views/Account/Login.cshtml
View File

@ -1,7 +1,7 @@
@using System.Collections.Generic
@using Microsoft.AspNetCore.Http
@using Microsoft.AspNetCore.Http.Authentication
@model Identity.API.Models.AccountViewModels.LoginViewModel
@model Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels.LoginViewModel
@{

2
src/Services/Identity/Identity.API/Views/Account/Logout.cshtml
View File

@ -1,4 +1,4 @@
@model Identity.API.Models.AccountViewModels.LogoutViewModel
@model Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels.LogoutViewModel
<div class="container logout-page">
<div class="page-header">

3
src/Services/Identity/Identity.API/Views/Account/Register.cshtml
View File

@ -1,5 +1,4 @@
@using Identity.API.Models.AccountViewModels
@model RegisterViewModel
@model Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels.RegisterViewModel
@{
ViewData["Title"] = "Register";
}

2
src/Services/Identity/Identity.API/Views/Consent/Index.cshtml
View File

@ -1,4 +1,4 @@
@model Identity.API.Models.AccountViewModels.ConsentViewModel
@model Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels.ConsentViewModel
<div class="container page-consent">
<div class="row page-header">

2
src/Services/Identity/Identity.API/Views/Consent/_ScopeListItem.cshtml
View File

@ -1,4 +1,4 @@
@model Identity.API.Models.AccountViewModels.ScopeViewModel
@model Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels.ScopeViewModel
<li class="list-group-item">
<label>

2
src/Services/Identity/Identity.API/Views/Shared/Error.cshtml
View File

@ -1,4 +1,4 @@
@model IdentityServer4.Quickstart.UI.Models.ErrorViewModel
@model Microsoft.eShopOnContainers.Services.Identity.API.Models.ErrorViewModel
@{
var error = Model?.Error?.Error;

29
src/Services/Ordering/Ordering.API/Infrastructure/OrderingDbContextDesigner.cs
View File

@ -1,29 +0,0 @@
using MediatR;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Design;
using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
using Microsoft.Extensions.Configuration;
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Text;
namespace Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure
{
public class OrderingDbContextDesigner : IDesignTimeDbContextFactory<OrderingContext>
{
public OrderingContext CreateDbContext(string[] args)
{
var options = new DbContextOptionsBuilder<OrderingContext>();
options.UseSqlServer("Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
sqlServerOptionsAction: sqlOptions =>
{
sqlOptions.MigrationsAssembly(typeof(Startup).GetTypeInfo().Assembly.GetName().Name);
});
return OrderingContext.CreateForEFDesignTools(options.Options);
}
}
}

10
src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs
View File

@ -31,15 +31,9 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Infrastructure
private readonly IMediator _mediator;
private OrderingContext(DbContextOptions<OrderingContext> options) : base (options) { }
public static OrderingContext CreateForEFDesignTools(DbContextOptions options)
{
return new OrderingContext(options);
}
private OrderingContext(DbContextOptions options) : base (options) { }
public OrderingContext(DbContextOptions options, IMediator mediator) : base(options)
public OrderingContext(DbContextOptions<OrderingContext> options, IMediator mediator) : base(options)
{
_mediator = mediator ?? throw new ArgumentNullException(nameof(mediator));