Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/publish-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:

- name: Build and Pack
run: |
dotnet pack Mythetech.Components/Mythetech.Components.csproj -c Release -o ./nupkgs
dotnet pack Mythetech.Components.WebAssembly/Mythetech.Components.WebAssembly.csproj -c Release -o ./nupkgs
dotnet pack Mythetech.Components.Desktop/Mythetech.Components.Desktop.csproj -c Release -o ./nupkgs
dotnet pack Mythetech.Framework/Mythetech.Framework.csproj -c Release -o ./nupkgs
dotnet pack Mythetech.Framework.WebAssembly/Mythetech.Framework.WebAssembly.csproj -c Release -o ./nupkgs
dotnet pack Mythetech.Framework.Desktop/Mythetech.Framework.Desktop.csproj -c Release -o ./nupkgs

- name: Publish to NuGet.org
run: dotnet nuget push ./nupkgs/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_ORG_API_KEY }} --skip-duplicate
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Simple workflow for deploying static content to GitHub Pages
name: Deploy Component Storybook
env:
PUBLISH_DIR: Mythetech.Components.Storybook/bin/Release/net10.0/publish/wwwroot
PUBLISH_DIR: Mythetech.Framework.Storybook/bin/Release/net10.0/publish/wwwroot

on:
# Runs on pushes targeting the default branch and PRs
push:
paths:
- Mythetech.Components.*/**
- Mythetech.Framework.*/**
- ".github/workflows/storybook.yml"
branches:
- main
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
run: dotnet workload install wasm-tools

- name: Run Tests
run: dotnet test Mythetech.Components.Test --logger trx --results-directory "TestResults-${{ matrix.dotnet-version }}"
run: dotnet test Mythetech.Framework.Test --logger trx --results-directory "TestResults-${{ matrix.dotnet-version }}"

- name: Upload dotnet test results
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -76,19 +76,19 @@ jobs:
run: dotnet workload install wasm-tools

- name: Publish app
run: dotnet publish Mythetech.Components.Storybook -c Release
run: dotnet publish Mythetech.Framework.Storybook -c Release

- name: Rewrite base href
uses: SteveSandersonMS/ghaction-rewrite-base-href@v1
with:
html_path: ${{ env.PUBLISH_DIR }}/index.html
base_href: /Mythetech.Components/
base_href: /Mythetech.Framework/

- name: Rewrite base href
uses: SteveSandersonMS/ghaction-rewrite-base-href@v1
with:
html_path: ${{ env.PUBLISH_DIR }}/iframe.html
base_href: /Mythetech.Components/
base_href: /Mythetech.Framework/

- name: Setup Pages
uses: actions/configure-pages@v5
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Mythetech.Components.Desktop;
namespace Mythetech.Framework.Desktop;

public enum DesktopHost
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Microsoft.Extensions.DependencyInjection;
using Mythetech.Components.Desktop.Photino;
using Mythetech.Components.Desktop.Services;
using Mythetech.Components.Infrastructure;
using Mythetech.Framework.Desktop.Photino;
using Mythetech.Framework.Desktop.Services;
using Mythetech.Framework.Infrastructure;

namespace Mythetech.Components.Desktop;
namespace Mythetech.Framework.Desktop;

/// <summary>
/// Generic desktop service registration extensions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackageId>Mythetech.Components.Desktop</PackageId>
<Version>0.0.10</Version>
<PackageId>Mythetech.Framework.Desktop</PackageId>
<Version>0.1.0</Version>
<Authors>Mythetech</Authors>
<Description>Desktop-specific components for cross platform blazor applications</Description>
<PackageTags>blazor;desktop;photino;components;ui</PackageTags>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryUrl>https://github.com/mythetech/Mythetech.Components</RepositoryUrl>
<PackageProjectUrl>https://github.com/mythetech/Mythetech.Components</PackageProjectUrl>
<RepositoryUrl>https://github.com/mythetech/Mythetech.Framework</RepositoryUrl>
<PackageProjectUrl>https://github.com/mythetech/Mythetech.Framework</PackageProjectUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIcon>icon.png</PackageIcon>
</PropertyGroup>
Expand All @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Mythetech.Components\Mythetech.Components.csproj" />
<ProjectReference Include="..\Mythetech.Framework\Mythetech.Framework.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Photino.Blazor;

namespace Mythetech.Components.Desktop.Photino;
namespace Mythetech.Framework.Desktop.Photino;

/// <summary>
/// Provides an instance of a running Photino Blazor App so that components can access desktop methods for particular use cases like file system access
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Mythetech.Components.Infrastructure;
using Mythetech.Framework.Infrastructure;

