Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/80
Browse files Browse the repository at this point in the history
# Conflicts:
#    src/AzureAppConfigurationEmulator/Common/Components/AzureDialog.razor
#    src/AzureAppConfigurationEmulator/Common/Components/AzureDialogHeader.razor
#    src/AzureAppConfigurationEmulator/Common/Components/AzureDialogProvider.razor
#    src/AzureAppConfigurationEmulator/Components/Pages/Overview.razor
#    src/AzureAppConfigurationEmulator/ConfigurationSettings/Components/ConfigurationSettingCreateDialog.razor
#    src/AzureAppConfigurationEmulator/ConfigurationSettings/Components/ConfigurationSettingEditDialog.razor
#    src/AzureAppConfigurationEmulator/ConfigurationSettings/Components/ConfigurationSettingTable.razor
#    src/AzureAppConfigurationEmulator/ConfigurationSettings/Components/FeatureFlagConfigurationSettingTable.razor
#    src/AzureAppConfigurationEmulator/ConfigurationSettings/Components/ImportExportContentTypeInputSelect.razor
#    src/AzureAppConfigurationEmulator/ConfigurationSettings/ConfigurationSettingResult.cs
#    src/AzureAppConfigurationEmulator/ConfigurationSettings/ConfigurationSettingsResult.cs
#    src/AzureAppConfigurationEmulator/ConfigurationSettings/Pages/ConfigurationExplorer.razor
#    src/AzureAppConfigurationEmulator/ConfigurationSettings/Pages/FeatureManager.razor
#    src/AzureAppConfigurationEmulator/ConfigurationSettings/Pages/ImportExport.razor
#    src/AzureAppConfigurationEmulator/Keys/KeysResult.cs
#    src/AzureAppConfigurationEmulator/Labels/LabelsResult.cs
#    src/AzureAppConfigurationEmulator/Program.cs
  • Loading branch information
tnc1997 committed Jun 11, 2024
1 parent f6330d0 commit 4558eaa
Show file tree
Hide file tree
Showing 53 changed files with 32 additions and 110 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@
<PackageReference Include="System.Linq.Async" Version="6.0.1"/>
</ItemGroup>

<ItemGroup>
<_ContentIncludedByDefault Remove="Common\Pages\Overview.razor" />
</ItemGroup>

</Project>

This file was deleted.

65 changes: 0 additions & 65 deletions src/AzureAppConfigurationEmulator/Common/Pages/Overview.razor

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
@using AzureAppConfigurationEmulator.Common.Components
@using Microsoft.AspNetCore.Components.Web

<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">

<head>
Expand All @@ -11,11 +8,11 @@
<link rel="stylesheet" href="app.css"/>
@* <link rel="stylesheet" href="AzureAppConfigurationEmulator.styles.css"/> *@
<link rel="icon" type="image/png" href="favicon.png"/>
<HeadOutlet @rendermode="@RenderMode.InteractiveServer"/>
<HeadOutlet @rendermode="@InteractiveServer"/>
</head>

<body class="text-base bg-white text-mine-shaft dark:bg-cod-grey dark:text-desert-storm">
<Routes @rendermode="@RenderMode.InteractiveServer"/>
<Routes @rendermode="@InteractiveServer"/>
<script src="_framework/blazor.web.js"></script>
</body>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
@inject IDialogService DialogService
@inject IJSRuntime JS
@using AzureAppConfigurationEmulator.Common
@using Microsoft.JSInterop

@foreach (var reference in References)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@typeparam TValue
@using System.Linq.Expressions
@using Microsoft.AspNetCore.Components.Forms

<InputDate @attributes="@AdditionalAttributes" class="px-2 pt-1 pb-1.5 w-full bg-white rounded-sm border border-storm-dust h-[24px] placeholder:text-storm-dust invalid:border-alizarin-crimson dark:bg-cod-grey dark:border-star-dust dark:placeholder:text-star-dust dark:disabled:bg-shark dark:disabled:border-natural-grey dark:disabled:text-natural-grey disabled:bg-concrete disabled:border-star-dust disabled:text-star-dust" Value="@Value" ValueChanged="@ValueChanged" ValueExpression="@ValueExpression"/>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@using Microsoft.AspNetCore.Components.Forms

<InputFile @attributes="@AdditionalAttributes" class="px-2 pt-0.5 pb-1 w-full bg-white rounded-sm border cursor-pointer disabled:cursor-default border-storm-dust h-[24px] placeholder:text-storm-dust invalid:border-alizarin-crimson file:hidden dark:bg-cod-grey dark:border-star-dust dark:placeholder:text-star-dust dark:disabled:bg-shark dark:disabled:border-natural-grey dark:disabled:text-natural-grey disabled:bg-concrete disabled:border-star-dust disabled:text-star-dust" OnChange="@OnChange"/>

