Upgraded ShadcnBlazor and Extras to 1.0.8, adjusted styles import paths, and adjusted frontend build process.
Some checks failed
Dev Publish: Nuget / Publish Dev Packages (push) Failing after 23s
Some checks failed
Dev Publish: Nuget / Publish Dev Packages (push) Failing after 23s
This commit is contained in:
@@ -34,8 +34,12 @@ RUN dotnet restore "Hosts/Moonlight.Frontend.Host/Moonlight.Frontend.Host.csproj
|
|||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# Build styles
|
# Build styles
|
||||||
WORKDIR /src/Hosts/Moonlight.Frontend.Host/Styles
|
# We need to build it before, so the class lists get generated
|
||||||
RUN npm run tailwind-build
|
WORKDIR "/src/Hosts/Moonlight.Frontend.Host"
|
||||||
|
RUN dotnet build "./Moonlight.Frontend.Host.csproj" -c $BUILD_CONFIGURATION -o /app/build-frontend
|
||||||
|
|
||||||
|
WORKDIR "/src/Hosts/Moonlight.Frontend.Host/Styles"
|
||||||
|
RUN npm run build
|
||||||
|
|
||||||
# Build projects
|
# Build projects
|
||||||
WORKDIR "/src/Hosts/Moonlight.Api.Host"
|
WORKDIR "/src/Hosts/Moonlight.Api.Host"
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
"postcss": "^8.5.6",
|
"postcss": "^8.5.6",
|
||||||
"postcss-cli": "^11.0.1",
|
"postcss-cli": "^11.0.1",
|
||||||
"postcss-selector-parser": "^7.1.1",
|
"postcss-selector-parser": "^7.1.1",
|
||||||
"shadcnblazor": "^1.0.5",
|
|
||||||
"tailwindcss": "^4.1.18",
|
"tailwindcss": "^4.1.18",
|
||||||
"tw-animate-css": "^1.4.0"
|
"tw-animate-css": "^1.4.0"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
@import "tailwindcss";
|
@import "tailwindcss";
|
||||||
@import "tw-animate-css";
|
@import "tw-animate-css";
|
||||||
|
|
||||||
@import "./node_modules/shadcnblazor/scrollbar.css";
|
@import "../../../Moonlight.Frontend/bin/ShadcnBlazor/scrollbar.css";
|
||||||
@import "./node_modules/shadcnblazor/default-theme.css";
|
@import "../../../Moonlight.Frontend/bin/ShadcnBlazor/default-theme.css";
|
||||||
@import "./theme.css";
|
@import "./theme.css";
|
||||||
@source "./node_modules/shadcnblazor/classes.json";
|
|
||||||
|
@source "../../../Moonlight.Frontend/bin/ShadcnBlazor/ShadcnBlazor.map";
|
||||||
|
|
||||||
@source "../../../Moonlight.Api/**/*.razor";
|
@source "../../../Moonlight.Api/**/*.razor";
|
||||||
@source "../../../Moonlight.Api/**/*.cs";
|
@source "../../../Moonlight.Api/**/*.cs";
|
||||||
|
|||||||
@@ -24,8 +24,8 @@
|
|||||||
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.1"/>
|
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.1"/>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1"/>
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1"/>
|
||||||
<PackageReference Include="Riok.Mapperly" Version="4.3.1-next.0"/>
|
<PackageReference Include="Riok.Mapperly" Version="4.3.1-next.0"/>
|
||||||
<PackageReference Include="ShadcnBlazor" Version="1.0.5" />
|
<PackageReference Include="ShadcnBlazor" Version="1.0.8" />
|
||||||
<PackageReference Include="ShadcnBlazor.Extras" Version="1.0.5" />
|
<PackageReference Include="ShadcnBlazor.Extras" Version="1.0.8" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
@using ShadcnBlazor.Extras.Alerts
|
@using ShadcnBlazor.Extras.Alerts
|
||||||
@using ShadcnBlazor.Extras.Dialogs
|
@using ShadcnBlazor.Extras.Dialogs
|
||||||
@using ShadcnBlazor.Extras.Toasts
|
@using ShadcnBlazor.Extras.Toasts
|
||||||
|
@using ShadcnBlazor.Portals
|
||||||
@using ShadcnBlazor.Sidebars
|
@using ShadcnBlazor.Sidebars
|
||||||
|
|
||||||
@inherits LayoutComponentBase
|
@inherits LayoutComponentBase
|
||||||
@@ -21,5 +22,7 @@
|
|||||||
<ToastLauncher/>
|
<ToastLauncher/>
|
||||||
<DialogLauncher/>
|
<DialogLauncher/>
|
||||||
<AlertDialogLauncher/>
|
<AlertDialogLauncher/>
|
||||||
|
|
||||||
|
<PortalOutlet />
|
||||||
</SidebarInset>
|
</SidebarInset>
|
||||||
</SidebarProvider>
|
</SidebarProvider>
|
||||||
Reference in New Issue
Block a user