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

Upgrade EventHub.Web to ABP 5.0.0-beta.3

pull/71/head
Berkan Sasmaz 5 years ago
parent
50b6eb6029
commit
b1b4c55c10
23 changed files with 98 additions and 91 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. 2
      src/EventHub.IdentityServer/Pages/Account/Manage.cshtml
  2. 14
      src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
  3. 2
      src/EventHub.Web.Theme/Themes/EventHub/Components/Menu/Default.cshtml
  4. 2
      src/EventHub.Web.Theme/Themes/EventHub/Components/Menu/_MenuItem.cshtml
  5. 2
      src/EventHub.Web.Theme/Themes/EventHub/Components/Toolbar/LanguageSwitch/Default.cshtml
  6. 2
      src/EventHub.Web.Theme/Themes/EventHub/Components/Toolbar/UserMenu/Default.cshtml
  7. 4
      src/EventHub.Web.Theme/wwwroot/themes/eventhub/style.css
  8. 2
      src/EventHub.Web/Pages/Events/Components/AttendeesArea/Default.cshtml
  9. 2
      src/EventHub.Web/Pages/Events/Components/EventsArea/_eventListSection.cshtml
  10. 2
      src/EventHub.Web/Pages/Events/Detail.cshtml
  11. 2
      src/EventHub.Web/Pages/Events/Edit.cshtml
  12. 2
      src/EventHub.Web/Pages/Events/New.cshtml
  13. 47
      src/EventHub.Web/Pages/Index.cshtml
  14. 36
      src/EventHub.Web/Pages/Organizations/Components/JoinArea/Default.cshtml
  15. 2
      src/EventHub.Web/Pages/Organizations/Components/MembersArea/_memberListSection.cshtml
  16. 2
      src/EventHub.Web/Pages/Organizations/Edit.cshtml
  17. 2
      src/EventHub.Web/Pages/Organizations/New.cshtml
  18. 28
      src/EventHub.Web/Pages/Organizations/Profile.cshtml
  19. 14
      src/EventHub.Web/Pages/Payment/PreCheckout.cshtml
  20. 6
      src/EventHub.Web/Pages/Pricing.cshtml
  21. 4
      src/EventHub.Web/Pages/PrivacyPolicy.cshtml
  22. 4
      src/EventHub.Web/Pages/TermsService.cshtml
  23. 6
      src/EventHub.Web/Pages/User.cshtml

2
src/EventHub.IdentityServer/Pages/Account/Manage.cshtml
View File

@ -18,7 +18,7 @@
<abp-row class="mb-2"> <abp-row class="mb-2">
<abp-column> <abp-column>
<a class="btn btn-primary" href="@Model.ReturnUrl"> <a class="btn btn-primary" href="@Model.ReturnUrl">
<i class="fa fa-chevron-left mr-2"></i>@L["ReturnToApplication"] <i class="fa fa-chevron-left me-2"></i>@L["ReturnToApplication"]
</a> </a>
</abp-column> </abp-column>
</abp-row> </abp-row>

14
src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
View File

