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

Merge pull request #2 from oqtane/master

Browse Source 
sync
This commit is contained in:
Shaun Walker 2020-04-11 11:07:39 -04:00 committed by GitHub
commit 93a09f6db8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 178 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Oqtane.Client/Modules/Admin/Logs/Detail.razor
View File

@ -10,52 +10,52 @@
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Date/Time: </label>
<Label For="dateTime" HelpText="The date and time of this log">Date/Time: </Label>
</td>
<td>
<input class="form-control" @bind="@_logDate" disabled />
<input id="dateTime" class="form-control" @bind="@_logDate" disabled />
</td>
</tr>
<tr>
<td>
<label class="control-label">Level: </label>
<Label For="level" HelpText="The level of this log">Level: </Label>
</td>
<td>
<input class="form-control" @bind="@_level" disabled />
<input id="level" class="form-control" @bind="@_level" disabled />
</td>
</tr>
<tr>
<td>
<label class="control-label">Feature: </label>
<Label For="feature" HelpText="The feature that was affected">Feature: </Label>
</td>
<td>
<input class="form-control" @bind="@_feature" disabled />
<input id="feature" class="form-control" @bind="@_feature" disabled />
</td>
</tr>
<tr>
<td>
<label class="control-label">Function: </label>
<Label For="function" HelpText="The function that was performed">Function: </Label>
</td>
<td>
<input class="form-control" @bind="@_function" disabled />
<input id="function" class="form-control" @bind="@_function" disabled />
</td>
</tr>
<tr>
<td>
<label class="control-label">Category: </label>
<Label For="category" HelpText="The categories that were affected">Category: </Label>
</td>
<td>
<input class="form-control" @bind="@_category" disabled />
<input id="category" class="form-control" @bind="@_category" disabled />
</td>
</tr>
@if (_pageName != string.Empty)
{
<tr>
<td>
<label class="control-label">Page: </label>
<Label For="page" HelpText="The page that was affected">Page: </Label>
</td>
<td>
<input class="form-control" @bind="@_pageName" disabled />
<input id="page" class="form-control" @bind="@_pageName" disabled />
</td>
</tr>
}
@ -63,10 +63,10 @@
{
<tr>
<td>
<label class="control-label">Module: </label>
<Label For="module" HelpText="The module that was affected">Module: </Label>
</td>
<td>
<input class="form-control" @bind="@_moduleTitle" disabled />
<input id="module" class="form-control" @bind="@_moduleTitle" disabled />
</td>
</tr>
}
@ -74,62 +74,62 @@
{
<tr>
<td>
<label class="control-label">User: </label>
<Label For="user" HelpText="The user that caused this log">User: </Label>
</td>
<td>
<input class="form-control" @bind="@_username" disabled />
<input id="user" class="form-control" @bind="@_username" disabled />
</td>
</tr>
}
<tr>
<td>
<label class="control-label">Url: </label>
<Label For="url" HelpText="The url the log comes from">Url: </Label>
</td>
<td>
<input class="form-control" @bind="@_url" disabled />
<input id="url" class="form-control" @bind="@_url" disabled />
</td>
</tr>
<tr>
<td>
<label class="control-label">Template: </label>
<Label For="template" HelpText="What the log is about">Template: </Label>
</td>
<td>
<input class="form-control" @bind="@_template" disabled />
<input id="template" class="form-control" @bind="@_template" disabled />
</td>
</tr>
<tr>
<td>
<label class="control-label">Message: </label>
<Label For="message" HelpText="The message that the system generated"class="control-label">Message: </Label>
</td>
<td>
<textarea class="form-control" @bind="@_message" rows="5" disabled></textarea>
<textarea id="message" class="form-control" @bind="@_message" rows="5" disabled></textarea>
</td>
</tr>
@if (!string.IsNullOrEmpty(_exception))
{
<tr>
<td>
<label class="control-label">Exception: </label>
<Label For="exception" HelpText="The exceptions generated by the system">Exception: </Label>
</td>
<td>
<textarea class="form-control" @bind="@_exception" rows="5" disabled></textarea>
<textarea id="exception" class="form-control" @bind="@_exception" rows="5" disabled></textarea>
</td>
</tr>
}
<tr>
<td>
<label class="control-label">Properties: </label>
<Label For="properties" HelpText="The properties that were affected">Properties: </Label>
</td>
<td>
<textarea class="form-control" @bind="@_properties" rows="5" disabled></textarea>
<textarea id="properties" class="form-control" @bind="@_properties" rows="5" disabled></textarea>
</td>
</tr>
<tr>
<td>
<label class="control-label">Server: </label>
<Label For="server" HelpText="The server that was affected">Server: </Label>
</td>
<td>
<input class="form-control" @bind="@_server" disabled />
<input id="server" class="form-control" @bind="@_server" disabled />
</td>
</tr>
</table>

