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
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

CS/DiagramBlazorApp/wwwroot/*
CS/DiagramBlazorApp/wwwroot/css/*
!CS/DiagramBlazorApp/wwwroot/css
!CS/DiagramBlazorApp/wwwroot/css/site.css
!CS/DiagramBlazorApp/wwwroot/css/theme-bs.css
!CS/DiagramBlazorApp/wwwroot/css/theme-fluent.css
!CS/DiagramBlazorApp/wwwroot/favicon.ico

# User-specific files
*.suo
*.user
Expand Down
17 changes: 7 additions & 10 deletions CS/DiagramBlazorApp/Components/App.razor
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
@using Microsoft.AspNetCore.Mvc.ViewFeatures
@using DiagramBlazorApp.Services
@inject IFileVersionProvider FileVersionProvider
@inject DxThemesService ThemesService

<!DOCTYPE html>
<html lang="en" data-bs-theme="@(ThemesService.IsBootstrapDarkActive ? "dark" : null)" data-fluent-darkmode="@(ThemesService.IsFluentDarkModeActive ? "" : null)">
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<base href="/" />
<script type="text/javascript" src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
<script src="https://cdn3.devexpress.com/jslib/25.1.3/js/dx-diagram.min.js"></script>
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/25.1.3/js/dx.all.js"></script>
@DxResourceManager.RegisterTheme(ThemesService.ActiveTheme)
<script type="text/javascript" src="/js/jquery.min.js"></script>
<script type="text/javascript" src="/js/dx-diagram.min.js"></script>
<script type="text/javascript" src="/js/dx.all.js"></script>
@DxResourceManager.RegisterTheme(Themes.Fluent)
@DxResourceManager.RegisterScripts((config) => {
config.Unregister(CommonResources.JQueryJS);
config.Unregister(CommonResources.DevExtremeJS);
})
<link rel="stylesheet" href="https://cdn3.devexpress.com/jslib/25.1.3/css/dx-diagram.min.css">
<link href=@AppendVersion("https://cdn3.devexpress.com/jslib/25.1.3/css/dx.fluent.blue.light.css") rel="stylesheet" />
<link href=@AppendVersion("css/site.css") rel="stylesheet" />
<link href=@AppendVersion("DiagramBlazorApp.styles.css") rel="stylesheet" />
<link href=@AppendVersion("css/dx.fluent.blue.light.css") rel="stylesheet" />
<link href=@AppendVersion("css/dx-diagram.min.css") rel="stylesheet" />
<HeadOutlet />
</head>
<body>
Expand Down
33 changes: 0 additions & 33 deletions CS/DiagramBlazorApp/Components/Layout/Drawer.razor

This file was deleted.

96 changes: 0 additions & 96 deletions CS/DiagramBlazorApp/Components/Layout/Drawer.razor.css

This file was deleted.

51 changes: 1 addition & 50 deletions CS/DiagramBlazorApp/Components/Layout/MainLayout.razor
Original file line number Diff line number Diff line change
@@ -1,52 +1,3 @@
@inherits LayoutComponentBase
@using DiagramBlazorApp.Services
@inject NavigationManager NavigationManager
@inject DxThemesService ThemesService

<div class="page">
<Drawer DrawerHeader="drawerHeader" DrawerFooter="drawerFooter">
<DrawerBody>
<div class="w-100">
<NavMenu></NavMenu>
</div>
</DrawerBody>
<DrawerTarget>
<div class="nav-buttons-container">
<NavLink href="@UrlGenerator.GetUrl(new Uri(NavigationManager.Uri).LocalPath, !ToggledSidebar)">
<DxButton RenderStyle="@(ThemesService.IsActiveThemeDark ? ButtonRenderStyle.Light : ButtonRenderStyle.Dark)" RenderStyleMode="@ButtonRenderStyleMode.Text" CssClass="menu-button" IconCssClass="icon icon-menu"></DxButton>
</NavLink>
@if (new Uri(NavigationManager.Uri).LocalPath != "/") {
<NavLink href="@UrlGenerator.GetUrl("/", ToggledSidebar)" class="button-link hidden">
<DxButton RenderStyle="@(ThemesService.IsActiveThemeDark ? ButtonRenderStyle.Light : ButtonRenderStyle.Dark)" Text="Back to Home" RenderStyleMode="@ButtonRenderStyleMode.Text" CssClass="menu-button-nav" IconCssClass="icon icon-back"></DxButton>
</NavLink>
}
</div>
<div class="p-4">
@Body
</div>
</DrawerTarget>
</Drawer>
</div>

@code {
[SupplyParameterFromQuery(Name = UrlGenerator.ToggleSidebarName)]
public bool ToggledSidebar { get; set; }

private RenderFragment drawerHeader => @<div class="navigation-drawer-header">
<img class="logo" src="images/logo.svg" alt="DevExpress logo" />
<NavLink href="@UrlGenerator.GetUrl(new Uri(NavigationManager.Uri).LocalPath, !ToggledSidebar)">
<DxButton RenderStyle="@(ThemesService.IsBootstrapDarkActive ? ButtonRenderStyle.Dark : ButtonRenderStyle.Light)" RenderStyleMode="@ButtonRenderStyleMode.Text" CssClass="menu-button-nav" IconCssClass="@(ToggledSidebar ? "icon icon-close" : "icon icon-menu")"></DxButton>
</NavLink>
</div>;

private RenderFragment drawerFooter => @<div>
<NavLink href="https://docs.devexpress.com/Blazor/400725/blazor-components" class="button-link">
<DxButton Text="Docs" RenderStyleMode="@ButtonRenderStyleMode.Text" CssClass="footer-button" RenderStyle="ButtonRenderStyle.Light" IconCssClass="icon docs-icon"></DxButton>
</NavLink>
<NavLink href="https://demos.devexpress.com/blazor/" class="button-link">
<DxButton Text="Demos" RenderStyleMode="@ButtonRenderStyleMode.Text" CssClass="footer-button" RenderStyle="ButtonRenderStyle.Light" IconCssClass="icon demos-icon"></DxButton>
</NavLink>
</div>;


}
@Body
83 changes: 0 additions & 83 deletions CS/DiagramBlazorApp/Components/Layout/MainLayout.razor.css

This file was deleted.

7 changes: 0 additions & 7 deletions CS/DiagramBlazorApp/Components/Layout/NavMenu.razor

This file was deleted.

Loading