namespace Mythetech.Components.Desktop.Photino;
namespace Mythetech.Framework.Desktop.Photino;

/// <summary>
/// Photino desktop implementation of file and folder open dialogs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Mythetech.Components.Infrastructure;
using Mythetech.Framework.Infrastructure;

namespace Mythetech.Components.Desktop.Photino;
namespace Mythetech.Framework.Desktop.Photino;

public class PhotinoInteropFileSaveService : IFileSaveService
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Microsoft.Extensions.DependencyInjection;
using Mythetech.Components.Infrastructure;
using Mythetech.Framework.Infrastructure;
using Photino.Blazor;

namespace Mythetech.Components.Desktop.Photino;
namespace Mythetech.Framework.Desktop.Photino;

/// <summary>
/// Photino Specific App Registration Methods
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Diagnostics;
using Mythetech.Components.Infrastructure;
using Mythetech.Framework.Infrastructure;

namespace Mythetech.Components.Desktop.Services
namespace Mythetech.Framework.Desktop.Services
{
public class LinkOpenService : ILinkOpenService
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using Mythetech.Components.Components.SimpleTabs
@using Mythetech.Framework.Components.SimpleTabs
<BlazingStoryApp Title="Mythetech" Assemblies="[typeof(App).Assembly, typeof(SimpleTabs).Assembly]" DefaultLayout="typeof(DefaultLayout)" AvailableColorSchemes="AvailableColorSchemes.Both">
<BrandLogoArea>
<MudImage Style="margin-top:-0.75em;margin-right:-0.25em;" Height="48" Src="typhon.png"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Mythetech.Components.WebAssembly\Mythetech.Components.WebAssembly.csproj" />
<ProjectReference Include="..\Mythetech.Components\Mythetech.Components.csproj" />
<ProjectReference Include="..\Mythetech.Framework.WebAssembly\Mythetech.Framework.WebAssembly.csproj" />
<ProjectReference Include="..\Mythetech.Framework\Mythetech.Framework.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Mythetech.Components.Storybook;
using Mythetech.Framework.Storybook;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using MudBlazor;
using MudBlazor.Services;
using Mythetech.Components.Infrastructure.MessageBus;
using Mythetech.Components.WebAssembly;
using Mythetech.Framework.Infrastructure.MessageBus;
using Mythetech.Framework.WebAssembly;

var builder = WebAssemblyHostBuilder.CreateDefault(args);
builder.RootComponents.Add<App>("#app");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using Mythetech.Components.Components.Badge
@using Mythetech.Components.Enums
@using Mythetech.Framework.Components.Badge
@using Mythetech.Framework.Enums
@using MudBlazor
@attribute [Stories("Components/Badge")]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using Mythetech.Components.Components.Buttons
@using Mythetech.Components.Enums
@using Mythetech.Framework.Components.Buttons
@using Mythetech.Framework.Enums
@attribute [Stories("Components/Button")]

<Stories TComponent="Button">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using Mythetech.Components.Components.Links
@using Mythetech.Framework.Components.Links
@attribute [Stories("Components/ExternalLink")]

<Stories TComponent="ExternalLink">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@using Mythetech.Components.Infrastructure
@using Mythetech.Components.Components.Buttons
@using Mythetech.Components.WebAssembly.Exceptions
@using Mythetech.Framework.Infrastructure
@using Mythetech.Framework.Components.Buttons
@using Mythetech.Framework.WebAssembly.Exceptions
@attribute [Stories("Infrastructure/FileServices")]

<Stories TComponent="IFileOpenService">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@using Mythetech.Components.Infrastructure.MessageBus
@using Mythetech.Components.Components.Buttons
@using Mythetech.Framework.Infrastructure.MessageBus
@using Mythetech.Framework.Components.Buttons
@attribute [Stories("Infrastructure/MessageBus")]
@inherits ComponentConsumer<MessageBus_stories.ExampleDialogMessage>
@inherits Mythetech.Framework.Infrastructure.MessageBus.ComponentConsumer<MessageBus_stories.ExampleDialogMessage>

<Stories TComponent="IMessageBus">

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using Mythetech.Components.Components.Buttons
@using Mythetech.Components.Components.Progress
@using Mythetech.Framework.Components.Buttons
@using Mythetech.Framework.Components.Progress
@attribute [Stories("Components/ProgressCountdown")]

<Stories TComponent="ProgressCountdown">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using Mythetech.Components.Components.SimpleTabs
@using Mythetech.Framework.Components.SimpleTabs
@using MudBlazor
@attribute [Stories("Components/SimpleTabs")]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
@using Microsoft.JSInterop
@using BlazingStory.Components
@using BlazingStory.Types
@using Mythetech.Components.Storybook
@using Mythetech.Components.Storybook.Shared
@using Mythetech.Components.Storybook.Stories
@using Mythetech.Components.Components
@using Mythetech.Framework.Storybook
@using Mythetech.Framework.Storybook.Shared
@using Mythetech.Framework.Storybook.Stories
@using Mythetech.Framework.Components
@using MudBlazor
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Mythetech.Components.Storybook</title>
<title>Mythetech.Framework.Storybook</title>
<base href="/" />
<link rel="stylesheet" href="css/blazor-ui.css" />
<link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet" />
<link href="_content/MudBlazor.Markdown/MudBlazor.Markdown.min.css" rel="stylesheet" />
<link rel="stylesheet" href="_content/Mythetech.Components/mythetech.css" />
<link rel="stylesheet" href="Mythetech.Components.Storybook.styles.css" />
<link rel="stylesheet" href="_content/Mythetech.Framework/mythetech.css" />
<link rel="stylesheet" href="Mythetech.Framework.Storybook.styles.css" />
</head>

<body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Mythetech.Components.Storybook</title>
<title>Mythetech.Framework.Storybook</title>
<base href="/" />
<!--
DON'T PUT ANY ADDITIONAL CSS OR JAVASCRIPT LINKS IN THIS FILE.
Please do that in the "iframe.html" instead.
-->
<link rel="stylesheet" href="css/blazor-ui.css" />
<link rel="stylesheet" href="_content/Mythetech.Components/mythetech.css" />
<link rel="stylesheet" href="_content/Mythetech.Framework/mythetech.css" />
<link href="https://fonts.googleapis.com/css2?family=Gotu&display=swap" rel="stylesheet">

</head>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Bunit;

namespace Mythetech.Components.Test.Components.SimpleTabs;
namespace Mythetech.Framework.Test.Components.SimpleTabs;

public class SimpleTabTests : TestContext
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using Mythetech.Components.Components.SimpleTabs
@using Mythetech.Framework.Components.SimpleTabs
<SimpleTabs>
<Tab Name="Tab1">
<div>Tab1</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Bunit;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Mythetech.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;
using NSubstitute;
using Shouldly;

namespace Mythetech.Components.Test.Infrastructure.MessageBus;
namespace Mythetech.Framework.Test.Infrastructure.MessageBus;

public class MessageBusTests : TestContext
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@inherits Mythetech.Components.Infrastructure.MessageBus.ComponentConsumer<TestCommand>
@inherits Mythetech.Framework.Infrastructure.MessageBus.ComponentConsumer<TestCommand>

<p>@Text</p>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@inherits Mythetech.Components.Infrastructure.MessageBus.ComponentConsumer<TestCommand>
@inherits Mythetech.Framework.Infrastructure.MessageBus.ComponentConsumer<TestCommand>

<p>@Text</p>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Mythetech.Components\Mythetech.Components.csproj" />
<ProjectReference Include="..\Mythetech.Framework\Mythetech.Framework.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Mythetech.Components.WebAssembly.Exceptions;
namespace Mythetech.Framework.WebAssembly.Exceptions;

/// <summary>
/// Exception thrown when a browser API is not supported by the current browser
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using KristofferStrube.Blazor.FileSystemAccess;
using Microsoft.JSInterop;
using Mythetech.Components.Infrastructure;
using Mythetech.Components.WebAssembly.Exceptions;
using Mythetech.Framework.Infrastructure;
using Mythetech.Framework.WebAssembly.Exceptions;

namespace Mythetech.Components.WebAssembly;
namespace Mythetech.Framework.WebAssembly;

/// <summary>
/// WebAssembly implementation of file open service using the File System Access API
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using KristofferStrube.Blazor.FileSystemAccess;
using Microsoft.JSInterop;
using Mythetech.Components.Infrastructure;
using Mythetech.Components.WebAssembly.Exceptions;
using Mythetech.Framework.Infrastructure;
using Mythetech.Framework.WebAssembly.Exceptions;

namespace Mythetech.Components.WebAssembly;
namespace Mythetech.Framework.WebAssembly;

/// <summary>
/// WebAssembly implementation of file save service using the File System Access API
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using KristofferStrube.Blazor.FileSystemAccess;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.JSInterop;
using Mythetech.Components.Infrastructure;
using Mythetech.Framework.Infrastructure;

namespace Mythetech.Components.WebAssembly;
namespace Mythetech.Framework.WebAssembly;

/// <summary>
/// WebAssembly implementation of link opening using JavaScript interop
Expand Down
Loading