Added comments to reusable components.

topnax · topnax · commit 41d2350064db · 2021-05-25T07:19:26.000+02:00
Fixed page styles
diff --git a/WebFrontend/Pages/EditMarketOrder.razor b/WebFrontend/Pages/EditMarketOrder.razor
@@ -23,7 +23,7 @@
             <MatCard>
                 <MatCardContent class="demo-mat-card-content">
                     <h2>Edit a market order</h2>
-                    <OrderForm Edit="true" FormModel="@_initialOrderModel" Currency="@_activePortfolio.Currency" Symbol="@_activeEntry.Symbol" OnSubmitEventHandler="@OnCreateOrderFormSubmit"></OrderForm>
+                    <OrderForm Edit="true" FormModel="@_initialOrderFormModel" Currency="@_activePortfolio.Currency" Symbol="@_activeEntry.Symbol" OnSubmitEventHandler="@OnCreateOrderFormSubmit"></OrderForm>
                 </MatCardContent>
             </MatCard>
         </div>
@@ -39,7 +39,7 @@
     public int OrderId { get; set; }
 
     // order form model
-    private OrderForm.NewOrderModel _initialOrderModel;
+    private OrderForm.OrderFormModel _initialOrderFormModel;
 
     // portfolio the order will belong to
     private Portfolio _activePortfolio;
@@ -58,23 +58,23 @@
         _activePortfolio = PortfolioService.GetPortfolio(_activeEntry.PortfolioId);
         
         // initialize the order form model
-        _initialOrderModel = new();
-        _initialOrderModel.Fee = _activeMarketOrder.Fee;
-        _initialOrderModel.Size = _activeMarketOrder.Size;
-        _initialOrderModel.FilledPrice = _activeMarketOrder.FilledPrice;
-        _initialOrderModel.OrderDate = _activeMarketOrder.Date;
-        _initialOrderModel.SellOrder = !_activeMarketOrder.Buy;
+        _initialOrderFormModel = new();
+        _initialOrderFormModel.Fee = _activeMarketOrder.Fee;
+        _initialOrderFormModel.Size = _activeMarketOrder.Size;
+        _initialOrderFormModel.FilledPrice = _activeMarketOrder.FilledPrice;
+        _initialOrderFormModel.OrderDate = _activeMarketOrder.Date;
+        _initialOrderFormModel.SellOrder = !_activeMarketOrder.Buy;
     }
 
-    private void OnCreateOrderFormSubmit(OrderForm.NewOrderModel formModel)
+    private void OnCreateOrderFormSubmit(OrderForm.OrderFormModel formFormModel)
     {
         // update the order
         MarketOrderService.UpdateMarketOrder(_activeMarketOrder with {
-            FilledPrice = formModel.FilledPrice, 
-            Fee = formModel.Fee, 
-            Size = formModel.Size, 
-            Date = formModel.OrderDate,
-            Buy = !formModel.SellOrder
+            FilledPrice = formFormModel.FilledPrice, 
+            Fee = formFormModel.Fee, 
+            Size = formFormModel.Size, 
+            Date = formFormModel.OrderDate,
+            Buy = !formFormModel.SellOrder
             });
         Toaster.Add("Order successfully edited", MatToastType.Success, "", "");
         
diff --git a/WebFrontend/Pages/EditPortfolio.razor b/WebFrontend/Pages/EditPortfolio.razor
@@ -9,9 +9,18 @@
 
 
 <style>
+    .demo-mat-card {
+        max-width: 400px;
+        margin-bottom: 2em;
+    }
+
     .demo-mat-card-content {
         padding: 1rem;
     }
+
+    .clear-margin {
+        margin: 0px;
+    }
 </style>
 
 <div class="mat-layout-grid">
@@ -27,7 +36,7 @@
                     <PortfolioForm
                         DefaultCurrency="@Currency.Usd"
                         AvailableCurrencies="@(EnumUtils.GetEnumList<Currency>())"
-                        FormModel="_formModel"
+                        FormModel="_formFormModel"
                         Edit="true"
                         OnSubmitEventHandler="@OnCreateFormSubmitted">
                     </PortfolioForm>
@@ -46,7 +55,7 @@
     public int PortfolioId { get; set; }
 
     // model of the form
-    private readonly PortfolioForm.NewPortfolioModel _formModel = new(Currency.Usd);
+    private readonly PortfolioForm.PortfolioFormModel _formFormModel = new(Currency.Usd);
 
     // currently edited portfolio
     private Portfolio _activePortfolio;
@@ -57,19 +66,19 @@
         _activePortfolio = PortfolioService.GetPortfolio(PortfolioId);
         
         // update the form model
-        _formModel.Name = _activePortfolio.Name;
-        _formModel.Description = _activePortfolio.Description;
+        _formFormModel.Name = _activePortfolio.Name;
+        _formFormModel.Description = _activePortfolio.Description;
     }
 
