Skip to content

Commit 34f5a1b

Browse files
committed
CHORE: update nuget dependencies
MIGRATE: tailwind 4 UPDATE: tailwind cli instead of postcss plugin FIX: generate qr in mobile app
1 parent f42f782 commit 34f5a1b

File tree

82 files changed

+225
-8083
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+225
-8083
lines changed
+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TailwindToolsVersion Condition="'$(TailwindToolsVersion)' == ''">4.0.3</TailwindToolsVersion>
4+
</PropertyGroup>
5+
6+
<Target Name="TailwindBuild" BeforeTargets="CoreBuild" DependsOnTargets="GetTailwindInputs; AcquireTailwindTooling"
7+
Inputs="@(TailwindFileInputs)" Outputs="$(TailwindCssOutput)">
8+
<Exec Command="$(TailwindExePath) -i $(TailwindCssInput) -o $(TailwindCssOutput) --minify" />
9+
<Touch Files="$(TailwindCssOutput)" />
10+
<ItemGroup>
11+
<FileWrites Include="$(TailwindCssOutput)" />
12+
</ItemGroup>
13+
</Target>
14+
15+
<Target Name="AcquireTailwindTooling" DependsOnTargets="GetTailwindInputs" Condition="!Exists('$(TailwindExePath)')">
16+
<DownloadFile SourceUrl="https://github.com/tailwindlabs/tailwindcss/releases/download/v$(TailwindToolsVersion)/$(TailwindExeName)" DestinationFolder="$(TailwindExeDir)" />
17+
<Exec Condition="!$([MSBuild]::IsOSPlatform('Windows'))" Command="chmod +x '$(TailwindExePath)'" />
18+
</Target>
19+
20+
<Target Name="GetTailwindInputs">
21+
<PropertyGroup>
22+
<TailwindExeName Condition="$([MSBuild]::IsOSPlatform('Windows'))">tailwindcss-windows-x64.exe</TailwindExeName>
23+
<TailwindExeName Condition="$([MSBuild]::IsOSPlatform('Linux'))">tailwindcss-linux-x64</TailwindExeName>
24+
<TailwindExeName Condition="$([MSBuild]::IsOSPlatform('OSX'))">tailwindcss-macos-x64</TailwindExeName>
25+
<TailwindExeDir>$([System.IO.Path]::Combine("node_modules", $(TailwindToolsVersion)))</TailwindExeDir>
26+
<TailwindExePath>$([System.IO.Path]::Combine($(TailwindExeDir), $(TailwindExeName)))</TailwindExePath>
27+
</PropertyGroup>
28+
<ItemGroup>
29+
<TailwindFileInputs Include="$(MSBuildProjectDirectory)\**\*.css;$(MSBuildProjectDirectory)\**\*.razor;$(MSBuildProjectDirectory)\**\*.cshtml" />
30+
<UpToDateCheckInput Include="@(TailwindFileInputs)" />
31+
</ItemGroup>
32+
</Target>
33+
</Project>

Src/Apps/Desktop/Pl.Desktop.Client/Pl.Desktop.Client.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<IncludeSymbols>false</IncludeSymbols>
2020
<GenerateTestArtifacts>false</GenerateTestArtifacts>
2121
<EnableDefaultCssItems>false</EnableDefaultCssItems>
22+
23+
<TailwindCssInput>wwwroot\app.css</TailwindCssInput>
24+
<TailwindCssOutput>wwwroot\app.min.css</TailwindCssOutput>
2225
</PropertyGroup>
2326

2427
<ItemGroup Label="Directory.Packages.props">
@@ -35,8 +38,8 @@
3538
</ItemGroup>
3639

3740
<ItemGroup Label="Packages">
38-
<PackageReference Include="Microsoft.Extensions.Options" VersionOverride="9.0.1" />
39-
<PackageReference Include="Microsoft.WindowsAppSDK" VersionOverride="1.6.250108002" />
41+
<PackageReference Include="Microsoft.Extensions.Options" VersionOverride="9.0.2" />
42+
<PackageReference Include="Microsoft.WindowsAppSDK" VersionOverride="1.6.250205002" />
4043

4144
<PackageReference Include="Velopack" VersionOverride="0.0.1053"/>
4245

