Skip to content

Commit a5ccd19

Browse files
authored
Merge pull request #8 from telerik/2023_R2
2023 r2
2 parents a8ab584 + 061152a commit a5ccd19

File tree

316 files changed

+46
-3069
lines changed

Some content is hidden

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

316 files changed

+46
-3069
lines changed

RPS.Web.Server/Components/Backlog/Chitchat.razor

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

RPS.Web.Server/Components/Backlog/Chitchat.razor.cs

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

RPS.Web.Server/Components/Backlog/Items.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767

6868
private void RowSelected(int itemId)
6969
{
70-
NavigationManager.NavigateTo($"/details/{itemId}/details");
70+
NavigationManager.NavigateTo($"/details/{itemId}");
7171
}
7272
}
7373

RPS.Web.Server/Components/Backlog/Tasks.razor

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

RPS.Web.Server/Components/Backlog/Tasks.razor.cs

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

RPS.Web.Server/Models/DetailScreenEnum.cs

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

RPS.Web.Server/Pages/Dashboard.razor

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
@page "/dashboard"
1+
@page "/"
2+
@page "/dashboard"
23
@page "/dashboard/{Months:int}/{UserId:int}"
34

45

RPS.Web.Server/Pages/Details.razor

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,11 @@
1-
@page "/details/{Id:int}/{ScreenParam}"
1+
@page "/details/{Id:int}"
22

33
@using RPS.Web.Server.Models;
44
@using RPS.Web.Server.Components.Backlog;
55

6-
<div>
7-
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3">
8-
<h1 class="h2" id="itemTitle">@Item.Title</h1>
9-
<div class="btn-toolbar mb-2 mb-md-0">
10-
<div class="btn-group mr-2">
11-
<NavLink href=@($"/Details/{Item.Id}/Details") class="btn btn-outline-secondary">Details</NavLink>
12-
<NavLink href=@($"/Details/{Item.Id}/Tasks") class="btn btn-outline-secondary">Tasks</NavLink>
13-
<NavLink href=@($"/Details/{Item.Id}/Chitchat") class="btn btn-outline-secondary">Chitchat</NavLink>
14-
15-
</div>
16-
</div>
17-
</div>
6+
<div class="pt-3 pb-2 mb-3">
7+
<h1 class="h2" id="itemTitle">@Item.Title</h1>
188
</div>
199

20-
@{ switch (Screen)
21-
{
22-
case DetailScreenEnum.Details:
23-
<DetailsForm Item="Item" />
24-
break;
25-
case DetailScreenEnum.Tasks:
26-
<Tasks Item="Item" />
27-
break;
28-
case DetailScreenEnum.Chitchat:
29-
<Chitchat Item="Item" />
30-
break;
31-
}
32-
}
10+
<DetailsForm Item="Item" />
3311

34-
@code { }

RPS.Web.Server/Pages/Details.razor.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ public partial class Details : ComponentBase
1515
[Parameter]
1616
public int Id { get; set; }
1717

18-
[Parameter]
19-
public string ScreenParam { get; set; } = "Details";
20-
21-
public DetailScreenEnum Screen { get {
22-
return Enum.Parse<DetailScreenEnum>(ScreenParam, true);
23-
} }
24-
2518
public PtItem Item { get; set; }
2619

2720
[Inject]

RPS.Web.Server/Pages/Index.razor

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

0 commit comments

Comments
 (0)