-    private void OnCreateFormSubmitted(PortfolioForm.NewPortfolioModel formModel)
+    private void OnCreateFormSubmitted(PortfolioForm.PortfolioFormModel formFormModel)
     {
         // update the portfolio
         PortfolioService.UpdatePortfolio(_activePortfolio with {
-            Name = formModel.Name,
-            Description = formModel.Description
+            Name = formFormModel.Name,
+            Description = formFormModel.Description
             });
         // reset the form 
-        formModel.Reset();
+        formFormModel.Reset();
         Toaster.Add("Portfolio successfully edited", MatToastType.Success, "", "");
         
         // navigate back to the portfolio detail
diff --git a/WebFrontend/Pages/Index.razor b/WebFrontend/Pages/Index.razor
@@ -26,6 +26,14 @@
         bottom: 1rem;
         right: 1rem;
     }
+    
+    .mat-paper {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        padding: 1em;
+    } 
 </style>
 <div class="mat-layout-grid mat-layout-grid-align-center">
     <div class="mat-layout-grid-inner center">
diff --git a/WebFrontend/Pages/NewMarketOrder.razor b/WebFrontend/Pages/NewMarketOrder.razor
@@ -52,12 +52,12 @@
         _activePortfolio = PortfolioService.GetPortfolio(_activeEntry.PortfolioId);
     }
 
-    private void OnCreateOrderFormSubmit(OrderForm.NewOrderModel formModel)
+    private void OnCreateOrderFormSubmit(OrderForm.OrderFormModel formFormModel)
     {
         // create the market order
-        MarketOrderService.CreateMarketOrder(formModel.FilledPrice, formModel.Fee, formModel.Size, formModel.OrderDate, !formModel.SellOrder, _activeEntry.Id);
+        MarketOrderService.CreateMarketOrder(formFormModel.FilledPrice, formFormModel.Fee, formFormModel.Size, formFormModel.OrderDate, !formFormModel.SellOrder, _activeEntry.Id);
         // reset the form model
-        formModel.Reset();
+        formFormModel.Reset();
         // notify user 
         Toaster.Add("New order successfully added", MatToastType.Success, "", "");
     }
diff --git a/WebFrontend/Pages/NewPortfolio.razor b/WebFrontend/Pages/NewPortfolio.razor
@@ -40,12 +40,12 @@
 
 @code
 {
-    private void OnCreateFormSubmitted(PortfolioForm.NewPortfolioModel formModel)
+    private void OnCreateFormSubmitted(PortfolioForm.PortfolioFormModel formFormModel)
     {
         // create the portfolio
-        PortfolioService.CreatePortfolio(formModel.Name, formModel.Description, formModel.SelectedCurrency);
+        PortfolioService.CreatePortfolio(formFormModel.Name, formFormModel.Description, formFormModel.SelectedCurrency);
         // reset the model
-        formModel.Reset();
+        formFormModel.Reset();
         // notify the user
         Toaster.Add("New portfolio successfully added", MatToastType.Success, "", "");
     }
diff --git a/WebFrontend/Pages/PortfolioDetail.razor b/WebFrontend/Pages/PortfolioDetail.razor
@@ -29,6 +29,14 @@
         bottom: 1rem;
         right: 1rem;
     }
+    
+    .mat-paper {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        padding: 1em;
+    } 
 </style>
 <div class="mat-layout-grid mat-layout-grid-align-center">
     <div class="mat-layout-grid-inner center">
