Skip to content
This repository was archived by the owner on May 8, 2025. It is now read-only.

Commit 6a8a975

Browse files
TimHessTimHess
committed
fix blog & font styles, blog & guide TOC, drop DocsSiteOptions
1 parent ae4d54a commit 6a8a975

33 files changed

+769
-133
lines changed

‎src/Client/Components/Layout/SiteFooter.razor‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
21

32
<footer>
43
<div class="width-all bg-midnight-blue">
@@ -40,10 +39,10 @@
4039
<div class="col" id="footer-learn-col">
4140
<div class="pb-2 font-weight-bold">Learn</div>
4241
<div><Href Class="link-light" href="/initializr" NewWindow="true">Steeltoe Initializr</Href></div>
43-
<div><Href Class="link-light" href="@(DocsSiteOptions.Value.GuidesHome)">Guides</Href></div>
44-
<div><Href Class="link-light" href="@(DocsSiteOptions.Value.DocsHome)">Documentation</Href></div>
45-
<div><Href Class="link-light" href="@(DocsSiteOptions.Value.ApiBrowserHome)">API Browser</Href></div>
46-
<div><Href Class="link-light" href="@(DocsSiteOptions.Value.BlogHome)">Blog</Href></div>
42+
<div><Href Class="link-light" href="/guides">Guides</Href></div>
43+
<div><Href Class="link-light" href="/api">Documentation</Href></div>
44+
<div><Href Class="link-light" href="/api/browser">API Browser</Href></div>
45+
<div><Href Class="link-light" href="/articles">Blog</Href></div>
4746
</div>
4847
<div class="col" id="footer-projects-col">
4948
<div class="pb-2 font-weight-bold">Projects</div>
@@ -52,11 +51,11 @@
5251
<div><Href Class="link-light" href="/logging">Dynamic Logging</Href></div>
5352
<div><Href Class="link-light" href="/cloud-management">Management</Href></div>
5453
<div><Href Class="link-light" href="/messaging">Messaging</Href></div>
55-
<div><Href Class="link-light" href="@(DocsSiteOptions.Value.FileShareHome)">Network File Sharing</Href></div>
54+
<div><Href Class="link-light" href="/api/v4/fileshares">Network File Sharing</Href></div>
5655
<div><Href Class="link-light" href="/security-providers">Security</Href></div>
5756
<div><Href Class="link-light" href="/service-connectors">Service Connectors</Href></div>
5857
<div><Href Class="link-light" href="/service-discovery">Service Discovery</Href></div>
59-
<div><Href Class="link-light" href="@(DocsSiteOptions.Value.DocsStreamHome)">Stream</Href></div>
58+
<div><Href Class="link-light" href="/api/v3/stream">Stream</Href></div>
6059
</div>
6160
<div class="col" id="footer-others-col">
6261
@*<div class="pb-2 font-weight-bold"><Href href="/training">Training</Href></div>*@

