forked from mastodon/mastodon
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Change onboarding flow in web UI (mastodon#32998)
- Loading branch information
Showing
32 changed files
with
1,142 additions
and
1,183 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import { | ||
| apiGetSuggestions, | ||
| apiDeleteSuggestion, | ||
| } from 'mastodon/api/suggestions'; | ||
| import { createDataLoadingThunk } from 'mastodon/store/typed_functions'; | ||
|
|
||
| import { fetchRelationships } from './accounts'; | ||
| import { importFetchedAccounts } from './importer'; | ||
|
|
||
| export const fetchSuggestions = createDataLoadingThunk( | ||
| 'suggestions/fetch', | ||
| () => apiGetSuggestions(20), | ||
| (data, { dispatch }) => { | ||
| dispatch(importFetchedAccounts(data.map((x) => x.account))); | ||
| dispatch(fetchRelationships(data.map((x) => x.account.id))); | ||
|
|
||
| return data; | ||
| }, | ||
| ); | ||
|
|
||
| export const dismissSuggestion = createDataLoadingThunk( | ||
| 'suggestions/dismiss', | ||
| ({ accountId }: { accountId: string }) => apiDeleteSuggestion(accountId), | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| import { apiRequestGet, apiRequestDelete } from 'mastodon/api'; | ||
| import type { ApiSuggestionJSON } from 'mastodon/api_types/suggestions'; | ||
|
|
||
| export const apiGetSuggestions = (limit: number) => | ||
| apiRequestGet<ApiSuggestionJSON[]>('v2/suggestions', { limit }); | ||
|
|
||
| export const apiDeleteSuggestion = (accountId: string) => | ||
| apiRequestDelete(`v1/suggestions/${accountId}`); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import type { ApiAccountJSON } from 'mastodon/api_types/accounts'; | ||
|
|
||
| export type ApiSuggestionSourceJSON = | ||
| | 'featured' | ||
| | 'most_followed' | ||
| | 'most_interactions' | ||
| | 'similar_to_recently_followed' | ||
| | 'friends_of_friends'; | ||
|
|
||
| export interface ApiSuggestionJSON { | ||
| sources: [ApiSuggestionSourceJSON, ...ApiSuggestionSourceJSON[]]; | ||
| account: ApiAccountJSON; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
app/javascript/mastodon/components/column_search_header.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| import { useCallback, useState, useEffect, useRef } from 'react'; | ||
|
|
||
| import { FormattedMessage } from 'react-intl'; | ||
|
|
||
| export const ColumnSearchHeader: React.FC<{ | ||
| onBack: () => void; | ||
| onSubmit: (value: string) => void; | ||
| onActivate: () => void; | ||
| placeholder: string; | ||
| active: boolean; | ||
| }> = ({ onBack, onActivate, onSubmit, placeholder, active }) => { | ||
| const inputRef = useRef<HTMLInputElement>(null); | ||
| const [value, setValue] = useState(''); | ||
|
|
||
| useEffect(() => { | ||
| if (!active) { | ||
| setValue(''); | ||
| } | ||
| }, [active]); | ||
|
|
||
| const handleChange = useCallback( | ||
| ({ target: { value } }: React.ChangeEvent<HTMLInputElement>) => { | ||
| setValue(value); | ||
| onSubmit(value); | ||
| }, | ||
| [setValue, onSubmit], | ||
| ); | ||
|
|
||
| const handleKeyUp = useCallback( | ||
| (e: React.KeyboardEvent<HTMLInputElement>) => { | ||
| if (e.key === 'Escape') { | ||
| e.preventDefault(); | ||
| onBack(); | ||
| inputRef.current?.blur(); | ||
| } | ||
| }, | ||
| [onBack], | ||
| ); | ||
|
|
||
| const handleFocus = useCallback(() => { | ||
| onActivate(); | ||
| }, [onActivate]); | ||
|
|
||
| const handleSubmit = useCallback(() => { | ||
| onSubmit(value); | ||
| }, [onSubmit, value]); | ||
|
|
||
| return ( | ||
| <form className='column-search-header' onSubmit={handleSubmit}> | ||
| <input | ||
| ref={inputRef} | ||
| type='search' | ||
| value={value} | ||
| onChange={handleChange} | ||
| onKeyUp={handleKeyUp} | ||
| placeholder={placeholder} | ||
| onFocus={handleFocus} | ||
| /> | ||
|
|
||
| {active && ( | ||
| <button type='button' className='link-button' onClick={onBack}> | ||
| <FormattedMessage id='column_search.cancel' defaultMessage='Cancel' /> | ||
| </button> | ||
| )} | ||
| </form> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.