Add validation when adding calendar items
This commit is contained in:
parent
64fb38e1ad
commit
6c696c7821
2 changed files with 27 additions and 22 deletions
|
@ -28,10 +28,11 @@ namespace BlazorApp.Data
|
||||||
|
|
||||||
public string Password { get; set; }
|
public string Password { get; set; }
|
||||||
|
|
||||||
public string Name { get; set; }
|
[Required] public string Name { get; set; }
|
||||||
|
|
||||||
private string AuthorizationHeader =>
|
private string AuthorizationHeader => Username == null || Password == null
|
||||||
$"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{Username}:{Password}"))}";
|
? null
|
||||||
|
: $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{Username}:{Password}"))}";
|
||||||
|
|
||||||
private static DateTime _parseDateTime(string s)
|
private static DateTime _parseDateTime(string s)
|
||||||
{
|
{
|
||||||
|
@ -119,7 +120,9 @@ namespace BlazorApp.Data
|
||||||
public async Task<List<Event>> GetEvents()
|
public async Task<List<Event>> GetEvents()
|
||||||
{
|
{
|
||||||
var client = new HttpClient();
|
var client = new HttpClient();
|
||||||
|
if (AuthorizationHeader != null)
|
||||||
client.DefaultRequestHeaders.Add("Authorization", AuthorizationHeader);
|
client.DefaultRequestHeaders.Add("Authorization", AuthorizationHeader);
|
||||||
|
|
||||||
var body = await client.GetStringAsync(Url);
|
var body = await client.GetStringAsync(Url);
|
||||||
var events = ParseICal(body);
|
var events = ParseICal(body);
|
||||||
|
|
||||||
|
@ -145,6 +148,7 @@ namespace BlazorApp.Data
|
||||||
public async Task<Event> GetEventByUid(string uid)
|
public async Task<Event> GetEventByUid(string uid)
|
||||||
{
|
{
|
||||||
var client = new HttpClient();
|
var client = new HttpClient();
|
||||||
|
if (AuthorizationHeader != null)
|
||||||
client.DefaultRequestHeaders.Add("Authorization", AuthorizationHeader);
|
client.DefaultRequestHeaders.Add("Authorization", AuthorizationHeader);
|
||||||
|
|
||||||
var request = new HttpRequestMessage(new HttpMethod("REPORT"), Url);
|
var request = new HttpRequestMessage(new HttpMethod("REPORT"), Url);
|
||||||
|
|
|
@ -18,16 +18,18 @@ else
|
||||||
{
|
{
|
||||||
<li>
|
<li>
|
||||||
<a href="/calendars/@calendar.Id">@calendar.Name</a>
|
<a href="/calendars/@calendar.Id">@calendar.Name</a>
|
||||||
(<a href="#" @onclick="() => DeleteCalendar(calendar)">
|
(
|
||||||
|
<a href="#" @onclick="() => DeleteCalendar(calendar)">
|
||||||
@if (_confirmDeleteId == calendar.Id)
|
@if (_confirmDeleteId == calendar.Id)
|
||||||
{
|
{
|
||||||
<span>Confirm deletion?</span>
|
@:Confirm deletion?
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
<span class="oi oi-x"></span>
|
<span class="oi oi-x"></span>
|
||||||
}
|
}
|
||||||
</a>)
|
</a>
|
||||||
|
)
|
||||||
</li>
|
</li>
|
||||||
}
|
}
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -37,6 +39,9 @@ else
|
||||||
<h2>Add New Calendar</h2>
|
<h2>Add New Calendar</h2>
|
||||||
|
|
||||||
<EditForm Model="@_calendarModel" OnValidSubmit="@HandleValidSubmit">
|
<EditForm Model="@_calendarModel" OnValidSubmit="@HandleValidSubmit">
|
||||||
|
<DataAnnotationsValidator/>
|
||||||
|
<ValidationSummary/>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="url">URL</label>
|
<label for="url">URL</label>
|
||||||
<InputText id="url" class="form-control" placeholder="Enter URL" @bind-Value="_calendarModel.Url"/>
|
<InputText id="url" class="form-control" placeholder="Enter URL" @bind-Value="_calendarModel.Url"/>
|
||||||
|
@ -46,24 +51,21 @@ else
|
||||||
<label for="username">Username</label>
|
<label for="username">Username</label>
|
||||||
<InputText
|
<InputText
|
||||||
id="username" class="form-control" placeholder="Enter username"
|
id="username" class="form-control" placeholder="Enter username"
|
||||||
@bind-Value="_calendarModel.Username"
|
@bind-Value="_calendarModel.Username"/>
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="password">Password</label>
|
<label for="password">Password</label>
|
||||||
<InputText
|
<InputText
|
||||||
type="password" id="password" class="form-control" placeholder="Enter password"
|
type="password" id="password" class="form-control" placeholder="Enter password"
|
||||||
@bind-Value="_calendarModel.Password"
|
@bind-Value="_calendarModel.Password"/>
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="name">Name</label>
|
<label for="name">Name</label>
|
||||||
<InputText
|
<InputText
|
||||||
type="text" id="name" class="form-control" placeholder="Enter name"
|
type="text" id="name" class="form-control" placeholder="Enter name"
|
||||||
@bind-Value="_calendarModel.Name"
|
@bind-Value="_calendarModel.Name"/>
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button type="submit" class="btn btn-primary">Submit</button>
|
<button type="submit" class="btn btn-primary">Submit</button>
|
||||||
|
@ -95,7 +97,6 @@ else
|
||||||
{
|
{
|
||||||
await CalendarService.CreateCalendar(_calendarModel);
|
await CalendarService.CreateCalendar(_calendarModel);
|
||||||
_calendarModel = null;
|
_calendarModel = null;
|
||||||
|
|
||||||
_calendars = await CalendarService.GetCalendars();
|
_calendars = await CalendarService.GetCalendars();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue