Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor App to eliminate 2 database calls

Browse Source
This commit is contained in:
sbwalker 2024-02-19 16:16:08 -05:00
parent cdc0dee6f5
commit 121a865bb8
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Oqtane.Server/Components/App.razor
View File

@ -171,27 +171,9 @@
// initial stylesheets (to prevent FOUC in interactive rendering) // initial stylesheets (to prevent FOUC in interactive rendering)
if (_renderMode == RenderModes.Interactive) if (_renderMode == RenderModes.Interactive)
{ {
var themes = ThemeRepository.GetThemes().ToList(); var themeType = (string.IsNullOrEmpty(page.ThemeType)) ? site.DefaultThemeType : page.ThemeType;
var resources = new List<Resource>(); var theme = site.Themes.FirstOrDefault(item => item.Themes.Any(item => item.TypeName == themeType));
if (string.IsNullOrEmpty(page.ThemeType)) ManageStyleSheets(GetStyleSheetResources(site, page, theme), alias, theme.ThemeName);
{
page.ThemeType = site.DefaultThemeType;
}
var theme = themes.FirstOrDefault(item => item.Themes.Any(item => item.TypeName == page.ThemeType));
if (theme?.Resources != null)
{
resources.AddRange(theme.Resources);
}
var type = Type.GetType(page.ThemeType);
if (type != null)
{
var obj = Activator.CreateInstance(type) as IThemeControl;
if (obj?.Resources != null)
{
resources.AddRange(obj.Resources);
}
}
ManageStyleSheets(resources, alias, theme.ThemeName);
} }
// scripts // scripts
@ -216,11 +198,10 @@
if (culture == null) if (culture == null)
{ {
// get default language for site // get default language for site
var languages = LanguageRepository.GetLanguages(alias.SiteId); if (site.Languages.Any())
if (languages.Any())
{ {
// use default language if specified otherwise use first language in collection // use default language if specified otherwise use first language in collection
culture = (languages.Where(l => l.IsDefault).SingleOrDefault() ?? languages.First()).Code; culture = (site.Languages.Where(l => l.IsDefault).SingleOrDefault() ?? site.Languages.First()).Code;
} }
else else
{ {
@ -596,6 +577,25 @@
} }
} }
private List<Resource> GetStyleSheetResources(Site site, Page page, Theme theme)
{
var resources = new List<Resource>();
if (theme?.Resources != null)
{
resources.AddRange(theme.Resources);
}
var type = Type.GetType(page.ThemeType);
if (type != null)
{
var obj = Activator.CreateInstance(type) as IThemeControl;
if (obj?.Resources != null)
{
resources.AddRange(obj.Resources);
}
}
return resources;
}
private void ManageScripts(List<Resource> resources, Alias alias) private void ManageScripts(List<Resource> resources, Alias alias)
{ {
if (resources != null) if (resources != null)