Skip to content

Commit

Permalink
feat(mudblazor): rename root namespace MudBlazorComponents to prevent…
Browse files Browse the repository at this point in the history
… collision with MudBlazor package namespace
  • Loading branch information
SonicGD committed Jan 17, 2022
1 parent 786907a commit d6a05f6
Show file tree
Hide file tree
Showing 48 changed files with 66 additions and 76 deletions.
2 changes: 1 addition & 1 deletion src/Sitko.Blockly.MudBlazor/ApplicationExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using JetBrains.Annotations;
using Sitko.Core.App;

namespace Sitko.Blockly.MudBlazor;
namespace Sitko.Blockly.MudBlazorComponents;

[PublicAPI]
public static class ApplicationExtensions
Expand Down
6 changes: 3 additions & 3 deletions src/Sitko.Blockly.MudBlazor/Blocks/MudCutBlockDescriptor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
using MudBlazor;
using Sitko.Blockly.Blazor;
using Sitko.Blockly.Blocks;
using Sitko.Blockly.MudBlazor.Display.Blocks;
using Sitko.Blockly.MudBlazor.Forms.Blocks;
using Sitko.Blockly.MudBlazorComponents.Display.Blocks;
using Sitko.Blockly.MudBlazorComponents.Forms.Blocks;
using Sitko.Core.App.Localization;

namespace Sitko.Blockly.MudBlazor.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Blocks;