diff --git a/WebFrontend/Pages/PortfolioEntryDetail.razor b/WebFrontend/Pages/PortfolioEntryDetail.razor
@@ -37,6 +37,14 @@
         bottom: 1rem;
         right: 1rem;
     }
+        
+    .mat-paper {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        padding: 1em;
+    } 
     
 </style>
 <div class="mat-layout-grid mat-layout-grid-align-center">
diff --git a/WebFrontend/Pages/PortfolioEntryManagement.razor b/WebFrontend/Pages/PortfolioEntryManagement.razor
@@ -119,7 +119,9 @@
     protected override async Task OnInitializedAsync()
     {
         // find all available cryptocurrencies
-        _availableCryptocurrencies = await CryptoStatsSource.GetAvailableCryptocurrencies();
+        _availableCryptocurrencies = (await CryptoStatsSource.GetAvailableCryptocurrencies())
+            // workaround till Coingecko removes binance-peg entries
+            .Where(c => !c.Id.Contains("binance-peg")).ToList();
         _filteredCryptocurrencies = _availableCryptocurrencies;
         UpdateAvailableCryptocurrencies(_availableCryptocurrencies);
     }
diff --git a/WebFrontend/Properties/launchSettings.json b/WebFrontend/Properties/launchSettings.json
@@ -19,7 +19,7 @@
       "commandName": "Project",
       "dotnetRunMessages": "true",
       "launchBrowser": false,
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "applicationUrl": "http://localhost:5001;http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/WebFrontend/Shared/OrderForm.razor b/WebFrontend/Shared/OrderForm.razor
@@ -56,34 +56,44 @@
 </EditForm>
 
 @code {
+    // model of the form
     [Parameter]
-    public NewOrderModel FormModel { get; set; } = new ();
+    public OrderFormModel FormModel { get; set; } = new ();
     
-    [Parameter] public EventCallback<NewOrderModel> OnSubmitEventHandler { get; set; }
+    // callback when the form is submitted
+    [Parameter] public EventCallback<OrderFormModel> OnSubmitEventHandler { get; set; }
 
+    // currency of the transaction 
     [Parameter] public Currency Currency { get; set; }
     
+    // traded cryptocurrency symbol
     [Parameter] public string Symbol { get; set; }
     
+    // flag indicating whether the order should be created or an existing one should be edited
     [Parameter] public bool Edit { get; set; }
     
     
-    public class NewOrderModel
+    public class OrderFormModel
     {
+        // transaction filled price
         [Required]
-        [CustomValidation(typeof(NewOrderModel), nameof(NonZeroValue))]
+        [CustomValidation(typeof(OrderFormModel), nameof(NonZeroValue))]
         public decimal FilledPrice { get; set; }
 
+        // size of the transaction
         [Required]
-        [CustomValidation(typeof(NewOrderModel), nameof(NonZeroValue))]
+        [CustomValidation(typeof(OrderFormModel), nameof(NonZeroValue))]
         public decimal Size { get; set; }
 
+        // fee for the transaction 
         [Required]
-        [CustomValidation(typeof(NewOrderModel), nameof(NonNegativeValue))]
+        [CustomValidation(typeof(OrderFormModel), nameof(NonNegativeValue))]
         public decimal Fee { get; set; }
 
+        // date at which the transaction was performed
         [Required] public DateTime OrderDate = DateTime.Now;
         
+        // a flag indicating whether the transaction was a sell
         [Required] public bool SellOrder;
 
         public void Reset()
diff --git a/WebFrontend/Shared/PortfolioForm.razor b/WebFrontend/Shared/PortfolioForm.razor
@@ -47,24 +47,30 @@
 
 
 @code {
+    // model of the portfolio form
     [Parameter]
-    public NewPortfolioModel FormModel { get; set; } = new (Currency.Usd);
+    public PortfolioFormModel FormModel { get; set; } = new (Currency.Usd);
     
-    [Parameter] public EventCallback<NewPortfolioModel> OnSubmitEventHandler { get; set; }
+    // callback called when the form is submitted
+    [Parameter] public EventCallback<PortfolioFormModel> OnSubmitEventHandler { get; set; }
     
+    // list of currencies available
     [Parameter]
     public List<Currency> AvailableCurrencies { get; set; }
     
+    // default currency to be used
     [Parameter]
     public Currency DefaultCurrency { get; set; } = Currency.Usd;
     
+    // flag indicating whether an existing portfolio will be edited or a new one created
     [Parameter] public bool Edit { get; set; }
     
-    public class NewPortfolioModel
+    public class PortfolioFormModel
     {
+        // default currency to be used
         private Currency _defaultCurrency;
 
-        public NewPortfolioModel(Currency defaultCurrency)
+        public PortfolioFormModel(Currency defaultCurrency)
         {
             _defaultCurrency = defaultCurrency;
             SelectedCurrency = defaultCurrency;

Original file line number	Diff line number	Diff line change
`@@ -52,12 +52,12 @@`
`52`	`52`	`_activePortfolio = PortfolioService.GetPortfolio(_activeEntry.PortfolioId);`
`53`	`53`	`}`
`54`	`54`
`55`		`- private void OnCreateOrderFormSubmit(OrderForm.NewOrderModel formModel)`
	`55`	`+ private void OnCreateOrderFormSubmit(OrderForm.OrderFormModel formFormModel)`
`56`	`56`	`{`
`57`	`57`	`// create the market order`
`58`		`- MarketOrderService.CreateMarketOrder(formModel.FilledPrice, formModel.Fee, formModel.Size, formModel.OrderDate, !formModel.SellOrder, _activeEntry.Id);`
	`58`	`+ MarketOrderService.CreateMarketOrder(formFormModel.FilledPrice, formFormModel.Fee, formFormModel.Size, formFormModel.OrderDate, !formFormModel.SellOrder, _activeEntry.Id);`
`59`	`59`	`// reset the form model`
`60`		`- formModel.Reset();`
	`60`	`+ formFormModel.Reset();`
`61`	`61`	`// notify user`
`62`	`62`	`Toaster.Add("New order successfully added", MatToastType.Success, "", "");`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@`
`40`	`40`
`41`	`41`	`@code`
`42`	`42`	`{`
`43`		`- private void OnCreateFormSubmitted(PortfolioForm.NewPortfolioModel formModel)`
	`43`	`+ private void OnCreateFormSubmitted(PortfolioForm.PortfolioFormModel formFormModel)`
`44`	`44`	`{`
`45`	`45`	`// create the portfolio`
`46`		`- PortfolioService.CreatePortfolio(formModel.Name, formModel.Description, formModel.SelectedCurrency);`
	`46`	`+ PortfolioService.CreatePortfolio(formFormModel.Name, formFormModel.Description, formFormModel.SelectedCurrency);`
`47`	`47`	`// reset the model`
`48`		`- formModel.Reset();`
	`48`	`+ formFormModel.Reset();`
`49`	`49`	`// notify the user`
`50`	`50`	`Toaster.Add("New portfolio successfully added", MatToastType.Success, "", "");`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,9 @@`
`119`	`119`	`protected override async Task OnInitializedAsync()`
`120`	`120`	`{`
`121`	`121`	`// find all available cryptocurrencies`
`122`		`- _availableCryptocurrencies = await CryptoStatsSource.GetAvailableCryptocurrencies();`
	`122`	`+ _availableCryptocurrencies = (await CryptoStatsSource.GetAvailableCryptocurrencies())`
	`123`	`+ // workaround till Coingecko removes binance-peg entries`
	`124`	`+ .Where(c => !c.Id.Contains("binance-peg")).ToList();`
`123`	`125`	`_filteredCryptocurrencies = _availableCryptocurrencies;`
`124`	`126`	`UpdateAvailableCryptocurrencies(_availableCryptocurrencies);`
`125`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`"commandName": "Project",`
`20`	`20`	`"dotnetRunMessages": "true",`
`21`	`21`	`"launchBrowser": false,`
`22`		`- "applicationUrl": "https://localhost:5001;http://localhost:5000",`
	`22`	`+ "applicationUrl": "http://localhost:5001;http://localhost:5000",`
`23`	`23`	`"environmentVariables": {`
`24`	`24`	`"ASPNETCORE_ENVIRONMENT": "Development"`
`25`	`25`	`}`