Skip to content

Commit 6df0315

Browse files
author
Konduru Keerthi Konduru Ravichandra Raju
committed
Mail Merge
1 parent 065870e commit 6df0315

File tree

27 files changed

+185
-895
lines changed

27 files changed

+185
-895
lines changed
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.8.34330.188
4+
VisualStudioVersion = 17.10.34928.147
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Replace-Merge-field-with-HTML", "Replace-Merge-field-with-HTML\Replace-Merge-field-with-HTML.csproj", "{82F25CEE-E0D8-43DA-BE5C-7439060000C9}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Replace-Merge-field-with-HTML", "Replace-Merge-field-with-HTML\Replace-Merge-field-with-HTML.csproj", "{41DA5D86-E234-4D7E-A7B2-15DCD8B08A11}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Any CPU = Debug|Any CPU
1111
Release|Any CPU = Release|Any CPU
1212
EndGlobalSection
1313
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{82F25CEE-E0D8-43DA-BE5C-7439060000C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{82F25CEE-E0D8-43DA-BE5C-7439060000C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{82F25CEE-E0D8-43DA-BE5C-7439060000C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{82F25CEE-E0D8-43DA-BE5C-7439060000C9}.Release|Any CPU.Build.0 = Release|Any CPU
14+
{41DA5D86-E234-4D7E-A7B2-15DCD8B08A11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{41DA5D86-E234-4D7E-A7B2-15DCD8B08A11}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{41DA5D86-E234-4D7E-A7B2-15DCD8B08A11}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{41DA5D86-E234-4D7E-A7B2-15DCD8B08A11}.Release|Any CPU.Build.0 = Release|Any CPU
1818
EndGlobalSection
1919
GlobalSection(SolutionProperties) = preSolution
2020
HideSolutionNode = FALSE
2121
EndGlobalSection
2222
GlobalSection(ExtensibilityGlobals) = postSolution
23-
SolutionGuid = {2BCB7D5F-41AE-4976-9AB0-A737B4DF9DBF}
23+
SolutionGuid = {561B7D88-76FD-4A31-9D08-CAF6382909F5}
2424
EndGlobalSection
2525
EndGlobal

Mail-Merge/Replace-Merge-field-with-HTML/Blazor/Client-side-application/Replace-Merge-field-with-HTML/Shared/MainLayout.razor renamed to Mail-Merge/Replace-Merge-field-with-HTML/Blazor/Client-side-application/Replace-Merge-field-with-HTML/Layout/MainLayout.razor

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
@inherits LayoutComponentBase
2-
32
<div class="page">
43
<div class="sidebar">
54
<NavMenu />
65
</div>
76

87
<main>
98
<div class="top-row px-4">
10-
<a href="https://docs.microsoft.com/aspnet/" target="_blank">About</a>
9+
<a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
1110
</div>
1211

1312
<article class="content px-4">

Mail-Merge/Replace-Merge-field-with-HTML/Blazor/Client-side-application/Replace-Merge-field-with-HTML/Shared/MainLayout.razor.css renamed to Mail-Merge/Replace-Merge-field-with-HTML/Blazor/Client-side-application/Replace-Merge-field-with-HTML/Layout/MainLayout.razor.css

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ main {
3737
}
3838

3939
@media (max-width: 640.98px) {
40-
.top-row:not(.auth) {
41-
display: none;
42-
}
43-
44-
.top-row.auth {
40+
.top-row {
4541
justify-content: space-between;
4642
}
4743

Mail-Merge/Replace-Merge-field-with-HTML/Blazor/Client-side-application/Replace-Merge-field-with-HTML/Shared/NavMenu.razor renamed to Mail-Merge/Replace-Merge-field-with-HTML/Blazor/Client-side-application/Replace-Merge-field-with-HTML/Layout/NavMenu.razor

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
</div>
88
</div>
99

10-
<div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
10+
<div class="@NavMenuCssClass nav-scrollable" @onclick="ToggleNavMenu">
1111
<nav class="flex-column">
1212
<div class="nav-item px-3">
1313
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
14-
<span class="oi oi-home" aria-hidden="true"></span> Home
14+
<span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
1515
</NavLink>
1616
</div>
1717
<div class="nav-item px-3">
1818
<NavLink class="nav-link" href="counter">
19-
<span class="oi oi-plus" aria-hidden="true"></span> Counter
19+
<span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Counter
2020
</NavLink>
2121
</div>
2222
<div class="nav-item px-3">
23-
<NavLink class="nav-link" href="fetchdata">
24-
<span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data
23+
<NavLink class="nav-link" href="weather">
24+
<span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
2525
</NavLink>
2626
</div>
2727
<div class="nav-item px-3">
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
.navbar-toggler {
2+
background-color: rgba(255, 255, 255, 0.1);
3+
}
4+
5+
.top-row {
6+
height: 3.5rem;
7+
background-color: rgba(0,0,0,0.4);
8+
}
9+
10+
.navbar-brand {
11+
font-size: 1.1rem;
12+
}
13+
14+
.bi {
15+
display: inline-block;
16+
position: relative;
17+
width: 1.25rem;
18+
height: 1.25rem;
19+
margin-right: 0.75rem;
20+
top: -1px;
21+
background-size: cover;
22+
}
23+
24+
.bi-house-door-fill-nav-menu {
25+
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
26+
}
27+
28+
.bi-plus-square-fill-nav-menu {
29+
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
30+
}
31+
32+
.bi-list-nested-nav-menu {
33+
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
34+
}
35+
36+
.nav-item {
37+
font-size: 0.9rem;
38+
padding-bottom: 0.5rem;
39+
}
40+
41+
.nav-item:first-of-type {
42+
padding-top: 1rem;
43+
}
44+
45+
.nav-item:last-of-type {
46+
padding-bottom: 1rem;
47+
}
48+
49+
.nav-item ::deep a {
50+
color: #d7d7d7;
51+
border-radius: 4px;
52+
height: 3rem;
53+
display: flex;
54+
align-items: center;
55+
line-height: 3rem;
56+
}
57+
58+
.nav-item ::deep a.active {
59+
background-color: rgba(255,255,255,0.37);
60+
color: white;
61+
}
62+
63+
.nav-item ::deep a:hover {
64+
background-color: rgba(255,255,255,0.1);
65+
color: white;
66+
}
67+
68+
@media (min-width: 641px) {
69+
.navbar-toggler {
70+
display: none;
71+
}
72+
73+
.collapse {
74+
/* Never collapse the sidebar for wide screens */
75+
display: block;
76+
}
77+
78+
.nav-scrollable {
79+
/* Allow sidebar to scroll for tall menus */
80+
height: calc(100vh - 3.5rem);
81+
overflow-y: auto;
82+
}
83+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@page "/"
2+
3+
<PageTitle>Home</PageTitle>
4+
5+
<h1>Hello, world!</h1>
6+
7+
Welcome to your new app.

Mail-Merge/Replace-Merge-field-with-HTML/Blazor/Client-side-application/Replace-Merge-field-with-HTML/Pages/Index.razor

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

Mail-Merge/Replace-Merge-field-with-HTML/Blazor/Client-side-application/Replace-Merge-field-with-HTML/Pages/FetchData.razor renamed to Mail-Merge/Replace-Merge-field-with-HTML/Blazor/Client-side-application/Replace-Merge-field-with-HTML/Pages/Weather.razor

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
@page "/fetchdata"
1+
@page "/weather"
22
@inject HttpClient Http
33

4-
<PageTitle>Weather forecast</PageTitle>
4+
<PageTitle>Weather</PageTitle>
55

6-
<h1>Weather forecast</h1>
6+
<h1>Weather</h1>
77

88
<p>This component demonstrates fetching data from the server.</p>
99

@@ -46,7 +46,7 @@ else
4646

4747
public class WeatherForecast
4848
{
49-
public DateTime Date { get; set; }
49+
public DateOnly Date { get; set; }
5050

5151
public int TemperatureC { get; set; }
5252

Mail-Merge/Replace-Merge-field-with-HTML/Blazor/Client-side-application/Replace-Merge-field-with-HTML/Properties/launchSettings.json

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,30 @@
11
{
2+
"$schema": "http://json.schemastore.org/launchsettings.json",
23
"iisSettings": {
34
"windowsAuthentication": false,
45
"anonymousAuthentication": true,
56
"iisExpress": {
6-
"applicationUrl": "http://localhost:7286",
7-
"sslPort": 44385
7+
"applicationUrl": "http://localhost:50277",
8+
"sslPort": 44306
89
}
910
},
1011
"profiles": {
11-
"Replace-Merge-field-with-HTML": {
12+
"http": {
1213
"commandName": "Project",
1314
"dotnetRunMessages": true,
1415
"launchBrowser": true,
1516
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
16-
"applicationUrl": "https://localhost:7279;http://localhost:5014",
17+
"applicationUrl": "http://localhost:5083",
18+
"environmentVariables": {
19+
"ASPNETCORE_ENVIRONMENT": "Development"
20+
}
21+
},
22+
"https": {
23+
"commandName": "Project",
24+
"dotnetRunMessages": true,
25+
"launchBrowser": true,
26+
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
27+
"applicationUrl": "https://localhost:7125;http://localhost:5083",
1728
"environmentVariables": {
1829
"ASPNETCORE_ENVIRONMENT": "Development"
1930
}

Mail-Merge/Replace-Merge-field-with-HTML/Blazor/Client-side-application/Replace-Merge-field-with-HTML/Replace-Merge-field-with-HTML.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.24" />
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.24" PrivateAssets="all" />
12-
<PackageReference Include="Syncfusion.DocIO.Net.Core" Version="*" />
10+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.7" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.7" PrivateAssets="all" />
12+
<PackageReference Include="Syncfusion.DocIO.Net.Core" Version="26.1.42" />
1313
</ItemGroup>
1414

1515
</Project>

0 commit comments

Comments
 (0)