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

Improve

pull/19418/head
Salih 3 years ago
parent
1a076d614b
commit
cc33797eaa
7 changed files with 27 additions and 21 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. 12
      modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs
  2. 6
      modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Members/Index.cshtml
  3. 2
      modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Members/Index.cshtml.cs
  4. 0
      modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Members/Index.css
  5. 0
      modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Members/Index.js
  6. 18
      modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml
  7. 10
      modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml

12
modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs
View File

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc.RazorPages; using System;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
@ -79,7 +80,7 @@ namespace Volo.Blogging
options.IgnoredPaths.AddRange(new[] options.IgnoredPaths.AddRange(new[]
{ {
"error", "ApplicationConfigurationScript", "ServiceProxyScript", "Languages/Switch", "error", "ApplicationConfigurationScript", "ServiceProxyScript", "Languages/Switch",
"ApplicationLocalizationScript" "ApplicationLocalizationScript", "members"
}); });
}); });
@ -91,11 +92,16 @@ namespace Volo.Blogging
var routePrefix = urlOptions.RoutePrefix; var routePrefix = urlOptions.RoutePrefix;
if (!routePrefix.IsNullOrWhiteSpace())
{
options.Conventions.AddPageRoute("/Blogs/Index", routePrefix);
}
options.Conventions.AddPageRoute("/Blogs/Posts/Index", routePrefix + "{blogShortName:blogNameConstraint}"); options.Conventions.AddPageRoute("/Blogs/Posts/Index", routePrefix + "{blogShortName:blogNameConstraint}");
options.Conventions.AddPageRoute("/Blogs/Posts/Detail", routePrefix + "{blogShortName:blogNameConstraint}/{postUrl}"); options.Conventions.AddPageRoute("/Blogs/Posts/Detail", routePrefix + "{blogShortName:blogNameConstraint}/{postUrl}");
options.Conventions.AddPageRoute("/Blogs/Posts/Edit", routePrefix + "{blogShortName}/posts/{postId}/edit"); options.Conventions.AddPageRoute("/Blogs/Posts/Edit", routePrefix + "{blogShortName}/posts/{postId}/edit");
options.Conventions.AddPageRoute("/Blogs/Posts/New", routePrefix + "{blogShortName}/posts/new"); options.Conventions.AddPageRoute("/Blogs/Posts/New", routePrefix + "{blogShortName}/posts/new");
options.Conventions.AddPageRoute("/Members/Index", routePrefix + "members/{userName}"); options.Conventions.AddPageRoute("/Blogs/Members/Index", routePrefix + "members/{userName}");
}); });
Configure<DynamicJavaScriptProxyOptions>(options => Configure<DynamicJavaScriptProxyOptions>(options =>

6
modules/blogging/src/Volo.Blogging.Web/Pages/Members/Index.cshtml → modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Members/Index.cshtml
View File

@ -5,7 +5,7 @@
@using Volo.Abp.Users @using Volo.Abp.Users
@using Volo.Blogging.Areas.Blog.Helpers.TagHelpers @using Volo.Blogging.Areas.Blog.Helpers.TagHelpers
@using Volo.Blogging.Localization @using Volo.Blogging.Localization
@model Volo.Blogging.Pages.Members.IndexModel @model Volo.Blogging.Pages.Blogs.Members.IndexModel
@inject IStringLocalizer<BloggingResource> L @inject IStringLocalizer<BloggingResource> L
@inject ICurrentUser CurrentUser @inject ICurrentUser CurrentUser
@{ @{
@ -13,11 +13,11 @@
} }
@section scripts { @section scripts {
<abp-script src="/Pages/Members/Index.js" /> <abp-script src="/Pages/Blogs/Members/Index.js" />
} }
@section styles { @section styles {
<abp-style src="/Pages/Members/Index.css"/> <abp-style src="/Pages/Blogs/Members/Index.css"/>
} }
<main> <main>

2
modules/blogging/src/Volo.Blogging.Web/Pages/Members/Index.cshtml.cs → modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Members/Index.cshtml.cs
View File

@ -8,7 +8,7 @@ using Volo.Blogging.Blogs;
using Volo.Blogging.Members; using Volo.Blogging.Members;
using Volo.Blogging.Posts; using Volo.Blogging.Posts;
namespace Volo.Blogging.Pages.Members; namespace Volo.Blogging.Pages.Blogs.Members;
public class IndexModel : AbpPageModel public class IndexModel : AbpPageModel
{ {

0
modules/blogging/src/Volo.Blogging.Web/Pages/Members/Index.css → modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Members/Index.css
View File

0
modules/blogging/src/Volo.Blogging.Web/Pages/Members/Index.js → modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Members/Index.js
View File

18
modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml
View File

@ -67,7 +67,7 @@
<div class="col-auto pe-1"> <div class="col-auto pe-1">
@if (Model.Post.Writer != null) @if (Model.Post.Writer != null)
{ {
<a href="/Members/@Model.Post.Writer.UserName" aria-label="Go to user profile"> <a href="@Url.Page("/Blogs/Members/Index", new {userName = Model.Post.Writer.UserName})" aria-label="Go to user profile">
<img gravatar-email="@Model.Post.Writer.Email" default-image="Identicon" class="article-avatar" alt="User Avatar"/> <img gravatar-email="@Model.Post.Writer.Email" default-image="Identicon" class="article-avatar" alt="User Avatar"/>
</a> </a>
} }
@ -76,7 +76,7 @@
@if (Model.Post.Writer != null) @if (Model.Post.Writer != null)
{ {
<h5 class="mt-2 mb-1"> <h5 class="mt-2 mb-1">
<a href="/Members/@Model.Post.Writer.UserName"> <a href="@Url.Page("/Blogs/Members/Index", new {userName = Model.Post.Writer.UserName})">
@(Model.Post.Writer.UserName) @(Model.Post.Writer.UserName)
</a> </a>
<span>@BloggingPageHelper.GetLocalizedTimeAgoText(Model.Post.CreationTime)</span> <span>@BloggingPageHelper.GetLocalizedTimeAgoText(Model.Post.CreationTime)</span>
@ -141,7 +141,7 @@
<div class="col-auto pe-2"> <div class="col-auto pe-2">
@if (Model.Post.Writer != null) @if (Model.Post.Writer != null)
{ {
<a href="/Members/@Model.Post.Writer.UserName" aria-label="Go to user profile"> <a href="@Url.Page("/Blogs/Members/Index", new {userName = Model.Post.Writer.UserName})" aria-label="Go to user profile">
<img gravatar-email="@Model.Post.Writer.Email" default-image="Identicon" class="article-avatar rounded-circle" alt="User Avatar"/> <img gravatar-email="@Model.Post.Writer.Email" default-image="Identicon" class="article-avatar rounded-circle" alt="User Avatar"/>
</a> </a>
} }
@ -151,7 +151,7 @@
{ {
<h5 class="mt-2 mb-1"> <h5 class="mt-2 mb-1">
<a href="/Members/@Model.Post.Writer.UserName"> <a href="@Url.Page("/Blogs/Members/Index", new {userName = Model.Post.Writer.UserName})">
@if (Model.Post.Writer.Name != null && Model.Post.Writer.Surname != null) @if (Model.Post.Writer.Name != null && Model.Post.Writer.Surname != null)
{ {
<p class="fw-bold pt-2 fs-5">@Model.Post.Writer.Name @Model.Post.Writer.Surname</p> <p class="fw-bold pt-2 fs-5">@Model.Post.Writer.Name @Model.Post.Writer.Surname</p>
@ -172,7 +172,7 @@
@if (CurrentUser.Id.HasValue && CurrentUser.Id.Value == Model.Post.Writer?.Id) @if (CurrentUser.Id.HasValue && CurrentUser.Id.Value == Model.Post.Writer?.Id)
{ {
<a class="fw-lighter" href="/Members/@Model.Post.Writer?.UserName#edit-profile">@L["EditProfile"] <i class="fas fa-edit"></i></a> <a class="fw-lighter" href="@(Url.Page("/Blogs/Members/Index", new {userName = Model.Post.Writer.UserName}))#edit-profile">@L["EditProfile"] <i class="fas fa-edit"></i></a>
} }
</div> </div>
@if (Model.LatestPosts.Count > 1) @if (Model.LatestPosts.Count > 1)
@ -194,14 +194,14 @@
{ {
<div class="row"> <div class="row">
<div class="col-auto pe-1"> <div class="col-auto pe-1">
<a href="/Members/@post.Writer.UserName" aria-label="Go to user profile"> <a href="@Url.Page("/Blogs/Members/Index", new {userName = Model.Post.Writer.UserName})" aria-label="Go to user profile">
<img gravatar-email="@post.Writer.Email" default-image="Identicon" class="last-post-image" alt="User Avatar"/> <img gravatar-email="@post.Writer.Email" default-image="Identicon" class="last-post-image" alt="User Avatar"/>
</a> </a>
</div> </div>
<div class="col"> <div class="col">
<h5 class="last-post-name"> <h5 class="last-post-name">
<a href="/Members/@post.Writer!.UserName"> <a href="@Url.Page("/Blogs/Members/Index", new {userName = Model.Post.Writer.UserName})">
@(post.Writer!.UserName) @(post.Writer!.UserName)
</a> </a>
</h5> </h5>
@ -456,13 +456,13 @@ else
var post = Model.PostsList[index]; var post = Model.PostsList[index];
<div class="post-item"> <div class="post-item">
<div class="post-type-cont"> <div class="post-type-cont">
<a href="/members/@Model.Post.Writer.UserName" class="text-decoration-none"> <a href="@Url.Page("/Blogs/Members/Index", new {userName = Model.Post.Writer.UserName})" class="text-decoration-none">
<img gravatar-email="@Model.Post.Writer.Email" default-image="Identicon" class="post-member-img rounded-circle d-block"/> <img gravatar-email="@Model.Post.Writer.Email" default-image="Identicon" class="post-member-img rounded-circle d-block"/>
</a> </a>
</div> </div>
<div class="post-detail-cont"> <div class="post-detail-cont">
<div class="post-info fs-12 mb-2"> <div class="post-info fs-12 mb-2">
<a href="/members/@Model.Post.Writer.UserName" class="text-decoration-none"> <a href="@Url.Page("/Blogs/Members/Index", new {userName = Model.Post.Writer.UserName})" class="text-decoration-none">
<span class="text-dark dot">@Model.Post.Writer.UserName</span> <span class="text-dark dot">@Model.Post.Writer.UserName</span>
</a> </a>
<span class="text-dark-200">@post.CreationTime.ToString("MMMM yyyy")</span> <span class="text-dark-200">@post.CreationTime.ToString("MMMM yyyy")</span>

10
modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml
View File

@ -60,13 +60,13 @@
<div class="user-card"> <div class="user-card">
<div class="row"> <div class="row">
<div class="col-auto pe-1"> <div class="col-auto pe-1">
<a href="/Members/@post.Writer.UserName"> <a href="@Url.Page("/Blogs/Members/Index", new {userName = post.Writer.UserName})">
<img gravatar-email="@post.Writer.Email" default-image="Identicon" class="article-avatar" alt="@post.Writer.UserName avatar" /> <img gravatar-email="@post.Writer.Email" default-image="Identicon" class="article-avatar" alt="@post.Writer.UserName avatar" />
</a> </a>
</div> </div>
<div class="col ps-1"> <div class="col ps-1">
<h5 class="mt-2 mb-1"> <h5 class="mt-2 mb-1">
<a href="/Members/@post.Writer.UserName"> <a href="@Url.Page("/Blogs/Members/Index", new {userName = post.Writer.UserName})">
@post.Writer.UserName @post.Writer.UserName
</a> </a>
<span>@BloggingPageHelper.GetLocalizedTimeAgoText(post.CreationTime)</span> <span>@BloggingPageHelper.GetLocalizedTimeAgoText(post.CreationTime)</span>
@ -127,7 +127,7 @@
@if (post.Writer != null) @if (post.Writer != null)
{ {
<h5 class="mt-2 mb-1"> <h5 class="mt-2 mb-1">
<a href="/Members/@post.Writer.UserName"> <a href="@Url.Page("/Blogs/Members/Index", new {userName = post.Writer.UserName})">
@post.Writer.UserName @post.Writer.UserName
</a> </a>
<span>@BloggingPageHelper.GetLocalizedTimeAgoText(post.CreationTime)</span> <span>@BloggingPageHelper.GetLocalizedTimeAgoText(post.CreationTime)</span>
@ -190,13 +190,13 @@
<div class="user-card"> <div class="user-card">
<div class="row"> <div class="row">
<div class="col-auto pe-1"> <div class="col-auto pe-1">
<a href="/Members/@post.Writer.UserName"> <a href="@Url.Page("/Blogs/Members/Index", new {userName = post.Writer.UserName})">
<img gravatar-email="@post.Writer.Email" default-image="Identicon" class="article-avatar" alt="@post.Writer.UserName avatar" /> <img gravatar-email="@post.Writer.Email" default-image="Identicon" class="article-avatar" alt="@post.Writer.UserName avatar" />
</a> </a>
</div> </div>
<div class="col ps-1"> <div class="col ps-1">
<h5 class="mt-2 mb-1"> <h5 class="mt-2 mb-1">
<a href="/Members/@post.Writer.UserName"> <a href="@Url.Page("/Blogs/Members/Index", new {userName = post.Writer.UserName})">
@post.Writer.UserName @post.Writer.UserName
</a> </a>
<span>@BloggingPageHelper.GetLocalizedTimeAgoText(post.CreationTime)</span> <span>@BloggingPageHelper.GetLocalizedTimeAgoText(post.CreationTime)</span>

Write Preview
Loading…
Cancel
Save