2
Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
View File

@ -8,7 +8,7 @@
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Module: </label>
<Label For="module" HelpText="Upload a module from your system">Module: </Label>
</td>
<td>
<FileManager Filter="nupkg" ShowFiles="false" Folder="Modules" />

6
Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
View File

@ -6,15 +6,15 @@
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Name: </label>
<Label For="name" HelpText="The name of the module">Name: </Label>
</td>
<td>
<input class="form-control" @bind="@_name" />
<input id="name" class="form-control" @bind="@_name" />
</td>
</tr>
<tr>
<td colspan="2" align="center">
<label class="control-label">Permissions: </label>
<Label For="permissions" HelpText="Select who you want to access the module">Permissions: </Label>
<PermissionGrid EntityName="@EntityNames.ModuleDefinition" PermissionNames=PermissionNames.Utilize Permissions="@_permissions" @ref="_permissionGrid" />
</td>
</tr>

4
Oqtane.Client/Modules/Admin/Modules/Export.razor
View File

@ -7,10 +7,10 @@
<tbody>
<tr>
<td>
<label class="control-label">Content: </label>
<Label For="content" HelpText="Enter the module content">Content: </Label>
</td>
<td>
<textarea class="form-control" @bind="@_content" rows="5"></textarea>
<textarea id="content" class="form-control" @bind="@_content" rows="5"></textarea>
</td>
</tr>
</tbody>

4
Oqtane.Client/Modules/Admin/Modules/Import.razor
View File

@ -7,10 +7,10 @@
<tbody>
<tr>
<td>
<label for="Title" class="control-label">Content: </label>
<Label For="content" HelpText="Enter the module content">Content: </Label>
</td>
<td>
<textarea class="form-control" @bind="@_content" rows="5"></textarea>
<textarea id="content" class="form-control" @bind="@_content" rows="5"></textarea>
</td>
</tr>
</tbody>

14
Oqtane.Client/Modules/Admin/Modules/Settings.razor
View File

