>) => {
let borderColor = '';
let textColor = '';
+ let hasButton = false;
switch (name.toLowerCase()) {
case 'nostr':
borderColor = 'border-purple-500';
@@ -391,19 +385,20 @@ const generateFilter = ({ name, state }: IGenerateFilter, onChangeFilters: React
}
borderColor = state ? 'border-green-500' : 'border-red-500';
textColor = state ? 'text-green-500' : 'text-red-500';
+ hasButton = true;
}
return (
{name}
- onChangeFilters((prevValue) => {
return prevValue.filter((x) => x.name !== name);
})}
- />
+ />}
);
};
diff --git a/src/features/search/components/people-to-follow-card.tsx b/src/features/explorer/components/popular-accounts.tsx
similarity index 94%
rename from src/features/search/components/people-to-follow-card.tsx
rename to src/features/explorer/components/popular-accounts.tsx
index 4e8b566dc..7f91980d9 100644
--- a/src/features/search/components/people-to-follow-card.tsx
+++ b/src/features/explorer/components/popular-accounts.tsx
@@ -17,9 +17,10 @@ import {
useSuggestions,
} from 'soapbox/queries/suggestions.ts';
+// @ts-ignore
import 'swiper/css';
-const PeopleToFollowCard = ({ id }: { id: string }) => {
+const PopularAccounts = ({ id }: { id: string }) => {
const account = useAccount(id).account;
const { logo } = useSoapboxConfig();
@@ -70,7 +71,7 @@ const PeopleToFollowCard = ({ id }: { id: string }) => {
const AccountsCarousel = () => {
const isMobile = useIsMobile();
const { data: suggestions, isFetching } = useSuggestions();
- const [isOpen, setIsOpen] = useState(false);
+ const [isOpen, setIsOpen] = useState(true);
if (!isFetching && !suggestions.length) {
@@ -101,7 +102,7 @@ const AccountsCarousel = () => {
>
{suggestions.map((suggestion) => (
-
+
))}
diff --git a/src/features/search/index.tsx b/src/features/explorer/index.tsx
similarity index 56%
rename from src/features/search/index.tsx
rename to src/features/explorer/index.tsx
index f8cb6eaf0..525d8839c 100644
--- a/src/features/search/index.tsx
+++ b/src/features/explorer/index.tsx
@@ -4,20 +4,19 @@ import { Column } from 'soapbox/components/ui/column.tsx';
import Divider from 'soapbox/components/ui/divider.tsx';
import Stack from 'soapbox/components/ui/stack.tsx';
import SearchResults from 'soapbox/features/compose/components/search-results.tsx';
-import Search from 'soapbox/features/compose/components/search.tsx';
-import ExplorerCards from 'soapbox/features/search/components/explorer-cards.tsx';
-import ExplorerFilter from 'soapbox/features/search/components/explorerFilter.tsx';
-import AccountsCarousel from 'soapbox/features/search/components/people-to-follow-card.tsx';
+import ExplorerCards from 'soapbox/features/explorer/components/explorer-cards.tsx';
+import ExplorerFilter from 'soapbox/features/explorer/components/explorerFilter.tsx';
+import AccountsCarousel from 'soapbox/features/explorer/components/popular-accounts.tsx';
const messages = defineMessages({
- heading: { id: 'column.search', defaultMessage: 'Explorer' },
+ heading: { id: 'column.explorer', defaultMessage: 'Explorer' },
});
const SearchPage = () => {
const intl = useIntl();
return (
-
+
@@ -32,11 +31,8 @@ const SearchPage = () => {
-
-
-
-
+
);
diff --git a/src/features/public-timeline/index.tsx b/src/features/public-timeline/index.tsx
index 9de335902..0dde4c547 100644
--- a/src/features/public-timeline/index.tsx
+++ b/src/features/public-timeline/index.tsx
@@ -70,6 +70,7 @@ const PublicTimeline = () => {
return (
: null}
slim
diff --git a/src/features/ui/components/trends-panel.tsx b/src/features/ui/components/trends-panel.tsx
index fd1afefec..dfcb6f0b9 100644
--- a/src/features/ui/components/trends-panel.tsx
+++ b/src/features/ui/components/trends-panel.tsx
@@ -38,7 +38,7 @@ const TrendsPanel = ({ limit }: ITrendsPanel) => {
}
action={
-
+
{intl.formatMessage(messages.viewAll)}
diff --git a/src/features/ui/index.tsx b/src/features/ui/index.tsx
index d6422624e..0eac22889 100644
--- a/src/features/ui/index.tsx
+++ b/src/features/ui/index.tsx
@@ -48,7 +48,6 @@ import Navbar from './components/navbar.tsx';
import {
Status,
CommunityTimeline,
- PublicTimeline,
RemoteTimeline,
AccountTimeline,
AccountGallery,
@@ -194,7 +193,6 @@ const SwitchingColumnsArea: React.FC = ({ children }) =>
https://stackoverflow.com/a/68637108
*/}
{features.federating && }
- {features.federating && }
{features.federating && }
{features.conversations && }
@@ -209,11 +207,11 @@ const SwitchingColumnsArea: React.FC = ({ children }) =>
-
+
{/* Pleroma FE web routes */}
-
+
@@ -251,7 +249,7 @@ const SwitchingColumnsArea: React.FC = ({ children }) =>
-
+
@@ -261,7 +259,7 @@ const SwitchingColumnsArea: React.FC = ({ children }) =>
-
+
{features.suggestionsLocal && }
{features.suggestions && }
{features.profileDirectory && }
diff --git a/src/features/ui/util/async-components.ts b/src/features/ui/util/async-components.ts
index e6717d626..6941e4425 100644
--- a/src/features/ui/util/async-components.ts
+++ b/src/features/ui/util/async-components.ts
@@ -58,7 +58,7 @@ export const BirthdaysModal = lazy(() => import('soapbox/features/ui/components/
export const BirthdayPanel = lazy(() => import('soapbox/components/birthday-panel.tsx'));
export const ListEditor = lazy(() => import('soapbox/features/list-editor/index.tsx'));
export const ListAdder = lazy(() => import('soapbox/features/list-adder/index.tsx'));
-export const Search = lazy(() => import('soapbox/features/search/index.tsx'));
+export const Search = lazy(() => import('soapbox/features/explorer/index.tsx'));
export const LoginPage = lazy(() => import('soapbox/features/auth-login/components/login-page.tsx'));
export const ExternalLogin = lazy(() => import('soapbox/features/external-login/index.tsx'));
export const LogoutPage = lazy(() => import('soapbox/features/auth-login/components/logout.tsx'));
diff --git a/src/locales/en.json b/src/locales/en.json
index 7ff7524f1..7bda59c24 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -368,6 +368,7 @@
"column.event_map": "Event location",
"column.event_participants": "Event participants",
"column.events": "Events",
+ "column.explorer": "Explorer",
"column.explorer.bridge_card.text": "Curious about Bridges? Click here",
"column.explorer.bridge_card.title": "Bridge",
"column.explorer.filters": "Filters:",
@@ -451,7 +452,6 @@
"column.reblogs": "Reposts",
"column.registration": "Sign Up",
"column.scheduled_statuses": "Scheduled Posts",
- "column.search": "Explorer",
"column.settings_store": "Settings store",
"column.soapbox_config": "Soapbox config",
"column.test": "Test timeline",
@@ -459,6 +459,7 @@
"column_forbidden.body": "You do not have permission to access this page.",
"column_forbidden.title": "Forbidden",
"common.cancel": "Cancel",
+ "common.search": "Search",
"compare_history_modal.header": "Edit history",
"compose.character_counter.title": "Used {chars} out of {maxChars} {maxChars, plural, one {character} other {characters}}",
"compose.edit_success": "Your post was edited",
@@ -1442,6 +1443,10 @@
"scheduled_status.cancel": "Cancel",
"search.action": "Search for “{query}”",
"search.placeholder": "Search",
+ "search_results.accounts": "Posts",
+ "search_results.filter_message": "You are searching for posts from @{acct}.",
+ "search_results.posts": "Accounts",
+ "search_results.trends": "Trends",
"security.codes.fail": "Failed to fetch backup codes",
"security.confirm.fail": "Incorrect code or password. Try again.",
"security.delete_account.fail": "Account deletion failed.",