diff --git a/src/EventHub.IdentityServer/Pages/Account/Manage.cshtml b/src/EventHub.IdentityServer/Pages/Account/Manage.cshtml new file mode 100644 index 0000000..2835b21 --- /dev/null +++ b/src/EventHub.IdentityServer/Pages/Account/Manage.cshtml @@ -0,0 +1,46 @@ +@page +@using Microsoft.AspNetCore.Mvc.Localization +@using Volo.Abp.Account.Localization +@using Volo.Abp.Account.Web.Pages.Account +@using Volo.Abp.AspNetCore.Mvc.UI.Theming +@inject IThemeManager ThemeManager +@inject IHtmlLocalizer L +@model ManageModel +@{ + Layout = ThemeManager.CurrentTheme.GetApplicationLayout(); +} +@section scripts { + +} +
+ @if (!Model.ReturnUrl.IsNullOrWhiteSpace()) + { + + + + @L["ReturnToApplication"] + + + + } + +
+ + + + @foreach (var group in Model.ProfileManagementPageCreationContext.Groups) + { + +

@group.DisplayName

+
+ @await Component.InvokeAsync(group.ComponentType, new + { + parameter = group.Parameter + }) + + } + + + +
+
\ No newline at end of file diff --git a/src/EventHub.IdentityServer/Pages/Index.cshtml b/src/EventHub.IdentityServer/Pages/Index.cshtml index 282e062..16798a7 100644 --- a/src/EventHub.IdentityServer/Pages/Index.cshtml +++ b/src/EventHub.IdentityServer/Pages/Index.cshtml @@ -3,30 +3,35 @@ @using Volo.Abp.Users @model IndexModel @inject ICurrentUser CurrentUser -@if (CurrentUser.IsAuthenticated) -{ -
- - - - Logout - - -

@CurrentUser.UserName

-
@CurrentUser.Email
-
-

Roles

@CurrentUser.Roles.JoinAsString(", ") -

Claims

@Html.Raw(CurrentUser.GetAllClaims().Select(c => $"{c.Type}={c.Value}").JoinAsString("
")) -
- - -
-} +
-@if (!CurrentUser.IsAuthenticated) -{ -
-

- Login -
-} \ No newline at end of file + @if (CurrentUser.IsAuthenticated) + { +
+
+ + + + Logout + + +

@CurrentUser.UserName

+
@CurrentUser.Email
+
+

Roles

@CurrentUser.Roles.JoinAsString(", ") +

Claims

@Html.Raw(CurrentUser.GetAllClaims().Select(c => $"{c.Type}={c.Value}").JoinAsString("
")) +
+ + +
+
+ } + + @if (!CurrentUser.IsAuthenticated) + { +
+

+ Login +
+ } +
\ No newline at end of file diff --git a/src/EventHub.Web.Theme/wwwroot/themes/eventhub/style.css b/src/EventHub.Web.Theme/wwwroot/themes/eventhub/style.css index a459354..6572a86 100644 --- a/src/EventHub.Web.Theme/wwwroot/themes/eventhub/style.css +++ b/src/EventHub.Web.Theme/wwwroot/themes/eventhub/style.css @@ -1,3 +1,8 @@ +:root { + --primary: #00044A; + --blue: #00044A; +} + body { font-family: 'Poppins', sans-serif; line-height: 1.5; @@ -84,25 +89,31 @@ p { margin-left: 12px; transition: color 0.3s ease; } - .active .nav-link { + .navbar-expand-lg .navbar-nav .active .nav-link { background-image: url(../../../../assets/underline.svg); background-repeat: no-repeat; background-size: inherit; background-position: center 28px; color: #df2751 !important; } - .nav-link:hover { + .navbar-expand-lg .navbar-nav .nav-link:hover { color: #df2751 !important; } } - + .btn { border-radius: 10px !important; font-weight: 600; font-size: 14px; - padding: 10px 20px; + padding: 10px 20px; +} +.btn-sm { + border-radius: 10px !important; + font-weight: 600; + font-size: 12px; + padding: 8px 16px; } .btn-primary { background-color: #E8345D !important; @@ -312,7 +323,17 @@ p { } .event-thumbnail { width: 100%; - height: 200px; + height: 220px; + background-position: center center; + background-repeat: no-repeat; + background-size: cover; +} +.event-thumbnail-left { + width: 100%; + height: 220px; + background-position: center center; + background-repeat: no-repeat; + background-size: cover; } .profile-content .form-control, .profile-content .form-select { @@ -431,7 +452,7 @@ p { } footer { background: #00044A; - padding: 3.5em 0 2em; + padding: 3em 0 3.5em 0; } .footer-logo { color: white; @@ -880,8 +901,7 @@ div.checkbox.switcher label, div.radio.switcher label { font-size: 1.05em; } -.event .card { - max-width: 330px; +.event .card { margin: 0 auto 34px; } diff --git a/src/EventHub.Web/Pages/Events/Components/EventsArea/_eventListSection.cshtml b/src/EventHub.Web/Pages/Events/Components/EventsArea/_eventListSection.cshtml index 9c0e99a..20d23e6 100644 --- a/src/EventHub.Web/Pages/Events/Components/EventsArea/_eventListSection.cshtml +++ b/src/EventHub.Web/Pages/Events/Components/EventsArea/_eventListSection.cshtml @@ -9,11 +9,13 @@
@if (eventDto.CoverImageContent is null) { - @eventDto.Title +
+
} else { - @eventDto.Title +
+
}
diff --git a/src/EventHub.Web/Pages/Events/Components/RegistrationArea/Default.cshtml b/src/EventHub.Web/Pages/Events/Components/RegistrationArea/Default.cshtml index 622c406..19f7c6d 100644 --- a/src/EventHub.Web/Pages/Events/Components/RegistrationArea/Default.cshtml +++ b/src/EventHub.Web/Pages/Events/Components/RegistrationArea/Default.cshtml @@ -3,36 +3,38 @@ @inject IHtmlLocalizer L @model EventHub.Web.Pages.Events.Components.RegistrationArea.RegistrationAreaViewComponent.RegistrationAreaViewComponentModel
- @if (Model.IsLoggedIn) + @if (Model.IsLoggedIn) + { + if (Model.IsRegistered) { - if (Model.IsRegistered) - { - - }else if (Model.IsPastEvent) - { - - } - else - { - - } +

@L["YouAttendedThisEvent"].Value

+ + } + else if (Model.IsPastEvent) + { + } else { - @L["LoginToRegister"] + } + } + else + { + @L["LoginToRegister"] + }
diff --git a/src/EventHub.Web/Pages/Events/Detail.cshtml b/src/EventHub.Web/Pages/Events/Detail.cshtml index ec4066c..e574919 100644 --- a/src/EventHub.Web/Pages/Events/Detail.cshtml +++ b/src/EventHub.Web/Pages/Events/Detail.cshtml @@ -52,11 +52,11 @@
@if (Model.Event.CoverImageContent == null) { - @Model.Event.Title + @Model.Event.Title } else { - @Model.Event.Title + @Model.Event.Title }
diff --git a/src/EventHub.Web/Pages/Events/Index.cshtml b/src/EventHub.Web/Pages/Events/Index.cshtml index ac83167..93ea27f 100644 --- a/src/EventHub.Web/Pages/Events/Index.cshtml +++ b/src/EventHub.Web/Pages/Events/Index.cshtml @@ -39,11 +39,9 @@
-
-
-
+
-
+
-
+
@@ -72,9 +70,7 @@
-
-
@await Component.InvokeAsync(typeof(EventsAreaViewComponent), new diff --git a/src/EventHub.Web/Pages/Events/New.cshtml b/src/EventHub.Web/Pages/Events/New.cshtml index 3565eea..89d0a72 100644 --- a/src/EventHub.Web/Pages/Events/New.cshtml +++ b/src/EventHub.Web/Pages/Events/New.cshtml @@ -10,10 +10,16 @@ @if (!Model.Organizations.Any()) { -
-
-

@L["NewEventYouHaveNoOrganizationYetMessage"]

- @L["CreateAnOrganization"] +
+
+
+
+
+

@L["NewEventYouHaveNoOrganizationYetMessage"]

+ @L["CreateAnOrganization"] +
+
+
} @@ -71,7 +77,7 @@ else
-

For horizontal format 600x300 sized upload images.

+

For horizontal format 600x400 sized upload images.

diff --git a/src/EventHub.Web/Pages/Index.cshtml b/src/EventHub.Web/Pages/Index.cshtml index 8e1189b..b916ea9 100644 --- a/src/EventHub.Web/Pages/Index.cshtml +++ b/src/EventHub.Web/Pages/Index.cshtml @@ -31,18 +31,6 @@
-
-
-
-
-
-

Let's Share Together

-

Try something new, or do more of what you love.

-
-
-
-
-
@@ -79,6 +67,18 @@
+
+
+
+
+
+

Let's Share Together

+

Try something new, or do more of what you love.

+
+
+
+
+
@@ -125,9 +125,9 @@
-
+
-

Upcoming Events

+

Upcoming Events

@@ -138,8 +138,7 @@ })
- -
+
@@ -149,23 +148,25 @@ {
-
-
+
+
@if (Model.OnlineEvents[i].CoverImageContent is null) { - +
+
} else { - @Model.OnlineEvents[i].Title +
+
}
-
+
@Model.OnlineEvents[i].Title
- @Model.OnlineEvents[i].StartTime.ToString("MMMM dd, yyyy dddd") | @Model.OnlineEvents[i].StartTime.ToString("hh tt", CultureInfo.InvariantCulture) - @Model.OnlineEvents[i].EndTime.ToString("hh tt", CultureInfo.InvariantCulture) | Online + @Model.OnlineEvents[i].StartTime.ToString("MMMM dd, yyyy dddd")
@Model.OnlineEvents[i].StartTime.ToString("hh tt", CultureInfo.InvariantCulture) - @Model.OnlineEvents[i].EndTime.ToString("hh tt", CultureInfo.InvariantCulture) | Online

@Model.OnlineEvents[i].Description

Learn More @@ -177,30 +178,31 @@ @if (i + 1 <= Model.OnlineEvents.Count - 1) {
-
-
+
+
@if (Model.OnlineEvents[i + 1].CoverImageContent is null) { - +
+
} else { - @Model.OnlineEvents[i + 1].Title +
+
}
-
+
@Model.OnlineEvents[i + 1].Title
- @Model.OnlineEvents[i + 1].StartTime.ToString("MMMM dd, yyyy dddd") | @Model.OnlineEvents[i + 1].StartTime.ToString("hh tt", CultureInfo.InvariantCulture) - @Model.OnlineEvents[i + 1].EndTime.ToString("hh tt", CultureInfo.InvariantCulture) | Online + @Model.OnlineEvents[i + 1].StartTime.ToString("MMMM dd, yyyy dddd")
@Model.OnlineEvents[i + 1].StartTime.ToString("hh tt", CultureInfo.InvariantCulture) - @Model.OnlineEvents[i + 1].EndTime.ToString("hh tt", CultureInfo.InvariantCulture) | Online

@Model.OnlineEvents[i + 1].Description

Learn More
-
- +
} @@ -211,7 +213,7 @@
-
+

How EventHub Works?

diff --git a/src/EventHub.Web/Pages/Index.js b/src/EventHub.Web/Pages/Index.js index 194dcd4..1c58e9e 100644 --- a/src/EventHub.Web/Pages/Index.js +++ b/src/EventHub.Web/Pages/Index.js @@ -20,7 +20,7 @@ 0: { items: 1, }, - 600: { + 991: { items: 2, }, }, diff --git a/src/EventHub.Web/Pages/Organizations/Components/OrganizationsArea/_organizationListSection.cshtml b/src/EventHub.Web/Pages/Organizations/Components/OrganizationsArea/_organizationListSection.cshtml index 7b94b4a..969201b 100644 --- a/src/EventHub.Web/Pages/Organizations/Components/OrganizationsArea/_organizationListSection.cshtml +++ b/src/EventHub.Web/Pages/Organizations/Components/OrganizationsArea/_organizationListSection.cshtml @@ -5,12 +5,14 @@
@if (organization.ProfilePictureContent == null) - { - @organization.Name + { +
+
} else - { - @organization.Name + { +
+
}
diff --git a/src/EventHub.Web/Pages/Organizations/New.cshtml b/src/EventHub.Web/Pages/Organizations/New.cshtml index 6c3177d..1b7f219 100644 --- a/src/EventHub.Web/Pages/Organizations/New.cshtml +++ b/src/EventHub.Web/Pages/Organizations/New.cshtml @@ -31,7 +31,7 @@
-

Photo size should be max @(OrganizationConsts.MaxProfilePictureFileSize / (1024 * 1024)) MB.

+

Photo size should be 1050x596 and max @(OrganizationConsts.MaxProfilePictureFileSize / (1024 * 1024)) MB.

diff --git a/src/EventHub.Web/Pages/Organizations/Profile.cshtml b/src/EventHub.Web/Pages/Organizations/Profile.cshtml index 56a1452..c8e8e0f 100644 --- a/src/EventHub.Web/Pages/Organizations/Profile.cshtml +++ b/src/EventHub.Web/Pages/Organizations/Profile.cshtml @@ -20,11 +20,11 @@
@if (Model.Organization.ProfilePictureContent == null) { - @Model.Organization.Name + @Model.Organization.Name } else { - @Model.Organization.Name + @Model.Organization.Name }
diff --git a/src/EventHub.Web/wwwroot/assets/eh-organization-big.png b/src/EventHub.Web/wwwroot/assets/eh-organization-big.png new file mode 100644 index 0000000..fcf5b0c Binary files /dev/null and b/src/EventHub.Web/wwwroot/assets/eh-organization-big.png differ