Skip to content

Commit dfba86b

Browse files
artemkuzmindevexpressartemkuzmindevexpress
authored
Merge pull request #2 from DevExpress-Examples/25.2.3-feature
Improve Project Structure
2 parents 261a5fb + 51d7140 commit dfba86b

73 files changed

Lines changed: 134 additions & 13468 deletions

Some content is hidden

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

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
##
44
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
55

6+
CS/DiagramBlazorApp/wwwroot/*
7+
CS/DiagramBlazorApp/wwwroot/css/*
8+
!CS/DiagramBlazorApp/wwwroot/css
9+
!CS/DiagramBlazorApp/wwwroot/css/site.css
10+
!CS/DiagramBlazorApp/wwwroot/css/theme-bs.css
11+
!CS/DiagramBlazorApp/wwwroot/css/theme-fluent.css
12+
!CS/DiagramBlazorApp/wwwroot/favicon.ico
13+
614
# User-specific files
715
*.suo
816
*.user

‎CS/DiagramBlazorApp/Components/App.razor‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
11
@using Microsoft.AspNetCore.Mvc.ViewFeatures
2-
@using DiagramBlazorApp.Services
32
@inject IFileVersionProvider FileVersionProvider
4-
@inject DxThemesService ThemesService
53

64
<!DOCTYPE html>
7-
<html lang="en" data-bs-theme="@(ThemesService.IsBootstrapDarkActive ? "dark" : null)" data-fluent-darkmode="@(ThemesService.IsFluentDarkModeActive ? "" : null)">
5+
<html lang="en">
86
<head>
97
<meta charset="utf-8" />
108
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
119
<base href="/" />
12-
<script type="text/javascript" src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
13-
<script src="https://cdn3.devexpress.com/jslib/25.1.3/js/dx-diagram.min.js"></script>
14-
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/25.1.3/js/dx.all.js"></script>
15-
@DxResourceManager.RegisterTheme(ThemesService.ActiveTheme)
10+
<script type="text/javascript" src="/js/jquery.min.js"></script>
11+
<script type="text/javascript" src="/js/dx-diagram.min.js"></script>
12+
<script type="text/javascript" src="/js/dx.all.js"></script>
13+
@DxResourceManager.RegisterTheme(Themes.Fluent)
1614
@DxResourceManager.RegisterScripts((config) => {
1715
config.Unregister(CommonResources.JQueryJS);
1816
config.Unregister(CommonResources.DevExtremeJS);
1917
})
20-
<link rel="stylesheet" href="https://cdn3.devexpress.com/jslib/25.1.3/css/dx-diagram.min.css">
21-
<link href=@AppendVersion("https://cdn3.devexpress.com/jslib/25.1.3/css/dx.fluent.blue.light.css") rel="stylesheet" />
2218
<link href=@AppendVersion("css/site.css") rel="stylesheet" />
23-
<link href=@AppendVersion("DiagramBlazorApp.styles.css") rel="stylesheet" />
19+
<link href=@AppendVersion("css/dx.fluent.blue.light.css") rel="stylesheet" />
20+
<link href=@AppendVersion("css/dx-diagram.min.css") rel="stylesheet" />
2421
<HeadOutlet />
2522
</head>
2623
<body>

‎CS/DiagramBlazorApp/Components/Layout/Drawer.razor‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎CS/DiagramBlazorApp/Components/Layout/Drawer.razor.css‎

Lines changed: 0 additions & 96 deletions
This file was deleted.

‎CS/DiagramBlazorApp/Components/Layout/MainLayout.razor‎

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,3 @@
11
@inherits LayoutComponentBase
2-
@using DiagramBlazorApp.Services
3-
@inject NavigationManager NavigationManager
4-
@inject DxThemesService ThemesService
52

6-
<div class="page">
7-
<Drawer DrawerHeader="drawerHeader" DrawerFooter="drawerFooter">
8-
<DrawerBody>
9-
<div class="w-100">
10-
<NavMenu></NavMenu>
11-
</div>
12-
</DrawerBody>
13-
<DrawerTarget>
14-
<div class="nav-buttons-container">
15-
<NavLink href="@UrlGenerator.GetUrl(new Uri(NavigationManager.Uri).LocalPath, !ToggledSidebar)">
16-
<DxButton RenderStyle="@(ThemesService.IsActiveThemeDark ? ButtonRenderStyle.Light : ButtonRenderStyle.Dark)" RenderStyleMode="@ButtonRenderStyleMode.Text" CssClass="menu-button" IconCssClass="icon icon-menu"></DxButton>
17-
</NavLink>
18-
@if (new Uri(NavigationManager.Uri).LocalPath != "/") {
19-
<NavLink href="@UrlGenerator.GetUrl("/", ToggledSidebar)" class="button-link hidden">
20-
<DxButton RenderStyle="@(ThemesService.IsActiveThemeDark ? ButtonRenderStyle.Light : ButtonRenderStyle.Dark)" Text="Back to Home" RenderStyleMode="@ButtonRenderStyleMode.Text" CssClass="menu-button-nav" IconCssClass="icon icon-back"></DxButton>
21-
</NavLink>
22-
}
23-
</div>
24-
<div class="p-4">
25-
@Body
26-
</div>
27-
</DrawerTarget>
28-
</Drawer>
29-
</div>
30-
31-
@code {
32-
[SupplyParameterFromQuery(Name = UrlGenerator.ToggleSidebarName)]
33-
public bool ToggledSidebar { get; set; }
34-
35-
private RenderFragment drawerHeader => @<div class="navigation-drawer-header">
36-
<img class="logo" src="images/logo.svg" alt="DevExpress logo" />
37-
<NavLink href="@UrlGenerator.GetUrl(new Uri(NavigationManager.Uri).LocalPath, !ToggledSidebar)">
38-
<DxButton RenderStyle="@(ThemesService.IsBootstrapDarkActive ? ButtonRenderStyle.Dark : ButtonRenderStyle.Light)" RenderStyleMode="@ButtonRenderStyleMode.Text" CssClass="menu-button-nav" IconCssClass="@(ToggledSidebar ? "icon icon-close" : "icon icon-menu")"></DxButton>
39-
</NavLink>
40-
</div>;
41-
42-
private RenderFragment drawerFooter => @<div>
43-
<NavLink href="https://docs.devexpress.com/Blazor/400725/blazor-components" class="button-link">
44-
<DxButton Text="Docs" RenderStyleMode="@ButtonRenderStyleMode.Text" CssClass="footer-button" RenderStyle="ButtonRenderStyle.Light" IconCssClass="icon docs-icon"></DxButton>
45-
</NavLink>
46-
<NavLink href="https://demos.devexpress.com/blazor/" class="button-link">
47-
<DxButton Text="Demos" RenderStyleMode="@ButtonRenderStyleMode.Text" CssClass="footer-button" RenderStyle="ButtonRenderStyle.Light" IconCssClass="icon demos-icon"></DxButton>
48-
</NavLink>
49-
</div>;
50-
51-
52-
}
3+
@Body

‎CS/DiagramBlazorApp/Components/Layout/MainLayout.razor.css‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎CS/DiagramBlazorApp/Components/Layout/NavMenu.razor‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)