@code {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@typeparam TValue
@using Microsoft.AspNetCore.Components.Forms

<InputRadio @attributes="@AdditionalAttributes" class="hidden" Value="@Value"/>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@typeparam TValue
@using System.Linq.Expressions
@using Microsoft.AspNetCore.Components.Forms

<InputRadioGroup @attributes="@AdditionalAttributes" Value="@Value" ValueChanged="@ValueChanged" ValueExpression="@ValueExpression">
<div class="flex flex-row gap-0.5 self-start p-0.5 rounded-full border border-storm-dust dark:border-star-dust" role="radiogroup">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@typeparam TValue
@using System.Linq.Expressions
@using Microsoft.AspNetCore.Components.Forms

<InputSelect @attributes="@AdditionalAttributes" class="px-1 pt-0 pb-0.5 w-full bg-white rounded-sm border cursor-pointer disabled:cursor-default border-storm-dust [&:not(multiple)]:h-[24px] invalid:border-alizarin-crimson dark:bg-cod-grey dark:border-star-dust dark:disabled:bg-shark dark:disabled:border-natural-grey dark:disabled:text-natural-grey disabled:bg-concrete disabled:border-star-dust disabled:text-star-dust" Value="@Value" ValueChanged="@ValueChanged" ValueExpression="@ValueExpression">
@ChildContent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using System.Linq.Expressions
@using Microsoft.AspNetCore.Components.Forms

<InputText @attributes="@AdditionalAttributes" class="px-2 pt-1 pb-1.5 w-full bg-white rounded-sm border border-storm-dust h-[24px] placeholder:text-storm-dust invalid:border-alizarin-crimson dark:bg-cod-grey dark:border-star-dust dark:placeholder:text-star-dust dark:disabled:bg-shark dark:disabled:border-natural-grey dark:disabled:text-natural-grey disabled:bg-concrete disabled:border-star-dust disabled:text-star-dust" Value="@Value" ValueChanged="@ValueChanged" ValueExpression="@ValueExpression"/>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@using System.Linq.Expressions
@using Microsoft.AspNetCore.Components.Forms
@using Microsoft.AspNetCore.Components.Web

<InputCheckbox @attributes="@AdditionalAttributes" class="hidden" Value="@Value" ValueChanged="@ValueChanged" ValueExpression="@ValueExpression"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</div>
}

<input @bind:get="@Value" @bind:set="@HandleInput" class="px-2 pt-1 pb-1.5 w-full bg-white rounded-sm border border-storm-dust h-[24px] placeholder:text-storm-dust invalid:border-alizarin-crimson dark:bg-cod-grey dark:border-star-dust dark:placeholder:text-star-dust dark:disabled:bg-shark dark:disabled:border-natural-grey dark:disabled:text-natural-grey disabled:bg-concrete disabled:border-star-dust disabled:text-star-dust" disabled="@IsDisabled" placeholder="@Placeholder" readonly="@IsReadOnly" required="@IsRequired" type="@Type"/>
<input @bind:get="@Value" @bind:set="@(value => ValueChanged.InvokeAsync(value))" class="px-2 pt-1 pb-1.5 w-full bg-white rounded-sm border border-storm-dust h-[24px] placeholder:text-storm-dust invalid:border-alizarin-crimson dark:bg-cod-grey dark:border-star-dust dark:placeholder:text-star-dust dark:disabled:bg-shark dark:disabled:border-natural-grey dark:disabled:text-natural-grey disabled:bg-concrete disabled:border-star-dust disabled:text-star-dust" disabled="@IsDisabled" placeholder="@Placeholder" readonly="@IsReadOnly" required="@IsRequired" type="@Type"/>
</label>

@code {
Expand All @@ -30,10 +30,4 @@
[Parameter] public string? Value { get; set; }

[Parameter] public EventCallback<string?> ValueChanged { get; set; }

private async Task HandleInput(string? value)
{
await ValueChanged.InvokeAsync(value);
}

}
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@using Microsoft.AspNetCore.Components.Web

<li class="h-[36px]">
<button class="flex flex-row items-center px-2 h-full enabled:hover:bg-concrete enabled:active:bg-gallery enabled:dark:hover:bg-shark enabled:dark:active:bg-tuatara disabled:text-star-dust disabled:dark:text-storm-dust" disabled="@IsDisabled" @onclick="OnClick">
<div class="h-[16px] w-[16px]"></div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using System.Linq.Expressions
@using AzureAppConfigurationEmulator.Common.Components