@@ -84,10 +87,7 @@
8487
<Content Include="..\..\..\Libs\Pl.Components\Shared\_Imports.razor" Link="_Imports.razor" CopyToOutputDirectory="PreserveNewest" />
8588
</ItemGroup>
8689

87-
<Import Project="..\..\..\.targets\NodePackages.targets" />
90+
<Import Project="..\..\..\.targets\TailwindIntegration.targets" />
8891
<Import Project="..\..\..\.targets\AppSettingsForMaui.targets" />
8992

90-
<Target Name="StaticsBuild" BeforeTargets="PreBuildEvent">
91-
<Exec Command="npm run build" />
92-
</Target>
93-
</Project>
93+
</Project>

Src/Apps/Desktop/Pl.Desktop.Client/Source/Features/DeviceStatusIcons/PrinterStatusIcon.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Class="relative"
1111
OnClick="@PrintStatusMessage"
1212
>
13-
<div class="@Css.Class("size-3 rounded-full shadow-sm overflow-hidden absolute -top-1 -right-1", GetIndicatorStyle)"></div>
13+
<div class="@Css.Class("size-3 rounded-full shadow-xs overflow-hidden absolute -top-1 -right-1", GetIndicatorStyle)"></div>
1414
<PrinterIcon class="@Css.Class("size-5", GetIconStyle)"/>
1515
</Button>
1616

Src/Apps/Desktop/Pl.Desktop.Client/Source/Features/DeviceStatusIcons/ScaleStatusIcon.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Class="relative"
1111
OnClick="@PrintStatusMessage"
1212
>
13-
<div class="@Css.Class("size-3 rounded-full shadow-sm overflow-hidden absolute -top-1 -right-1", GetIndicatorStyle)"></div>
13+
<div class="@Css.Class("size-3 rounded-full shadow-xs overflow-hidden absolute -top-1 -right-1", GetIndicatorStyle)"></div>
1414
<ScaleIcon class="@Css.Class("size-5", GetIconStyle)"/>
1515
</Button>
1616

Src/Apps/Desktop/Pl.Desktop.Client/Source/Features/MobileNumericInput/MobileNumericDisplay.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
maxlength="@Parent.MaxDigitCount"
88
placeholder="1"
99
inputmode="none"
10-
class="w-full border px-3 py-2 focus:border-border focus:outline-none rounded-lg focus:ring-0 text-right text-4xl"
10+
class="w-full border px-3 py-2 focus:border-border focus:outline-hidden rounded-lg focus:ring-0 text-right text-4xl"
1111
/>
1212