‎src/Client/Components/Layout/SiteHeader.razor‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
2-
31
<header class="sticky-top" style="box-shadow: 0 0 20px -4px #eeeeee;">
42
<nav class="navbar navbar-expand-xl container py-xl-2">
53
<Href Class="navbar-brand" href="/">
@@ -87,10 +85,10 @@
8785
</a>
8886
<div class="dropdown-menu" aria-labelledby="learn">
8987
<Href class="dropdown-item" href="/initializr">Steeltoe Initializr</Href>
90-
<Href class="dropdown-item" href="@(DocsSiteOptions.Value.GuidesHome)">Guides</Href>
91-
<Href class="dropdown-item" href="@(DocsSiteOptions.Value.DocsHome)">Documentation</Href>
92-
<Href class="dropdown-item" href="@(DocsSiteOptions.Value.ApiBrowserHome)">API Browser</Href>
93-
<Href class="dropdown-item" href="@(DocsSiteOptions.Value.BlogHome)">Blog</Href>
88+
<Href class="dropdown-item" href="/guides">Guides</Href>
89+
<Href class="dropdown-item" href="/api">Documentation</Href>
90+
<Href class="dropdown-item" href="/api/browser">API Browser</Href>
91+
<Href class="dropdown-item" href="/articles">Blog</Href>
9492
</div>
9593
</li>
9694
<li class="nav-item dropdown mx-xl-2">
@@ -103,11 +101,11 @@
103101
<Href class="dropdown-item" href="/docs/logging">Steeltoe Dynamic Logging</Href>
104102
<Href class="dropdown-item" href="/cloud-management">Steeltoe Management</Href>
105103
<Href class="dropdown-item" href="/messaging">Steeltoe Messaging</Href>
106-
<Href class="dropdown-item" href="@(DocsSiteOptions.Value.FileShareHome)">Steeltoe Network File Sharing</Href>
104+
<Href class="dropdown-item" href="/api/v4/fileshares">Steeltoe Network File Sharing</Href>
107105
<Href class="dropdown-item" href="/security-providers">Steeltoe Security</Href>
108106
<Href class="dropdown-item" href="/service-connectors">Steeltoe Service Connectors</Href>
109107
<Href class="dropdown-item" href="/service-discovery">Steeltoe Service Discovery</Href>
110-
<Href class="dropdown-item" href="@(DocsSiteOptions.Value.DocsStreamHome)">Steeltoe Stream</Href>
108+
<Href class="dropdown-item" href="/api/v3/stream">Steeltoe Stream</Href>
111109
</div>
112110
</li>
113111
@*<li class="nav-item mx-xl-2">

‎src/Client/Components/Pages/AppConfiguration/Redirects.razor‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
@page "/app-configuration/get-started/{Provider}"
22

33
@inject NavigationManager Navigation
4-
@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
54

