Skip to content

Commit dc56bf8

Browse files
topnaxtopnax
committed
Layout improvements
1 parent e81bb0b commit dc56bf8

12 files changed

+27
-208
lines changed

‎WebFrontend/Pages/Counter.razor

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

‎WebFrontend/Pages/EditMarketOrder.razor

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@
1717

1818
<div class="mat-layout-grid">
1919
<div class="mat-layout-grid-inner">
20-
<div class="mat-layout-grid-cell">
20+
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-2"></div>
21+
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-8">
2122
<MatButton Outlined="true" Icon="keyboard_arrow_left" Style="margin-bottom: 1rem;" OnClick='() => { NavigationManager.NavigateTo($"/entries/{ActiveEntry.Id}"); }'>Back</MatButton>
2223
<MatCard>
2324
<MatCardContent class="demo-mat-card-content">
2425
<h2>Edit a market order</h2>
25-
<EntryForm Edit="true" FormModel="@InitialOrderModel" Currency="@ActivePortfolio.Currency" Symbol="@ActiveEntry.Symbol" OnSubmitEventHandler="@OnCreateOrderFormSubmit" ></EntryForm>
26+
<EntryForm Edit="true" FormModel="@InitialOrderModel" Currency="@ActivePortfolio.Currency" Symbol="@ActiveEntry.Symbol" OnSubmitEventHandler="@OnCreateOrderFormSubmit"></EntryForm>
2627
</MatCardContent>
2728
</MatCard>
2829
</div>
30+
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-2"></div>
2931
</div>
3032
</div>
3133

@@ -34,15 +36,15 @@
3436
{
3537
[Parameter]
3638
public int OrderId { get; set; }
37-
39+
3840
protected EntryForm.NewOrderModel InitialOrderModel;
3941
protected Portfolio ActivePortfolio;
4042
protected PortfolioEntry ActiveEntry;
4143
protected MarketOrder ActiveMarketOrder;
4244

4345
protected override void OnInitialized()
4446
{
45-
ActiveMarketOrder = MarketOrderService.GetMarketOrder(OrderId);
47+
ActiveMarketOrder = MarketOrderService.GetMarketOrder(OrderId);
4648
ActiveEntry = PortfolioEntrySerivce.GetPortfolioEntry(ActiveMarketOrder.PortfolioEntryId);
4749
ActivePortfolio = PortfolioService.GetPortfolio(ActiveEntry.PortfolioId);
4850
InitialOrderModel = new();

‎WebFrontend/Pages/EditPortfolio.razor

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525

2626
<div class="mat-layout-grid">
2727
<div class="mat-layout-grid-inner">
28-
<div class="mat-layout-grid-cell">
28+
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-2"></div>
29+
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-8">
2930
<MatButton Outlined="true" Icon="keyboard_arrow_left" Style="margin-bottom:1em; margin-right: 1rem;" OnClick='() => { NavigationManager.NavigateTo($""); }'>Back</MatButton>
3031
<MatCard>
3132
<MatCardContent class="demo-mat-card-content">
@@ -40,6 +41,7 @@
4041
</MatCardContent>
4142
</MatCard>
4243
</div>
44+
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-2"></div>
4345
</div>
4446
</div>
4547

‎WebFrontend/Pages/FetchData.razor

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

‎WebFrontend/Pages/Index.razor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<div class="mat-layout-grid mat-layout-grid-align-center">
4040
<div class="mat-layout-grid-inner center">
4141

42-
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-3"></div>
43-
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-6">
42+
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-2"></div>
43+
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-8">
4444
<MatH5>Portfolios</MatH5>
4545
@if (PortfoliosWithEntries == null)
4646
{
@@ -93,7 +93,7 @@
9393
}
9494
}
9595
</div>
96-
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-3"></div>
96+
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-2"></div>
9797
</div>
9898
</div>
9999
<MatFAB Class="app-fab--absolute" Icon="@MatIconNames.Add" Label="Add a new portfolio" OnClick='() => { NavigationManager.NavigateTo($"newportfolio");}'></MatFAB>

‎WebFrontend/Pages/NewMarketOrder.razor

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@
1717

1818
<div class="mat-layout-grid">
1919
<div class="mat-layout-grid-inner">
20-
<div class="mat-layout-grid-cell">
20+
<div class="mat-layout-grid-cell-span-2"></div>
21+
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-8">
2122
<MatButton Outlined="true" Icon="keyboard_arrow_left" Style="margin-bottom: 1rem;" OnClick='() => { NavigationManager.NavigateTo($"/entries/{ActiveEntry.Id}"); }'>Back</MatButton>
2223
<MatCard>
2324
<MatCardContent class="demo-mat-card-content">
2425
<h2>Create a new market order</h2>
25-
<EntryForm Currency="@ActivePortfolio.Currency" Symbol="@ActiveEntry.Symbol" OnSubmitEventHandler="@OnCreateOrderFormSubmit" ></EntryForm>
26+
<EntryForm Currency="@ActivePortfolio.Currency" Symbol="@ActiveEntry.Symbol" OnSubmitEventHandler="@OnCreateOrderFormSubmit"></EntryForm>
2627
</MatCardContent>
2728
</MatCard>
2829
</div>
30+
<div class="mat-layout-grid-cell-span-2"></div>
2931
</div>
3032
</div>
3133

@@ -34,7 +36,7 @@
3436
{
3537
[Parameter]
3638
public int EntryId { get; set; }
37-
39+
3840
protected Portfolio ActivePortfolio = new("", "", Currency.Usd);
3941
protected PortfolioEntry ActiveEntry = new("btc", 1);
4042

‎WebFrontend/Pages/NewPortfolio.razor

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616

1717
<div class="mat-layout-grid">
1818
<div class="mat-layout-grid-inner">
19-
<div class="mat-layout-grid-cell">
19+
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-2"></div>
20+
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-8">
21+
2022
<MatButton Outlined="true" Icon="keyboard_arrow_left" Style="margin-bottom:1em; margin-right: 1rem;" OnClick='() => { NavigationManager.NavigateTo($""); }'>Back</MatButton>
2123
<MatCard>
2224
<MatCardContent class="demo-mat-card-content">
@@ -29,6 +31,7 @@
2931
</MatCardContent>
3032
</MatCard>
3133
</div>
34+
<div class="mat-layout-grid-cell mat-layout-grid-cell-span-2"></div>
3235
</div>
3336
</div>
3437

‎WebFrontend/Pages/NewPortfolioEntry.razor

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030

3131
<div class="mat-layout-grid">
3232
<div class="mat-layout-grid-inner">
33-
<div class="mat-layout-grid-cell-span-6">
33+
<div class="mat-layout-grid-cell-span-2"></div>
34+
<div class="mat-layout-grid-cell-span-8">
3435
<MatH5><MatButton Outlined="true" Icon="keyboard_arrow_left" Style="margin-right: 1rem;" OnClick='() => { NavigationManager.NavigateTo($"/portfolios/{Portfolio.Id}"); }'>Back to portfolio</MatButton>Manage entries of <b>@Portfolio.Name</b></MatH5>
3536
<MatTextField Label="Filter by symbol" Style="margin-bottom: 2rem;" Icon="filter_list" FullWidth="true" @bind-Value="@CryptocurrencyFilter"></MatTextField>
3637
@if (AvailableCryptocurrenciesWithUsage == null)
@@ -75,6 +76,7 @@
7576
}
7677
}
7778
</div>
79+
<div class="mat-layout-grid-cell-span-2"></div>
7880
</div>
7981
</div>
8082

