Skip to content

Commit

Permalink
merge results!
Browse files Browse the repository at this point in the history
  • Loading branch information
ysmoradi committed Oct 20, 2024
2 parents 994b8d3 + 196d1ef commit 7fc8db8
Show file tree
Hide file tree
Showing 145 changed files with 696 additions and 631 deletions.
2 changes: 1 addition & 1 deletion src/Besql/Bit.Besql/wwwroot/bit-besql.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var BitBesql = BitBesql || {};
BitBesql.version = window['bit-besql version'] = '8.12.0-pre-03';
BitBesql.version = window['bit-besql version'] = '8.12.0-pre-04';

async function synchronizeDbWithCache(file) {

Expand Down
4 changes: 2 additions & 2 deletions src/Bit.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

<ReleaseVersion>8.12.0</ReleaseVersion>

<PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)-pre-03</PackageReleaseNotes>
<PackageVersion>$(ReleaseVersion)-pre-03</PackageVersion>
<PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)-pre-04</PackageReleaseNotes>
<PackageVersion>$(ReleaseVersion)-pre-04</PackageVersion>

<!-- Version -->
<Version Condition=" '$(Configuration)' == 'Release' ">$(ReleaseVersion).$([System.DateTime]::Now.ToString(HHmm))</Version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
AriaCurrent="@(Item == Nav.SelectedItem ? _AriaCurrentMap[Nav.GetAriaCurrent(Item)] : null)"
Rel="@(url.HasValue() && target.HasValue() && IsRelativeUrl(url!) is false ? "noopener noreferrer" : null)">
<div class="bit-nav-mct" style="@(Nav.ReversedChevron ? "flex-flow:row-reverse" : null)">
@if (childItems.Any())
@if (childItems.Any() && Nav.IconOnly is false)
{
<button @onclick="ToggleItem"
@onclick:preventDefault="true"
Expand Down
2 changes: 1 addition & 1 deletion src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(BitBlazorUI as any).version = (window as any)['bit-blazorui version'] = '8.12.0-pre-03';
(BitBlazorUI as any).version = (window as any)['bit-blazorui version'] = '8.12.0-pre-04';

interface DotNetObject {
invokeMethod<T>(methodIdentifier: string, ...args: any[]): T;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-03">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-03">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-03">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-03">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<Content Remove="appsettings.json" />
<EmbeddedResource Include="appsettings.json" />

<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-03">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-03">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,17 @@ public partial class _BitNavCustomDemo
private static readonly List<Section> CustomIconOnlyNavMenu =
[
new() { Text = "Home", Icon = BitIconName.Home },
new() { Text = "Todo sample", Icon = BitIconName.ToDoLogoOutline },
new() { Text = "AdminPanel sample", Icon = BitIconName.LocalAdmin },
new() {
Text = "AdminPanel sample",
Icon = BitIconName.LocalAdmin,
Links =
[
new() { Text = "Dashboard", Icon = BitIconName.ViewDashboard },
new() { Text = "Categories", Icon = BitIconName.BuildQueue },
new() { Text = "Products", Icon = BitIconName.Product },
]
},
new() { Text = "Todo sample", Icon = BitIconName.ToDoLogoOutline},
new() { Text = "BlazorUI", Icon = BitIconName.F12DevTools },
new() { Text = "Bit academy", Icon = BitIconName.LearningTools, IsEnabled = false },
new() { Text = "Contact us", Icon = BitIconName.Contact },
Expand Down Expand Up @@ -626,8 +635,17 @@ public class Section
private static readonly List<Section> CustomIconOnlyNavMenu =
[
new() { Text = ""Home"", Icon = BitIconName.Home },
new() { Text = ""Todo sample"", Icon = BitIconName.ToDoLogoOutline },
new() { Text = ""AdminPanel sample"", Icon = BitIconName.LocalAdmin },
new() {
Text = ""AdminPanel sample"",
Icon = BitIconName.LocalAdmin,
Links =
[
new() { Text = ""Dashboard"", Icon = BitIconName.ViewDashboard },
new() { Text = ""Categories"", Icon = BitIconName.BuildQueue },
new() { Text = ""Products"", Icon = BitIconName.Product },
]
},
new() { Text = ""Todo sample"", Icon = BitIconName.ToDoLogoOutline},
new() { Text = ""BlazorUI"", Icon = BitIconName.F12DevTools },
new() { Text = ""Bit academy"", Icon = BitIconName.LearningTools, IsEnabled = false },
new() { Text = ""Contact us"", Icon = BitIconName.Contact },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,17 @@ public partial class _BitNavItemDemo
private static readonly List<BitNavItem> IconOnlyNavMenu =
[
new() { Text = "Home", IconName = BitIconName.Home },
new() { Text = "Todo sample", IconName = BitIconName.ToDoLogoOutline },
new() { Text = "AdminPanel sample", IconName = BitIconName.LocalAdmin },
new() {
Text = "AdminPanel sample",
IconName = BitIconName.LocalAdmin,
ChildItems =
[
new() { Text = "Dashboard", IconName = BitIconName.ViewDashboard },
new() { Text = "Categories", IconName = BitIconName.BuildQueue },
new() { Text = "Products", IconName = BitIconName.Product },
]
},
new() { Text = "Todo sample", IconName = BitIconName.ToDoLogoOutline},
new() { Text = "BlazorUI", IconName = BitIconName.F12DevTools },
new() { Text = "Bit academy", IconName = BitIconName.LearningTools, IsEnabled = false },
new() { Text = "Contact us", IconName = BitIconName.Contact },
Expand Down Expand Up @@ -605,8 +614,17 @@ public partial class _BitNavItemDemo
private static readonly List<BitNavItem> IconOnlyNavMenu =
[
new() { Text = ""Home"", IconName = BitIconName.Home },
new() { Text = ""Todo sample"", IconName = BitIconName.ToDoLogoOutline },
new() { Text = ""AdminPanel sample"", IconName = BitIconName.LocalAdmin },
new() {
Text = ""AdminPanel sample"",
IconName = BitIconName.LocalAdmin,
ChildItems =
[
new() { Text = ""Dashboard"", IconName = BitIconName.ViewDashboard },
new() { Text = ""Categories"", IconName = BitIconName.BuildQueue },
new() { Text = ""Products"", IconName = BitIconName.Product },
]
},
new() { Text = ""Todo sample"", IconName = BitIconName.ToDoLogoOutline},
new() { Text = ""BlazorUI"", IconName = BitIconName.F12DevTools },
new() { Text = ""Bit academy"", IconName = BitIconName.LearningTools, IsEnabled = false },
new() { Text = ""Contact us"", IconName = BitIconName.Contact },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,12 @@
<br />
<BitNav TItem="BitNavOption" Mode="BitNavMode.Manual" IconOnly="iconOnly">
<BitNavOption Text="Home" IconName="@BitIconName.Home" />
<BitNavOption Text="AdminPanel sample" IconName="@BitIconName.LocalAdmin">
<BitNavOption Text="Dashboard" IconName="@BitIconName.ViewDashboard" />
<BitNavOption Text="Categories" IconName="@BitIconName.BuildQueue" />
<BitNavOption Text="Products" IconName="@BitIconName.Product" />
</BitNavOption>
<BitNavOption Text="Todo sample" IconName="@BitIconName.ToDoLogoOutline" />
<BitNavOption Text="AdminPanel sample" IconName="@BitIconName.LocalAdmin" />
<BitNavOption Text="BlazorUI" IconName="@BitIconName.F12DevTools" />
<BitNavOption Text="Bit academy" IconName="@BitIconName.LearningTools" IsEnabled="false" />
<BitNavOption Text="Contact us" IconName="@BitIconName.Contact" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,12 @@ public partial class _BitNavOptionDemo
<BitToggle @bind-Value=""iconOnly"" Label=""Hide texts?"" Inline />
<BitNav TItem=""BitNavOption"" Mode=""BitNavMode.Manual"" IconOnly=""iconOnly"">
<BitNavOption Text=""Home"" IconName=""@BitIconName.Home"" />
<BitNavOption Text=""AdminPanel sample"" IconName=""@BitIconName.LocalAdmin"">
<BitNavOption Text=""Dashboard"" IconName=""@BitIconName.ViewDashboard"" />
<BitNavOption Text=""Categories"" IconName=""@BitIconName.BuildQueue"" />
<BitNavOption Text=""Products"" IconName=""@BitIconName.Product"" />
</BitNavOption>
<BitNavOption Text=""Todo sample"" IconName=""@BitIconName.ToDoLogoOutline"" />
<BitNavOption Text=""AdminPanel sample"" IconName=""@BitIconName.LocalAdmin"" />
<BitNavOption Text=""BlazorUI"" IconName=""@BitIconName.F12DevTools"" />
<BitNavOption Text=""Bit academy"" IconName=""@BitIconName.LearningTools"" IsEnabled=""false"" />
<BitNavOption Text=""Contact us"" IconName=""@BitIconName.Contact"" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-03">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.5" />
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-03">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Bit.Bswup" Version="8.12.0-pre-03" />
<PackageReference Include="Bit.Bswup" Version="8.12.0-pre-04" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-03">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-03">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.12.0-pre-03
// bit version: 8.12.0-pre-04
// https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup

self.assetsInclude = [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<Using Include="Bit.BlazorUI.Demo.Client.Core.Services.Contracts" />
<Using Include="Bit.BlazorUI.Demo.Client.Core.Services" />

<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-03">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-03">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/BlazorUI/Demo/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Generated by bit-bp template v-8.12.0-pre-03 -->
<!-- Generated by bit-bp template v-8.12.0-pre-04 -->
<Project>
<PropertyGroup>
<LangVersion>12.0</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.12.0-pre-03
// bit version: 8.12.0-pre-04

self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
self.caseInsensitiveUrl = true;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.12.0-pre-03
// bit version: 8.12.0-pre-04

self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
self.caseInsensitiveUrl = true;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.12.0-pre-03
// bit version: 8.12.0-pre-04

// In development, always fetch from the network and do not enable offline support.
// This is because caching would make development more difficult (changes would not
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.12.0-pre-03
// bit version: 8.12.0-pre-04

self.assetsInclude = [];
self.assetsExclude = [
Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
window['bit-bswup.progress version'] = '8.12.0-pre-03';
window['bit-bswup.progress version'] = '8.12.0-pre-04';

; (function () {
(window as any).startBswupProgress = (autoReload: boolean,
Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
self['bit-bswup.sw version'] = '8.12.0-pre-03';
self['bit-bswup.sw version'] = '8.12.0-pre-04';

interface Window {
clients: any
Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const BitBswup = {} as any;
BitBswup.version = window['bit-bswup version'] = '8.12.0-pre-03';
BitBswup.version = window['bit-bswup version'] = '8.12.0-pre-04';

declare const Blazor: any;

Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/FullDemo/Client/wwwroot/service-worker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.12.0-pre-03
// bit version: 8.12.0-pre-04

// In development, always fetch from the network and do not enable offline support.
// This is because caching would make development more difficult (changes would not
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.12.0-pre-03
// bit version: 8.12.0-pre-04

self.assetsInclude = [];
self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
Expand Down
2 changes: 1 addition & 1 deletion src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
window['bit-bup.progress version'] = '8.12.0-pre-03';
window['bit-bup.progress version'] = '8.12.0-pre-04';

; (function () {
(window as any).startBupProgress = (showLogs: boolean, showAssets: boolean, appContainerSelector: string, hideApp: boolean, autoHide: boolean) => {
Expand Down
2 changes: 1 addition & 1 deletion src/Bup/Bit.Bup/Scripts/bit-bup.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var BitBup = BitBup || {};
BitBup.version = window['bit-bup version'] = '8.12.0-pre-03';
BitBup.version = window['bit-bup version'] = '8.12.0-pre-04';

declare const Blazor: any;

Expand Down
2 changes: 1 addition & 1 deletion src/Butil/Bit.Butil/Scripts/butil.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
var BitButil = BitButil || {};
BitButil.version = window['bit-butil version'] = '8.12.0-pre-03';
BitButil.version = window['bit-butil version'] = '8.12.0-pre-04';
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Generated by bit-empty template v-8.12.0-pre-03 -->
<!-- Generated by bit-empty template v-8.12.0-pre-04 -->

<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

Expand All @@ -17,14 +17,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Bit.BlazorUI" Version="8.12.0-pre-03" />
<PackageReference Include="Bit.BlazorUI" Version="8.12.0-pre-04" />

<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-03">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-03">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Generated by bit-empty template v-8.12.0-pre-03 -->
<!-- Generated by bit-empty template v-8.12.0-pre-04 -->

<Project Sdk="Microsoft.NET.Sdk.Web">

Expand All @@ -19,14 +19,14 @@
<!--#endif -->

<ItemGroup>
<PackageReference Include="Bit.BlazorUI" Version="8.12.0-pre-03" />
<PackageReference Include="Bit.BlazorUI" Version="8.12.0-pre-04" />

<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-03">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-03">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-04">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

namespace Boilerplate.Client.Core.Components;

public partial class AppRouteDataPublisher : AppComponentBase
{
[Parameter] public RouteData? RouteData { get; set; }

protected override Task OnInitAsync()
{
PubSubService.Publish(PubSubMessages.ROUTE_DATA_UPDATED, RouteData);

return base.OnInitAsync();
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
namespace Boilerplate.Client.Core.Components.Layout;

<<<<<<<< HEAD:src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AuthenticatedHeader.razor.cs
public partial class AuthenticatedHeader : AppComponentBase
========
public partial class AuthorizedHeader : AppComponentBase
>>>>>>>> 196d1ef14557dc3d723cd6ce6f8c73456bfd7ec4:src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AuthorizedHeader.razor.cs
{
private string? pageTitle;
private string? pageSubtitle;
Expand Down
Loading

0 comments on commit 7fc8db8

Please sign in to comment.