65
@code
76
{
87
[Parameter] public string Provider { get; set; }
98

109
protected override void OnParametersSet()
1110
{
12-
Navigation.NavigateTo($"{DocsSiteOptions.Value.BaseAddress}/guides/application-configuration/{TranslateProviderName(Provider)}.html");
11+
Navigation.NavigateTo($"/guides/application-configuration/{TranslateProviderName(Provider)}.html");
1312
}
1413

1514
private static string TranslateProviderName(string provider)

‎src/Client/Components/Pages/Blog.razor‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@inject NavigationManager NavigationManager
2-
@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
32

43
@page "/blog"
54
@page "/blogs"
@@ -15,8 +14,8 @@
1514
protected override void OnParametersSet()
1615
{
1716
var uri = Area != null
18-
? $"{DocsSiteOptions.Value.BaseAddress}/articles/{Area}/{ArticleName}.html"
19-
: $"{DocsSiteOptions.Value.BaseAddress}/articles/{ArticleName}.html";
17+
? $"/articles/{Area}/{ArticleName}.html"
18+
: $"/articles/{ArticleName}.html";
2019

2120
NavigationManager.NavigateTo(uri);
2221
}

‎src/Client/Components/Pages/CircuitBreakers/Index.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
This component has been discontinued from Steeltoe v4. Please click here to read more and provide feedback.
66
</Banner>
77

8-
<Template Name="Circuit Breaker" Features="@_features" DocsUrl="/docs/3/circuitbreaker" MetaDescription="Prevent cascading failures in .NET applications with Steeltoe Circuit Breaker.">
8+
<Template Name="Circuit Breaker" Features="@_features" DocsUrl="/docs/circuitbreaker" MetaDescription="Prevent cascading failures in .NET applications with Steeltoe Circuit Breaker.">
99
<Description>
1010
What do you do when a service you depend on stops responding? Circuit breakers enable you to bypass a failing service, allowing it time to recover, and preventing your users from seeing nasty error messages.
1111
Steeltoe includes a .NET implementation of Netflix Hystrix, a proven circuit breaker implementation with rich metrics and monitoring features.

‎src/Client/Components/Pages/CircuitBreakers/Redirects.razor‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
@page "/circuit-breakers/get-started/breaker"
22
@page "/circuit-breakers/get-started"
33
@inject NavigationManager Navigation
4-
@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
54

65
@code
76
{
87
protected override void OnParametersSet()
98
{
10-
Navigation.NavigateTo($"{DocsSiteOptions.Value.BaseAddress}/guides/circuit-breaker/circuit-breaker.html");
9+
Navigation.NavigateTo("/guides/circuit-breaker/circuit-breaker.html");
1110
}
1211
}

‎src/Client/Components/Pages/Doc.razor‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
11
@inject NavigationManager NavigationManager
2-
@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
3-
@*
42
@page "/doc"
5-
@page "/docs"
6-
7-
@page "/{Component}"
8-
@page "/{Component}/{Area}"
9-
@page "/{Component}/docs"*@
10-
@* @page "/docs/{Component}"
11-
@page "/docs/{Component}/{Area}"
12-
*@
13-
@* @page "/docs/{Version:int}"
3+
@page "/{Component}/docs"
4+
@page "/docs/{Component}"
5+
@page "/docs/{Version:int}"
146
@page "/docs/{Version:int}/{Component}"
157
@page "/docs/{Version:int}/{Component}/{Area}"
16-
*@
8+
179
@code
1810
{
1911
private const int CurrentVersion = 4;
2012

13+
private readonly string[] _v3Components = ["circuitbreaker", "messaging", "stream"];
14+
2115
[Parameter] public string Area { get; set; }
2216
[Parameter] public string Component { get; set; }
2317
[Parameter] public int? Version { get; set; }
2418

2519
protected override void OnParametersSet()
2620
{
27-
if (Version is null or < 2 or > CurrentVersion)
21+
if (_v3Components.Contains(Component))
22+
{
23+
Version = 3;
24+
}
25+
else if (Version is null or < 2 or > CurrentVersion)
2826
{
2927
Version = CurrentVersion;
3028
}
3129

30+
3231
Component ??= "welcome";
33-
var uri = $"/docs/v{Version}/{Component}/";
32+
var uri = $"/api/v{Version}/{Component}/";
3433

3534
Area ??= "index";
3635
uri += $"{Area}.html";

‎src/Client/Components/Pages/DynamicLogging/Redirects.razor‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
@page "/steeltoe-logging"
44

55
@inject NavigationManager Navigation
6-
@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
76

87
@code
98
{
109
protected override void OnParametersSet()
1110
{
12-
Navigation.NavigateTo(DocsSiteOptions.Value.DynamicLoggingHome);
11+
Navigation.NavigateTo("/api/v4/logging");
1312
}
1413
}

‎src/Client/Components/Pages/GenericGuidesRedirect.razor‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212
@page "/service-discovery/get-started"
1313

1414
@inject NavigationManager Navigation
15-
@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
1615

1716
@code
1817
{
1918
protected override void OnParametersSet()
2019
{
21-
Navigation.NavigateTo($"{DocsSiteOptions.Value.BaseAddress}/guides/");
20+
Navigation.NavigateTo("/guides/");
2221
}
2322
}

‎src/Client/Components/Pages/Home.razor‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
@page "/index"
33

44
@inject IOptions<CalendarEventOptions> CalendarEventOptions
5-
@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
65
@inject NavigationManager Navigation
76

87
<PageTitle>Steeltoe | Home</PageTitle>
@@ -28,7 +27,7 @@
2827
<div class="row g-0 mt-5">
2928
<div class="col text-center">
3029
<Href class="text-white border-white mr-4" href="/why-steeltoe" AsButton="true">WHY STEELTOE</Href>
31-
<Href class="text-white border-white" href="@(DocsSiteOptions.Value.GuidesHome)" AsButton="true">GET STARTED</Href>
30+
<Href class="text-white border-white" href="/guides" AsButton="true">GET STARTED</Href>
3231
</div>
3332
</div>
3433
</div>

0 commit comments

Comments
 (0)