public record MudCutBlockDescriptor : BlazorBlockDescriptor<CutBlock, MudCutBlockComponent, MudCutBlockForm>
{
Expand Down
6 changes: 3 additions & 3 deletions src/Sitko.Blockly.MudBlazor/Blocks/MudFilesBlockDescriptor.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Microsoft.AspNetCore.Components;
using Sitko.Blockly.Blazor;
using Sitko.Blockly.Blocks;
using Sitko.Blockly.MudBlazor.Display.Blocks;
using Sitko.Blockly.MudBlazor.Forms.Blocks;
using Sitko.Blockly.MudBlazorComponents.Display.Blocks;
using Sitko.Blockly.MudBlazorComponents.Forms.Blocks;
using Sitko.Core.App.Localization;

namespace Sitko.Blockly.MudBlazor.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Blocks;

public record MudFilesBlockDescriptor : BlazorBlockDescriptor<FilesBlock, MudFilesBlockComponent, MudFilesBlockForm>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Microsoft.AspNetCore.Components;
using Sitko.Blockly.Blazor;
using Sitko.Blockly.Blocks;
using Sitko.Blockly.MudBlazor.Display.Blocks;
using Sitko.Blockly.MudBlazor.Forms.Blocks;
using Sitko.Blockly.MudBlazorComponents.Display.Blocks;
using Sitko.Blockly.MudBlazorComponents.Forms.Blocks;
using Sitko.Core.App.Localization;

namespace Sitko.Blockly.MudBlazor.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Blocks;

public record
MudGalleryBlockDescriptor : BlazorBlockDescriptor<GalleryBlock, MudGalleryBlockComponent, MudGalleryBlockForm>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Microsoft.AspNetCore.Components;
using Sitko.Blockly.Blazor;
using Sitko.Blockly.Blocks;
using Sitko.Blockly.MudBlazor.Display.Blocks;
using Sitko.Blockly.MudBlazor.Forms.Blocks;
using Sitko.Blockly.MudBlazorComponents.Display.Blocks;
using Sitko.Blockly.MudBlazorComponents.Forms.Blocks;
using Sitko.Core.App.Localization;

namespace Sitko.Blockly.MudBlazor.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Blocks;

public record
MudIframeBlockDescriptor : BlazorBlockDescriptor<IframeBlock, MudIframeBlockComponent, MudIFrameBlockForm>
Expand Down
6 changes: 3 additions & 3 deletions src/Sitko.Blockly.MudBlazor/Blocks/MudQuoteBlockDescriptor.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Microsoft.AspNetCore.Components;
using Sitko.Blockly.Blazor;
using Sitko.Blockly.Blocks;
using Sitko.Blockly.MudBlazor.Display.Blocks;
using Sitko.Blockly.MudBlazor.Forms.Blocks;
using Sitko.Blockly.MudBlazorComponents.Display.Blocks;
using Sitko.Blockly.MudBlazorComponents.Forms.Blocks;
using Sitko.Core.App.Localization;

namespace Sitko.Blockly.MudBlazor.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Blocks;

public record MudQuoteBlockDescriptor : BlazorBlockDescriptor<QuoteBlock, MudQuoteBlockComponent, MudQuoteBlockForm>
{
Expand Down
6 changes: 3 additions & 3 deletions src/Sitko.Blockly.MudBlazor/Blocks/MudTextBlockDescriptor.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Microsoft.AspNetCore.Components;
using Sitko.Blockly.Blazor;
using Sitko.Blockly.Blocks;
using Sitko.Blockly.MudBlazor.Display.Blocks;
using Sitko.Blockly.MudBlazor.Forms.Blocks;
using Sitko.Blockly.MudBlazorComponents.Display.Blocks;
using Sitko.Blockly.MudBlazorComponents.Forms.Blocks;
using Sitko.Core.App.Localization;

namespace Sitko.Blockly.MudBlazor.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Blocks;

public record MudTextBlockDescriptor : BlazorBlockDescriptor<TextBlock, MudTextBlockComponent, MudTextBlockForm>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Microsoft.AspNetCore.Components;
using Sitko.Blockly.Blazor;
using Sitko.Blockly.Blocks;
using Sitko.Blockly.MudBlazor.Display.Blocks;
using Sitko.Blockly.MudBlazor.Forms.Blocks;
using Sitko.Blockly.MudBlazorComponents.Display.Blocks;
using Sitko.Blockly.MudBlazorComponents.Forms.Blocks;
using Sitko.Core.App.Localization;

namespace Sitko.Blockly.MudBlazor.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Blocks;

public record
MudTwitchBlockDescriptor : BlazorBlockDescriptor<TwitchBlock, MudTwitchBlockComponent, MudTwitchBlockForm>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Microsoft.AspNetCore.Components;
using Sitko.Blockly.Blazor;
using Sitko.Blockly.Blocks;
using Sitko.Blockly.MudBlazor.Display.Blocks;
using Sitko.Blockly.MudBlazor.Forms.Blocks;
using Sitko.Blockly.MudBlazorComponents.Display.Blocks;
using Sitko.Blockly.MudBlazorComponents.Forms.Blocks;
using Sitko.Core.App.Localization;

namespace Sitko.Blockly.MudBlazor.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Blocks;

public record
MudTwitterBlockDescriptor : BlazorBlockDescriptor<TwitterBlock, MudTwitterBlockComponent, MudTwitterBlockForm>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Microsoft.AspNetCore.Components;
using Sitko.Blockly.Blazor;
using Sitko.Blockly.Blocks;
using Sitko.Blockly.MudBlazor.Display.Blocks;
using Sitko.Blockly.MudBlazor.Forms.Blocks;
using Sitko.Blockly.MudBlazorComponents.Display.Blocks;
using Sitko.Blockly.MudBlazorComponents.Forms.Blocks;
using Sitko.Core.App.Localization;

namespace Sitko.Blockly.MudBlazor.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Blocks;

public record
MudYoutubeBlockDescriptor : BlazorBlockDescriptor<YoutubeBlock, MudYoutubeBlockComponent, MudYoutubeBlockForm>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Display.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Display.Blocks;

public partial class MudCutBlockComponent
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using global::MudBlazor
@inherits FilesBlockComponent<MudBlazorBlocklyListOptions>
@inherits FilesBlockComponent<MudBlazorBlocklyListOptions>
@if (Options.Storage is not null)
{
<ul>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Display.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Display.Blocks;

public partial class MudFilesBlockComponent
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using Sitko.Core.Storage
@inherits GalleryBlockComponent<MudBlazorBlocklyListOptions>
@inherits GalleryBlockComponent<MudBlazorBlocklyListOptions>
@if (Options.Storage is not null)
{
if (Block.Pictures.Any())
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Display.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Display.Blocks;

public partial class MudGalleryBlockComponent
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Display.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Display.Blocks;

public partial class MudIframeBlockComponent
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Display.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Display.Blocks;

public partial class MudQuoteBlockComponent
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Display.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Display.Blocks;

public partial class MudTextBlockComponent
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Display.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Display.Blocks;

public partial class MudTwitchBlockComponent
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Display.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Display.Blocks;

public partial class MudTwitterBlockComponent
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Display.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Display.Blocks;

public partial class MudYoutubeBlockComponent
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Sitko.Blockly.Display;
using Sitko.Core.Storage;

namespace Sitko.Blockly.MudBlazor.Display;
namespace Sitko.Blockly.MudBlazorComponents.Display;

public class MudBlazorBlocklyListOptions : BlazorBlocklyListOptions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@using Microsoft.Extensions.Hosting
@using Sitko.Core.App.Localization
@using global::MudBlazor
<div class="blockly-error">
@if (Environment.IsDevelopment())
{
Expand Down
2 changes: 1 addition & 1 deletion src/Sitko.Blockly.MudBlazor/Display/MudBlocksList.razor.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Components;
using Sitko.Blazor.ScriptInjector;

namespace Sitko.Blockly.MudBlazor.Display;
namespace Sitko.Blockly.MudBlazorComponents.Display;

public partial class MudBlocksList
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using global::MudBlazor
@inherits CutBlockForm<MudBlazorBlocklyFormOptions>
@inherits CutBlockForm<MudBlazorBlocklyFormOptions>
<MudItem>
<MudTextField @bind-Value="@Block.ButtonText" Label="@LocalizationProvider["Button text"]" />
<MudTooltip Text="@LocalizationProvider["Text on button when block rendered in preview list mode"]">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Forms.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Forms.Blocks;

public partial class MudCutBlockForm
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Forms.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Forms.Blocks;

public partial class MudFilesBlockForm
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Forms.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Forms.Blocks;

public partial class MudGalleryBlockForm
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using global::MudBlazor
@inherits IFrameBlockForm<MudBlazorBlocklyFormOptions>
@inherits IFrameBlockForm<MudBlazorBlocklyFormOptions>
<!--suppress HtmlDeprecatedAttribute -->
<MudItem>
<MudTextField @bind-Value="@Block.Src" Placeholder="@LocalizationProvider["Source"]" Label="@LocalizationProvider["Url"]" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Forms.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Forms.Blocks;

public partial class MudIFrameBlockForm
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using global::MudBlazor
@inherits QuoteBlockForm<MudBlazorBlocklyFormOptions>
@inherits QuoteBlockForm<MudBlazorBlocklyFormOptions>
<MudGrid>
<MudItem xs="12">
<CKEditor Config="FormOptions.CKEditorConfig" Placeholder="@LocalizationProvider["Quote text"]" @bind-Value="Block.Text"></CKEditor>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Forms.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Forms.Blocks;

public partial class MudQuoteBlockForm
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Forms.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Forms.Blocks;

public partial class MudTextBlockForm
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using global::MudBlazor
@inherits TwitchBlockForm<MudBlazorBlocklyFormOptions>
@inherits TwitchBlockForm<MudBlazorBlocklyFormOptions>

<MudITem>
<MudTextField T="string" @bind-Value="Block.Url" Placeholder="@LocalizationProvider["Twitch link"]" OnChange="OnChangeAsync" AllowClear="true" Label="@LocalizationProvider["Url"]"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Forms.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Forms.Blocks;

public partial class MudTwitchBlockForm
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using global::MudBlazor
@inherits TwitterBlockForm<MudBlazorBlocklyFormOptions>
@inherits TwitterBlockForm<MudBlazorBlocklyFormOptions>

<MudItem>
<MudTextField @bind-Value="Block.Url" Label="@LocalizationProvider["Url"]" Placeholder="@LocalizationProvider["Tweet link"]" AllowClear="true" OnChange="OnChangeAsync" T="string"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Forms.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Forms.Blocks;

public partial class MudTwitterBlockForm
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using global::MudBlazor
@inherits YoutubeBlockForm<MudBlazorBlocklyFormOptions>
@inherits YoutubeBlockForm<MudBlazorBlocklyFormOptions>
<!--suppress HtmlDeprecatedAttribute -->
<MudItem>
<MudTextField Label="@LocalizationProvider["Url"]" Placeholder="@LocalizationProvider["Video url"]" @bind-Value="@Block.Url"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Sitko.Blockly.MudBlazor.Forms.Blocks;
namespace Sitko.Blockly.MudBlazorComponents.Forms.Blocks;

public partial class MudYoutubeBlockForm
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Sitko.Blazor.CKEditor;
using Sitko.Blockly.Blazor.Forms;

namespace Sitko.Blockly.MudBlazor.Forms;
namespace Sitko.Blockly.MudBlazorComponents.Forms;

public class MudBlazorBlocklyFormOptions : BlazorBlocklyFormOptions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using global::MudBlazor
<div class="blockly-form-error">
<div class="blockly-form-error">
<MudAlert Severity="@Severity.Error">@Error</MudAlert>
</div>

Expand Down
5 changes: 2 additions & 3 deletions src/Sitko.Blockly.MudBlazor/Forms/MudBlocklyForm.razor
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using global::MudBlazor
@inherits BlocklyForm<MudBlazorBlocklyFormOptions>
@inherits BlocklyForm<MudBlazorBlocklyFormOptions>
<div class="blockly-form [email protected]().ToLowerInvariant()">
@if (!string.IsNullOrEmpty(Label))
{
Expand Down Expand Up @@ -65,7 +64,7 @@
@code{

private RenderFragment disabledBlockIndicator = @<span class="block-disabled-icon">
<Icon Type="eye-invisible"></Icon>
<MudIcon Icon="@Icons.Filled.DisabledVisible"></MudIcon>
</span>;

private RenderFragment AddPanelTemplate(ContentBlock? afterBlock = null)
Expand Down
2 changes: 1 addition & 1 deletion src/Sitko.Blockly.MudBlazor/Forms/MudBlocklyForm.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.Extensions.Options;
using Sitko.Core.App.Localization;

namespace Sitko.Blockly.MudBlazor.Forms;
namespace Sitko.Blockly.MudBlazorComponents.Forms;

public partial class MudBlocklyForm
{
Expand Down
2 changes: 1 addition & 1 deletion src/Sitko.Blockly.MudBlazor/MudBlazorBlocklyModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Sitko.Core.App;
using Sitko.Core.App.Localization;

namespace Sitko.Blockly.MudBlazor;
namespace Sitko.Blockly.MudBlazorComponents;

public class MudBlazorBlocklyModule : BlazorBlocklyModule<IBlazorBlockDescriptor, MudBlazorBlocklyModuleOptions>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Sitko.Blockly.Blazor;

namespace Sitko.Blockly.MudBlazor;
namespace Sitko.Blockly.MudBlazorComponents;

public class MudBlazorBlocklyModuleOptions : BlazorBlocklyModuleOptions<IBlazorBlockDescriptor>
{
Expand Down
2 changes: 1 addition & 1 deletion src/Sitko.Blockly.MudBlazor/RenderTreeBuilderExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Components.Rendering;
using MudBlazor;

namespace Sitko.Blockly.MudBlazor;
namespace Sitko.Blockly.MudBlazorComponents;

public static class RenderTreeBuilderExtensions
{
Expand Down
Loading

0 comments on commit d6a05f6

Please sign in to comment.