‎WebFrontend/Pages/_Host.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<head>
1111
<meta charset="utf-8" />
1212
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
13-
<title>WebFrontend</title>
13+
<title>Crypto portfolio tracker</title>
1414
<base href="~/" />
1515
<link href="ServerSideBlazor.styles.css" rel="stylesheet" />
1616
<link href="_content/MatBlazor/dist/matBlazor.css" rel="stylesheet" />

‎WebFrontend/Shared/MainLayout.razor

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,13 @@
22

33
<MatAppBar Style="z-index: 100;" Class="mat">
44
<MatAppBarRow>
5-
<MatAppBarSection>
6-
<MatIconButton Icon="menu" OnClick="@((e) => ButtonClicked())"></MatIconButton>
7-
<MatAppBarTitle>Material Design Blazor Template (Server-side)</MatAppBarTitle>
8-
</MatAppBarSection>
9-
<MatAppBarSection Align="@MatAppBarSectionAlign.End">
10-
<MatIconButton Icon="favorite"></MatIconButton>
5+
<MatAppBarSection style="justify-content: center">
6+
<MatAppBarTitle style="font-size: 1.6em; letter-spacing: 0.06rem;">Crypto Portfolio Tracker</MatAppBarTitle>
117
</MatAppBarSection>
128
</MatAppBarRow>
139
</MatAppBar>
1410

1511
<MatDrawerContainer>
16-
<MatHidden Breakpoint="@MatBreakpoint.SM" Direction="@MatHiddenDirection.Up" HiddenChanged="@ModelDrawerHiddenChanged">
17-
<ChildContent>
18-
<MatDrawer @bind-Opened="@_navMenuOpened" Mode="@MatDrawerMode.Modal">
19-
<MatAppBarAdjust></MatAppBarAdjust>
20-
<NavMenu />
21-
</MatDrawer>
22-
</ChildContent>
23-
<ElseContent>
24-
<MatDrawer @bind-Opened="@_navMenuOpened" Mode="@MatDrawerMode.Dismissible">
25-
<MatAppBarAdjust></MatAppBarAdjust>
26-
<NavMenu />
27-
</MatDrawer>
28-
</ElseContent>
29-
</MatHidden>
30-
3112

3213
<MatDrawerContent>
3314
<MatAppBarAdjust></MatAppBarAdjust>
@@ -37,21 +18,3 @@
3718
</MatDrawerContent>
3819

3920
</MatDrawerContainer>
40-
41-
@code
42-
{
43-
bool _navMenuOpened = true;
44-
45-
void ButtonClicked()
46-
{
47-
_navMenuOpened = !_navMenuOpened;
48-
}
49-
50-
protected void ModelDrawerHiddenChanged(bool hidden)
51-
{
52-
if (!hidden)
53-
{
54-
_navMenuOpened = false;
55-
}
56-
}
57-
}

0 commit comments

Comments
 (0)