Namespace fix (#335)

Oqtane.Server/Controllers/AliasController.cs

@@ -10,6 +10,7 @@ using System.Globalization;
 using Oqtane.Enums;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Controllers
 {

Oqtane.Server/Controllers/FileController.cs

@@ -16,6 +16,7 @@ using System.Net;
 using Oqtane.Enums;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 // ReSharper disable StringIndexOfIsCultureSpecific.1
 

Oqtane.Server/Controllers/FolderController.cs

@@ -8,6 +8,7 @@ using System.Net;
 using Oqtane.Enums;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Security;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/JobController.cs

@@ -9,6 +9,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Enums;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Controllers
 {

Oqtane.Server/Controllers/JobLogController.cs

@@ -6,6 +6,7 @@ using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Controllers
 {

Oqtane.Server/Controllers/LogController.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using Microsoft.AspNetCore.Authorization;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Shared;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/ModuleController.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using Oqtane.Enums;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Security;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/ModuleDefinitionController.cs

@@ -12,6 +12,8 @@ using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
 using Oqtane.Security;
 using System;
+using Oqtane.Repository.Interfaces;
+
 // ReSharper disable StringIndexOfIsCultureSpecific.1
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/NotificationController.cs

@@ -6,6 +6,7 @@ using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Security;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/PageController.cs

@@ -9,6 +9,7 @@ using System.Net;
 using Oqtane.Enums;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Controllers
 {

Oqtane.Server/Controllers/PageModuleController.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using Oqtane.Enums;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Security;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/ProfileController.cs

@@ -6,6 +6,7 @@ using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Controllers
 {

Oqtane.Server/Controllers/RoleController.cs

@@ -6,6 +6,7 @@ using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Controllers
 {

Oqtane.Server/Controllers/SettingController.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using Oqtane.Enums;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Controllers
 {

Oqtane.Server/Controllers/SiteController.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using Oqtane.Enums;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Controllers
 {

Oqtane.Server/Controllers/SiteTemplateController.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Oqtane.Models;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Controllers
 {

Oqtane.Server/Controllers/SqlController.cs

@@ -11,6 +11,7 @@ using System.Data;
 using System.Dynamic;
 using Newtonsoft.Json;
 using System;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Controllers
 {

Oqtane.Server/Controllers/TenantController.cs

@@ -6,6 +6,7 @@ using Oqtane.Enums;
 using Oqtane.Shared;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Controllers
 {

Oqtane.Server/Controllers/ThemeController.cs

@@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Hosting;
 using Oqtane.Enums;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 // ReSharper disable StringIndexOfIsCultureSpecific.1
 

Oqtane.Server/Controllers/UserController.cs

@@ -13,6 +13,7 @@ using System.Net;
 using Oqtane.Enums;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Controllers
 {

Oqtane.Server/Controllers/UserRoleController.cs

@@ -6,6 +6,7 @@ using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Controllers
 {

Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -6,7 +6,11 @@ using System.Reflection;
 using System.Runtime.Loader;
 using Microsoft.Extensions.Hosting;
 using Oqtane.Infrastructure;
+using Oqtane.Infrastructure.Jobs;
+using Oqtane.Interfaces;
+using Oqtane.Models;
 using Oqtane.Modules;
+using File = System.IO.File;
 
 // ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection

Oqtane.Server/Infrastructure/DatabaseManager.cs

@@ -15,6 +15,8 @@ using Oqtane.Controllers;
 using Oqtane.Extensions;
 using Oqtane.Models;
 using Oqtane.Repository;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Shared;
 using File = System.IO.File;
 

Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs

@@ -6,10 +6,10 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Oqtane.Models;
-using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Shared;
 
-namespace Oqtane.Infrastructure
+namespace Oqtane.Infrastructure.Jobs
 {
     public abstract class HostedServiceBase : IHostedService, IDisposable
     {

Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs

@@ -5,10 +5,10 @@ using System.Net;
 using System.Net.Mail;
 using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Models;
-using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Shared;
 
-namespace Oqtane.Infrastructure
+namespace Oqtane.Infrastructure.Jobs
 {
     public class NotificationJob : HostedServiceBase
     {

Oqtane.Server/Infrastructure/LogManager.cs

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using Oqtane.Enums;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Security;
 // ReSharper disable StringIndexOfIsCultureSpecific.2
 // ReSharper disable StringIndexOfIsCultureSpecific.1

Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs

@@ -1,11 +1,11 @@
-using Oqtane.Models;
-using Oqtane.Infrastructure.Interfaces;
-using System.Collections.Generic;
-using Oqtane.Repository;
+using System.Collections.Generic;
 using Microsoft.AspNetCore.Hosting;
+using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Models;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Shared;
 
-namespace Oqtane.SiteTemplates
+namespace Oqtane.Infrastructure.SiteTemplates
 {
     public class DefaultSiteTemplate : ISiteTemplate
     {

Oqtane.Server/Infrastructure/SyncManager.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Infrastructure
 {

Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Modules.HtmlText.Models;
 using Oqtane.Modules.HtmlText.Repository;
 using Microsoft.AspNetCore.Http;
 using Oqtane.Shared;
@@ -8,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using Oqtane.Enums;
 using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Modules.Models.HtmlText;
 
 namespace Oqtane.Modules.HtmlText.Controllers
 {

Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs

@@ -1,7 +1,7 @@
 using Oqtane.Models;
-using Oqtane.Modules.HtmlText.Models;
 using Oqtane.Modules.HtmlText.Repository;
 using System.Net;
+using Oqtane.Modules.Models.HtmlText;
 
 namespace Oqtane.Modules.HtmlText.Manager
 {

Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs

@@ -1,7 +1,11 @@
 using Microsoft.EntityFrameworkCore;
-using Oqtane.Modules.HtmlText.Models;
 using Oqtane.Repository;
 using Microsoft.AspNetCore.Http;
+using Oqtane.Interfaces;
+using Oqtane.Models;
+using Oqtane.Modules.Models.HtmlText;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Modules.HtmlText.Repository
 {

Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs

@@ -1,6 +1,8 @@
 using Microsoft.EntityFrameworkCore;
 using System.Linq;
-using Oqtane.Modules.HtmlText.Models;
+using Oqtane.Interfaces;
+using Oqtane.Models;
+using Oqtane.Modules.Models.HtmlText;
 
 namespace Oqtane.Modules.HtmlText.Repository
 {

Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs

@@ -1,4 +1,4 @@
-using Oqtane.Modules.HtmlText.Models;
+using Oqtane.Modules.Models.HtmlText;
 
 namespace Oqtane.Modules.HtmlText.Repository
 {

Oqtane.Server/Pages/Login.cshtml

@@ -1,3 +1,3 @@
 @page "/pages/login"
-@namespace  Oqtane.Pages
+@namespace Oqtane.Pages
 @model Oqtane.Pages.LoginModel

Oqtane.Server/Program.cs

@@ -1,13 +1,10 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
-// DO NOT REMOVE - needed for client-side Blazor
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
-using Microsoft.AspNetCore;
 using Microsoft.Extensions.DependencyInjection;
-using Oqtane.Infrastructure;
+using Oqtane.Infrastructure; // DO NOT REMOVE - needed for client-side Blazor
 
-namespace Oqtane.Server
+namespace Oqtane
 {
     public class Program
     {

Oqtane.Server/Repository/AliasRepository.cs

@@ -4,6 +4,8 @@ using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Repository
 {

Oqtane.Server/Repository/Context/DBContextBase.cs

@@ -4,9 +4,11 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
+using Oqtane.Interfaces;
 using Oqtane.Models;
+using Oqtane.Repository.Interfaces;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Context
 {
     public class DBContextBase :  IdentityUserContext<IdentityUser> 
     {

Oqtane.Server/Repository/Context/InstallationContext.cs

@@ -1,8 +1,7 @@
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Context
 {
     
     public class InstallationContext : DbContext

Oqtane.Server/Repository/Context/MasterDBContext.cs

@@ -2,9 +2,10 @@
 using System.Linq;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
+using Oqtane.Interfaces;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Context
 {
     public class MasterDBContext : DbContext
     {

Oqtane.Server/Repository/Context/TenantDBContext.cs

@@ -1,8 +1,9 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
+using Oqtane.Repository.Interfaces;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Context
 {
     public class TenantDBContext : DBContextBase
     {

Oqtane.Server/Repository/FileRepository.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Shared;
 
 namespace Oqtane.Repository

Oqtane.Server/Repository/FolderRepository.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Shared;
 
 namespace Oqtane.Repository

Oqtane.Server/Repository/Interfaces/IAliasRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IAliasRepository
     {

Oqtane.Server/Repository/Interfaces/IFileRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IFileRepository
     {

Oqtane.Server/Repository/Interfaces/IFolderRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IFolderRepository
     {

Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IJobLogRepository
     {

Oqtane.Server/Repository/Interfaces/IJobRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IJobRepository
     {

Oqtane.Server/Repository/Interfaces/ILogRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface ILogRepository
     {

Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IModuleDefinitionRepository
     {

Oqtane.Server/Repository/Interfaces/IModuleRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IModuleRepository
     {

Oqtane.Server/Repository/Interfaces/INotificationRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface INotificationRepository
     {

Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IPageModuleRepository
     {

Oqtane.Server/Repository/Interfaces/IPageRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IPageRepository
     {

Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IPermissionRepository
     {

Oqtane.Server/Repository/Interfaces/IProfileRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IProfileRepository
     {

Oqtane.Server/Repository/Interfaces/IRoleRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IRoleRepository
     {

Oqtane.Server/Repository/Interfaces/ISettingRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface ISettingRepository
     {

Oqtane.Server/Repository/Interfaces/ISiteRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface ISiteRepository
     {

Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface ISiteTemplateRepository
     {

Oqtane.Server/Repository/Interfaces/ISqlRepository.cs

@@ -1,7 +1,7 @@
 using System.Data.SqlClient;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface ISqlRepository
     {

Oqtane.Server/Repository/Interfaces/ITenantRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface ITenantRepository
     {

Oqtane.Server/Repository/Interfaces/ITenantResolver.cs

@@ -1,6 +1,6 @@
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface ITenantResolver
     {

Oqtane.Server/Repository/Interfaces/IThemeRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IThemeRepository
     {

Oqtane.Server/Repository/Interfaces/IUserRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IUserRepository
     {

Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Repository
+namespace Oqtane.Repository.Interfaces
 {
     public interface IUserRoleRepository
     {

Oqtane.Server/Repository/JobLogRepository.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Repository
 {

Oqtane.Server/Repository/JobRepository.cs

@@ -4,6 +4,8 @@ using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Repository
 {

Oqtane.Server/Repository/LogRepository.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Repository
 {

Oqtane.Server/Repository/ModuleDefinitionRepository.cs

@@ -5,6 +5,8 @@ using System.Reflection;
 using Microsoft.Extensions.Caching.Memory;
 using Oqtane.Models;
 using Oqtane.Modules;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Shared;
 
 namespace Oqtane.Repository

Oqtane.Server/Repository/ModuleRepository.cs

@@ -7,6 +7,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Models;
 using Oqtane.Modules;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 using Module = Oqtane.Models.Module;
 
 namespace Oqtane.Repository

Oqtane.Server/Repository/NotificationRepository.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Repository
 {

Oqtane.Server/Repository/PageModuleRepository.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Repository
 {

Oqtane.Server/Repository/PageRepository.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Shared;
 
 namespace Oqtane.Repository

Oqtane.Server/Repository/PermissionRepository.cs

@@ -5,6 +5,8 @@ using System.Text;
 using System.Text.Json;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Repository
 {

Oqtane.Server/Repository/ProfileRepository.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Repository
 {

Oqtane.Server/Repository/RoleRepository.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Repository
 {

Oqtane.Server/Repository/SettingRepository.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Repository
 {

Oqtane.Server/Repository/SiteRepository.cs

@@ -8,6 +8,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Models;
 using Oqtane.Modules;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Shared;
 using Module = Oqtane.Models.Module;
 

Oqtane.Server/Repository/SiteTemplateRepository.cs

@@ -5,6 +5,7 @@ using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Models;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Repository
 {

Oqtane.Server/Repository/SqlRepository.cs

@@ -2,6 +2,7 @@
 using System.Data;
 using System.Data.SqlClient;
 using Oqtane.Models;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Repository
 {

Oqtane.Server/Repository/TenantRepository.cs

@@ -4,6 +4,8 @@ using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Shared;
 
 namespace Oqtane.Repository

Oqtane.Server/Repository/TenantResolver.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Http;
 using Oqtane.Models;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Shared;
 
 namespace Oqtane.Repository

Oqtane.Server/Repository/ThemeRepository.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Oqtane.Models;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Themes;
 
 namespace Oqtane.Repository

Oqtane.Server/Repository/UserRepository.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Repository
 {

Oqtane.Server/Repository/UserRoleRepository.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Repository
 {

Oqtane.Server/Security/ClaimsPrincipalFactory.cs

@@ -7,6 +7,7 @@ using Oqtane.Shared;
 using System.Collections.Generic;
 using System.Linq;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Security
 {

Oqtane.Server/Security/UserPermissions.cs

@@ -3,6 +3,7 @@ using Oqtane.Models;
 using System.Linq;
 using System.Security.Claims;
 using Oqtane.Repository;
+using Oqtane.Repository.Interfaces;
 
 namespace Oqtane.Security
 {

Oqtane.Server/Startup.cs

@@ -17,8 +17,11 @@ using Microsoft.OpenApi.Models;
 using Oqtane.Infrastructure;
 using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
+using Oqtane.Repository.Context;
+using Oqtane.Repository.Interfaces;
 using Oqtane.Security;
 using Oqtane.Services;
+using Oqtane.Services.Interfaces;
 using Oqtane.Shared; 
 
 namespace Oqtane

Oqtane.Server/appsettings.json

@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": ""
+    "DefaultConnection": "Data Source=(LocalDb)\\MSSQLLocalDB;AttachDbFilename=W:\\Oqtane\\oqtane.framework\\Oqtane.Server\\Data\\Oqtane-202004031921.mdf;Initial Catalog=Oqtane-202004031921;Integrated Security=SSPI;"
   },
   "Installation": {
     "DefaultAlias": "",
@@ -12,4 +12,4 @@
     "DefaultLayout": "",
     "DefaultContainer": ""
   }
-}
+}