From 61ad0200cec832d3e7c45224be0103e2150a35aa Mon Sep 17 00:00:00 2001
From: JFronny <33260128+JFronny@users.noreply.github.com>
Date: Wed, 1 Jul 2020 17:34:53 +0200
Subject: [PATCH] Less broken UI code (still broken, don't get me wrong)
---
WebHax/Pages/Counter.razor | 17 -----------
WebHax/Pages/FetchData.razor | 58 ------------------------------------
WebHax/Pages/Index.razor | 19 ++++++++----
3 files changed, 14 insertions(+), 80 deletions(-)
delete mode 100644 WebHax/Pages/Counter.razor
delete mode 100644 WebHax/Pages/FetchData.razor
diff --git a/WebHax/Pages/Counter.razor b/WebHax/Pages/Counter.razor
deleted file mode 100644
index 1d04bcb..0000000
--- a/WebHax/Pages/Counter.razor
+++ /dev/null
@@ -1,17 +0,0 @@
-@page "/counter"
-
-
Counter
-
-Current count: @currentCount
-
-
-
-@code {
- private int currentCount = 0;
-
- private void IncrementCount()
- {
- currentCount++;
- }
-
-}
\ No newline at end of file
diff --git a/WebHax/Pages/FetchData.razor b/WebHax/Pages/FetchData.razor
deleted file mode 100644
index 1bfba52..0000000
--- a/WebHax/Pages/FetchData.razor
+++ /dev/null
@@ -1,58 +0,0 @@
-@page "/fetchdata"
-@inject HttpClient Http
-
-Weather forecast
-
-This component demonstrates fetching data from the server.
-
-@if (forecasts == null)
-{
-
- Loading...
-
-}
-else
-{
-
-
-
- Date |
- Temp. (C) |
- Temp. (F) |
- Summary |
-
-
-
- @foreach (var forecast in forecasts)
- {
-
- @forecast.Date.ToShortDateString() |
- @forecast.TemperatureC |
- @forecast.TemperatureF |
- @forecast.Summary |
-
- }
-
-
-}
-
-@code {
- private WeatherForecast[] forecasts;
-
- protected override async Task OnInitializedAsync()
- {
- forecasts = await Http.GetFromJsonAsync("sample-data/weather.json");
- }
-
- public class WeatherForecast
- {
- public DateTime Date { get; set; }
-
- public int TemperatureC { get; set; }
-
- public string Summary { get; set; }
-
- public int TemperatureF => 32 + (int) (TemperatureC / 0.5556);
- }
-
-}
\ No newline at end of file
diff --git a/WebHax/Pages/Index.razor b/WebHax/Pages/Index.razor
index 9e767d3..047572b 100644
--- a/WebHax/Pages/Index.razor
+++ b/WebHax/Pages/Index.razor
@@ -53,9 +53,9 @@ Select a repository and click load to view contained packages
@code {
[Parameter]
- public string Link { get; set; } = "https://gitlab.com/JFronny/UpTool2/snippets/1988600/raw";
+ public string Link { get; set; } = "";
- private string CurrentPageLink => _baseLinkCurrent + "?link=" + Uri.EscapeDataString(Link);
+ private string CurrentPageLink => _baseLinkCurrent + (_baseLinkCurrent.EndsWith('/') ? "" : "/") + "?link=" + Uri.EscapeDataString(Link);
private string _baseLinkCurrent = "";
List _apps = new List();
@@ -160,18 +160,27 @@ Select a repository and click load to view contained packages
private async Task UpdateApps()
{
- NavManager.NavigateTo(CurrentPageLink);
- Uri uri = new Uri(CurrentPageLink);
+ Uri uri;
+ if (string.IsNullOrWhiteSpace(Link))
+ uri = NavManager.ToAbsoluteUri(NavManager.Uri);
+ else
+ uri = new Uri(CurrentPageLink);
if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("link", out StringValues linkInit))
{
Link = linkInit;
_apps.Clear();
_btnState = "disabled";
+ NavManager.NavigateTo(CurrentPageLink);
StateHasChanged();
_uriSelected = true;
await ProcessApps(await FetchRepo());
- _btnState = "";
}
+ else
+ {
+ Link = "https://gitlab.com/JFronny/UpTool2/snippets/1988600/raw";
+ UpdateApps();
+ }
+ _btnState = "";
pLog.Clear();
}