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

Merge pull request #29 from sbwalker/master

Browse Source 
Resolves Issue #9
This commit is contained in:
Shaun Walker 2019-06-19 08:38:25 -04:00 committed by GitHub
commit 13920e1599
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 107 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/App.razor
View File

@ -5,7 +5,7 @@
<SiteRouter OnStateChange="@ChangeState" /> <SiteRouter OnStateChange="@ChangeState" />
</CascadingValue> </CascadingValue>
@functions { @code {
private PageState PageState { get; set; } private PageState PageState { get; set; }
private void ChangeState(PageState pagestate) private void ChangeState(PageState pagestate)

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

@ -23,7 +23,7 @@
</ul> </ul>
<br /><br /> <br /><br />
@functions { @code {
List<Page> pages; List<Page> pages;
protected override void OnInit() protected override void OnInit()

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

@ -14,17 +14,17 @@
@((MarkupString)Message) @((MarkupString)Message)
<div class="form-group"> <div class="form-group">
<label for="Username" class="control-label">Username: </label> <label for="Username" class="control-label">Username: </label>
<input type="text" name="Username" class="form-control" placeholder="Username" bind="@Username" /> <input type="text" name="Username" class="form-control" placeholder="Username" @bind="@Username" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="Password" class="control-label">Password: </label> <label for="Password" class="control-label">Password: </label>
<input type="password" name="Password" class="form-control" placeholder="Password" bind="@Password" /> <input type="password" name="Password" class="form-control" placeholder="Password" @bind="@Password" />
</div> </div>
<button type="button" class="btn btn-primary" onclick="@Login">Login</button> <button type="button" class="btn btn-primary" @onclick="@Login">Login</button>
<NavLink class="btn btn-secondary" href="/">Cancel</NavLink> <NavLink class="btn btn-secondary" href="/">Cancel</NavLink>
</div> </div>
@functions { @code {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Anonymous; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Anonymous; } }
public string Message { get; set; } = "<div class=\"alert alert-info\" role=\"alert\">Use host/host For Demo Access</div>"; public string Message { get; set; } = "<div class=\"alert alert-info\" role=\"alert\">Use host/host For Demo Access</div>";

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

@ -29,7 +29,7 @@ else
</table> </table>
} }
@functions { @code {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } }
List<ModuleDefinition> moduledefinitions; List<ModuleDefinition> moduledefinitions;

14
Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
View File

@ -16,7 +16,7 @@
<label for="Title" class="control-label">Title: </label> <label for="Title" class="control-label">Title: </label>
</td> </td>
<td> <td>
<input type="text" name="Title" class="form-control" bind="@title" /> <input type="text" name="Title" class="form-control" @bind="@title" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -24,7 +24,7 @@
<label for="Container" class="control-label">Container: </label> <label for="Container" class="control-label">Container: </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@containertype"> <select class="form-control" @bind="@containertype">
<option value="">&lt;Select Container&gt;</option> <option value="">&lt;Select Container&gt;</option>
@foreach (KeyValuePair<string, string> container in containers) @foreach (KeyValuePair<string, string> container in containers)
{ {
@ -38,7 +38,7 @@
<label for="ViewPermissions" class="control-label">View Permissions: </label> <label for="ViewPermissions" class="control-label">View Permissions: </label>
</td> </td>
<td> <td>
<input type="text" name="ViewPermissions" class="form-control" bind="@viewpermissions" /> <input type="text" name="ViewPermissions" class="form-control" @bind="@viewpermissions" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -46,7 +46,7 @@
<label for="EditPermissions" class="control-label">Edit Permissions: </label> <label for="EditPermissions" class="control-label">Edit Permissions: </label>
</td> </td>
<td> <td>
<input type="text" name="EditPermissions" class="form-control" bind="@editpermissions" /> <input type="text" name="EditPermissions" class="form-control" @bind="@editpermissions" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -54,7 +54,7 @@
<label for="Page" class="control-label">Page: </label> <label for="Page" class="control-label">Page: </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@pageid"> <select class="form-control" @bind="@pageid">
@foreach (Page p in PageState.Pages) @foreach (Page p in PageState.Pages)
{ {
<option value="@p.PageId">@p.Name</option> <option value="@p.PageId">@p.Name</option>
@ -63,10 +63,10 @@
</td> </td>
</tr> </tr>
</table> </table>
<button class="btn btn-success" onclick="@SaveModule">Save</button> <button class="btn btn-success" @onclick="@SaveModule">Save</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
@functions { @code {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Edit; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Edit; } }
public override string Title { get { return "Module Settings"; } } public override string Title { get { return "Module Settings"; } }

24
Oqtane.Client/Modules/Admin/Pages/Add.razor
View File

@ -14,7 +14,7 @@
<label for="Name" class="control-label">Name: </label> <label for="Name" class="control-label">Name: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@name" /> <input class="form-control" @bind="@name" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -22,7 +22,7 @@
<label for="Name" class="control-label">Path: </label> <label for="Name" class="control-label">Path: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@path" /> <input class="form-control" @bind="@path" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -30,7 +30,7 @@
<label for="Name" class="control-label">Parent: </label> <label for="Name" class="control-label">Parent: </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@parentid"> <select class="form-control" @bind="@parentid">
<option value="">&lt;Select Parent&gt;</option> <option value="">&lt;Select Parent&gt;</option>
@foreach (Page p in PageState.Pages) @foreach (Page p in PageState.Pages)
{ {
@ -44,7 +44,7 @@
<label for="Name" class="control-label">Order: </label> <label for="Name" class="control-label">Order: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@order" /> <input class="form-control" @bind="@order" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -52,7 +52,7 @@
<label for="Name" class="control-label">Navigation? </label> <label for="Name" class="control-label">Navigation? </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@isnavigation"> <select class="form-control" @bind="@isnavigation">
<option value="true">Yes</option> <option value="true">Yes</option>
<option value="false">No</option> <option value="false">No</option>
</select> </select>
@ -63,7 +63,7 @@
<label for="Name" class="control-label">Theme: </label> <label for="Name" class="control-label">Theme: </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@themetype"> <select class="form-control" @bind="@themetype">
<option value="">&lt;Select Theme&gt;</option> <option value="">&lt;Select Theme&gt;</option>
@foreach (KeyValuePair<string, string> item in themes) @foreach (KeyValuePair<string, string> item in themes)
{ {
@ -77,7 +77,7 @@
<label for="Name" class="control-label">Layout: </label> <label for="Name" class="control-label">Layout: </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@layouttype"> <select class="form-control" @bind="@layouttype">
<option value="">&lt;Select Layout&gt;</option> <option value="">&lt;Select Layout&gt;</option>
@foreach (KeyValuePair<string, string> panelayout in panelayouts) @foreach (KeyValuePair<string, string> panelayout in panelayouts)
{ {
@ -91,7 +91,7 @@
<label for="Name" class="control-label">Icon: </label> <label for="Name" class="control-label">Icon: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@icon" /> <input class="form-control" @bind="@icon" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -99,7 +99,7 @@
<label for="Name" class="control-label">View Permissions: </label> <label for="Name" class="control-label">View Permissions: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@viewpermissions" /> <input class="form-control" @bind="@viewpermissions" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -107,14 +107,14 @@
<label for="Name" class="control-label">Edit Permissions: </label> <label for="Name" class="control-label">Edit Permissions: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@editpermissions" /> <input class="form-control" @bind="@editpermissions" />
</td> </td>
</tr> </tr>
</table> </table>
<button class="btn btn-success" onclick="@SavePage">Save</button> <button class="btn btn-success" @onclick="@SavePage">Save</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
@functions { @code {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } }
Dictionary<string, string> themes = new Dictionary<string, string>(); Dictionary<string, string> themes = new Dictionary<string, string>();

24
Oqtane.Client/Modules/Admin/Pages/Delete.razor
View File

@ -14,7 +14,7 @@
<label for="Name" class="control-label">Name: </label> <label for="Name" class="control-label">Name: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@name" readonly /> <input class="form-control" @bind="@name" readonly />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -22,7 +22,7 @@
<label for="Name" class="control-label">Path: </label> <label for="Name" class="control-label">Path: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@path" readonly /> <input class="form-control" @bind="@path" readonly />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -30,7 +30,7 @@
<label for="Name" class="control-label">Parent: </label> <label for="Name" class="control-label">Parent: </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@parentid" readonly> <select class="form-control" @bind="@parentid" readonly>
<option value="">&lt;Select Parent&gt;</option> <option value="">&lt;Select Parent&gt;</option>
@foreach (Page p in PageState.Pages) @foreach (Page p in PageState.Pages)
{ {
@ -44,7 +44,7 @@
<label for="Name" class="control-label">Order: </label> <label for="Name" class="control-label">Order: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@order" readonly /> <input class="form-control" @bind="@order" readonly />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -52,7 +52,7 @@
<label for="Name" class="control-label">Navigation? </label> <label for="Name" class="control-label">Navigation? </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@isnavigation" readonly> <select class="form-control" @bind="@isnavigation" readonly>
<option value="true">Yes</option> <option value="true">Yes</option>
<option value="false">No</option> <option value="false">No</option>
</select> </select>
@ -63,7 +63,7 @@
<label for="Name" class="control-label">Theme: </label> <label for="Name" class="control-label">Theme: </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@themetype"> <select class="form-control" @bind="@themetype">
<option value="">&lt;Select Theme&gt;</option> <option value="">&lt;Select Theme&gt;</option>
@foreach (KeyValuePair<string, string> item in themes) @foreach (KeyValuePair<string, string> item in themes)
{ {
@ -77,7 +77,7 @@
<label for="Name" class="control-label">Layout: </label> <label for="Name" class="control-label">Layout: </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@layouttype"> <select class="form-control" @bind="@layouttype">
<option value="">&lt;Select Layout&gt;</option> <option value="">&lt;Select Layout&gt;</option>
@foreach (KeyValuePair<string, string> panelayout in panelayouts) @foreach (KeyValuePair<string, string> panelayout in panelayouts)
{ {
@ -91,7 +91,7 @@
<label for="Name" class="control-label">Icon: </label> <label for="Name" class="control-label">Icon: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@icon" readonly /> <input class="form-control" @bind="@icon" readonly />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -99,7 +99,7 @@
<label for="Name" class="control-label">View Permissions: </label> <label for="Name" class="control-label">View Permissions: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@viewpermissions" readonly /> <input class="form-control" @bind="@viewpermissions" readonly />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -107,14 +107,14 @@
<label for="Name" class="control-label">Edit Permissions: </label> <label for="Name" class="control-label">Edit Permissions: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@editpermissions" readonly /> <input class="form-control" @bind="@editpermissions" readonly />
</td> </td>
</tr> </tr>
</table> </table>
<button class="btn btn-danger" onclick="@DeletePage">Delete</button> <button class="btn btn-danger" @onclick="@DeletePage">Delete</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
@functions { @code {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } }
Dictionary<string, string> themes = new Dictionary<string, string>(); Dictionary<string, string> themes = new Dictionary<string, string>();

24
Oqtane.Client/Modules/Admin/Pages/Edit.razor
View File

@ -15,7 +15,7 @@
<label for="Name" class="control-label">Name: </label> <label for="Name" class="control-label">Name: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@name" /> <input class="form-control" @bind="@name" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -23,7 +23,7 @@
<label for="Name" class="control-label">Path: </label> <label for="Name" class="control-label">Path: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@path" /> <input class="form-control" @bind="@path" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -31,7 +31,7 @@
<label for="Name" class="control-label">Parent: </label> <label for="Name" class="control-label">Parent: </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@parentid"> <select class="form-control" @bind="@parentid">
<option value="">&lt;Select Parent&gt;</option> <option value="">&lt;Select Parent&gt;</option>
@foreach (Page p in PageState.Pages) @foreach (Page p in PageState.Pages)
{ {
@ -45,7 +45,7 @@
<label for="Name" class="control-label">Order: </label> <label for="Name" class="control-label">Order: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@order" /> <input class="form-control" @bind="@order" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -53,7 +53,7 @@
<label for="Name" class="control-label">Navigation? </label> <label for="Name" class="control-label">Navigation? </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@isnavigation"> <select class="form-control" @bind="@isnavigation">
<option value="true">Yes</option> <option value="true">Yes</option>
<option value="false">No</option> <option value="false">No</option>
</select> </select>
@ -64,7 +64,7 @@
<label for="Name" class="control-label">Theme: </label> <label for="Name" class="control-label">Theme: </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@themetype"> <select class="form-control" @bind="@themetype">
<option value="">&lt;Select Theme&gt;</option> <option value="">&lt;Select Theme&gt;</option>
@foreach (KeyValuePair<string, string> item in themes) @foreach (KeyValuePair<string, string> item in themes)
{ {
@ -78,7 +78,7 @@
<label for="Name" class="control-label">Layout: </label> <label for="Name" class="control-label">Layout: </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@layouttype"> <select class="form-control" @bind="@layouttype">
<option value="">&lt;Select Layout&gt;</option> <option value="">&lt;Select Layout&gt;</option>
@foreach (KeyValuePair<string, string> panelayout in panelayouts) @foreach (KeyValuePair<string, string> panelayout in panelayouts)
{ {
@ -92,7 +92,7 @@
<label for="Name" class="control-label">Icon: </label> <label for="Name" class="control-label">Icon: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@icon" /> <input class="form-control" @bind="@icon" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -100,7 +100,7 @@
<label for="Name" class="control-label">View Permissions: </label> <label for="Name" class="control-label">View Permissions: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@viewpermissions" /> <input class="form-control" @bind="@viewpermissions" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -108,14 +108,14 @@
<label for="Name" class="control-label">Edit Permissions: </label> <label for="Name" class="control-label">Edit Permissions: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@editpermissions" /> <input class="form-control" @bind="@editpermissions" />
</td> </td>
</tr> </tr>
</table> </table>
<button class="btn btn-success" onclick="@SavePage">Save</button> <button class="btn btn-success" @onclick="@SavePage">Save</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
@functions { @code {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } }
Dictionary<string, string> themes = new Dictionary<string, string>(); Dictionary<string, string> themes = new Dictionary<string, string>();

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

@ -35,6 +35,6 @@ else
<ActionLink Action="Add" Text="Add Page" /> <ActionLink Action="Add" Text="Add Page" />
} }
@functions { @code {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } }
} }

6
Oqtane.Client/Modules/Admin/Register/Index.razor
View File

@ -11,17 +11,17 @@
<div class="container"> <div class="container">
<div class="form-group"> <div class="form-group">
<label for="Username" class="control-label">Email: </label> <label for="Username" class="control-label">Email: </label>
<input type="text" name="Username" class="form-control" placeholder="Username" bind="@Username" /> <input type="text" name="Username" class="form-control" placeholder="Username" @bind="@Username" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="Password" class="control-label">Password: </label> <label for="Password" class="control-label">Password: </label>
<input type="password" name="Password" class="form-control" placeholder="Password" bind="@Password" /> <input type="password" name="Password" class="form-control" placeholder="Password" @bind="@Password" />
</div> </div>
<button type="button" class="btn btn-primary">Register</button> <button type="button" class="btn btn-primary">Register</button>
<NavLink class="btn btn-secondary" href="/">Cancel</NavLink> <NavLink class="btn btn-secondary" href="/">Cancel</NavLink>
</div> </div>
@functions { @code {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Anonymous; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Anonymous; } }
public string Username { get; set; } = ""; public string Username { get; set; } = "";

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

@ -21,7 +21,7 @@ else
<label for="Name" class="control-label">Tenant: </label> <label for="Name" class="control-label">Tenant: </label>
</td> </td>
<td> <td>
<select class="form-control" bind="@tenantid"> <select class="form-control" @bind="@tenantid">
<option value="">&lt;Select Tenant&gt;</option> <option value="">&lt;Select Tenant&gt;</option>
@foreach (Tenant tenant in tenants) @foreach (Tenant tenant in tenants)
{ {
@ -35,7 +35,7 @@ else
<label for="Name" class="control-label">Name: </label> <label for="Name" class="control-label">Name: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@name" /> <input class="form-control" @bind="@name" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -43,7 +43,7 @@ else
<label for="Name" class="control-label">Alias: </label> <label for="Name" class="control-label">Alias: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@url" /> <input class="form-control" @bind="@url" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -51,15 +51,15 @@ else
<label for="Name" class="control-label">Logo: </label> <label for="Name" class="control-label">Logo: </label>
</td> </td>
<td> <td>
<input class="form-control" bind="@logo" /> <input class="form-control" @bind="@logo" />
</td> </td>
</tr> </tr>
</table> </table>
<button class="btn btn-success" onclick="@SaveSite">Save</button> <button class="btn btn-success" @onclick="@SaveSite">Save</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
} }
@functions { @code {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } }
List<Tenant> tenants; List<Tenant> tenants;

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

@ -30,7 +30,7 @@ else
<ActionLink Action="Add" Text="Add Site" /> <ActionLink Action="Add" Text="Add Site" />
} }
@functions { @code {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } }
List<Site> sites; List<Site> sites;

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

@ -28,7 +28,7 @@ else
</table> </table>
} }
@functions { @code {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } }
List<Theme> Themes; List<Theme> Themes;

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

@ -29,7 +29,7 @@ else
</table> </table>
} }
@functions { @code {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } }
List<User> Users; List<User> Users;

2
Oqtane.Client/Modules/Controls/ActionLink.razor
View File

@ -10,7 +10,7 @@
<NavLink class="@buttonClass" href="@url">@text</NavLink> <NavLink class="@buttonClass" href="@url">@text</NavLink>
} }
@functions { @code {
[Parameter] [Parameter]
private string Action { get; set; } private string Action { get; set; }

4
Oqtane.Client/Modules/Counter/Index.razor
View File

@ -2,10 +2,10 @@
@inherits ModuleBase @inherits ModuleBase
Current count: @currentCount Current count: @currentCount
<br /> <br />
<button class="btn btn-primary" onclick="@IncrementCount">Click me</button> <button class="btn btn-primary" @onclick="@IncrementCount">Click me</button>
<br /><br /> <br /><br />
@functions { @code {
int currentCount = 0; int currentCount = 0;
void IncrementCount() void IncrementCount()

6
Oqtane.Client/Modules/HtmlText/Edit.razor
View File

@ -16,15 +16,15 @@
<label for="Name" class="control-label">Content: </label> <label for="Name" class="control-label">Content: </label>
</td> </td>
<td> <td>
<textarea class="form-control" bind="@content" rows="5" style="width:400px;" /> <textarea class="form-control" @bind="@content" rows="5" style="width:400px;" />
</td> </td>
</tr> </tr>
</table> </table>
<button class="btn btn-success" onclick="@SaveContent">Save</button> <button class="btn btn-success" @onclick="@SaveContent">Save</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
</form> </form>
@functions { @code {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Edit; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Edit; } }
public override string Title { get { return "Edit Html/Text"; } } public override string Title { get { return "Edit Html/Text"; } }

2
Oqtane.Client/Modules/HtmlText/Index.razor
View File

@ -12,7 +12,7 @@
<br /><ActionLink Action="Edit" /><br /><br /> <br /><ActionLink Action="Edit" /><br /><br />
@functions { @code {
string content; string content;
protected override async Task OnInitAsync() protected override async Task OnInitAsync()

2
Oqtane.Client/Modules/Weather/Index.razor
View File

@ -31,7 +31,7 @@ else
</table> </table>
} }
@functions { @code {
WeatherForecast[] forecasts; WeatherForecast[] forecasts;
protected override async Task OnInitAsync() protected override async Task OnInitAsync()

4
Oqtane.Client/Oqtane.Client.csproj
View File

@ -27,8 +27,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview4-19216-03" /> <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview6.19307.2" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview4-19216-03" PrivateAssets="all" /> <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
Oqtane.Client/Shared/Container.razor
View File

@ -5,7 +5,7 @@
@DynamicComponent @DynamicComponent
</CascadingValue> </CascadingValue>
@functions { @code {
[CascadingParameter] [CascadingParameter]
protected PageState PageState { get; set; } protected PageState PageState { get; set; }

2
Oqtane.Client/Shared/ModuleInstance.razor
View File

@ -3,7 +3,7 @@
@DynamicComponent @DynamicComponent
@functions { @code {
[CascadingParameter] [CascadingParameter]
protected PageState PageState { get; set; } protected PageState PageState { get; set; }

2
Oqtane.Client/Shared/Pane.razor
View File

@ -13,7 +13,7 @@
@DynamicComponent @DynamicComponent
</div> </div>
@functions { @code {
[CascadingParameter] [CascadingParameter]
protected PageState PageState { get; set; } protected PageState PageState { get; set; }

2
Oqtane.Client/Shared/PaneLayout.razor
View File

@ -3,7 +3,7 @@
@DynamicComponent @DynamicComponent
@functions { @code {
[CascadingParameter] [CascadingParameter]
protected PageState PageState { get; set; } protected PageState PageState { get; set; }

7
Oqtane.Client/Shared/SiteRouter.razor
View File

@ -5,6 +5,7 @@
@using System.Collections.Generic @using System.Collections.Generic
@using Oqtane.Shared @using Oqtane.Shared
@using Microsoft.JSInterop @using Microsoft.JSInterop
@using Microsoft.AspNetCore.Components.Routing
@inject SiteState SiteState @inject SiteState SiteState
@inject IUriHelper UriHelper @inject IUriHelper UriHelper
@inject IJSRuntime jsRuntime @inject IJSRuntime jsRuntime
@ -19,7 +20,7 @@
@DynamicComponent @DynamicComponent
@functions { @code {
[CascadingParameter] PageState PageState { get; set; } [CascadingParameter] PageState PageState { get; set; }
@ -236,9 +237,9 @@
} }
} }
private async void OnLocationChanged(object sender, string AbsoluteUri) private async void OnLocationChanged(object sender, LocationChangedEventArgs args)
{ {
_absoluteUri = AbsoluteUri; _absoluteUri = args.Location;
await LocationChanged(); await LocationChanged();
} }

2
Oqtane.Client/Shared/Theme.razor
View File

@ -2,7 +2,7 @@
@DynamicComponent @DynamicComponent
@functions { @code {
[CascadingParameter] PageState PageState { get; set; } [CascadingParameter] PageState PageState { get; set; }
RenderFragment DynamicComponent { get; set; } RenderFragment DynamicComponent { get; set; }

2
Oqtane.Client/Themes/AdminContainer.razor
View File

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
@functions { @code {
string closeurl; string closeurl;
protected override void OnInit() protected override void OnInit()

12
Oqtane.Client/Themes/Controls/ControlPanel.razor
View File

@ -31,7 +31,7 @@
<label for="Module" class="control-label" style="color: white !important;">Module: </label> <label for="Module" class="control-label" style="color: white !important;">Module: </label>
@if (moduledefinitions != null) @if (moduledefinitions != null)
{ {
<select class="form-control" bind="@moduledefinitionname"> <select class="form-control" @bind="@moduledefinitionname">
<option value="">&lt;Select Module&gt;</option> <option value="">&lt;Select Module&gt;</option>
@foreach (var moduledefinition in moduledefinitions) @foreach (var moduledefinition in moduledefinitions)
{ {
@ -42,7 +42,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="Pane" class="control-label" style="color: white !important;">Pane: </label> <label for="Pane" class="control-label" style="color: white !important;">Pane: </label>
<select class="form-control" bind="@pane"> <select class="form-control" @bind="@pane">
<option value="">&lt;Select Pane&gt;</option> <option value="">&lt;Select Pane&gt;</option>
@foreach (string pane in PageState.Page.Panes.Split(';')) @foreach (string pane in PageState.Page.Panes.Split(';'))
{ {
@ -52,11 +52,11 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="Title" class="control-label" style="color: white !important;">Title: </label> <label for="Title" class="control-label" style="color: white !important;">Title: </label>
<input type="text" name="Title" class="form-control" bind="@title" /> <input type="text" name="Title" class="form-control" @bind="@title" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="Container" class="control-label" style="color: white !important;">Container: </label> <label for="Container" class="control-label" style="color: white !important;">Container: </label>
<select class="form-control" bind="@containertype"> <select class="form-control" @bind="@containertype">
<option value="">&lt;Select Container&gt;</option> <option value="">&lt;Select Container&gt;</option>
@foreach (KeyValuePair<string, string> container in containers) @foreach (KeyValuePair<string, string> container in containers)
{ {
@ -64,13 +64,13 @@
} }
</select> </select>
</div> </div>
<button type="button" class="btn btn-primary" onclick="@AddModule">Add Module To Page</button> <button type="button" class="btn btn-primary" @onclick="@AddModule">Add Module To Page</button>
</div> </div>
</div> </div>
</div> </div>
<span class="oi oi-menu" style="@display" onclick="openActions()"></span> <span class="oi oi-menu" style="@display" onclick="openActions()"></span>
@functions { @code {
string display = "display: none"; string display = "display: none";
List<ModuleDefinition> moduledefinitions; List<ModuleDefinition> moduledefinitions;
Dictionary<string, string> containers = new Dictionary<string, string>(); Dictionary<string, string> containers = new Dictionary<string, string>();

4
Oqtane.Client/Themes/Controls/Login.razor
View File

@ -5,9 +5,9 @@
@inject IUriHelper UriHelper @inject IUriHelper UriHelper
@inject IJSRuntime jsRuntime @inject IJSRuntime jsRuntime
<button type="button" class="btn btn-primary" onclick="@Click">@name</button> <button type="button" class="btn btn-primary" @onclick="@Click">@name</button>
@functions { @code {
string name = ""; string name = "";
protected override async Task OnInitAsync() protected override async Task OnInitAsync()

2
Oqtane.Client/Themes/Controls/Logo.razor
View File

@ -3,7 +3,7 @@
@((MarkupString)logo) @((MarkupString)logo)
@functions { @code {
string logo = ""; string logo = "";
protected override void OnInit() protected override void OnInit()

2
Oqtane.Client/Themes/Controls/Menu.razor
View File

@ -30,7 +30,7 @@
} }
</ul> </ul>
@functions { @code {
List<Page> pages; List<Page> pages;
Page parent = null; Page parent = null;

4
Oqtane.Client/Themes/Controls/ModuleActions.razor
View File

@ -11,12 +11,12 @@
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
@foreach (var action in actions) @foreach (var action in actions)
{ {
<a class="dropdown-item" onclick="@(async () => await ModuleAction(action.Action))">@action.Name</a> <a class="dropdown-item" @onclick="@(async () => await ModuleAction(action.Action))">@action.Name</a>
} }
</div> </div>
</div> </div>
@functions { @code {
string display = "display: none"; string display = "display: none";
List<ActionViewModel> actions; List<ActionViewModel> actions;

2
Oqtane.Client/Themes/Controls/ModuleTitle.razor
View File

@ -3,7 +3,7 @@
@title @title
@functions { @code {
string title = ""; string title = "";
protected override void OnInit() protected override void OnInit()

2
Oqtane.Client/Themes/Controls/Profile.razor
View File

@ -9,7 +9,7 @@
<NavLink class="btn btn-primary" href="@url">@name</NavLink> <NavLink class="btn btn-primary" href="@url">@name</NavLink>
@functions { @code {
string name = ""; string name = "";
string url = ""; string url = "";

2
Oqtane.Client/Themes/Theme1/Theme1.razor
View File

@ -27,7 +27,7 @@
</div> </div>
</div> </div>
@functions { @code {
public override string Name { get { return "Theme1"; } } public override string Name { get { return "Theme1"; } }
public override string Panes { get { return "Left;Right"; } } public override string Panes { get { return "Left;Right"; } }
} }

2
Oqtane.Client/Themes/Theme2/Theme2.razor
View File

@ -25,7 +25,7 @@
</div> </div>
</div> </div>
@functions { @code {
public override string Name { get { return "Theme2"; } } public override string Name { get { return "Theme2"; } }
public override string Panes { get { return "Top;Bottom"; } } public override string Panes { get { return "Top;Bottom"; } }
} }

2
Oqtane.Client/Themes/Theme3/HorizontalLayout.razor
View File

@ -11,7 +11,7 @@
</div> </div>
</div> </div>
@functions { @code {
public override string Name { get { return "Horizontal Layout"; } } public override string Name { get { return "Horizontal Layout"; } }
public override string Panes { get { return "Left;Right"; } } public override string Panes { get { return "Left;Right"; } }
} }

2
Oqtane.Client/Themes/Theme3/Theme3.razor
View File

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
@functions { @code {
public override string Name { get { return "Theme3"; } } public override string Name { get { return "Theme3"; } }
public override string Panes { get { return ""; } } public override string Panes { get { return ""; } }
} }

2
Oqtane.Client/Themes/Theme3/VerticalLayout.razor
View File

@ -9,7 +9,7 @@
<Pane Name="Bottom" /> <Pane Name="Bottom" />
</div> </div>
@functions { @code {
public override string Name { get { return "Vertical Layout"; } } public override string Name { get { return "Vertical Layout"; } }
public override string Panes { get { return "Top;Bottom"; } } public override string Panes { get { return "Top;Bottom"; } }
} }

4
Oqtane.Server/Oqtane.Server.csproj
View File

@ -31,8 +31,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="dbup" Version="4.2.0" /> <PackageReference Include="dbup" Version="4.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview4-19216-03" /> <PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview6.19307.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview4-19216-03" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview6.19307.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.3" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.3" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.3" />
</ItemGroup> </ItemGroup>

5
Oqtane.Server/Startup.cs
View File

@ -278,14 +278,15 @@ namespace Oqtane.Server
app.UseBlazorDebugging(); app.UseBlazorDebugging();
} }
app.UseClientSideBlazorFiles<Client.Startup>();
app.UseRouting(); app.UseRouting();
app.UseEndpoints(endpoints => app.UseEndpoints(endpoints =>
{ {
endpoints.MapDefaultControllerRoute(); endpoints.MapDefaultControllerRoute();
endpoints.MapFallbackToClientSideBlazor<Client.Startup>("index.html");
}); });
app.UseBlazor<Client.Startup>();
} }
#endif #endif
} }