1313
@code {

Src/Apps/Desktop/Pl.Desktop.Client/Source/Pages/Labels/LabelsPage.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</div>
2323
</AppHeader>
2424
<div class="size-full flex flex-col grow overflow-hidden items-center justify-center px-8 pt-2 pb-4">
25-
<div class="w-full grid grid-rows-1 gap-4 grid-cols-[1fr,1.5fr] h-[34rem] max-w-screen-2xl overflow-hidden">
25+
<div class="w-full grid grid-rows-1 gap-4 grid-cols-[1fr_1.5fr] h-[34rem] max-w-screen-2xl overflow-hidden">
2626
<LabelConfig />
2727
<LabelCreateForm />
2828
</div>

Src/Apps/Desktop/Pl.Desktop.Client/Source/Pages/Pallet/FunctionalityDescription/FunctionalityDescription.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@using Blazor.Heroicons
22

3-
<div class="rounded-md max-w-2xl max-h-full overflow-y-auto border shadow-sm bg-background p-6 w-full">
3+
<div class="rounded-md max-w-2xl max-h-full overflow-y-auto border shadow-xs bg-background p-6 w-full">
44
<div class="flex flex-col space-y-1.5">
55
<h3 class="font-semibold leading-none tracking-tight">
66
@Localizer["FuncCardHeader"]

Src/Apps/Desktop/Pl.Desktop.Client/Source/Pages/Pallet/LabelsGrid.razor

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</div>
2626
<div class="flex w-full pb-2 justify-between items-end">
2727
<div class="w-1/2 pb-2">
28-
<div class="w-full border bg-background rounded-md pb-0.5 px-2 h-9 flex items-center shadow-sm gap-2 justify-between overflow-hidden">
28+
<div class="w-full border bg-background rounded-md pb-0.5 px-2 h-9 flex items-center shadow-xs gap-2 justify-between overflow-hidden">
2929
<Heroicon
3030
Name="@HeroiconName.MagnifyingGlass"
3131
Type="HeroiconType.Outline"
@@ -36,7 +36,7 @@
3636
@bind="SearchingNumber"
3737
@bind:event="oninput"
3838
placeholder="@Localizer["SearchByNumberPlaceholder"]"
39-
class="bg-transparent size-full text-sm focus:outline-none focus:border-0 focus:ring-0"
39+
class="bg-transparent size-full text-sm focus:outline-hidden focus:border-0 focus:ring-0"
4040
/>
4141
</div>
4242
</div>
@@ -48,7 +48,7 @@
4848
</div>
4949
</div>
5050
<div class="size-full grow overflow-hidden px-6 pb-6 pt-0">
51-
<div class="rounded-md border size-full bg-background shadow-sm overflow-hidden">
51+
<div class="rounded-md border size-full bg-background shadow-xs overflow-hidden">
5252
<div class="size-full overflow-y-auto">
5353
<UseEndpoint Endpoint="@PalletEndpoints.PalletLabelsEndpoint" Arg="@new(Pallet.Id)" Context="labelsQuery">
5454
<FluentDataGrid

Src/Apps/Desktop/Pl.Desktop.Client/Source/Pages/Pallet/PalletManForm.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@using vNext.BlazorComponents.FluentValidation
22

3-
<div class="rounded-lg overflow-hidden max-w-sm p-6 border shadow-sm bg-background w-full">
3+
<div class="rounded-lg overflow-hidden max-w-sm p-6 border shadow-xs bg-background w-full">
44
<div class="w-full pb-4 border-b">
55
<h2 class="text-lg font-semibold leading-none tracking-tight">
66
@Localizer["PalletManFormHeader"]

Src/Apps/Desktop/Pl.Desktop.Client/Source/Pages/Pallet/PalletPage.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525
else
2626
{
27-
<div class="size-full grid grid-rows-1 grid-cols-[24rem,2fr] rounded-lg shadow-sm bg-background border divide-x max-w-screen-2xl overflow-hidden">
27+
<div class="size-full grid grid-rows-1 grid-cols-[24rem_2fr] rounded-lg shadow-xs bg-background border divide-x max-w-screen-2xl overflow-hidden">
2828
<PalletSelect />
2929
<div class="size-full overflow-hidden">
3030
@if (PalletState.Value.Pallet == null)

Src/Apps/Desktop/Pl.Desktop.Client/Source/Pages/Pallet/PalletSelect/PalletSelectItem.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
type="button"
77
disabled="@IsSelected"
88
@onclick="@(() => Dispatcher.Dispatch(new ChangePalletAction(Pallet)))"
9-
class="@Css.Class("w-full h-18 shrink-0 px-4 pb-2.5 pt-2 items-center flex shadow-sm transition-colors rounded-md border hover:bg-secondary/[.6]",
9+
class="@Css.Class("w-full h-18 shrink-0 px-4 pb-2.5 pt-2 items-center flex shadow-xs transition-colors rounded-md border hover:bg-secondary/[.6]",
1010
IsSelected ? "bg-secondary hover:bg-secondary" : string.Empty)"
1111
>
1212
<div class="size-full overflow-hidden grow flex gap-0.5 flex-col">

Src/Apps/Desktop/Pl.Desktop.Client/Source/Pages/Pallet/PalletSelect/PalletSelectSearching.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@bind="SearchingString"
1111
@bind:event="oninput"
1212
@bind:after="OnInputChanged"
13-
class="size-full border-none text-sm pl-1 focus:outline-none focus:ring-0"
13+
class="size-full border-none text-sm pl-1 focus:outline-hidden focus:ring-0"
1414
placeholder="@Localizer["SearchByNumberPlaceholder"]"/>
1515
</div>
1616
<div class="w-9">

Src/Apps/Desktop/Pl.Desktop.Client/appsettings.DevelopVS.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"System": {
33
"Language": "ru-RU",
4-
"FullScreenMode": true,
4+
"FullScreenMode": false,
55
"MockPrinter": false,
66
"MockScales": true
77
},

0 commit comments

Comments
 (0)