@ -22,7 +22,7 @@
<a class="navbar-brand font-weight-bold" href="@Url.Page("/index")"> <a class="navbar-brand font-weight-bold" href="@Url.Page("/index")">
<img src="/assets/eventhub-logo.svg" class="logo"/> <img src="/assets/eventhub-logo.svg" class="logo"/>
</a> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarResponsive"> <div class="collapse navbar-collapse" id="navbarResponsive">
@ -44,10 +44,10 @@
<ul class="navbar-nav"> <ul class="navbar-nav">
<li class="nav-item"> <li class="nav-item">
<div class="dropdown"> <div class="dropdown">
<a class="nav-link event-link" type="button" id="createDropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link event-link" type="button" id="createDropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ Create + Create
</a> </a>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> <div class="dropdown-menu m-2" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" href="@UrlOptions.Value.Www@Url.Page("/organizations/new")">Organization</a> <a class="dropdown-item" href="@UrlOptions.Value.Www@Url.Page("/organizations/new")">Organization</a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a class="dropdown-item" href="@UrlOptions.Value.Www@Url.Page("/events/new")">Event</a> <a class="dropdown-item" href="@UrlOptions.Value.Www@Url.Page("/events/new")">Event</a>
@ -61,11 +61,11 @@
@if (CurrentUser.IsAuthenticated) @if (CurrentUser.IsAuthenticated)
{ {
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="user-avatar"> <span class="user-avatar">
<img gravatar-email="@CurrentUser.Email" default-image="Wavatar" gravatar-size="40" width="40" height="40" class="nav-avatar avatar rounded-circle"/> <img gravatar-email="@CurrentUser.Email" default-image="Wavatar" gravatar-size="40" width="40" height="40" class="nav-avatar avatar rounded-circle"/>
</span> </span>
<span class="ml-2"> <span class="ms-2">
@if (!string.IsNullOrWhiteSpace(CurrentUser.Name) && !string.IsNullOrWhiteSpace(CurrentUser.SurName)) @if (!string.IsNullOrWhiteSpace(CurrentUser.Name) && !string.IsNullOrWhiteSpace(CurrentUser.SurName))
{ {
@(CurrentUser.Name + " " + CurrentUser.SurName) @(CurrentUser.Name + " " + CurrentUser.SurName)
@ -78,7 +78,7 @@
} }
</span> </span>
</a> </a>
<div class="dropdown-menu dropdown-menu-right"> <div class="dropdown-menu dropdown-menu-right m-2">
<a class="dropdown-item" href="@(UrlOptions.Value.Account.EnsureEndsWith('/') + "account/manage")" title="@L["Account"]"> <a class="dropdown-item" href="@(UrlOptions.Value.Account.EnsureEndsWith('/') + "account/manage")" title="@L["Account"]">
<i class="fas fa-cog"></i> @L["Account"] <i class="fas fa-cog"></i> @L["Account"]
</a> </a>
@ -97,7 +97,7 @@
<a class="nav-link" href="/account/login?returnUrl=@returnUrl">Log In</a> <a class="nav-link" href="/account/login?returnUrl=@returnUrl">Log In</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="btn btn-primary ml-lg-2" href="@UrlOptions.Value.Account/account/register?returnUrl=@returnUrl">Sign Up</a> <a class="btn btn-primary ms-lg-2" href="@UrlOptions.Value.Account/account/register?returnUrl=@returnUrl">Sign Up</a>
</li> </li>
} }
</ul> </ul>

2
src/EventHub.Web.Theme/Themes/EventHub/Components/Menu/Default.cshtml
View File