<AzureInputSelect AdditionalAttributes="@AdditionalAttributes" TValue="@string" Value="@Value" ValueChanged="@HandleValueChanged" ValueExpression="@ValueExpression">
<option checked="@(Value is null)" hidden value="">Please select a file type</option>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using System.Linq.Expressions
@using AzureAppConfigurationEmulator.Common.Components

<AzureInputSelect AdditionalAttributes="@AdditionalAttributes" TValue="@string?[]" Value="@Value" ValueChanged="@HandleValueChanged" ValueExpression="@ValueExpression">
@if (Labels is not null)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using System.Linq.Expressions
@using AzureAppConfigurationEmulator.Common.Components

<AzureInputRadioGroup AdditionalAttributes="@AdditionalAttributes" TValue="@string" Value="@Value" ValueChanged="@ValueChanged" ValueExpression="@ValueExpression">
<AzureInputRadioLabel>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using System.Linq.Expressions
@using AzureAppConfigurationEmulator.Common.Components

<AzureInputSelect AdditionalAttributes="@AdditionalAttributes" TValue="@string" Value="@Value" ValueChanged="@HandleValueChanged" ValueExpression="@ValueExpression">
<option checked="@(Value is null)" value="">(No separator)</option>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using System.Linq.Expressions
@using AzureAppConfigurationEmulator.Common.Components

<AzureInputSelect AdditionalAttributes="@AdditionalAttributes" TValue="@string" Value="@Value" ValueChanged="@HandleValueChanged" ValueExpression="@ValueExpression">
<option checked="@(Value is null)" hidden value="">Please select a source service</option>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@using Microsoft.AspNetCore.Components.Routing

<li class="nav-item">
<NavLink ActiveClass="bg-gallery hover:bg-alto dark:bg-tuatara dark:hover:bg-mine-shaft" class="flex flex-row py-2 px-5 nav-link dark:hover:bg-shark dark:active:bg-tuatara hover:bg-concrete active:bg-gallery" href="@Href" Match="@Match">
<div class="mr-2.5 h-[15px] w-[15px]"></div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@using Microsoft.AspNetCore.Components.Routing

<nav class="flex flex-col">
<nav class="flex flex-col">
<div class="my-2 mr-9 ml-5">
<AzureTextField IsDisabled="true" Placeholder="Search"/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
@inject IServer Server
@page "/keys"
@using AzureAppConfigurationEmulator.Authentication.Hmac
@using AzureAppConfigurationEmulator.Common.Components
@using Microsoft.AspNetCore.Components.Web
@using Microsoft.AspNetCore.Hosting.Server
@using Microsoft.AspNetCore.Hosting.Server.Features
@using Microsoft.Extensions.Options
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@page "/error"
@using System.Diagnostics
@using Microsoft.AspNetCore.Components.Web

<PageTitle>Error</PageTitle>

Expand Down
5 changes: 5 additions & 0 deletions src/AzureAppConfigurationEmulator/Components/Routes.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Router AppAssembly="@typeof(Program).Assembly">
<Found Context="routeData">
<RouteView DefaultLayout="@typeof(Layout.MainLayout)" RouteData="@routeData"/>
</Found>
</Router>
10 changes: 10 additions & 0 deletions src/AzureAppConfigurationEmulator/Components/_Imports.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@using System.Net.Http
@using System.Net.Http.Json
@using Microsoft.AspNetCore.Components.Forms
@using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using static Microsoft.AspNetCore.Components.Web.RenderMode
@using Microsoft.AspNetCore.Components.Web.Virtualization
@using Microsoft.JSInterop
@using AzureAppConfigurationEmulator
@using AzureAppConfigurationEmulator.Components
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using System.Text.Json;
using System.Text.Json.Serialization.Metadata;
using AzureAppConfigurationEmulator.Common;

namespace AzureAppConfigurationEmulator.ConfigurationSettings;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using System.Text.Json;
using System.Text.Json.Serialization.Metadata;
using AzureAppConfigurationEmulator.Common;

namespace AzureAppConfigurationEmulator.ConfigurationSettings;
Expand Down
2 changes: 2 additions & 0 deletions src/AzureAppConfigurationEmulator/Keys/KeysResult.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using System.Text.Json;
using System.Text.Json.Serialization.Metadata;
using AzureAppConfigurationEmulator.Common;

namespace AzureAppConfigurationEmulator.Keys;
Expand Down
2 changes: 2 additions & 0 deletions src/AzureAppConfigurationEmulator/Labels/LabelsResult.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using System.Text.Json;
using System.Text.Json.Serialization.Metadata;
using AzureAppConfigurationEmulator.Common;

namespace AzureAppConfigurationEmulator.Labels;
Expand Down

0 comments on commit 4558eaa

Please sign in to comment.