Renamed everything from MultiShop to Props.

This commit is contained in:
Harrison Deng 2021-07-13 00:35:31 -05:00
parent cefd02f202
commit 7e8a398741
114 changed files with 117 additions and 106 deletions

View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Framework\MultiShop.Shop.Framework.csproj" /> <ProjectReference Include="..\Framework\Props.Shop.Framework.csproj" />
<ProjectReference Include="..\..\..\Libraries\SimpleLogger\SimpleLogger.csproj" /> <ProjectReference Include="..\..\..\Libraries\SimpleLogger\SimpleLogger.csproj" />
</ItemGroup> </ItemGroup>

View File

@ -10,10 +10,10 @@ using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using GameServiceWarden.Core.Collection; using GameServiceWarden.Core.Collection;
using MultiShop.Shop.Framework; using Props.Shop.Framework;
using SimpleLogger; using SimpleLogger;
namespace MultiShop.Shop.AliExpressModule namespace Props.Shop.AliExpressModule
{ {
public class Shop : IShop public class Shop : IShop
{ {

View File

@ -7,10 +7,10 @@ using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using GameServiceWarden.Core.Collection; using GameServiceWarden.Core.Collection;
using MultiShop.Shop.Framework; using Props.Shop.Framework;
using SimpleLogger; using SimpleLogger;
namespace MultiShop.Shop.AliExpressModule namespace Props.Shop.AliExpressModule
{ {
class ShopEnumerator : IAsyncEnumerator<ProductListing> class ShopEnumerator : IAsyncEnumerator<ProductListing>
{ {

View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Framework\MultiShop.Shop.Framework.csproj" /> <ProjectReference Include="..\Framework\Props.Shop.Framework.csproj" />
<ProjectReference Include="..\..\..\Libraries\SimpleLogger\SimpleLogger.csproj" /> <ProjectReference Include="..\..\..\Libraries\SimpleLogger\SimpleLogger.csproj" />
</ItemGroup> </ItemGroup>

View File

@ -3,9 +3,9 @@ using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Threading; using System.Threading;
using MultiShop.Shop.Framework; using Props.Shop.Framework;
namespace MultiShop.Shop.BanggoodModule namespace Props.Shop.BanggoodModule
{ {
public class Shop : IShop public class Shop : IShop
{ {

View File

@ -9,10 +9,10 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml; using System.Xml;
using HtmlAgilityPack; using HtmlAgilityPack;
using MultiShop.Shop.Framework; using Props.Shop.Framework;
using SimpleLogger; using SimpleLogger;
namespace MultiShop.Shop.BanggoodModule namespace Props.Shop.BanggoodModule
{ {
class ShopEnumerator : IAsyncEnumerator<ProductListing> class ShopEnumerator : IAsyncEnumerator<ProductListing>
{ {

View File

@ -1,4 +1,4 @@
namespace MultiShop.Shop.Framework namespace Props.Shop.Framework
{ {
public enum Currency public enum Currency
{ {

View File

@ -4,7 +4,7 @@ using System.Net.Http;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace MultiShop.Shop.Framework namespace Props.Shop.Framework
{ {
public interface IShop : IAsyncEnumerable<ProductListing>, IDisposable public interface IShop : IAsyncEnumerable<ProductListing>, IDisposable
{ {

View File

@ -1,4 +1,4 @@
namespace MultiShop.Shop.Framework namespace Props.Shop.Framework
{ {
public struct ProductListing public struct ProductListing
{ {

View File

@ -20,8 +20,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\MultiShop.Shop\BanggoodModule\MultiShop.Shop.BanggoodModule.csproj" />
<ProjectReference Include="..\..\..\..\Libraries\SimpleLogger\SimpleLogger.csproj" /> <ProjectReference Include="..\..\..\..\Libraries\SimpleLogger\SimpleLogger.csproj" />
<ProjectReference Include="..\..\..\Props.Shop\AliExpressModule\Props.Shop.AliExpressModule.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -1,9 +1,9 @@
using MultiShop.Shop.Framework; using Props.Shop.Framework;
using SimpleLogger; using SimpleLogger;
using Xunit; using Xunit;
using Xunit.Abstractions; using Xunit.Abstractions;
namespace MultiShop.Shop.AliExpressModule.Tests namespace Props.Shop.AliExpressModule.Tests
{ {
public class ShopTest public class ShopTest
{ {

View File

@ -2,7 +2,7 @@ using System;
using SimpleLogger; using SimpleLogger;
using Xunit.Abstractions; using Xunit.Abstractions;
namespace MultiShop.Shop.BanggoodModule namespace Props.Shop.AliExpressModule
{ {
public class XUnitLogger : ILogReceiver public class XUnitLogger : ILogReceiver
{ {

View File

@ -20,8 +20,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\Props.Shop\BanggoodModule\Props.Shop.BanggoodModule.csproj" />
<ProjectReference Include="..\..\..\..\Libraries\SimpleLogger\SimpleLogger.csproj" /> <ProjectReference Include="..\..\..\..\Libraries\SimpleLogger\SimpleLogger.csproj" />
<ProjectReference Include="..\..\..\MultiShop.Shop\AliExpressModule\MultiShop.Shop.AliExpressModule.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -1,9 +1,9 @@
using MultiShop.Shop.Framework; using Props.Shop.Framework;
using SimpleLogger; using SimpleLogger;
using Xunit; using Xunit;
using Xunit.Abstractions; using Xunit.Abstractions;
namespace MultiShop.Shop.BanggoodModule.Tests namespace Props.Shop.BanggoodModule.Tests
{ {
public class ShopTest public class ShopTest
{ {

View File

@ -2,7 +2,7 @@ using System;
using SimpleLogger; using SimpleLogger;
using Xunit.Abstractions; using Xunit.Abstractions;
namespace MultiShop.Shop.AliExpressModule namespace Props.Shop.BanggoodModule
{ {
public class XUnitLogger : ILogReceiver public class XUnitLogger : ILogReceiver
{ {

View File

@ -17,7 +17,7 @@
"request": "launch", "request": "launch",
"preLaunchTask": "build", "preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path. // If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/server/bin/Debug/net5.0/MultiShop.dll", "program": "${workspaceFolder}/server/bin/Debug/net5.0/Props.dll",
"args": [], "args": [],
"cwd": "${workspaceFolder}/server", "cwd": "${workspaceFolder}/server",
"stopAtEntry": false, "stopAtEntry": false,

View File

@ -7,7 +7,7 @@
"type": "process", "type": "process",
"args": [ "args": [
"build", "build",
"${workspaceFolder}/server/MultiShop.csproj", "${workspaceFolder}/server/Props.csproj",
"/property:GenerateFullPaths=true", "/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary" "/consoleloggerparameters:NoSummary"
], ],
@ -19,7 +19,7 @@
"type": "process", "type": "process",
"args": [ "args": [
"publish", "publish",
"${workspaceFolder}/server/MultiShop.csproj", "${workspaceFolder}/server/Props.csproj",
"/property:GenerateFullPaths=true", "/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary" "/consoleloggerparameters:NoSummary"
], ],
@ -41,7 +41,7 @@
"args": [ "args": [
"watch", "watch",
"-p", "-p",
"${workspaceFolder}/server/MultiShop.csproj", "${workspaceFolder}/server/Props.csproj",
"run" "run"
], ],
"problemMatcher": ["$msCompile"] "problemMatcher": ["$msCompile"]

View File

@ -1,4 +1,4 @@
# multishop # props
## Project setup ## Project setup
``` ```

View File

@ -1,5 +1,5 @@
{ {
"name": "multishop", "name": "props",
"version": "0.1.0", "version": "0.1.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,

View File

@ -1,5 +1,5 @@
{ {
"name": "multishop", "name": "props",
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {

View File

@ -2,7 +2,7 @@ import { UserManager, WebStorageStateStore } from "oidc-client";
const userManager = new UserManager({ const userManager = new UserManager({
authority: window.location.origin, authority: window.location.origin,
client_id: "MultiShop", client_id: "Props",
redirect_uri: window.location.origin + "/authentication/login-callback", redirect_uri: window.location.origin + "/authentication/login-callback",
post_logout_redirect_uri: window.location.origin + "/authentication/logout-callback", post_logout_redirect_uri: window.location.origin + "/authentication/logout-callback",
response_type: "code", response_type: "code",

View File

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

View File

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

Before

Width:  |  Height:  |  Size: 799 B

After

Width:  |  Height:  |  Size: 799 B

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 215 B

View File

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

View File

@ -9,7 +9,7 @@
id="svg5" id="svg5"
inkscape:version="1.1 (c68e22c387, 2021-05-23)" inkscape:version="1.1 (c68e22c387, 2021-05-23)"
sodipodi:docname="logo.svg" sodipodi:docname="logo.svg"
inkscape:export-filename="C:\Users\yunya\Documents\MultiShop\MultiShop\client\src\assets\images\logo.png" inkscape:export-filename="C:\Users\yunya\Documents\Props\Props\client\src\assets\images\logo.png"
inkscape:export-xdpi="96" inkscape:export-xdpi="96"
inkscape:export-ydpi="96" inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

View File

@ -1,5 +1,5 @@
<template> <template>
<a v-if="visible" href="Identity/Account/Manage" class="btn"> <a v-if="visible" :href="manageUrl" class="btn">
<slot v-if="username" :displayName="username" name="username"> <slot v-if="username" :displayName="username" name="username">
{{ username }} {{ username }}
</slot> </slot>
@ -13,6 +13,7 @@
</template> </template>
<script> <script>
import { identityPaths } from "../services/authentication";
import WaitCircle from "./WaitCircle.vue"; import WaitCircle from "./WaitCircle.vue";
export default { export default {
components: { components: {
@ -27,7 +28,9 @@ export default {
} }
}, },
data() { data() {
return {}; return {
manageUrl: identityPaths.Manage,
};
}, },
computed: { computed: {
username() { username() {

View File

@ -2,7 +2,7 @@ import { UserManager, WebStorageStateStore } from "oidc-client";
const userManager = new UserManager({ const userManager = new UserManager({
authority: window.location.origin, authority: window.location.origin,
client_id: "MultiShop", client_id: "Props",
redirect_uri: window.location.origin + "/authentication/login-callback", redirect_uri: window.location.origin + "/authentication/login-callback",
post_logout_redirect_uri: window.location.origin + "/authentication/logout-callback", post_logout_redirect_uri: window.location.origin + "/authentication/logout-callback",
response_type: "code", response_type: "code",

View File

@ -1,4 +1,4 @@
const prefix = "MultiShop"; const prefix = "Props";
function put(key, value) { function put(key, value) {
if (value == null) return false; if (value == null) return false;
try { try {

View File

@ -1,4 +1,11 @@
module.exports = { module.exports = {
pages: {
index: {
entry: "src/main.js",
template: "public/index.html",
title: "Props"
}
},
css: { css: {
loaderOptions: { loaderOptions: {
sass: { sass: {

View File

@ -2,7 +2,7 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace MultiShop.Controllers namespace Props.Controllers
{ {
public class OidcConfigurationController : Controller public class OidcConfigurationController : Controller
{ {

View File

@ -2,9 +2,9 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using MultiShop.Options; using Props.Options;
namespace MultiShop.Server.Controllers namespace Props.Server.Controllers
{ {
[ApiController] [ApiController]
[Route("api/[controller]")] [Route("api/[controller]")]

View File

@ -4,11 +4,11 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using MultiShop.Data; using Props.Data;
using MultiShop.Models; using Props.Models;
using MultiShop.Shared.Models; using Props.Shared.Models;
namespace MultiShop.Server.Controllers namespace Props.Server.Controllers
{ {
[ApiController] [ApiController]

View File

@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace MultiShop.Controllers namespace Props.Controllers
{ {
// TODO: Create new shop search controller. // TODO: Create new shop search controller.
[Authorize] [Authorize]

View File

@ -1,4 +1,4 @@
using MultiShop.Models; using Props.Models;
using IdentityServer4.EntityFramework.Options; using IdentityServer4.EntityFramework.Options;
using Microsoft.AspNetCore.ApiAuthorization.IdentityServer; using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
@ -10,7 +10,7 @@ using System.Threading.Tasks;
using System.Text.Json; using System.Text.Json;
using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.EntityFrameworkCore.ChangeTracking;
namespace MultiShop.Data namespace Props.Data
{ {
public class ApplicationDbContext : ApiAuthorizationDbContext<ApplicationUser> public class ApplicationDbContext : ApiAuthorizationDbContext<ApplicationUser>
{ {

View File

@ -4,9 +4,9 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using MultiShop.Data; using Props.Data;
namespace MultiShop.Data.Migrations namespace Props.Data.Migrations
{ {
[DbContext(typeof(ApplicationDbContext))] [DbContext(typeof(ApplicationDbContext))]
[Migration("20210712080053_InitialCreate")] [Migration("20210712080053_InitialCreate")]
@ -253,7 +253,7 @@ namespace MultiShop.Data.Migrations
b.ToTable("AspNetUserTokens"); b.ToTable("AspNetUserTokens");
}); });
modelBuilder.Entity("MultiShop.Models.ApplicationUser", b => modelBuilder.Entity("Props.Models.ApplicationUser", b =>
{ {
b.Property<string>("Id") b.Property<string>("Id")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
@ -317,7 +317,7 @@ namespace MultiShop.Data.Migrations
b.ToTable("AspNetUsers"); b.ToTable("AspNetUsers");
}); });
modelBuilder.Entity("MultiShop.Models.ResultsPreferences", b => modelBuilder.Entity("Props.Models.ResultsPreferences", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
@ -338,7 +338,7 @@ namespace MultiShop.Data.Migrations
b.ToTable("ResultsPreferences"); b.ToTable("ResultsPreferences");
}); });
modelBuilder.Entity("MultiShop.Models.SearchOutline", b => modelBuilder.Entity("Props.Models.SearchOutline", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
@ -401,7 +401,7 @@ namespace MultiShop.Data.Migrations
b.ToTable("SearchOutline"); b.ToTable("SearchOutline");
}); });
modelBuilder.Entity("MultiShop.Shared.Models.ApplicationPreferences", b => modelBuilder.Entity("Props.Shared.Models.ApplicationPreferences", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
@ -438,7 +438,7 @@ namespace MultiShop.Data.Migrations
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b => modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{ {
b.HasOne("MultiShop.Models.ApplicationUser", null) b.HasOne("Props.Models.ApplicationUser", null)
.WithMany() .WithMany()
.HasForeignKey("UserId") .HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
@ -447,7 +447,7 @@ namespace MultiShop.Data.Migrations
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b => modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{ {
b.HasOne("MultiShop.Models.ApplicationUser", null) b.HasOne("Props.Models.ApplicationUser", null)
.WithMany() .WithMany()
.HasForeignKey("UserId") .HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
@ -462,7 +462,7 @@ namespace MultiShop.Data.Migrations
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
.IsRequired(); .IsRequired();
b.HasOne("MultiShop.Models.ApplicationUser", null) b.HasOne("Props.Models.ApplicationUser", null)
.WithMany() .WithMany()
.HasForeignKey("UserId") .HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
@ -471,35 +471,35 @@ namespace MultiShop.Data.Migrations
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b => modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{ {
b.HasOne("MultiShop.Models.ApplicationUser", null) b.HasOne("Props.Models.ApplicationUser", null)
.WithMany() .WithMany()
.HasForeignKey("UserId") .HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
.IsRequired(); .IsRequired();
}); });
modelBuilder.Entity("MultiShop.Models.ResultsPreferences", b => modelBuilder.Entity("Props.Models.ResultsPreferences", b =>
{ {
b.HasOne("MultiShop.Models.ApplicationUser", null) b.HasOne("Props.Models.ApplicationUser", null)
.WithOne("ResultsPreferences") .WithOne("ResultsPreferences")
.HasForeignKey("MultiShop.Models.ResultsPreferences", "ApplicationUserId"); .HasForeignKey("Props.Models.ResultsPreferences", "ApplicationUserId");
}); });
modelBuilder.Entity("MultiShop.Models.SearchOutline", b => modelBuilder.Entity("Props.Models.SearchOutline", b =>
{ {
b.HasOne("MultiShop.Models.ApplicationUser", null) b.HasOne("Props.Models.ApplicationUser", null)
.WithOne("SearchOutline") .WithOne("SearchOutline")
.HasForeignKey("MultiShop.Models.SearchOutline", "ApplicationUserId"); .HasForeignKey("Props.Models.SearchOutline", "ApplicationUserId");
}); });
modelBuilder.Entity("MultiShop.Shared.Models.ApplicationPreferences", b => modelBuilder.Entity("Props.Shared.Models.ApplicationPreferences", b =>
{ {
b.HasOne("MultiShop.Models.ApplicationUser", null) b.HasOne("Props.Models.ApplicationUser", null)
.WithOne("ApplicationPreferences") .WithOne("ApplicationPreferences")
.HasForeignKey("MultiShop.Shared.Models.ApplicationPreferences", "ApplicationUserId"); .HasForeignKey("Props.Shared.Models.ApplicationPreferences", "ApplicationUserId");
}); });
modelBuilder.Entity("MultiShop.Models.ApplicationUser", b => modelBuilder.Entity("Props.Models.ApplicationUser", b =>
{ {
b.Navigation("ApplicationPreferences") b.Navigation("ApplicationPreferences")
.IsRequired(); .IsRequired();

View File

@ -1,7 +1,7 @@
using System; using System;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
namespace MultiShop.Data.Migrations namespace Props.Data.Migrations
{ {
public partial class InitialCreate : Migration public partial class InitialCreate : Migration
{ {

View File

@ -3,9 +3,9 @@ using System;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using MultiShop.Data; using Props.Data;
namespace MultiShop.Data.Migrations namespace Props.Data.Migrations
{ {
[DbContext(typeof(ApplicationDbContext))] [DbContext(typeof(ApplicationDbContext))]
partial class ApplicationDbContextModelSnapshot : ModelSnapshot partial class ApplicationDbContextModelSnapshot : ModelSnapshot
@ -251,7 +251,7 @@ namespace MultiShop.Data.Migrations
b.ToTable("AspNetUserTokens"); b.ToTable("AspNetUserTokens");
}); });
modelBuilder.Entity("MultiShop.Models.ApplicationUser", b => modelBuilder.Entity("Props.Models.ApplicationUser", b =>
{ {
b.Property<string>("Id") b.Property<string>("Id")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
@ -315,7 +315,7 @@ namespace MultiShop.Data.Migrations
b.ToTable("AspNetUsers"); b.ToTable("AspNetUsers");
}); });
modelBuilder.Entity("MultiShop.Models.ResultsPreferences", b => modelBuilder.Entity("Props.Models.ResultsPreferences", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
@ -336,7 +336,7 @@ namespace MultiShop.Data.Migrations
b.ToTable("ResultsPreferences"); b.ToTable("ResultsPreferences");
}); });
modelBuilder.Entity("MultiShop.Models.SearchOutline", b => modelBuilder.Entity("Props.Models.SearchOutline", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
@ -399,7 +399,7 @@ namespace MultiShop.Data.Migrations
b.ToTable("SearchOutline"); b.ToTable("SearchOutline");
}); });
modelBuilder.Entity("MultiShop.Shared.Models.ApplicationPreferences", b => modelBuilder.Entity("Props.Shared.Models.ApplicationPreferences", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
@ -436,7 +436,7 @@ namespace MultiShop.Data.Migrations
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b => modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{ {
b.HasOne("MultiShop.Models.ApplicationUser", null) b.HasOne("Props.Models.ApplicationUser", null)
.WithMany() .WithMany()
.HasForeignKey("UserId") .HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
@ -445,7 +445,7 @@ namespace MultiShop.Data.Migrations
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b => modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{ {
b.HasOne("MultiShop.Models.ApplicationUser", null) b.HasOne("Props.Models.ApplicationUser", null)
.WithMany() .WithMany()
.HasForeignKey("UserId") .HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
@ -460,7 +460,7 @@ namespace MultiShop.Data.Migrations
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
.IsRequired(); .IsRequired();
b.HasOne("MultiShop.Models.ApplicationUser", null) b.HasOne("Props.Models.ApplicationUser", null)
.WithMany() .WithMany()
.HasForeignKey("UserId") .HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
@ -469,35 +469,35 @@ namespace MultiShop.Data.Migrations
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b => modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{ {
b.HasOne("MultiShop.Models.ApplicationUser", null) b.HasOne("Props.Models.ApplicationUser", null)
.WithMany() .WithMany()
.HasForeignKey("UserId") .HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
.IsRequired(); .IsRequired();
}); });
modelBuilder.Entity("MultiShop.Models.ResultsPreferences", b => modelBuilder.Entity("Props.Models.ResultsPreferences", b =>
{ {
b.HasOne("MultiShop.Models.ApplicationUser", null) b.HasOne("Props.Models.ApplicationUser", null)
.WithOne("ResultsPreferences") .WithOne("ResultsPreferences")
.HasForeignKey("MultiShop.Models.ResultsPreferences", "ApplicationUserId"); .HasForeignKey("Props.Models.ResultsPreferences", "ApplicationUserId");
}); });
modelBuilder.Entity("MultiShop.Models.SearchOutline", b => modelBuilder.Entity("Props.Models.SearchOutline", b =>
{ {
b.HasOne("MultiShop.Models.ApplicationUser", null) b.HasOne("Props.Models.ApplicationUser", null)
.WithOne("SearchOutline") .WithOne("SearchOutline")
.HasForeignKey("MultiShop.Models.SearchOutline", "ApplicationUserId"); .HasForeignKey("Props.Models.SearchOutline", "ApplicationUserId");
}); });
modelBuilder.Entity("MultiShop.Shared.Models.ApplicationPreferences", b => modelBuilder.Entity("Props.Shared.Models.ApplicationPreferences", b =>
{ {
b.HasOne("MultiShop.Models.ApplicationUser", null) b.HasOne("Props.Models.ApplicationUser", null)
.WithOne("ApplicationPreferences") .WithOne("ApplicationPreferences")
.HasForeignKey("MultiShop.Shared.Models.ApplicationPreferences", "ApplicationUserId"); .HasForeignKey("Props.Shared.Models.ApplicationPreferences", "ApplicationUserId");
}); });
modelBuilder.Entity("MultiShop.Models.ApplicationUser", b => modelBuilder.Entity("Props.Models.ApplicationUser", b =>
{ {
b.Navigation("ApplicationPreferences") b.Navigation("ApplicationPreferences")
.IsRequired(); .IsRequired();

View File

@ -1,4 +1,4 @@
namespace MultiShop.Shared.Models namespace Props.Shared.Models
{ {
public class ApplicationPreferences public class ApplicationPreferences
{ {

View File

@ -1,12 +1,12 @@
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using MultiShop.Shared.Models; using Props.Shared.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace MultiShop.Models namespace Props.Models
{ {
public class ApplicationUser : IdentityUser public class ApplicationUser : IdentityUser
{ {

View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq; using System.Linq;
using System.Text.Json; using System.Text.Json;
namespace MultiShop.Models namespace Props.Models
{ {
public class ResultsPreferences public class ResultsPreferences
{ {

View File

@ -2,9 +2,9 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Linq; using System.Linq;
using MultiShop.Shop.Framework; using Props.Shop.Framework;
namespace MultiShop.Models namespace Props.Models
{ {
public class SearchOutline public class SearchOutline
{ {

Some files were not shown because too many files have changed in this diff Show More