Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(post): Move post domain beneath post title #1363

Merged
merged 8 commits into from
Jun 19, 2023
Merged

feat(post): Move post domain beneath post title #1363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2829eab
feat(post): Move post domain and preview button beneath post title
jsit Jun 18, 2023
3c88558
Merge branch 'main' into feat/move-post-domain-beneath-title
jsit Jun 18, 2023
9a864ac
Merge remote-tracking branch 'origin/main' into feat/move-post-domain…
jsit Jun 18, 2023
95ea3ae
fix: Move the 'show body' button back to actions line; only show if t…
jsit Jun 18, 2023
6047d5a
fix: Fix some margins
jsit Jun 18, 2023
64fa839
Merge remote-tracking branch 'origin/main' into feat/move-post-domain…
jsit Jun 19, 2023
22ad04a
Merge remote-tracking branch 'origin/main' into feat/move-post-domain…
jsit Jun 19, 2023
b849443
Merge branch 'main' into feat/move-post-domain-beneath-title
dessalines Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/assets/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,6 @@
margin-top: -6.5px;
}

.post-title {
line-height: 1;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Every bit of custom css we can remove is a win.


.post-title a:visited {
color: var(--gray) !important;
}
Expand Down
229 changes: 126 additions & 103 deletions src/shared/components/post/post-listing.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,10 +367,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {

createdLine() {
const post_view = this.postView;
const url = post_view.post.url;
const body = post_view.post.body;
return (
<ul className="list-inline mb-1 text-muted small">
<ul className="list-inline mb-1 text-muted small mt-2">
<li className="list-inline-item">
<PersonListing person={post_view.creator} />

Expand Down Expand Up @@ -402,21 +400,6 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
</span>
)}
<li className="list-inline-item">•</li>
{url && !(hostname(url) === getExternalHost()) && (
<>
<li className="list-inline-item">
<a
className="text-muted font-italic"
href={url}
title={url}
rel={relTags}
>
{hostname(url)}
</a>
</li>
<li className="list-inline-item">•</li>
</>
)}
<li className="list-inline-item">
<span>
<MomentTime
Expand All @@ -425,21 +408,6 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
/>
</span>
</li>
{body && (
<>
<li className="list-inline-item">•</li>
<li className="list-inline-item">
<button
className="text-muted btn btn-sm btn-link p-0"
data-tippy-content={mdNoImages.render(body)}
data-tippy-allowHtml={true}
onClick={linkEvent(this, this.handleShowBody)}
>
<Icon icon="book-open" classes="icon-inline mr-1" />
</button>
</li>
</>
)}
</ul>
);
}
Expand Down Expand Up @@ -518,80 +486,105 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
const url = post.url;

