kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #416 from chlupac/SiteInstall

Browse Source 
Get custom theme and layout on a default install
This commit is contained in:
Shaun Walker 2020-04-28 09:02:55 -04:00 committed by GitHub
commit eebe5d8d8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Oqtane.Client/UI/Installer.razor
View File

@ -179,31 +179,8 @@
}; };
var installation = await InstallationService.Install(config); var installation = await InstallationService.Install(config);
//TODO: Should be moved to Database manager
if (installation.Success) if (installation.Success)
{ {
Site site = new Site();
site.TenantId = -1; // will be populated on server
site.Name = "Default Site";
site.LogoFileId = null;
site.FaviconFileId = null;
site.DefaultThemeType = Constants.DefaultTheme;
site.DefaultLayoutType = Constants.DefaultLayout;
site.DefaultContainerType = Constants.DefaultContainer;
site.PwaIsEnabled = false;
site.PwaAppIconFileId = null;
site.PwaSplashIconFileId = null;
site.AllowRegistration = false;
site = await SiteService.AddSiteAsync(site, null);
User user = new User();
user.SiteId = site.SiteId;
user.Username = _hostUsername;
user.Password = _hostPassword;
user.Email = _hostEmail;
user.DisplayName = _hostUsername;
user = await UserService.AddUserAsync(user);
NavigationManager.NavigateTo("", true); NavigationManager.NavigateTo("", true);
} }
else else

1
Oqtane.Server/Controllers/InstallationController.cs
View File

@ -44,6 +44,7 @@ namespace Oqtane.Controllers
_config.Reload(); _config.Reload();
} }
_databaseManager.BuildDefaultSite(config.Password, config.HostEmail);
installation.Success = true; installation.Success = true;
return installation; return installation;
} }

2
Oqtane.Server/Infrastructure/DatabaseManager.cs
View File

@ -315,7 +315,7 @@ namespace Oqtane.Infrastructure
} }
} }
private void BuildDefaultSite(string password, string email) public void BuildDefaultSite(string password, string email)
{ {
using (var scope = _serviceScopeFactory.CreateScope()) using (var scope = _serviceScopeFactory.CreateScope())
{ {