Browse Source

Merge pull request #119 from onurpicakci/onur/bugfix

fix some bug on eventhub
pull/120/head
Berkan Sasmaz 4 years ago
committed by GitHub
parent
commit
ab5c11076b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
  2. 6
      src/EventHub.Admin.Web/Pages/OrganizationManagement.razor.cs
  3. 2
      src/EventHub.Domain.Shared/Organizations/OrganizationContst.cs
  4. 16
      src/EventHub.Web/Pages/Events/Components/CreateOrEditEventArea/_eventSection.cshtml
  5. 8
      src/EventHub.Web/Pages/Organizations/Components/MembersArea/_memberListSection.cshtml
  6. 2
      src/EventHub.Web/Pages/Organizations/New.cshtml

8
src/EventHub.Admin.Web/Pages/OrganizationManagement.razor

@ -111,7 +111,7 @@
<Form id="EditOrganizationForm">
<ModalHeader>
<ModalTitle>@L["UpdateOrganization"]</ModalTitle>
<CloseButton Clicked="() => EditOrganizationModal.Hide()"/>
<CloseButton Clicked="@ClouseUpdateOrganizationModal"/>
</ModalHeader>
<ModalBody>
<Tabs SelectedTab="@SelectedTabInEditModal" SelectedTabChanged="@OnSelectedTabChangedInEditModal">
@ -241,7 +241,7 @@
<Column ColumnSize="ColumnSize.Is3">
@if (DisabledProfileImageButton)
{
<Button disabled Color="Color.Secondary" Clicked="@OnDeleteCoverImageButtonClicked">@L["DeleteCoverImage"]</Button>
<Button disabled Color="Color.Secondary" Clicked="@OnDeleteCoverImageButtonClicked" >@L["DeleteCoverImage"]</Button>
}
else
{
@ -256,8 +256,8 @@
</ModalBody>
<ModalFooter>
<Button Color="Color.Secondary"
Clicked="() => EditOrganizationModal.Hide()">
@L["Cancel"]
Clicked="@ClouseUpdateOrganizationModal">
@L["Cancel"]
</Button>
<Button Type="ButtonType.Submit" PreventDefaultOnSubmit="true" Color="Color.Primary"
Clicked="UpdateOrganizationAsync">

6
src/EventHub.Admin.Web/Pages/OrganizationManagement.razor.cs

@ -102,6 +102,12 @@ namespace EventHub.Admin.Web.Pages
IsLoadingProfileImage = false;
}
private void ClouseUpdateOrganizationModal()
{
DisabledProfileImageButton = false;
EditOrganizationModal.Hide();
}
private async Task DeleteOrganizationAsync(OrganizationInListDto organization)
{
await OrganizationAppService.DeleteAsync(organization.Id);

2
src/EventHub.Domain.Shared/Organizations/OrganizationContst.cs

@ -13,7 +13,7 @@
public const int MinDescriptionNameLength = 50;
public const int MaxDescriptionNameLength = 1000;
public const int MaxProfilePictureFileSize = 5 * 1024 * 1024;
public const int MaxProfilePictureFileSize = 1 * 1024 * 1024;
public const int MaxWebsiteLength = 512;

16
src/EventHub.Web/Pages/Events/Components/CreateOrEditEventArea/_eventSection.cshtml

@ -60,27 +60,27 @@
<div class="col-md-6">
<div class="form-label-group">
<input type="text" id="inputTitle" asp-for="@Model.Title" class="form-control" placeholder="Title">
<label for="inputTitle">Title</label>
<label for="inputTitle">Title *</label>
<span asp-validation-for="@Model.Title" class="text-danger"></span>
</div>
</div>
<div class="col-md-6">
<div class="form-label-group">
<input id="inputStartdate" asp-for="@Model.StartTime" class="form-control" placeholder="Start Date">
<label for="inputStartdate">Start Date</label>
<label for="inputStartdate">Start Date *</label>
<span asp-validation-for="@Model.StartTime" class="text-danger"></span>
</div>
</div>
<div class="col-md-6">
<div class="form-label-group">
<input id="inputEnddate" asp-for="@Model.EndTime" class="form-control" placeholder="End Date">
<label for="inputEnddate">End Date</label>
<label for="inputEnddate">End Date *</label>
<span asp-validation-for="@Model.EndTime" class="text-danger"></span>
</div>
</div>
<div class="col-md-12">
<div class="form-label-group">
<textarea type="text" id="inputDescription" asp-for="@Model.Description" class="form-control" placeholder="Description"></textarea>
<textarea type="text" id="inputDescription" asp-for="@Model.Description" class="form-control" placeholder="Description*" style="resize: none"></textarea>
<span asp-validation-for="@Model.Description" class="text-danger"></span>
</div>
</div>
@ -126,20 +126,20 @@
</div>
<div class="col-md-6">
<div class="form-label-group">
<input type="number" id="inputCapacity" asp-for="@Model.Capacity" class="form-control" placeholder="Capacity">
<label for="inputCapacity">Capacity</label>
<input type="number" id="inputCapacity" min="0" oninput="validity.valid||(value='');" asp-for="@Model.Capacity" class="form-control" placeholder="Capacity" >
<label for="inputCapacity">Capacity </label>
<span asp-validation-for="@Model.Capacity" class="text-danger"></span>
</div>
</div>
<div class="col-md-6 event-location-group">
<select asp-for="@Model.CountryId" asp-items="countries" class="form-select">
<option selected="" value="">Country</option>
<option selected="" value="">Country *</option>
</select>
<span asp-validation-for="@Model.CountryId" class="text-danger"></span>
</div>
<div class="col-md-6 event-location-group">
<div class="form-label-group">
<input type="text" id="inputCity" asp-for="@Model.City" class="form-control" placeholder="City">
<input type="text" id="inputCity" asp-for="@Model.City" class="form-control" placeholder="City*">
<label for="inputCity">City</label>
<span asp-validation-for="@Model.City" class="text-danger"></span>
</div>

8
src/EventHub.Web/Pages/Organizations/Components/MembersArea/_memberListSection.cshtml

@ -4,9 +4,11 @@
{
<div>
<div>
<a href="/users/@member.UserName">
<img gravatar-email="@member.Email" default-image="Wavatar" gravatar-size="40" class="org-avatar avatar rounded-circle" data-bs-toggle="tooltip" title="@member.UserName"/>
</a>
<p>
<a href="/users/@member.UserName">
<img gravatar-email="@member.Email" default-image="Wavatar" gravatar-size="40" class="org-avatar avatar rounded-circle" data-bs-toggle="tooltip" title="@member.UserName"/>
</a>@member.UserName</p>
<span class="member-name" style="display: none">
@if (!string.IsNullOrWhiteSpace(member.Name) && !string.IsNullOrWhiteSpace(member.Surname))
{

2
src/EventHub.Web/Pages/Organizations/New.cshtml

@ -57,7 +57,7 @@
</div>
<div class="col-md-12">
<div class="form-label-group">
<textarea rows="5" type="text" id="inputDescription" asp-for="Organization.Description" class="form-control" placeholder="Description*" required=""></textarea>
<textarea rows="5" type="text" id="inputDescription" asp-for="Organization.Description" class="form-control" placeholder="Description*" required="" style="resize: none; "></textarea>
<span asp-validation-for="Organization.Description" class="text-danger"></span>
</div>
</div>

Loading…
Cancel
Save