return (
<div className="post-title overflow-hidden">
<h5 className="d-inline">
{url && this.props.showBody ? (
<a
className={
!post.featured_community && !post.featured_local
? "text-body"
: "text-primary"
}
href={url}
title={url}
rel={relTags}
dangerouslySetInnerHTML={mdToHtmlInline(post.name)}
></a>
) : (
this.postLink
<>
<div className="post-title overflow-hidden">
<h5 className="d-inline">
{url && this.props.showBody ? (
<a
className={
!post.featured_community && !post.featured_local
? "text-body"
: "text-primary"
}
href={url}
title={url}
rel={relTags}
dangerouslySetInnerHTML={mdToHtmlInline(post.name)}
></a>
) : (
this.postLink
)}
</h5>
{(url && isImage(url)) ||
(post.thumbnail_url && (
<button
className="btn btn-link text-monospace text-muted small d-inline-block"
data-tippy-content={i18n.t("expand_here")}
onClick={linkEvent(this, this.handleImageExpandClick)}
>
<Icon
icon={
!this.state.imageExpanded ? "plus-square" : "minus-square"
}
classes="icon-inline"
/>
</button>
))}
{post.removed && (
<small className="ml-2 badge text-bg-secondary">
{i18n.t("removed")}
</small>
)}
</h5>
{(url && isImage(url)) ||
(post.thumbnail_url && (
<button
className="btn btn-link text-monospace text-muted small d-inline-block"
data-tippy-content={i18n.t("expand_here")}
onClick={linkEvent(this, this.handleImageExpandClick)}
{post.deleted && (
<small
className="unselectable pointer ml-2 text-muted font-italic"
data-tippy-content={i18n.t("deleted")}
>
<Icon
icon={
!this.state.imageExpanded ? "plus-square" : "minus-square"
}
classes="icon-inline"
/>
</button>
))}
{post.removed && (
<small className="ml-2 badge text-bg-secondary">
{i18n.t("removed")}
</small>
)}
{post.deleted && (
<small
className="unselectable pointer ml-2 text-muted font-italic"
data-tippy-content={i18n.t("deleted")}
>
<Icon icon="trash" classes="icon-inline text-danger" />
</small>
)}
{post.locked && (
<small
className="unselectable pointer ml-2 text-muted font-italic"
data-tippy-content={i18n.t("locked")}
>
<Icon icon="lock" classes="icon-inline text-danger" />
</small>
)}
{post.featured_community && (
<small
className="unselectable pointer ml-2 text-muted font-italic"
data-tippy-content={i18n.t("featured")}
>
<Icon icon="pin" classes="icon-inline text-primary" />
</small>
)}
{post.featured_local && (
<small
className="unselectable pointer ml-2 text-muted font-italic"
data-tippy-content={i18n.t("featured")}
<Icon icon="trash" classes="icon-inline text-danger" />
</small>
)}
{post.locked && (
<small
className="unselectable pointer ml-2 text-muted font-italic"
data-tippy-content={i18n.t("locked")}
>
<Icon icon="lock" classes="icon-inline text-danger" />
</small>
)}
{post.featured_community && (
<small
className="unselectable pointer ml-2 text-muted font-italic"
data-tippy-content={i18n.t("featured")}
>
<Icon icon="pin" classes="icon-inline text-primary" />
</small>
)}
{post.featured_local && (
<small
className="unselectable pointer ml-2 text-muted font-italic"
data-tippy-content={i18n.t("featured")}
>
<Icon icon="pin" classes="icon-inline text-secondary" />
</small>
)}
{post.nsfw && (
<small className="ml-2 badge text-bg-danger">
{i18n.t("nsfw")}
</small>
)}
</div>
{url && this.urlLine()}
</>
);
}

urlLine() {
const post = this.postView.post;
const url = post.url;

return (
<p className="d-flex text-muted align-items-center gap-1 small m-0">
{url && !(hostname(url) === getExternalHost()) && (
<a
className="text-muted font-italic"
href={url}
title={url}
rel={relTags}
>
<Icon icon="pin" classes="icon-inline text-secondary" />
</small>
)}
{post.nsfw && (
<small className="ml-2 badge text-bg-danger">{i18n.t("nsfw")}</small>
{hostname(url)}
</a>
)}
</div>
</p>
);
}

Expand Down Expand Up @@ -660,15 +653,45 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
);
}

showPreviewButton() {
const post_view = this.postView;
const body = post_view.post.body;

return (
<button
className="btn btn-link btn-animate text-muted py-0"
data-tippy-content={body && mdNoImages.render(body)}
data-tippy-allowHtml={true}
onClick={linkEvent(this, this.handleShowBody)}
>
<Icon
icon="book-open"
classes={classNames("icon-inline mr-1", {
"text-success": this.state.showBody,
})}
/>
</button>
);
}

postActions() {
// Possible enhancement: Priority+ pattern instead of just hard coding which get hidden behind the show more button.
// Possible enhancement: Make each button a component.
const post_view = this.postView;
const post = post_view.post;

return (
<>
{this.saveButton}
{this.crossPostButton}

{/**
* If there is a URL, or if the post has a body and we were told not to
* show the body, show the MetadataCard/body toggle.
*/}
{(post.url || (post.body && !this.props.showBody)) &&
this.showPreviewButton()}

{this.showBody && post_view.post.body && this.viewSourceButton}

{this.hasAdvancedButtons && (
Expand Down