@ -33,18 +33,18 @@
<tbody>
<tr>
<td>
<label for="Title" class="control-label">Title: </label>
<Label For="title" HelpText="Enter the title of the module">Title: </Label>
</td>
<td>
<input type="text" name="Title" class="form-control" @bind="@_title" />
<input id="title" type="text" name="Title" class="form-control" @bind="@_title" />
</td>
</tr>
<tr>
<td>
<label for="Container" class="control-label">Container: </label>
<Label For="container" HelpText="Select the module's container">Container: </Label>
</td>
<td>
<select class="form-control" @bind="@_containerType">
<select id="container" class="form-control" @bind="@_containerType">
<option value="">&lt;Select Container&gt;</option>
@foreach (KeyValuePair<string, string> container in _containers)
{
@ -55,16 +55,16 @@
</tr>
<tr>
<td colspan="2" align="center">
<label for="Name" class="control-label">Permissions: </label>
<Label For="permissions" HelpText="Who do you want to be able to access the module">Permissions: </Label>
<PermissionGrid EntityName="@EntityNames.Module" PermissionNames="@_permissionNames" Permissions="@_permissions" @ref="_permissionGrid" />
</td>
</tr>
<tr>
<td>
<label for="Page" class="control-label">Page: </label>
<Label For="page" HelpText="The page that the module is on">Page: </Label>
</td>
<td>
<select class="form-control" @bind="@_pageId">
<select id="page" class="form-control" @bind="@_pageId">
@foreach (Page p in PageState.Pages)
{
<option value="@p.PageId">@p.Name</option>

36
Oqtane.Client/Modules/Admin/Profiles/Edit.razor
View File

@ -6,66 +6,66 @@
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Name: </label>
<Label For="name" HelpText="The name of this field">Name: </Label>
</td>
<td>
<input class="form-control" @bind="@_name" />
<input id="name" class="form-control" @bind="@_name" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Title: </label>
<Label For="title" HelpText="The title of the field">Title: </Label>
</td>
<td>
<input class="form-control" @bind="@_title" />
<input id="title" class="form-control" @bind="@_title" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Description: </label>
<Label For="description" HelpText="What the profile field is">Description: </Label>
</td>
<td>
<textarea class="form-control" @bind="@_description" rows="5"></textarea>
<textarea id="description" class="form-control" @bind="@_description" rows="5"></textarea>
</td>
</tr>
<tr>
<td>
<label class="control-label">Category: </label>
<Label For="category" HelpText="What larger category does this field belong to">Category: </Label>
</td>
<td>
<input class="form-control" @bind="@_category" />
<input id="category" class="form-control" @bind="@_category" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Order: </label>
<Label For="order" HelpText="What place is this field in a larger category list">Order: </Label>
</td>
<td>
<input class="form-control" @bind="@_vieworder" />
<input id="order" class="form-control" @bind="@_vieworder" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Length: </label>
<Label For="length" HelpText="What is the max amount of characters should this field accept">Length: </Label>
</td>
<td>
<input class="form-control" @bind="@_maxlength" />
<input id="length" class="form-control" @bind="@_maxlength" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Default Value: </label>
<Label For="defaultVal" HelpText="What value do you want this field to start with">Default Value: </Label>
</td>
<td>
<input class="form-control" @bind="@_defaultvalue" />
<input id="defaultVal" class="form-control" @bind="@_defaultvalue" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Required? </label>
<Label For="required" HelpText="Is a user required to input something into this field?">Required? </Label>
</td>
<td>
<select class="form-control" @bind="@_isrequired">
<select id="required" class="form-control" @bind="@_isrequired">
<option value="True">Yes</option>
<option value="False">No</option>
</select>
@ -73,10 +73,10 @@
</tr>
<tr>
<td>
<label class="control-label">Private? </label>
<Label For="private" HelpText="Is this field private?">Private? </Label>
</td>
<td>
<select class="form-control" @bind="@_isprivate">
<select id="private" class="form-control" @bind="@_isprivate">
<option value="True">Yes</option>
<option value="False">No</option>
</select>

64
Oqtane.Client/Modules/Admin/Site/Index.razor
View File

@ -12,31 +12,31 @@
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Name: </label>
<Label For="name" HelpText="Enter the site name">Name: </Label>
</td>
<td>
<input class="form-control" @bind="@_name" />
<input id="name" class="form-control" @bind="@_name" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Tenant: </label>
<Label For="tenant" HelpText="Enter the tenant for the site">Tenant: </Label>
</td>
<td>
<input class="form-control" @bind="@_tenant" readonly />
<input id="tenant" class="form-control" @bind="@_tenant" readonly />
</td>
</tr>
<tr>
<td>
<label class="control-label">Aliases: </label>
<Label For="alias" HelpText="Enter the alias for the server">Aliases: </Label>
</td>
<td>
<textarea class="form-control" @bind="@_urls" rows="3"></textarea>
<textarea id="alias" class="form-control" @bind="@_urls" rows="3"></textarea>
</td>
</tr>
<tr>
<td>
<label class="control-label">Logo: </label>
<Label For="logo" HelpText="Upload a logo for the site">Logo: </Label>
</td>
<td>
<FileManager FileId="@_logofileid.ToString()" Filter="@Constants.ImageFiles" @ref="_logofilemanager" />
@ -44,7 +44,7 @@
</tr>
<tr>
<td>
<label class="control-label">Favicon: </label>
<Label For="favicon" HelpText="Select Your default icon">Favicon: </Label>
</td>
<td>
<FileManager FileId="@_faviconfileid.ToString()" Filter="ico" @ref="_faviconfilemanager" />
@ -52,10 +52,10 @@
</tr>
<tr>
<td>
<label class="control-label">Default Theme: </label>
<Label For="defaultTheme" HelpText="Select the sites default theme">Default Theme: </Label>
</td>
<td>
<select class="form-control" @onchange="(e => ThemeChanged(e))">
<select id="defaultTheme" class="form-control" @onchange="(e => ThemeChanged(e))">
<option value="">&lt;Select Theme&gt;</option>
@foreach (KeyValuePair<string, string> item in _themes)
{
@ -73,10 +73,10 @@
</tr>
<tr>
<td>
<label class="control-label">Default Layout: </label>
<Label For="defaultLayout" HelpText="Select the sites default layout">Default Layout: </Label>
</td>
<td>
<select class="form-control" @bind="@_layouttype">
<select id="defaultLayout" class="form-control" @bind="@_layouttype">
<option value="">&lt;Select Layout&gt;</option>
@foreach (KeyValuePair<string, string> panelayout in _panelayouts)
{
@ -87,10 +87,10 @@
</tr>
<tr>
<td>
<label class="control-label">Default Container: </label>
<Label For="defaultContainer" HelpText="Select the default container for the site">Default Container: </Label>
</td>
<td>
<select class="form-control" @bind="@_containertype">
<select id="defaultContainer" class="form-control" @bind="@_containertype">
<option value="">&lt;Select Container&gt;</option>
@foreach (KeyValuePair<string, string> container in _containers)
{
@ -101,10 +101,10 @@
</tr>
<tr>
<td>
<label class="control-label">Allow User Registration? </label>
<Label For="allowRegister" HelpText="Do you want the users to be able to register for an account on the site">Allow User Registration? </Label>
</td>
<td>
<select class="form-control" @bind="@_allowregistration">
<select id="allowRegister" class="form-control" @bind="@_allowregistration">
<option value="True">Yes</option>
<option value="False">No</option>
</select>
@ -112,10 +112,10 @@
</tr>
<tr>
<td>
<label class="control-label">Is Deleted? </label>
<Label For="isDeleted" HelpText="Is this site deleted?">Is Deleted? </Label>
</td>
<td>
<select class="form-control" @bind="@_isdeleted">
<select id="isDeleted" class="form-control" @bind="@_isdeleted">
<option value="True">Yes</option>
<option value="False">No</option>
</select>
@ -127,42 +127,42 @@
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Host: </label>
<Label For="host" HelpText="Enter the host name of the server">Host: </Label>
</td>
<td>
<input class="form-control" @bind="@_smtphost" />
<input id="host" class="form-control" @bind="@_smtphost" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Port: </label>
<Label For="port" HelpText="Enter the port number for the server">Port: </Label>
</td>
<td>
<input class="form-control" @bind="@_smtpport" />
<input id="port" class="form-control" @bind="@_smtpport" />
</td>
</tr>
<tr>
<td>
<label class="control-label">SSL Enabled: </label>
<Label For="enabledSSl" HelpText="Specifiy if SSL is enabled for your server">SSL Enabled: </Label>
</td>
<td>
<input class="form-control" @bind="@_smtpssl" />
<input id="enabledSSl" class="form-control" @bind="@_smtpssl" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Username: </label>
<Label For="username" HelpText="Enter the username for the server">Username: </Label>
</td>
<td>
<input class="form-control" @bind="@_smtpusername" />
<input id="username" class="form-control" @bind="@_smtpusername" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Password: </label>
<Label For="password" HelpText="Enter the password for the server">Password: </Label>
</td>
<td>
<input type="password" class="form-control" @bind="@_smtppassword" />
<input id="password" type="password" class="form-control" @bind="@_smtppassword" />
</td>
</tr>
</table>
@ -171,10 +171,10 @@
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Is Enabled? </label>
<Label For="isEnabled" HelpText="Select whether you would like this site to be avaiable as a proggressive web application">Is Enabled? </Label>
</td>
<td>
<select class="form-control" @bind="@_pwaisenabled">
<select id="isEnabled" class="form-control" @bind="@_pwaisenabled">
<option value="True">Yes</option>
<option value="False">No</option>
</select>
@ -182,7 +182,7 @@
</tr>
<tr>
<td>
<label class="control-label">App Icon: </label>
<Label For="appIcon" HelpText="Include an application icon for your PWA">App Icon: </Label>
</td>
<td>
<FileManager FileId="@_pwaappiconfileid.ToString()" Filter="png" @ref="_pwaappiconfilemanager" />
@ -190,7 +190,7 @@
</tr>
<tr>
<td>
<label class="control-label">Splash Icon: </label>
<Label For="splashIcon" HelpText="Include a splash icon">Splash Icon: </Label>
</td>
<td>
<FileManager FileId="@_pwasplashiconfileid.ToString()" Filter="png" @ref="_pwasplashiconfilemanager" />

36
Oqtane.Client/Modules/Admin/Sites/Add.razor
View File

@ -17,10 +17,10 @@ else
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Tenant: </label>
<Label For="tenant" HelpText="Select the tenant for the site">Tenant: </Label>
</td>
<td>
<select class="form-control" @onchange="(e => TenantChanged(e))">
<select id="tenant" class="form-control" @onchange="(e => TenantChanged(e))">
<option value="-1">&lt;Select Tenant&gt;</option>
@foreach (Tenant tenant in _tenants)
{
@ -31,26 +31,26 @@ else
</tr>
<tr>
<td>
<label class="control-label">Name: </label>
<Label For="name" HelpText="Enter the name of the site">Name: </Label>
</td>
<td>
<input class="form-control" @bind="@_name" />
<input id="name" class="form-control" @bind="@_name" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Aliases: </label>
<Label For="alias" HelpText="Enter the alias for the server">Aliases: </Label>
</td>
<td>
<textarea class="form-control" @bind="@_urls" rows="3"></textarea>
<textarea id="alias" class="form-control" @bind="@_urls" rows="3"></textarea>
</td>
</tr>
<tr>
<td>
<label class="control-label">Default Theme: </label>
<Label For="defaultTheme" HelpText="Select the default theme for the website">Default Theme: </Label>
</td>
<td>
<select class="form-control" @onchange="(e => ThemeChanged(e))">
<select id="defaultTheme" class="form-control" @onchange="(e => ThemeChanged(e))">
<option value="">&lt;Select Theme&gt;</option>
@foreach (KeyValuePair<string, string> item in _themes)
{
@ -61,10 +61,10 @@ else
</tr>
<tr>
<td>
<label class="control-label">Default Layout: </label>
<Label For="defaultLayout" HelpText="Select the default layout for the site">Default Layout: </Label>
</td>
<td>
<select class="form-control" @bind="@_layouttype">
<select id="defaultLayout" class="form-control" @bind="@_layouttype">
<option value="">&lt;Select Layout&gt;</option>
@foreach (KeyValuePair<string, string> panelayout in _panelayouts)
{
@ -75,10 +75,10 @@ else
</tr>
<tr>
<td>
<label class="control-label">Default Container: </label>
<Label For="defaultContainer" HelpText="Select the default container for the site">Default Container: </Label>
</td>
<td>
<select class="form-control" @bind="@_containertype">
<select id="defaultContainer" class="form-control" @bind="@_containertype">
<option value="">&lt;Select Container&gt;</option>
@foreach (KeyValuePair<string, string> container in _containers)
{
@ -89,10 +89,10 @@ else
</tr>
<tr>
<td>
<label class="control-label">Site Template: </label>
<Label For="siteTemplate" HelpText="Select the site template">Site Template: </Label>
</td>
<td>
<select class="form-control" @bind="@_sitetemplatetype">
<select id="siteTemplate" class="form-control" @bind="@_sitetemplatetype">
<option value="">&lt;Select Site Template&gt;</option>
@foreach (SiteTemplate siteTemplate in _siteTemplates)
{
@ -105,18 +105,18 @@ else
{
<tr>
<td>
<label class="control-label">Host Username:</label>
<Label For="hostUsername" HelpText="Enter the username of the host for this site">Host Username:</Label>
</td>
<td>
<input class="form-control" @bind="@_username" readonly />
<input id="hostUsername" class="form-control" @bind="@_username" readonly />
</td>
</tr>
<tr>
<td>
<label class="control-label">Host Password:</label>
<Label For="hostPassword" HelpText="Enter the password for the host of this site">Host Password:</Label>
</td>
<td>
<input type="password" class="form-control" @bind="@_password" />
<input id="hostPassword" type="password" class="form-control" @bind="@_password" />
</td>
</tr>
}

28
Oqtane.Client/Modules/Admin/Sites/Edit.razor
View File

@ -11,34 +11,34 @@
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Name: </label>
<Label For="name" HelpText="Enter the name of the site">Name: </Label>
</td>
<td>
<input class="form-control" @bind="@_name" />
<input id="name" class="form-control" @bind="@_name" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Tenant: </label>
<Label For="tenant" HelpText="Enter the tenant for the site">Tenant: </Label>
</td>
<td>
<input class="form-control" @bind="@_tenant" readonly />
<input id="tenant" class="form-control" @bind="@_tenant" readonly />
</td>
</tr>
<tr>
<td>
<label class="control-label">Aliases: </label>
<Label For="alias" HelpText="Enter the alias for the server">Aliases: </Label>
</td>
<td>
<textarea class="form-control" @bind="@_urls" rows="3" />
<textarea id="alias" class="form-control" @bind="@_urls" rows="3" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Default Theme: </label>
<Label For="defaultTheme" HelpText="Select the default theme for the website">Default Theme: </Label>
</td>
<td>
<select class="form-control" @onchange="(e => ThemeChanged(e))">
<select id="defaultTheme" class="form-control" @onchange="(e => ThemeChanged(e))">
<option value="">&lt;Select Theme&gt;</option>
@foreach (KeyValuePair<string, string> item in _themes)
{
@ -56,10 +56,10 @@
</tr>
<tr>
<td>
<label class="control-label">Default Layout: </label>
<Label For="defaultLayout" HelpText="Select the default layout for the site">Default Layout: </Label>
</td>
<td>
<select class="form-control" @bind="@_layouttype">
<select id="defaultLayout" class="form-control" @bind="@_layouttype">
<option value="">&lt;Select Layout&gt;</option>
@foreach (KeyValuePair<string, string> panelayout in _panelayouts)
{
@ -70,10 +70,10 @@
</tr>
<tr>
<td>
<label class="control-label">Default Container: </label>
<Label For="defaultContainer" HelpText="Select the default container for the site">Default Container: </Label>
</td>
<td>
<select class="form-control" @bind="@_containertype">
<select id="defaultIdea" class="form-control" @bind="@_containertype">
<option value="">&lt;Select Container&gt;</option>
@foreach (KeyValuePair<string, string> container in _containers)
{
@ -84,10 +84,10 @@
</tr>
<tr>
<td>
<label class="control-label">Is Deleted? </label>
<Label For="isDeleted" HelpText="Has this site been deleted?">Is Deleted? </Label>
</td>
<td>
<select class="form-control" @bind="@_isdeleted">
<select id="isDeleted" class="form-control" @bind="@_isdeleted">
<option value="True">Yes</option>
<option value="False">No</option>
</select>

8
Oqtane.Client/Modules/Admin/Sql/Index.razor
View File

@ -13,10 +13,10 @@ else
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Tenant: </label>
<Label For="tenant" HelpText="Select the tenant for the SQL server">Tenant: </Label>
</td>
<td>
<select class="form-control" @bind="_tenantid">
<select id="teneant" class="form-control" @bind="_tenantid">
<option value="-1">&lt;Select Tenant&gt;</option>
@foreach (Tenant tenant in _tenants)
{
@ -27,10 +27,10 @@ else
</tr>
<tr>
<td>
<label class="control-label">SQL Query: </label>
<Label For="sqlQeury" HelpText="Enter the query for the SQL server">SQL Query: </Label>
</td>
<td>
<textarea class="form-control" @bind="@_sql" rows="5"></textarea>
<textarea id="sqlQeury" class="form-control" @bind="@_sql" rows="5"></textarea>
</td>
</tr>
</table>

28
Oqtane.Client/Modules/Admin/Tenants/Add.razor
View File

@ -7,18 +7,18 @@
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Name: </label>
<Label For="name" HelpText="Enter the name for the tenant">Name: </Label>
</td>
<td>
<input class="form-control" @bind="@name" />
<input id="name" class="form-control" @bind="@name" />
</td>
</tr>
<tr>
<td>
<label for="Title" class="control-label">Database Type: </label>
<Label For="databaseType" HelpText="Select the database type for the tenant">Database Type: </Label>
</td>
<td>
<select class="custom-select" @bind="@type">
<select id="databaseType" class="custom-select" @bind="@type">
<option value="LocalDB">Local Database</option>
<option value="SQLServer">SQL Server</option>
</select>
@ -26,26 +26,26 @@
</tr>
<tr>
<td>
<label for="Title" class="control-label">Server: </label>
<Label For="server" HelpText="Enter the server for the tenant">Server: </Label>
</td>
<td>
<input type="text" class="form-control" @bind="@server" />
<input id="server" type="text" class="form-control" @bind="@server" />
</td>
</tr>
<tr>
<td>
<label for="Title" class="control-label">Database: </label>
<Label For="database" HelpText="Enter the database for the tenant">Database: </Label>
</td>
<td>
<input type="text" class="form-control" @bind="@database" />
<input id="database" type="text" class="form-control" @bind="@database" />
</td>
</tr>
<tr>
<td>
<label for="Title" class="control-label">Integrated Security: </label>
<Label For="integratedSecurity" HelpText="Select if you want integrated security or not">Integrated Security: </Label>
</td>
<td>
<select class="custom-select" @onchange="SetIntegratedSecurity">
<select id="integratedSecurity" class="custom-select" @onchange="SetIntegratedSecurity">
<option value="true" selected>True</option>
<option value="false">False</option>
</select>
@ -53,18 +53,18 @@
</tr>
<tr style="@integratedsecurity">
<td>
<label for="Title" class="control-label">Username: </label>
<Label For="username" HelpText="Enter the username for the integrated security">Username: </Label>
</td>
<td>
<input type="text" class="form-control" @bind="@username" />
<input id="username" type="text" class="form-control" @bind="@username" />
</td>
</tr>
<tr style="@integratedsecurity">
<td>
<label for="Title" class="control-label">Password: </label>
<Label For="password" HelpText="Enter the password for the integrated security">Password: </Label>
</td>
<td>
<input type="password" class="form-control" @bind="@password" />
<input id="password" type="password" class="form-control" @bind="@password" />
</td>
</tr>
</table>

10
Oqtane.Client/Modules/Admin/Tenants/Edit.razor
View File

@ -6,25 +6,25 @@
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Name: </label>
<Label For="name" HelpText="Enter the nameof the tenant">Name: </Label>
</td>
<td>
@if (name == Constants.MasterTenant)
{
<input class="form-control" @bind="@name" readonly />
<input id="name" class="form-control" @bind="@name" readonly />
}
else
{
<input class="form-control" @bind="@name" />
<input id="name" class="form-control" @bind="@name" />
}
</td>
</tr>
<tr>
<td>
<label class="control-label">Connection String: </label>
<Label For="connectionString" HelpText="Enter the connection string for the tenant">Connection String: </Label>
</td>
<td>
<input class="form-control" @bind="@connectionstring" />
<input id="integratedSecurity" class="form-control" @bind="@connectionstring" />
</td>
</tr>

4
Oqtane.Client/Modules/Admin/Themes/Add.razor
View File

@ -8,10 +8,10 @@
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Theme: </label>
<Label For="theme" HelpText="Upload a theme from your system">Theme: </Label>
</td>
<td>
<FileManager Filter="nupkg" ShowFiles="false" Folder="Themes" />
<FileManager Filter="nupkg" ShowFiles="false" Folder="Themes" />
</td>
</tr>
</table>

2
Oqtane.Client/Modules/Admin/Upgrade/Index.razor
View File

@ -8,7 +8,7 @@
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Framework: </label>
<Label For="framework" HelpText="Upload a framework to update the site">Framework: </Label>
</td>
<td>
<FileManager Filter="nupkg" ShowFiles="false" Folder="Framework" />

12
Oqtane.Client/Modules/Admin/UserProfile/Add.razor
View File

@ -9,10 +9,10 @@
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">To: </label>
<Label For="to" HelpText="Select the user it is going to">To: </Label>
</td>
<td>
<select class="form-control" @bind="@userid">
<select id="to" class="form-control" @bind="@userid">
<option value="-1">&lt;Select User&gt;</option>
@if (userroles != null)
{
@ -26,18 +26,18 @@
</tr>
<tr>
<td>
<label class="control-label">Subject: </label>
<Label For="subject" HelpText="Enter the subject of the message">Subject: </Label>
</td>
<td>
<input class="form-control" @bind="@subject" />
<input id="subject" class="form-control" @bind="@subject" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Message: </label>
<Label For="message" HelpText="Enter the message">Message: </Label>
</td>
<td>
<textarea class="form-control" @bind="@body" rows="5" />
<textarea id="message" class="form-control" @bind="@body" rows="5" />
</td>
</tr>
</table>

4
Oqtane.Client/Modules/Admin/Users/Edit.razor
View File

@ -88,10 +88,10 @@
}
<tr>
<td>
<label class="control-label">Is Deleted? </label>
<Label For="isDeleted" HelpText="Has the user been deleted">Is Deleted? </Label>
</td>
<td>
<select class="form-control" @bind="@isdeleted">
<select id="isDeleted" class="form-control" @bind="@isdeleted">
<option value="True">Yes</option>
<option value="False">No</option>
</select>

12
Oqtane.Client/Modules/Admin/Users/Roles.razor
View File

@ -12,10 +12,10 @@ else
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">Role: </label>
<Label For="role" HelpText="What is the role of this user">Role: </Label>
</td>
<td>
<select class="form-control" @bind="@roleid">
<select id="role" class="form-control" @bind="@roleid">
<option value="-1">&lt;Select Role&gt;</option>
@foreach (Role role in roles)
{
@ -26,18 +26,18 @@ else
</tr>
<tr>
<td>
<label class="control-label">Effective Date: </label>
<Label For="effectiveDate" HelpText="The date that this role is implemented">Effective Date: </Label>
</td>
<td>
<input class="form-control" @bind="@effectivedate" />
<input id="effectiveDate" class="form-control" @bind="@effectivedate" />
</td>
</tr>
<tr>
<td>
<label class="control-label">Expiry Date: </label>
<Label For="expiryDate" HelpText="The date that this role expires">Expiry Date: </Label>
</td>
<td>
<input class="form-control" @bind="@expirydate" />
<input id="expiryDate" class="form-control" @bind="@expirydate" />
</td>
</tr>
</table>

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

@ -74,7 +74,6 @@ namespace Oqtane.Infrastructure
}
}
public bool IsInstalled
{
get
@ -212,6 +211,8 @@ namespace Oqtane.Infrastructure
private static void ModuleMigration(Assembly assembly, string connectionString)
{
Console.WriteLine($"Migrating assembly {assembly.FullName}");
var dbUpgradeConfig = DeployChanges.To.SqlDatabase(connectionString)
.WithScriptsEmbeddedInAssembly(assembly); // scripts must be included as Embedded Resources
var dbUpgrade = dbUpgradeConfig.Build();
@ -238,17 +239,19 @@ namespace Oqtane.Infrastructure
}
}
}
private static void TenantMigration(string connectionString, string dataDirectory)
{
Console.WriteLine("Tenant migration");
var assemblies = AppDomain.CurrentDomain.GetAssemblies()
.Where(item => item.FullName != null && item.FullName.Contains(".Module.")).ToArray();
.Where(item => item.FullName != null && item.FullName.ToLower().Contains(".module.")).ToArray();
// get tenants
using (var db = new InstallationContext(connectionString))
{
foreach (var tenant in db.Tenant.ToList())
{
Console.WriteLine($"Migrating tenant {tenant.Name}");
connectionString = NormalizeConnectionString(tenant.DBConnectionString, dataDirectory);
// upgrade framework
var dbUpgradeConfig = DeployChanges.To.SqlDatabase(connectionString)

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

@ -107,7 +107,7 @@ namespace Oqtane.Infrastructure
}
}
if (install && restart)
if (install)
{
if (restart)
{

7
Oqtane.Server/Program.cs
View File

@ -16,8 +16,11 @@ namespace Oqtane.Server
var host = BuildWebHost(args);
using (var serviceScope = host.Services.GetRequiredService<IServiceScopeFactory>().CreateScope())
{
var manager = serviceScope.ServiceProvider.GetService<DatabaseManager>();
manager.StartupMigration();
var installationManager = serviceScope.ServiceProvider.GetService<IInstallationManager>();
// install any modules or themes stored in nugget, then restart app to ensure all is loaded in order
installationManager.InstallPackages("Modules,Themes", true);
var databaseManager = serviceScope.ServiceProvider.GetService<DatabaseManager>();
databaseManager.StartupMigration();
}
host.Run();
}

5
Oqtane.Server/Startup.cs
View File

@ -201,7 +201,7 @@ namespace Oqtane
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IInstallationManager installationManager)
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
if (env.IsDevelopment())
{
@ -214,9 +214,6 @@ namespace Oqtane
app.UseHsts();
}
// install any modules or themes
installationManager.InstallPackages("Modules,Themes", false);
app.UseHttpsRedirection();
app.UseStaticFiles();
app.UseBlazorFrameworkFiles();