Skip to content

Commit bb09d00

Browse files
author
Vladislav
committed
Merge remote-tracking branch 'origin/master'
2 parents d59b569 + a2505f4 commit bb09d00

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+390
-248
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,3 +366,7 @@ eFormAPI/eFormAPI/Plugins/
366366
eFormAPI/EformBase\.Pn/Plugins/EformBase/
367367

368368
eFormAPI/Plugins/Vehicles\.Pn/Vehicles/
369+
370+
eform-client/src/app/plugins/modules/
371+
372+
eFormAPI/Plugins/

‎eFormAPI/EformBase.Pn/Infrastructure/Data/Base/BaseEntity.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System.ComponentModel.DataAnnotations;
2+
using System.ComponentModel.DataAnnotations.Schema;
3+
4+
namespace EformBase.Pn.Infrastructure.Data.Base
5+
{
6+
public class BaseEntity
7+
{
8+
[Key]
9+
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
10+
public int Id { get; set; }
11+
}
12+
}

eFormAPI/eFormAPI/Infrastructure/Data/BaseDbContext.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/Data/BaseDbContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System.Data.Entity;
2-
using eFormAPI.Web.Infrastructure.Data.Entities;
2+
using EformBase.Pn.Infrastructure.Data.Entities;
33
using Microsoft.AspNet.Identity.EntityFramework;
44

5-
namespace eFormAPI.Web.Infrastructure.Data
5+
namespace EformBase.Pn.Infrastructure.Data
66
{
77
public class BaseDbContext : IdentityDbContext<EformUser, EformRole,
88
int, EformUserLogin, EformUserRole, EformUserClaim>

eFormAPI/eFormAPI/Infrastructure/Data/Entities/EformRole.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformRole.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.AspNet.Identity.EntityFramework;
22

3-
namespace eFormAPI.Web.Infrastructure.Data.Entities
3+
namespace EformBase.Pn.Infrastructure.Data.Entities
44
{
55
public class EformRole : IdentityRole<int, EformUserRole>
66
{

eFormAPI/eFormAPI/Infrastructure/Data/Entities/EformRoleStore.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformRoleStore.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.AspNet.Identity.EntityFramework;
22

3-
namespace eFormAPI.Web.Infrastructure.Data.Entities
3+
namespace EformBase.Pn.Infrastructure.Data.Entities
44
{
55
public class EformRoleStore : RoleStore<EformRole, int, EformUserRole>
66
{

eFormAPI/eFormAPI/Infrastructure/Data/Entities/EformUser.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Microsoft.AspNet.Identity;
44
using Microsoft.AspNet.Identity.EntityFramework;
55

6-
namespace eFormAPI.Web.Infrastructure.Data.Entities
6+
namespace EformBase.Pn.Infrastructure.Data.Entities
77
{
88
public class EformUser : IdentityUser<int, EformUserLogin, EformUserRole,
99
EformUserClaim>

eFormAPI/eFormAPI/Infrastructure/Data/Entities/EformUserClaim.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUserClaim.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.AspNet.Identity.EntityFramework;
22

3-
namespace eFormAPI.Web.Infrastructure.Data.Entities
3+
namespace EformBase.Pn.Infrastructure.Data.Entities
44
{
55
public class EformUserClaim : IdentityUserClaim<int>
66
{

eFormAPI/eFormAPI/Infrastructure/Data/Entities/EformUserLogin.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUserLogin.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.AspNet.Identity.EntityFramework;
22

3-
namespace eFormAPI.Web.Infrastructure.Data.Entities
3+
namespace EformBase.Pn.Infrastructure.Data.Entities
44
{
55
public class EformUserLogin : IdentityUserLogin<int>
66
{

eFormAPI/eFormAPI/Infrastructure/Data/Entities/EformUserRole.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUserRole.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.AspNet.Identity.EntityFramework;
22

3-
namespace eFormAPI.Web.Infrastructure.Data.Entities
3+
namespace EformBase.Pn.Infrastructure.Data.Entities
44
{
55
public class EformUserRole : IdentityUserRole<int>
66
{

eFormAPI/eFormAPI/Infrastructure/Data/Entities/EformUserStore.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUserStore.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.AspNet.Identity.EntityFramework;
22

3-
namespace eFormAPI.Web.Infrastructure.Data.Entities
3+
namespace EformBase.Pn.Infrastructure.Data.Entities
44
{
55
public class EformUserStore : UserStore<EformUser, EformRole, int,
66
EformUserLogin, EformUserRole, EformUserClaim>

0 commit comments

Comments
 (0)