Skip to content

updates #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

updates #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cef52a
updates
alex-hedley Apr 9, 2025
ae02ece
Merge branch 'main' into wip
alex-hedley Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 28 additions & 45 deletions src/Utility/Components/SQLContains/SQLContains.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,33 @@
@inject IJSRuntime JSRuntime

<div class="container">
<label class="label-control">Field:</label>
<div class="input-group">
<input type="text" id="field" name="field" class="form-control" @bind="Field">
<span class="input-group-btn">
<button class="btn btn-info" type="button" id="btnFieldCopy" name="btnFieldCopy" @onclick="CopyField"><i class="far fa-copy"></i></button>
<button class="btn btn-danger" type="button" id="btnFieldClear" name="btnFieldClear" @onclick="ClearField"><i class="far fa-trash-alt"></i></button>
</span>
</div>
<div class="row">
<div class="col">
<div class="input-group">
<textarea id="sqlBuilderInput" name="sqlBuilderInput" class="form-control" rows="5" @bind="Input"></textarea>
<span class="input-group-btn">
<button id="btnClearSQLBuilder" name="btnClearSQLBuilder" class="btn btn-danger" @onclick="Clear"><i class="far fa-trash-alt"></i></button>
</span>
</div>
</div>
</div>
<div class="row">
<div class="col">
<div class="form-check">
<input class="form-check-input" type="checkbox" id="chkIncludeWildcard" @bind-value="IncludeWildcard" checked="@(IncludeWildcard ? "checked" : null)">
<label class="form-check-label" for="chkIncludeWildcard">
Include Wildcard
</label>
</div>
</div>
</div>
<div class="row">
<div class="col">
<button class="btn btn-success" type="button" id="btnParse" name="btnParse" @onclick="Create">Create</button>
</div>
</div>
<div class="row">
<div class="col">
<div class="input-group">
<textarea id="sqlBuilderOutput" name="sqlBuilderOutput" class="form-control" rows="5" @bind="Output"></textarea>
<span class="input-group-btn">
<button id="btnCopySQLBuilder" name="btnCopySQLBuilder" class="btn btn-info" @onclick="Copy"><i class="far fa-copy"></i></button>
</span>
</div>

</div>
</div>
<div style="display: flex; width=100%">
<FluentTextField @bind-Value=Field>
<FluentLabel Typo="Typography.Body" Slot="start">Field:</FluentLabel>
<FluentButton OnClick="CopyField" Title="Copy" IconStart="@(new Icons.Regular.Size16.Copy())" Slot="end" />
<FluentButton OnClick="ClearField" Title="Clear" IconStart="@(new Icons.Regular.Size16.Delete())" Slot="end" />
</FluentTextField>
</div>

<div style="display: flex; width=100%">
<FluentTextArea @bind-Value=Input AriaLabel="Without label">
<FluentButton OnClick="Clear" Title="Clear" IconStart="@(new Icons.Regular.Size16.Delete())" Slot="end" />
</FluentTextArea>
</div>

<div style="display: flex; width=100%">
<FluentStack>
<FluentCheckbox @bind-Value="@IncludeWildcard" Label="Include Wildcard" />
</FluentStack>
</div>

<div style="display: flex; width=100%">
<FluentButton OnClick="Create" Title="Create">Create</FluentButton>
</div>

<div style="display: flex; width=100%">
<FluentTextArea @bind-Value=Output AriaLabel="Without label">
<FluentButton OnClick="Copy" Title="Copy" IconStart="@(new Icons.Regular.Size16.Copy())" Slot="end" />
</FluentTextArea>
</div>

@code {
Expand Down
2 changes: 1 addition & 1 deletion src/Utility/Infrastructure/CacheStorageAccessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Utility.Infrastructure;

public class CacheStorageAccessor(IJSRuntime js) : JSModule(js, "./_content/Utility/js/CacheStorageAccessor.js")
public class CacheStorageAccessor(IJSRuntime js) : JSModule(js, "js/CacheStorageAccessor.js")
{
public async ValueTask PutAsync(HttpRequestMessage requestMessage, HttpResponseMessage responseMessage)
{
Expand Down
46 changes: 9 additions & 37 deletions src/Utility/Pages/SQLBuilder.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,15 @@

<h1>SQL Builder</h1>

<div class="container">

<div class="row">
<div class="col">
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
<h2>IN Clause</h2>
</div>

<SQLInClause />
</div>
</div>

<div class="row">
<div class="col">

<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
<h2>Input</h2>
</div>

<SQLInput />
</div>
</div>

<div class="row">
<div class="col">

<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
<h2>Contains</h2>
</div>

<SQLContains />
</div>
</div>

<br />

</div>
<h2>IN Clause</h2>
@* <SQLInClause /> *@


@* <h2>Input</h2>
<SQLInput /> *@

<h2>Contains</h2>
<SQLContains />

@code {

Expand Down
10 changes: 7 additions & 3 deletions src/Utility/Shared/MainLayout.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@implements IDisposable
@using Microsoft.IdentityModel.Tokens
@inherits LayoutComponentBase

@inject Blazored.LocalStorage.ILocalStorageService localStorage
Expand All @@ -19,9 +20,11 @@
<FluentBodyContent Class="body-content">
<ErrorBoundary>
<ChildContent>
<div class="content">
@Body
</div>
<article id="article">
<div class="content">
@Body
</div>
</article>
</ChildContent>
<ErrorContent Context="ex">
<div class="blazor-error-boundary">@ex.Message</div>
Expand Down Expand Up @@ -67,6 +70,7 @@
Uri uri = new Uri(e.Location);
string pathName = uri.AbsolutePath;
var path = pathName.Split(new []{ "/" }, StringSplitOptions.RemoveEmptyEntries);
if (path.Length == 0) return;

await localStorage.SetItemAsync(Constants.LOCAL_STORAGE_TAB, path[^1]);
}
Expand Down
45 changes: 42 additions & 3 deletions src/Utility/wwwroot/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '/_content/Microsoft.FluentUI.AspNetCore.Components/css/reboot.css';
/* @import '/_content/Microsoft.FluentUI.AspNetCore.Components/css/reboot.css'; */

body {
--body-font: "Segoe UI Variable", "Segoe UI", sans-serif;
Expand All @@ -8,6 +8,43 @@ body {
margin: 0;
}

.siteheader {
background-color: var(--neutral-layer-4) !important;
border-bottom: calc(var(--stroke-width) * 2px) solid var(--accent-fill-rest);
margin-bottom: 0 !important;
}

.siteheader .logo {
width: 108px;
height: 23px;
grid-column: 1;
}

.siteheader .search {
display: flex;
align-items: center;
padding-right: 20px;
}

.siteheader .links {
padding-right: 10px;
display: flex;
align-items: center;
}

.siteheader .notifications {
display: flex;
align-items: center;
}

.siteheader .settings {
padding-right: 6px;
display: flex;
align-items: center;
margin-left: 0;
margin-right: 10px;
}

.navmenu-icon {
display: none;
}
Expand All @@ -25,8 +62,10 @@ body {
}

.content {
padding: 0.5rem 1.5rem;
align-self: stretch !important;
/* padding: 0.5rem 1.5rem; */
/* align-self: stretch !important; */
display: flex;
background-color: var(--neutral-layer-1);
}

footer {
Expand Down
4 changes: 2 additions & 2 deletions src/Utility/wwwroot/css/font-awesome/css/all.min.css
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added src/Utility/wwwroot/css/font-awesome/webfonts/fa-brands-400.eot
View file
Open in desktop
Binary file not shown.
Loading
Loading