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.

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

[next] Fixes #1484: Re-Adds the Search page component #1621

Merged
merged 3 commits into from
Feb 5, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
63 changes: 63 additions & 0 deletions src/frontend/next/src/components/SearchPage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import { FormEvent, useState } from 'react';
import { makeStyles } from '@material-ui/core/styles';
import { useRouter } from 'next/router';

import SearchResults from './SearchResults';
import SearchBar from './SearchBar';
import BackToTopButton from './BackToTopButton';

type FilterProp = {
filter: 'post' | 'author';
};

const useStyles = makeStyles(() => ({
anchor: {
position: 'absolute',
top: 0,
},
}));

const SearchPage = () => {
const classes = useStyles();
const router = useRouter();
// We synchronize the `text` and `filter` values to the URL's query string
// Router query object for a query can be an array if url becomes text=123&text=456
// https://stackoverflow.com/questions/60110364/type-string-string-is-not-assignable-to-type-string
const [textParam = '', setTextParam] = useState(
Array.isArray(router.query.text) ? router.query.text[0] : router.query.text
);
const [filterParam = 'post', setFilterParam] = useState<FilterProp['filter']>(
router.query.filter === 'post' ? 'post' : 'author'
);

// We manage the state of `text` and `filter` internally, and update URL on
// form submit only. These are used in the <SearchBar>, and the user can change them.
const [text, setText] = useState('');
const [filter, setFilter] = useState<FilterProp['filter']>('post');

// Form was submitted, so go ahead and sync to URL, (re)triggering search.
function onSubmitHandler(event: FormEvent) {
event.preventDefault();
setTextParam(text);
setFilterParam(filter);
router.push(`/search?text=${text}&filter=${filter}`);
}

return (
<div>
<div className={classes.anchor} id="back-to-top-anchor" />
<SearchBar
text={text}
onTextChange={(value: string) => setText(value)}
filter={filter}
onFilterChange={(value: FilterProp['filter']) => setFilter(value)}
onSubmit={onSubmitHandler}
/>
<br />
<SearchResults text={textParam} filter={filterParam} />
<BackToTopButton />
</div>
);
};

export default SearchPage;
66 changes: 8 additions & 58 deletions src/frontend/next/src/pages/search.tsx
Original file line number Diff line number Diff line change
@@ -1,63 +1,13 @@
import { FormEvent, useState } from 'react';
import { makeStyles } from '@material-ui/core/styles';
import { useRouter } from 'next/router';

import SearchResults from '../components/SearchResults';
import SearchBar from '../components/SearchBar';
import BackToTopButton from '../components/BackToTopButton';

type FilterProp = {
filter: 'post' | 'author';
};

const useStyles = makeStyles(() => ({
anchor: {
position: 'absolute',
top: 0,
},
}));

const SearchPage = () => {
const classes = useStyles();
const router = useRouter();
// We synchronize the `text` and `filter` values to the URL's query string
// Router query object for a query can be an array if url becomes text=123&text=456
// https://stackoverflow.com/questions/60110364/type-string-string-is-not-assignable-to-type-string
const [textParam = '', setTextParam] = useState(
Array.isArray(router.query.text) ? router.query.text[0] : router.query.text
);
const [filterParam = 'post', setFilterParam] = useState<FilterProp['filter']>(
router.query.filter === 'post' ? 'post' : 'author'
);

// We manage the state of `text` and `filter` internally, and update URL on
// form submit only. These are used in the <SearchBar>, and the user can change them.
const [text, setText] = useState('');
const [filter, setFilter] = useState<FilterProp['filter']>('post');

// Form was submitted, so go ahead and sync to URL, (re)triggering search.
function onSubmitHandler(event: FormEvent) {
event.preventDefault();
setTextParam(text);
setFilterParam(filter);
router.push(`/search?text=${text}&filter=${filter}`);
}
import SEO from '../components/SEO';
import SearchPage from '../components/SearchPage';

const Search = () => {
return (
<div>
<div className={classes.anchor} id="back-to-top-anchor" />
<SearchBar
text={text}
onTextChange={(value: string) => setText(value)}
filter={filter}
onFilterChange={(value: FilterProp['filter']) => setFilter(value)}
onSubmit={onSubmitHandler}
/>
<br />
<SearchResults text={textParam} filter={filterParam} />
<BackToTopButton />
</div>
<>
<SEO pageTitle="Search" />
<SearchPage />
</>
);
chrispinkney marked this conversation as resolved.
Show resolved Hide resolved
};

export default SearchPage;
export default Search;