- - - - - {{Pic.Address}} - - - - {{Pic.RelativeTime}} - - - - - - - - - {{Pic.Description}} - - - - - Edit - - - -
+@inject IJSRuntime JS + + - @status.EmojiOrDefault + @Status.EmojiOrDefault - - @status.Address + + @Status.Address - @status.HtmlContent + @Status.HtmlContent - @status.RelativeTime + @Status.RelativeTime - + Respond + @if (Editable) { + Edit + } @@ -24,11 +29,21 @@ @code { [Parameter] - public Status status { get; set; } + public Status Status { get; set; } + [Parameter] + public bool Editable { get; set; } = false; + [Parameter] + public EditStatusDialog? Dialog { get; set; } + + private async Task EditStatus(EventArgs e) { + Dialog.Status = Status; + await InvokeAsync(StateHasChanged); + await JS.InvokeVoidAsync("ui", "#" + Dialog?.id); + } public async Task ShareClick(EventArgs e){ await Share.Default.RequestAsync(new ShareTextRequest{ - Text = $"{status.Content}\n- from [@{status.Address}]({status.Url})", + Text = $"{Status.Content}\n- from [@{Status.Address}]({Status.Url})", Title = "I saw this on status.lol", Subject = "I saw this on status.lol" }); diff --git a/Components/StatusList.razor b/Components/StatusList.razor index a63b2a1..e18035f 100644 --- a/Components/StatusList.razor +++ b/Components/StatusList.razor @@ -1,8 +1,12 @@ @inject IJSRuntime JS @inject State State +@if (Editable) { + +} + @if(statuses != null) foreach(Status status in statuses) { - + } @@ -12,6 +16,8 @@ public Func?>> StatusFunc { get; set; } [Parameter] public bool Editable { get; set; } = false; + + public EditStatusDialog? Dialog { get; set; } private List? statuses; diff --git a/Models/PatchStatus.cs b/Models/PatchStatus.cs new file mode 100644 index 0000000..24b9936 --- /dev/null +++ b/Models/PatchStatus.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Neighbourhood.omg.lol.Models { + public class PatchStatus { + public string Id { get; set; } + public string Content { get; set; } + public string? Emoji { get; set; } + } +} diff --git a/Models/PatchStatusResponseData.cs b/Models/PatchStatusResponseData.cs new file mode 100644 index 0000000..5766903 --- /dev/null +++ b/Models/PatchStatusResponseData.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Neighbourhood.omg.lol.Models { + public class PatchStatusResponseData : IOmgLolResponseData { + public string Message { get; set; } + public string Id { get; set; } + public string Url { get; set; } + } +} diff --git a/RestService.cs b/RestService.cs index f4bcc93..33deb3a 100644 --- a/RestService.cs +++ b/RestService.cs @@ -94,6 +94,25 @@ namespace Neighbourhood.omg.lol { return responseData; } + private async Task Patch(string uri, TData data, CancellationToken cancellationToken = default) where TResponse : IOmgLolResponseData { + TResponse? responseData = default(TResponse); + try { + HttpResponseMessage response = await _client.PatchAsJsonAsync(uri, data, _serializerOptions, cancellationToken: cancellationToken); + string str = await response.Content.ReadAsStringAsync(); + if (response.IsSuccessStatusCode) { + OmgLolResponse? responseObj = await response.Content.ReadFromJsonAsync>(_serializerOptions, cancellationToken: cancellationToken); + if (responseObj != null && responseObj.Request.Success) { + responseData = responseObj.Response; + } + } + } + catch (Exception ex) { + Debug.WriteLine(@"\tERROR {0}", ex.Message); + } + + return responseData; + } + public async Task> StatuslogLatest() => (await Get("/statuslog/latest"))?.Statuses ?? new List(); @@ -148,6 +167,10 @@ namespace Neighbourhood.omg.lol { public async Task PostPicDescription(string address, string id, string description) => (await Post($"/address/{address}/pics/{id}", new PostPic { Description = description })); + public async Task PatchStatus(string address, string id, string content, string? emoji) => + (await Patch($"/address/{address}/statuses/", new PatchStatus { Id = id, Content = content, Emoji = emoji })); + + public async Task?> NowGarden() => (await Get($"/now/garden"))?.Garden ?? new List(); diff --git a/wwwroot/css/style.css b/wwwroot/css/style.css index f37c14c..b9035eb 100644 --- a/wwwroot/css/style.css +++ b/wwwroot/css/style.css @@ -82,7 +82,7 @@ img { margin: 0 auto; } -.status .emoji, #status-emoji { +.status .emoji { margin-bottom: auto; inline-size: 5.5rem; block-size: 5.5rem; @@ -91,6 +91,15 @@ img { text-indent: -10px; } +#status-emoji { + margin-bottom: auto; + inline-size: 3.5rem; + block-size: 3.5rem; + font-size: 3.1rem; + line-height: 3.5rem; + text-indent: -6px; +} + :is(h1, h2, h3, h4, h5, h6) :is(i.fa-at, i:only-child){ margin-right: 0; inline-size: auto;
- @status.EmojiOrDefault + @Status.EmojiOrDefault - - @status.Address + + @Status.Address - @status.HtmlContent + @Status.HtmlContent - @status.RelativeTime + @Status.RelativeTime - + Respond + @if (Editable) { + Edit + } @@ -24,11 +29,21 @@ @code { [Parameter] - public Status status { get; set; } + public Status Status { get; set; } + [Parameter] + public bool Editable { get; set; } = false; + [Parameter] + public EditStatusDialog? Dialog { get; set; } + + private async Task EditStatus(EventArgs e) { + Dialog.Status = Status; + await InvokeAsync(StateHasChanged); + await JS.InvokeVoidAsync("ui", "#" + Dialog?.id); + } public async Task ShareClick(EventArgs e){ await Share.Default.RequestAsync(new ShareTextRequest{ - Text = $"{status.Content}\n- from [@{status.Address}]({status.Url})", + Text = $"{Status.Content}\n- from [@{Status.Address}]({Status.Url})", Title = "I saw this on status.lol", Subject = "I saw this on status.lol" }); diff --git a/Components/StatusList.razor b/Components/StatusList.razor index a63b2a1..e18035f 100644 --- a/Components/StatusList.razor +++ b/Components/StatusList.razor @@ -1,8 +1,12 @@ @inject IJSRuntime JS @inject State State +@if (Editable) { + +} + @if(statuses != null) foreach(Status status in statuses) { - + } @@ -12,6 +16,8 @@ public Func?>> StatusFunc { get; set; } [Parameter] public bool Editable { get; set; } = false; + + public EditStatusDialog? Dialog { get; set; } private List? statuses; diff --git a/Models/PatchStatus.cs b/Models/PatchStatus.cs new file mode 100644 index 0000000..24b9936 --- /dev/null +++ b/Models/PatchStatus.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Neighbourhood.omg.lol.Models { + public class PatchStatus { + public string Id { get; set; } + public string Content { get; set; } + public string? Emoji { get; set; } + } +} diff --git a/Models/PatchStatusResponseData.cs b/Models/PatchStatusResponseData.cs new file mode 100644 index 0000000..5766903 --- /dev/null +++ b/Models/PatchStatusResponseData.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Neighbourhood.omg.lol.Models { + public class PatchStatusResponseData : IOmgLolResponseData { + public string Message { get; set; } + public string Id { get; set; } + public string Url { get; set; } + } +} diff --git a/RestService.cs b/RestService.cs index f4bcc93..33deb3a 100644 --- a/RestService.cs +++ b/RestService.cs @@ -94,6 +94,25 @@ namespace Neighbourhood.omg.lol { return responseData; } + private async Task Patch(string uri, TData data, CancellationToken cancellationToken = default) where TResponse : IOmgLolResponseData { + TResponse? responseData = default(TResponse); + try { + HttpResponseMessage response = await _client.PatchAsJsonAsync(uri, data, _serializerOptions, cancellationToken: cancellationToken); + string str = await response.Content.ReadAsStringAsync(); + if (response.IsSuccessStatusCode) { + OmgLolResponse? responseObj = await response.Content.ReadFromJsonAsync>(_serializerOptions, cancellationToken: cancellationToken); + if (responseObj != null && responseObj.Request.Success) { + responseData = responseObj.Response; + } + } + } + catch (Exception ex) { + Debug.WriteLine(@"\tERROR {0}", ex.Message); + } + + return responseData; + } + public async Task> StatuslogLatest() => (await Get("/statuslog/latest"))?.Statuses ?? new List(); @@ -148,6 +167,10 @@ namespace Neighbourhood.omg.lol { public async Task PostPicDescription(string address, string id, string description) => (await Post($"/address/{address}/pics/{id}", new PostPic { Description = description })); + public async Task PatchStatus(string address, string id, string content, string? emoji) => + (await Patch($"/address/{address}/statuses/", new PatchStatus { Id = id, Content = content, Emoji = emoji })); + + public async Task?> NowGarden() => (await Get($"/now/garden"))?.Garden ?? new List(); diff --git a/wwwroot/css/style.css b/wwwroot/css/style.css index f37c14c..b9035eb 100644 --- a/wwwroot/css/style.css +++ b/wwwroot/css/style.css @@ -82,7 +82,7 @@ img { margin: 0 auto; } -.status .emoji, #status-emoji { +.status .emoji { margin-bottom: auto; inline-size: 5.5rem; block-size: 5.5rem; @@ -91,6 +91,15 @@ img { text-indent: -10px; } +#status-emoji { + margin-bottom: auto; + inline-size: 3.5rem; + block-size: 3.5rem; + font-size: 3.1rem; + line-height: 3.5rem; + text-indent: -6px; +} + :is(h1, h2, h3, h4, h5, h6) :is(i.fa-at, i:only-child){ margin-right: 0; inline-size: auto;