tsai
/
eventhub
mirror of https://github.com/abpframework/eventhub
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Refactoring

pull/17/head
EngincanV 6 years ago
parent
a35fed2e14
commit
8ac23910a7
2 changed files with 17 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/EventHub.Web/Pages/Organizations/Profile.cshtml
  2. 6
      test/EventHub.Application.Tests/Organizations/OrganizationAppServiceTests.cs

24
src/EventHub.Web/Pages/Organizations/Profile.cshtml
View File

@ -34,12 +34,12 @@
<abp-card-text class="mt-3"> <abp-card-text class="mt-3">
@Model.Organization.Description @Model.Organization.Description
@if (!Model.Organization.Website.IsNullOrEmpty() || !Model.Organization.TwitterUsername.IsNullOrEmpty() || @if (!Model.Organization.Website.IsNullOrWhiteSpace() || !Model.Organization.TwitterUsername.IsNullOrWhiteSpace() ||
!Model.Organization.GitHubUsername.IsNullOrEmpty() || !Model.Organization.InstagramUsername.IsNullOrEmpty() || !Model.Organization.GitHubUsername.IsNullOrWhiteSpace() || !Model.Organization.InstagramUsername.IsNullOrWhiteSpace() ||
!Model.Organization.GitHubUsername.IsNullOrEmpty() || !Model.Organization.MediumUsername.IsNullOrEmpty()) !Model.Organization.FacebookUsername.IsNullOrWhiteSpace() || !Model.Organization.MediumUsername.IsNullOrWhiteSpace())
{ {
<hr/> <hr/>
@if (Model.Organization.Website != null) @if (!Model.Organization.Website.IsNullOrWhiteSpace())
{ {
<div class="mt-4 text-center"> <div class="mt-4 text-center">
<small class="text-muted text-uppercase">@L["PersonalWebsite"]</small> <small class="text-muted text-uppercase">@L["PersonalWebsite"]</small>
@ -53,37 +53,37 @@
</h5> </h5>
</div> </div>
} }
@if (Model.Organization.TwitterUsername != null || Model.Organization.GitHubUsername != null || @if (!Model.Organization.TwitterUsername.IsNullOrWhiteSpace() || !Model.Organization.GitHubUsername.IsNullOrWhiteSpace() ||
Model.Organization.InstagramUsername != null || Model.Organization.GitHubUsername != null || !Model.Organization.InstagramUsername.IsNullOrWhiteSpace() || !Model.Organization.FacebookUsername.IsNullOrWhiteSpace() ||
Model.Organization.MediumUsername != null) !Model.Organization.MediumUsername.IsNullOrWhiteSpace())
{ {
<div class="profile-icons mt-4 text-center"> <div class="profile-icons mt-4 text-center">
<small class="text-muted text-uppercase">@L["SocialMedia"]</small><br/> <small class="text-muted text-uppercase">@L["SocialMedia"]</small><br/>
@if (Model.Organization.TwitterUsername != null) @if (!Model.Organization.TwitterUsername.IsNullOrWhiteSpace())
{ {
<a href="https://twitter.com/@Model.Organization.TwitterUsername" class="text-twitter text-decoration-none" target="_blank" style="font-size: 1.5rem"> <a href="https://twitter.com/@Model.Organization.TwitterUsername" class="text-twitter text-decoration-none" target="_blank" style="font-size: 1.5rem">
<i class="fab fa-twitter"></i> <i class="fab fa-twitter"></i>
</a> </a>
} }
@if (Model.Organization.GitHubUsername != null) @if (!Model.Organization.GitHubUsername.IsNullOrWhiteSpace())
{ {
<a href="https://github.com/@Model.Organization.GitHubUsername" class="text-github text-decoration-none" target="_blank" style="font-size: 1.5rem"> <a href="https://github.com/@Model.Organization.GitHubUsername" class="text-github text-decoration-none" target="_blank" style="font-size: 1.5rem">
<i class="fab fa-github"></i> <i class="fab fa-github"></i>
</a> </a>
} }
@if (Model.Organization.InstagramUsername != null) @if (!Model.Organization.InstagramUsername.IsNullOrWhiteSpace())
{ {
<a href="https://www.instagram.com/@Model.Organization.InstagramUsername" class="text-instagram text-decoration-none" target="_blank" style="font-size: 1.5rem"> <a href="https://www.instagram.com/@Model.Organization.InstagramUsername" class="text-instagram text-decoration-none" target="_blank" style="font-size: 1.5rem">
<i class="fab fa-instagram"></i> <i class="fab fa-instagram"></i>
</a> </a>
} }
@if (Model.Organization.FacebookUsername != null) @if (!Model.Organization.FacebookUsername.IsNullOrWhiteSpace())
{ {
<a href="https://www.facebook.com/@Model.Organization.FacebookUsername" class="text-facebook text-decoration-none" target="_blank" style="font-size: 1.5rem"> <a href="https://www.facebook.com/@Model.Organization.FacebookUsername" class="text-facebook text-decoration-none" target="_blank" style="font-size: 1.5rem">
<i class="fab fa-facebook"></i> <i class="fab fa-facebook"></i>
</a> </a>
} }
@if (Model.Organization.MediumUsername != null) @if (!Model.Organization.MediumUsername.IsNullOrWhiteSpace())
{ {
<a href="https://medium.com/@Html.Raw("@")@Model.Organization.MediumUsername" class="text-medium text-decoration-none" target="_blank" style="font-size: 1.5rem"> <a href="https://medium.com/@Html.Raw("@")@Model.Organization.MediumUsername" class="text-medium text-decoration-none" target="_blank" style="font-size: 1.5rem">
<i class="fab fa-medium"></i> <i class="fab fa-medium"></i>

6
test/EventHub.Application.Tests/Organizations/OrganizationAppServiceTests.cs
View File

@ -6,7 +6,6 @@ using Shouldly;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.Authorization; using Volo.Abp.Authorization;
using Volo.Abp.MultiTenancy;
using Volo.Abp.Users; using Volo.Abp.Users;
using Xunit; using Xunit;
@ -100,6 +99,11 @@ namespace EventHub.Organizations
Website = "https://volosoft.com/", Website = "https://volosoft.com/",
MediumUsername = "volosoft" MediumUsername = "volosoft"
}); });
var organization = await GetOrganizationOrNullAsync(_testData.OrganizationVolosoftName);
organization.ShouldNotBeNull();
organization.DisplayName.ShouldBe("VOLOSOFT");
organization.Description.ShouldBe("Test description text that is valid and long enough for updating!");
} }
[Fact] [Fact]

Write Preview
Loading…
Cancel
Save