Feliday/Feliday-UI
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1760 from jsit/fix/use-row-in-filters

Browse source 
fix: Small cleanup to search/inbox controls
This commit is contained in:
SleeplessOne1917 2023-07-03 00:02:16 +00:00 committed by GitHub
commit 90a9b6bda1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 71 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/shared/components/common/searchable-select.tsx
View file

@ -102,7 +102,7 @@ export class SearchableSelect extends Component<
const { searchText, selectedIndex, loadingEllipses } = this.state; const { searchText, selectedIndex, loadingEllipses } = this.state;
return ( return (
<div className="searchable-select dropdown"> <div className="searchable-select dropdown col-12 col-sm-auto flex-grow-1">
<button <button
id={id} id={id}
type="button" type="button"

42
src/shared/components/person/inbox.tsx
View file

@ -221,7 +221,7 @@ export class Inbox extends Component<any, InboxState> {
title={this.documentTitle} title={this.documentTitle}
path={this.context.router.route.match.url} path={this.context.router.route.match.url}
/> />
<h5 className="mb-2"> <h1 className="h4 mb-4">
{I18NextService.i18n.t("inbox")} {I18NextService.i18n.t("inbox")}
{inboxRss && ( {inboxRss && (
<small> <small>
@ -235,10 +235,10 @@ export class Inbox extends Component<any, InboxState> {
/> />
</small> </small>
)} )}
</h5> </h1>
{this.hasUnreads && ( {this.hasUnreads && (
<button <button
className="btn btn-secondary mb-2" className="btn btn-secondary mb-2 mb-sm-3"
onClick={linkEvent(this, this.handleMarkAllAsRead)} onClick={linkEvent(this, this.handleMarkAllAsRead)}
> >
{this.state.markAllAsReadRes.state == "loading" ? ( {this.state.markAllAsReadRes.state == "loading" ? (
@ -284,7 +284,7 @@ export class Inbox extends Component<any, InboxState> {
unreadOrAllRadios() { unreadOrAllRadios() {
return ( return (
<div className="btn-group btn-group-toggle flex-wrap mb-2"> <div className="btn-group btn-group-toggle flex-wrap">
<label <label
className={`btn btn-outline-secondary pointer className={`btn btn-outline-secondary pointer
${this.state.unreadOrAll == UnreadOrAll.Unread && "active"} ${this.state.unreadOrAll == UnreadOrAll.Unread && "active"}
@ -319,7 +319,7 @@ export class Inbox extends Component<any, InboxState> {
messageTypeRadios() { messageTypeRadios() {
return ( return (
<div className="btn-group btn-group-toggle flex-wrap mb-2"> <div className="btn-group btn-group-toggle flex-wrap">
<label <label
className={`btn btn-outline-secondary pointer className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.All && "active"} ${this.state.messageType == MessageType.All && "active"}
@ -382,13 +382,15 @@ export class Inbox extends Component<any, InboxState> {
selects() { selects() {
return ( return (
<div className="mb-2"> <div className="row row-cols-auto g-2 g-sm-3 mb-2 mb-sm-3">
<span className="me-3">{this.unreadOrAllRadios()}</span> <div className="col">{this.unreadOrAllRadios()}</div>
<span className="me-3">{this.messageTypeRadios()}</span> <div className="col">{this.messageTypeRadios()}</div>
<CommentSortSelect <div className="col">
sort={this.state.sort} <CommentSortSelect
onChange={this.handleSortChange} sort={this.state.sort}
/> onChange={this.handleSortChange}
/>
</div>
</div> </div>
); );
} }
@ -541,9 +543,9 @@ export class Inbox extends Component<any, InboxState> {
this.state.messagesRes.state == "loading" this.state.messagesRes.state == "loading"
) { ) {
return ( return (
<h5> <h1 className="h4">
<Spinner large /> <Spinner large />
</h5> </h1>
); );
} else { } else {
return ( return (
@ -556,9 +558,9 @@ export class Inbox extends Component<any, InboxState> {
switch (this.state.repliesRes.state) { switch (this.state.repliesRes.state) {
case "loading": case "loading":
return ( return (
<h5> <h1 className="h4">
<Spinner large /> <Spinner large />
</h5> </h1>
); );
case "success": { case "success": {
const replies = this.state.repliesRes.data.replies; const replies = this.state.repliesRes.data.replies;
@ -603,9 +605,9 @@ export class Inbox extends Component<any, InboxState> {
switch (this.state.mentionsRes.state) { switch (this.state.mentionsRes.state) {
case "loading": case "loading":
return ( return (
<h5> <h1 className="h4">
<Spinner large /> <Spinner large />
</h5> </h1>
); );
case "success": { case "success": {
const mentions = this.state.mentionsRes.data.mentions; const mentions = this.state.mentionsRes.data.mentions;
@ -653,9 +655,9 @@ export class Inbox extends Component<any, InboxState> {
switch (this.state.messagesRes.state) { switch (this.state.messagesRes.state) {
case "loading": case "loading":
return ( return (
<h5> <h1 className="h4">
<Spinner large /> <Spinner large />
</h5> </h1>
); );
case "success": { case "success": {
const messages = this.state.messagesRes.data.private_messages; const messages = this.state.messagesRes.data.private_messages;

89
src/shared/components/search.tsx
View file

@ -181,8 +181,8 @@ const Filter = ({
loading: boolean; loading: boolean;
}) => { }) => {
return ( return (
<div className="mb-3 col-sm-6"> <div className="col-sm-6">
<label className="col-form-label me-2" htmlFor={`${filterType}-filter`}> <label className="mb-1" htmlFor={`${filterType}-filter`}>
{capitalizeFirstLetter(I18NextService.i18n.t(filterType))} {capitalizeFirstLetter(I18NextService.i18n.t(filterType))}
</label> </label>
<SearchableSelect <SearchableSelect
@ -467,7 +467,7 @@ export class Search extends Component<any, SearchState> {
title={this.documentTitle} title={this.documentTitle}
path={this.context.router.route.match.url} path={this.context.router.route.match.url}
/> />
<h5>{I18NextService.i18n.t("search")}</h5> <h1 className="h4 mb-4">{I18NextService.i18n.t("search")}</h1>
{this.selects} {this.selects}
{this.searchForm} {this.searchForm}
{this.displayResults(type)} {this.displayResults(type)}
@ -500,8 +500,11 @@ export class Search extends Component<any, SearchState> {
get searchForm() { get searchForm() {
return ( return (
<form className="row" onSubmit={linkEvent(this, this.handleSearchSubmit)}> <form
<div className="col-auto"> className="row gx-2 gy-3"
onSubmit={linkEvent(this, this.handleSearchSubmit)}
>
<div className="col-auto flex-grow-1 flex-sm-grow-0">
<input <input
type="text" type="text"
className="form-control me-2 mb-2 col-sm-8" className="form-control me-2 mb-2 col-sm-8"
@ -542,41 +545,45 @@ export class Search extends Component<any, SearchState> {
communitiesRes.data.communities.length > 0; communitiesRes.data.communities.length > 0;
return ( return (
<div className="mb-2"> <>
<select <div className="row row-cols-auto g-2 g-sm-3 mb-2 mb-sm-3">
value={type} <div className="col">
onChange={linkEvent(this, this.handleTypeChange)} <select
className="form-select d-inline-block w-auto mb-2" value={type}
aria-label={I18NextService.i18n.t("type")} onChange={linkEvent(this, this.handleTypeChange)}
> className="form-select d-inline-block w-auto"
<option disabled aria-hidden="true"> aria-label={I18NextService.i18n.t("type")}
{I18NextService.i18n.t("type")} >
</option> <option disabled aria-hidden="true">
{searchTypes.map(option => ( {I18NextService.i18n.t("type")}
<option value={option} key={option}> </option>
{I18NextService.i18n.t( {searchTypes.map(option => (
option.toString().toLowerCase() as NoOptionI18nKeys <option value={option} key={option}>
)} {I18NextService.i18n.t(
</option> option.toString().toLowerCase() as NoOptionI18nKeys
))} )}
</select> </option>
<span className="ms-2"> ))}
<ListingTypeSelect </select>
type_={listingType} </div>
showLocal={showLocal(this.isoData)} <div className="col">
showSubscribed <ListingTypeSelect
onChange={this.handleListingTypeChange} type_={listingType}
/> showLocal={showLocal(this.isoData)}
</span> showSubscribed
<span className="ms-2"> onChange={this.handleListingTypeChange}
<SortSelect />
sort={sort} </div>
onChange={this.handleSortChange} <div className="col">
hideHot <SortSelect
hideMostComments sort={sort}
/> onChange={this.handleSortChange}
</span> hideHot
<div className="row"> hideMostComments
/>
</div>
</div>
<div className="row gy-2 gx-4 mb-3">
{hasCommunities && ( {hasCommunities && (
<Filter <Filter
filterType="community" filterType="community"
@ -596,7 +603,7 @@ export class Search extends Component<any, SearchState> {
loading={searchCreatorLoading} loading={searchCreatorLoading}
/> />
</div> </div>
</div> </>
); );
} }