@ -28,7 +28,7 @@
{ {
<li class="nav-item"> <li class="nav-item">
<div class="dropdown"> <div class="dropdown">
<a class="nav-link dropdown-toggle" href="#" id="Menu_@(menuItem.Name)" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="#" id="Menu_@(menuItem.Name)" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@if (menuItem.Icon != null) @if (menuItem.Icon != null)
{ {
if (menuItem.Icon.StartsWith("fa")) if (menuItem.Icon.StartsWith("fa"))

2
src/EventHub.Web.Theme/Themes/EventHub/Components/Menu/_MenuItem.cshtml
View File

@ -25,7 +25,7 @@
else else
{ {
<div class="dropdown-submenu"> <div class="dropdown-submenu">
<a role="button" class="btn dropdown-toggle" data-toggle="dropdown" <a role="button" class="btn dropdown-toggle" data-bs-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"> aria-haspopup="true" aria-expanded="false">
<span class="lp-icon"> <span class="lp-icon">
<i class="@(Model.Icon ?? "")"></i> <i class="@(Model.Icon ?? "")"></i>

2
src/EventHub.Web.Theme/Themes/EventHub/Components/Toolbar/LanguageSwitch/Default.cshtml
View File

@ -4,7 +4,7 @@
@if (Model.OtherLanguages.Any()) @if (Model.OtherLanguages.Any())
{ {
<div class="dropdown"> <div class="dropdown">
<a class="nav-link dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@Model.CurrentLanguage.DisplayName @Model.CurrentLanguage.DisplayName
</a> </a>

2
src/EventHub.Web.Theme/Themes/EventHub/Components/Toolbar/UserMenu/Default.cshtml
View File

@ -8,7 +8,7 @@
@inject IHtmlLocalizer<AbpUiResource> L @inject IHtmlLocalizer<AbpUiResource> L
@model ApplicationMenu @model ApplicationMenu
<div class="dropdown"> <div class="dropdown">
<a class="nav-link dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@if (CurrentUser.TenantId != null) @if (CurrentUser.TenantId != null)
{ {
<small><i>@CurrentTenant.Name</i>\</small>@CurrentUser.UserName <small><i>@CurrentTenant.Name</i>\</small>@CurrentUser.UserName

4
src/EventHub.Web.Theme/wwwroot/themes/eventhub/style.css
View File

@ -40,6 +40,10 @@ body {
font-weight: 600; font-weight: 600;
} }
a:link, a:visited, a:hover, a:focus, a:active {
text-decoration: none;
}
p.lead { p.lead {
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;

2
src/EventHub.Web/Pages/Events/Components/AttendeesArea/Default.cshtml
View File

@ -6,7 +6,7 @@
@foreach (var attendee in Model.Attendees) @foreach (var attendee in Model.Attendees)
{ {
<a href="/users/@attendee.UserName"> <a href="/users/@attendee.UserName">
<img gravatar-email="@attendee.Email" default-image="Wavatar" gravatar-size="40" class="org-avatar rounded-circle" data-toggle="tooltip" title="@attendee.UserName" /> <img gravatar-email="@attendee.Email" default-image="Wavatar" gravatar-size="40" class="org-avatar rounded-circle" data-bs-toggle="tooltip" title="@attendee.UserName" />
</a> </a>
} }
</div> </div>

2
src/EventHub.Web/Pages/Events/Components/EventsArea/_eventListSection.cshtml
View File

@ -13,7 +13,7 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="event-container"> <div class="event-container">
<div class="form-row"> <div class="row">
<div class="col-3"> <div class="col-3">
<div class="event-date text-center"> <div class="event-date text-center">
<small>@eventDto.StartTime.ToString("MMM")</small> <small>@eventDto.StartTime.ToString("MMM")</small>

2
src/EventHub.Web/Pages/Events/Detail.cshtml
View File

@ -53,7 +53,7 @@
<h5 class="detail-head mt-4">Owner</h5> <h5 class="detail-head mt-4">Owner</h5>
<div> <div>
<a href="/users/@Model.Event.OwnerUserName"> <a href="/users/@Model.Event.OwnerUserName">
<img gravatar-email="@Model.Event.OwnerEmail" default-image="Wavatar" gravatar-size="40" class="org-avatar avatar rounded-circle" data-toggle="tooltip" title="@Model.Event.OwnerUserName"/> <img gravatar-email="@Model.Event.OwnerEmail" default-image="Wavatar" gravatar-size="40" class="org-avatar avatar rounded-circle" data-bs-toggle="tooltip" title="@Model.Event.OwnerUserName"/>
</a> </a>
</div> </div>
@if (Model.IsEventOwner) @if (Model.IsEventOwner)

2
src/EventHub.Web/Pages/Events/Edit.cshtml
View File

@ -120,7 +120,7 @@
</div> </div>
<div class="col-md-12 text-right"> <div class="col-md-12 text-end">
<button type="submit" class="btn btn-primary btn-lg"> <button type="submit" class="btn btn-primary btn-lg">
@L["Submit"] @L["Submit"]
</button> </button>

2
src/EventHub.Web/Pages/Events/New.cshtml
View File

@ -129,7 +129,7 @@ else
</select> </select>
<span asp-validation-for="Event.Language" class="text-danger"></span> <span asp-validation-for="Event.Language" class="text-danger"></span>
</div> </div>
<div class="col-md-12 text-right"> <div class="col-md-12 text-end">
<button type="submit" class="btn btn-primary btn-lg"> <button type="submit" class="btn btn-primary btn-lg">
Publish New Event Publish New Event
</button> </button>

47
src/EventHub.Web/Pages/Index.cshtml
View File

@ -51,7 +51,7 @@
<div class="search-event container"> <div class="search-event container">
<div class="card bg-primary mb-0"> <div class="card bg-primary mb-0">
<div class="card-body"> <div class="card-body">
<div class="form-row search-form"> <div class="row search-form">
<div class="col-md mb-3 mb-md-0"> <div class="col-md mb-3 mb-md-0">
<select id="LanguageSelect" class="form-select" aria-label="en"> <select id="LanguageSelect" class="form-select" aria-label="en">
<option value="" selected>Language</option> <option value="" selected>Language</option>
@ -78,8 +78,8 @@
<label for="inputWhen">When</label> <label for="inputWhen">When</label>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-2 d-grid gap-2">
<button id="SearchButton" class="btn btn-primary btn-lg btn-block "> <button id="SearchButton" class="btn btn-primary btn-lg">
<img src="/assets/search.svg"> <img src="/assets/search.svg">
Search Search
</button> </button>
@ -162,28 +162,27 @@
</div> </div>
</div> </div>
<div class="container text-center py-5"> <div class="container text-center py-5">
<h1 class="my-5 pb-5">How EventHub Works?</h1> <h1 class="my-5 pb-5">How EventHub Works?</h1>
<div class="row my-4"> <div class="row my-4">
<div class="col-md-5 ml-auto"> <div class="col-md-5 ms-auto">
<div class="px-5"> <div class="px-5">
<h3>Explore groups</h3> <h3>Explore groups</h3>
<p class="lead"> <p class="lead">
List who is organizing local events List who is organizing local events
with one click. with one click.
</p> </p>
@if (!CurrentUser.IsAuthenticated) @if (!CurrentUser.IsAuthenticated)
{ {
<a href="@UrlOptions.Value.Account/Account/Register?returnUrl=@UrlOptions.Value.Www" class="btn btn-link btn-lg">Join EventHub</a> <a href="@UrlOptions.Value.Account/Account/Register?returnUrl=@UrlOptions.Value.Www" class="btn btn-link btn-lg">Join EventHub</a>
} }
</div>
</div> </div>
<div class="col-md-5 mr-auto border-left"> </div>
<div class="px-5"> <div class="col-md-5 me-auto border-left">
<h3>Start an Event</h3> <div class="px-5">
<p class="lead">Create your own Eventhub group and benefit from a community of millions.</p> <h3>Start an Event</h3>
<a href="@Url.Page("/Events/New")" class="btn btn-link btn-lg">Start</a> <p class="lead">Create your own Eventhub group and benefit from a community of millions.</p>
</div> <a href="@Url.Page("/Events/New")" class="btn btn-link btn-lg">Start</a>
</div> </div>
</div> </div>
</div> </div>

36
src/EventHub.Web/Pages/Organizations/Components/JoinArea/Default.cshtml
View File

@ -6,24 +6,24 @@
<abp-card-body> <abp-card-body>
@if (Model.IsLoggedIn) @if (Model.IsLoggedIn)
{ {
if (Model.IsJoined) <div class="d-grid gap-2">
{ @if (Model.IsJoined)
<abp-button id="OrganizationLeaveButton" {
button-type="Secondary" <abp-button id="OrganizationLeaveButton"
size="Block" button-type="Secondary"
icon="fas fa-times" icon="fas fa-times"
text="@L["LeaveOrganization"].Value" text="@L["LeaveOrganization"].Value"
data-url="@Url.Action("Leave","OrganizationMembership", new { organizationId = Model.OrganizationId })" /> data-url="@Url.Action("Leave","OrganizationMembership", new { organizationId = Model.OrganizationId })" />
} }
else else
{ {
<abp-button id="OrganizationJoinButton" <abp-button id="OrganizationJoinButton"
button-type="Primary" button-type="Primary"
size="Block" icon="fas fa-plus"
icon="fas fa-plus" text="@L["JoinOrganization"].Value"
text="@L["JoinOrganization"].Value" data-url="@Url.Action("Join","OrganizationMembership", new { organizationId = Model.OrganizationId })"/>
data-url="@Url.Action("Join","OrganizationMembership", new { organizationId = Model.OrganizationId })"/> }
} </div>
} }
else else
{ {

2
src/EventHub.Web/Pages/Organizations/Components/MembersArea/_memberListSection.cshtml
View File

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

2
src/EventHub.Web/Pages/Organizations/Edit.cshtml
View File

@ -102,7 +102,7 @@
<span asp-validation-for="Organization.MediumUsername" class="text-danger"></span> <span asp-validation-for="Organization.MediumUsername" class="text-danger"></span>
</div> </div>
</div> </div>
<div class="col-md-12 text-right"> <div class="col-md-12 text-end">
<button type="submit" class="btn btn-primary btn-lg"> <button type="submit" class="btn btn-primary btn-lg">
@L["Submit"] @L["Submit"]
</button> </button>

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

@ -103,7 +103,7 @@
<span asp-validation-for="Organization.MediumUsername" class="text-danger"></span> <span asp-validation-for="Organization.MediumUsername" class="text-danger"></span>
</div> </div>
</div> </div>
<div class="col-md-12 text-right"> <div class="col-md-12 text-end">
<button type="submit" class="btn btn-primary btn-lg"> <button type="submit" class="btn btn-primary btn-lg">
Create Organization Create Organization
</button> </button>

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

@ -31,13 +31,13 @@
<div class="col-12 mt-4"> <div class="col-12 mt-4">
<ul class="nav nav-tabs profile-nav" id="myTab"> <ul class="nav nav-tabs profile-nav" id="myTab">
<li class="nav-item"> <li class="nav-item">
<a href="#about-organization-section" class="nav-link active" data-toggle="tab">About the Organization</a> <a href="#about-organization-section" class="nav-link active" data-bs-toggle="tab">About the Organization</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="#events-section" class="nav-link" data-toggle="tab">Events</a> <a href="#events-section" class="nav-link" data-bs-toggle="tab">Events</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="#members-section" class="nav-link" data-toggle="tab">Members</a> <a href="#members-section" class="nav-link" data-bs-toggle="tab">Members</a>
</li> </li>
</ul> </ul>
@ -60,7 +60,7 @@
<h5 class="detail-head mt-3 font-weight-bold">Owners</h5> <h5 class="detail-head mt-3 font-weight-bold">Owners</h5>
<div> <div>
<a href="/users/@Model.Organization.OwnerUserName"> <a href="/users/@Model.Organization.OwnerUserName">
<img gravatar-email="@Model.Organization.OwnerEmail" default-image="Wavatar" gravatar-size="40" class="org-avatar avatar rounded-circle" data-toggle="tooltip" title="@Model.Organization.OwnerUserName"/> <img gravatar-email="@Model.Organization.OwnerEmail" default-image="Wavatar" gravatar-size="40" class="org-avatar avatar rounded-circle" data-bs-toggle="tooltip" title="@Model.Organization.OwnerUserName"/>
</a> </a>
</div> </div>
@ -79,16 +79,20 @@
<span>Premium end date: @Model.Organization.PremiumEndDate!.Value.ToShortDateString()</span> <span>Premium end date: @Model.Organization.PremiumEndDate!.Value.ToShortDateString()</span>
@if (PremiumPlanInfoOptionsSnapshot.Value.IsExtendable && Model.Organization.PremiumEndDate!.Value.IsBetween(DateTime.Now, DateTime.Now.AddMonths(PremiumPlanInfoOptionsSnapshot.Value.OnePremiumPeriodAsMonth - PremiumPlanInfoOptionsSnapshot.Value.CanBeExtendedAfterHowManyMonths))) @if (PremiumPlanInfoOptionsSnapshot.Value.IsExtendable && Model.Organization.PremiumEndDate!.Value.IsBetween(DateTime.Now, DateTime.Now.AddMonths(PremiumPlanInfoOptionsSnapshot.Value.OnePremiumPeriodAsMonth - PremiumPlanInfoOptionsSnapshot.Value.CanBeExtendedAfterHowManyMonths)))
{ {
<a href="@Url.Page("/Pricing", new { organizationName = Model.Organization.Name })" class="btn btn-primary btn-block mt-3"> <div class="d-grid gap-2">
<i class="fas fa-handshake"></i> @L["ExtendNow"].Value <a href="@Url.Page("/Pricing", new { organizationName = Model.Organization.Name })" class="btn btn-primary mt-3">
</a> <i class="fas fa-handshake"></i> @L["ExtendNow"].Value
</a>
</div>
} }
} }
else else
{ {
<a href="@Url.Page("/Pricing", new { organizationName = Model.Organization.Name })" class="btn btn-primary btn-block"> <div class="d-grid gap-2">
<i class="fas fa-handshake"></i> @L["UpgradeToPremium"] <a href="@Url.Page("/Pricing", new { organizationName = Model.Organization.Name })" class="btn btn-primary">
</a> <i class="fas fa-handshake"></i> @L["UpgradeToPremium"]
</a>
</div>
} }
</abp-card-body> </abp-card-body>
</abp-card> </abp-card>
@ -167,10 +171,10 @@
<div class="list-style"> <div class="list-style">
<ul class="nav nav-pills events" role="tablist"> <ul class="nav nav-pills events" role="tablist">
<li class="nav-item"> <li class="nav-item">
<a href="#PastEvent" class="selected" data-toggle="tab"><img src="/assets/past.svg"> Past</a> <a href="#PastEvent" class="selected" data-bs-toggle="tab"><img src="/assets/past.svg"> Past</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="#UpcomingEvent" data-toggle="tab"><img src="/assets/now.svg"> Upcoming</a> <a href="#UpcomingEvent" data-bs-toggle="tab"><img src="/assets/now.svg"> Upcoming</a>
</li> </li>
</ul> </ul>
</div> </div>

14
src/EventHub.Web/Pages/Payment/PreCheckout.cshtml
View File

@ -56,7 +56,7 @@
@if (!organizationPaymentRequestExtraParameterConfiguration.IsExtend) @if (!organizationPaymentRequestExtraParameterConfiguration.IsExtend)
{ {
<span class="text-muted">Target Plan: @OrganizationPlanType.Premium</span> <span class="text-muted">Target Plan: @OrganizationPlanType.Premium</span>
<span class="text-muted ml-1">End date: @DateTime.Now.AddMonths(planInfo.OnePremiumPeriodAsMonth).ToShortDateString()</span> <span class="text-muted ms-1">End date: @DateTime.Now.AddMonths(planInfo.OnePremiumPeriodAsMonth).ToShortDateString()</span>
} }
else else
{ {
@ -75,9 +75,9 @@
<div class="d-flex flex-wrap justify-content-between align-items-center pb-4"> <div class="d-flex flex-wrap justify-content-between align-items-center pb-4">
<abp-container> <abp-container>
<abp-row class="float-right"> <abp-row class="float-end">
<abp-column> <abp-column>
<div class="text-right mt-4"> <div class="text-end mt-4">
<label class="text-muted font-weight-normal m-0">Total price</label> <label class="text-muted font-weight-normal m-0">Total price</label>
<div class="text-large"><strong>@Model.PaymentRequest.Price @Model.PaymentRequest.Currency</strong></div> <div class="text-large"><strong>@Model.PaymentRequest.Price @Model.PaymentRequest.Currency</strong></div>
</div> </div>
@ -86,9 +86,9 @@
</abp-container> </abp-container>
</div> </div>
<abp-container class="float-right"> <abp-container class="float-end">
<abp-row> <abp-row>
<abp-column class="float-right"> <abp-column class="float-end">
<form method="post"> <form method="post">
@if (Model.PaymentRequest.State != PaymentRequestState.Waiting) @if (Model.PaymentRequest.State != PaymentRequestState.Waiting)
{ {
@ -97,8 +97,8 @@
} }
else else
{ {
<abp-button class="mt-2 float-right" offset="_10" size="Large" type="submit" button-type="Primary">@L["Checkout"]</abp-button> <abp-button class="mt-2 float-end" offset="_10" size="Large" type="submit" button-type="Primary">@L["Checkout"]</abp-button>
<a href="@Url.Page("/Pricing", new { organizationName = organizationName })" class="btn btn-lg btn-default md-btn-flat mt-2 mr-3 float-right">Back to pricing</a> <a href="@Url.Page("/Pricing", new { organizationName = organizationName })" class="btn btn-lg btn-default md-btn-flat mt-2 me-3 float-end">Back to pricing</a>
} }
</form> </form>
</abp-column> </abp-column>

6
src/EventHub.Web/Pages/Pricing.cshtml
View File

@ -22,10 +22,10 @@
<div class="d-flex col-md flex-column py-4"> <div class="d-flex col-md flex-column py-4">
<div class="display-1 text-primary my-4"><i class="lnr lnr-briefcase text-big"></i></div> <div class="display-1 text-primary my-4"><i class="lnr lnr-briefcase text-big"></i></div>
<h5 class="m-0 ml-2">Free account</h5> <h5 class="m-0 ms-2">Free account</h5>
<div class="flex-grow-1"> <div class="flex-grow-1">
<div class="py-4 my-2"> <div class="py-4 my-2">
<span class="d-inline-block text-muted text-big align-middle mr-2">$</span> <span class="d-inline-block text-muted text-big align-middle me-2">$</span>
<span class="display-3 d-inline-block font-weight-bold align-middle">0</span> <span class="display-3 d-inline-block font-weight-bold align-middle">0</span>
</div> </div>
<div class="pb-5"> <div class="pb-5">
@ -50,7 +50,7 @@
</h5> </h5>
<div class="flex-grow-1"> <div class="flex-grow-1">
<div class="py-4 my-2"> <div class="py-4 my-2">
<span class="d-inline-block text-muted text-big align-middle mr-2">$</span> <span class="d-inline-block text-muted text-big align-middle me-2">$</span>
<span class="display-3 d-inline-block font-weight-bold align-middle">@Model.PremiumPlanInfo.Price</span> <span class="display-3 d-inline-block font-weight-bold align-middle">@Model.PremiumPlanInfo.Price</span>
</div> </div>
<div class="pb-5"> <div class="pb-5">

4
src/EventHub.Web/Pages/PrivacyPolicy.cshtml
View File

@ -6,7 +6,7 @@
<div class="d-print-none"> <div class="d-print-none">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-auto mr-auto"></div> <div class="col-auto me-auto"></div>
<div class="col-auto"> <div class="col-auto">
<abp-button icon="print" text="Print" onclick="javascript:window.print();"></abp-button> <abp-button icon="print" text="Print" onclick="javascript:window.print();"></abp-button>
</div> </div>
@ -548,7 +548,7 @@
<div class="d-print-none"> <div class="d-print-none">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-auto mr-auto"></div> <div class="col-auto me-auto"></div>
<div class="col-auto"> <div class="col-auto">
<abp-button icon="print" text="Print" onclick="javascript:window.print();"></abp-button> <abp-button icon="print" text="Print" onclick="javascript:window.print();"></abp-button>
</div> </div>

4
src/EventHub.Web/Pages/TermsService.cshtml
View File

@ -5,7 +5,7 @@
<div class="d-print-none"> <div class="d-print-none">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-auto mr-auto"></div> <div class="col-auto me-auto"></div>
<div class="col-auto"> <div class="col-auto">
<abp-button icon="print" text="Print" onclick="javascript:window.print();"></abp-button> <abp-button icon="print" text="Print" onclick="javascript:window.print();"></abp-button>
</div> </div>
@ -578,7 +578,7 @@
<div class="d-print-none"> <div class="d-print-none">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-auto mr-auto"></div> <div class="col-auto me-auto"></div>
<div class="col-auto"> <div class="col-auto">
<abp-button icon="print" text="Print" onclick="javascript:window.print();"></abp-button> <abp-button icon="print" text="Print" onclick="javascript:window.print();"></abp-button>
</div> </div>

6
src/EventHub.Web/Pages/User.cshtml
View File

@ -52,13 +52,13 @@
<abp-column size="_8"> <abp-column size="_8">
<ul class="nav nav-tabs profile-nav" id="profileTab"> <ul class="nav nav-tabs profile-nav" id="profileTab">
<li class="nav-item"> <li class="nav-item">
<a href="#UpcomingEvents" class="nav-link active" data-toggle="tab">Upcoming Events</a> <a href="#UpcomingEvents" class="nav-link active" data-bs-toggle="tab">Upcoming Events</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="#AttendedEvents" class="nav-link" data-toggle="tab">Attended Events</a> <a href="#AttendedEvents" class="nav-link" data-bs-toggle="tab">Attended Events</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="#Organizations" class="nav-link" data-toggle="tab">Organizations</a> <a href="#Organizations" class="nav-link" data-bs-toggle="tab">Organizations</a>
</li> </li>
</ul> </ul>
</abp-column> </abp-column>

Write Preview
Loading…
Cancel
Save