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

Fix #1470: Port SearchBar from Gatsby -> NextJS #1503

Closed
wants to merge 5 commits into from
Closed
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
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ module.exports = {
'plugin:prettier/recommended',
'plugin:promise/recommended',
'plugin:react-hooks/recommended',
'plugin:import/typescript',
],
plugins: ['prettier', 'promise', 'react', 'react-hooks'],
settings: {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
"ioredis": "4.17.3",
"ioredis-mock": "5.1.0",
"jsdom": "16.4.0",
"next": "10.0.3",
MSTEWARDSON marked this conversation as resolved.
Show resolved Hide resolved
"node-fetch": "2.6.1",
"normalize-url": "5.1.0",
"opml-generator": "1.1.1",
Expand Down
3 changes: 3 additions & 0 deletions src/frontend/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
"start": "next start"
},
"dependencies": {
"@material-ui/core": "^4.11.2",
"@material-ui/icons": "^4.11.2",
"next": "^10.0.2",
"prop-types": "^15.7.2",
MSTEWARDSON marked this conversation as resolved.
Show resolved Hide resolved
"react": "^16.13.1",
"react-dom": "^16.13.1"
},
Expand Down
156 changes: 156 additions & 0 deletions src/frontend/next/src/components/SearchBar/SearchBar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
import React, { FC } from 'react';
import { makeStyles } from '@material-ui/core/styles';
import SearchIcon from '@material-ui/icons/Search';
import {
Grid,
MenuItem,
TextField,
FormControl,
Paper,
IconButton,
Box,
Typography,
} from '@material-ui/core';

import SearchInput from '../SearchInput';
import SearchHelp from '../SearchHelp';

const useStyles = makeStyles((theme) => ({
root: {
overflow: 'visible',
maxWidth: '785px',
padding: 0,
marginTop: '10rem',
marginLeft: 'auto',
marginRight: 'auto',
marginBottom: theme.spacing(6),
},
card: {
padding: theme.spacing(2, 4, 2, 4),
backgroundColor: theme.palette.background.default,
},
header: {
padding: 0,
marginBottom: theme.spacing(2),
backgroundColor: theme.palette.primary.main,
},
h1: {
display: 'block',
transition: 'all linear 350ms',
fontWeight: 600,
color: theme.palette.text.secondary,
[theme.breakpoints.between('xs', 'sm')]: {
fontSize: '3rem',
},
[theme.breakpoints.between('md', 'lg')]: {
fontSize: '4rem',
},
[theme.breakpoints.up('xl')]: {
fontSize: '5rem',
},
},
iconButton: {
backgroundColor: theme.palette.secondary.main,
'&:hover': {
backgroundColor: theme.palette.secondary.dark,
},
'& * > .MuiSvgIcon-root': {
fontSize: '2rem',
color: theme.palette.primary.contrastText,
},
margin: 0,
position: 'absolute',
right: '10px',
top: '6px',
},
selectControl: {
'& > *': {
fontSize: '1.2rem',
textTransform: 'capitalize',
color: theme.palette.primary.main,
},
},
selectItem: {
fontSize: '1.4rem',
textTransform: 'capitalize',
color: theme.palette.primary.main,
},
}));

interface CustomizedInputBaseProps {
text: string | null;
onTextChange(): any;
MSTEWARDSON marked this conversation as resolved.
Show resolved Hide resolved
filter: string | null;
onFilterChange(value: string): any;
onSubmit(): any;
}

const CustomizedInputBase: FC<CustomizedInputBaseProps> = ({
text,
onTextChange,
onFilterChange,
filter,
onSubmit,
}: CustomizedInputBaseProps) => {
const classes = useStyles();

const searchOptions = ['post', 'author'];

return (
<Box className={classes.root} boxShadow={2}>
<Paper component="form" className={classes.card} elevation={0}>
<Grid
container
className={classes.header}
direction="row"
spacing={8}
alignItems="center"
justify="flex-start"
>
<Grid item>
<Typography variant="h1" className={classes.h1}>
Search
</Typography>
</Grid>
<SearchHelp />
</Grid>
<Grid container direction="row" spacing={2} alignItems="center" justify="flex-start">
<Grid item xs={12} sm={2} lg={2}>
<FormControl fullWidth>
<TextField
id="standard-select-search-type"
select
label="Filter"
value={filter}
variant="outlined"
className={classes.selectControl}
onChange={(event) => onFilterChange(event.target.value)}
>
{searchOptions.map((option) => (
<MenuItem key={option} value={option} className={classes.selectItem}>
{option}
</MenuItem>
))}
</TextField>
</FormControl>
</Grid>
<Grid item xs={12} sm={10} lg={10}>
<FormControl fullWidth>
<SearchInput filter={filter} text={text} onChange={onTextChange} />
<IconButton
className={classes.iconButton}
type="submit"
onClick={onSubmit}
aria-label="search"
>
<SearchIcon />
</IconButton>
</FormControl>
</Grid>
</Grid>
</Paper>
</Box>
);
};

export default CustomizedInputBase;