mirror of
https://github.com/ClaytonWWilson/CS307-Team24.git
synced 2025-12-15 18:08:46 +00:00
Improved speed of search and made it fuzzy search
This commit is contained in:
parent
6e32b25861
commit
1a02b53d0f
@ -331,6 +331,24 @@ exports.getUserDetails = (req, res) => {
|
||||
});
|
||||
};
|
||||
|
||||
exports.getAllHandles = (req, res) => {
|
||||
var user_query = admin.firestore().collection("users");
|
||||
user_query.get()
|
||||
.then((allUsers) => {
|
||||
let users = [];
|
||||
allUsers.forEach((user) => {
|
||||
users.push(user.data().handle);
|
||||
});
|
||||
return res.status(200).json(users);
|
||||
})
|
||||
.catch((err) => {
|
||||
return res.status(500).json({
|
||||
message:"Failed to retrieve posts from database.",
|
||||
error: err
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
exports.getAuthenticatedUser = (req, res) => {
|
||||
let credentials = {};
|
||||
db.doc(`/users/${req.user.handle}`)
|
||||
|
||||
@ -11,6 +11,7 @@ app.use(cors());
|
||||
*------------------------------------------------------------------*/
|
||||
const {
|
||||
getAuthenticatedUser,
|
||||
getAllHandles,
|
||||
getUserDetails,
|
||||
getProfileInfo,
|
||||
login,
|
||||
@ -39,6 +40,10 @@ app.delete("/delete", fbAuth, deleteUser);
|
||||
|
||||
app.post("/getUserDetails", fbAuth, getUserDetails);
|
||||
|
||||
// Returns a list of all usernames
|
||||
// Used for searching
|
||||
app.get("/getAllHandles", fbAuth, getAllHandles);
|
||||
|
||||
// Returns all profile data of the currently logged in user
|
||||
app.get("/getProfileInfo", fbAuth, getProfileInfo);
|
||||
|
||||
|
||||
@ -10,11 +10,13 @@
|
||||
"axios": "^0.19.0",
|
||||
"clsx": "^1.0.4",
|
||||
"create-react-app": "^3.1.2",
|
||||
"fuse.js": "^3.4.6",
|
||||
"install": "^0.13.0",
|
||||
"jwt-decode": "^2.2.0",
|
||||
"node-pre-gyp": "^0.13.0",
|
||||
"react": "^16.9.0",
|
||||
"react-dom": "^16.9.0",
|
||||
"react-modal": "^3.11.1",
|
||||
"react-redux": "^7.1.1",
|
||||
"react-router-dom": "^5.1.0",
|
||||
"react-scripts": "0.9.5",
|
||||
|
||||
@ -2,38 +2,75 @@ import React, { Component } from "react";
|
||||
// import props
|
||||
import { TextField, Button } from "@material-ui/core";
|
||||
import Grid from "@material-ui/core/Grid";
|
||||
import Axios from "axios";
|
||||
import axios from "axios";
|
||||
import Fuse from "fuse.js";
|
||||
|
||||
import { BrowserRouter as Router } from "react-router-dom";
|
||||
|
||||
import CircularProgress from "@material-ui/core/CircularProgress";
|
||||
|
||||
const fuseOptions = {
|
||||
shouldSort: true,
|
||||
threshold: 0.6,
|
||||
location: 0,
|
||||
distance: 100,
|
||||
maxPatternLength: 32,
|
||||
minMatchCharLength: 1,
|
||||
keys: []
|
||||
};
|
||||
|
||||
let fuse;
|
||||
|
||||
|
||||
export class Search extends Component {
|
||||
state = {
|
||||
searchPhase: null,
|
||||
searchResult: null
|
||||
handles: [],
|
||||
// searchPhrase: null,
|
||||
searchResult: null,
|
||||
loading: false
|
||||
};
|
||||
|
||||
handleSearch = () => {
|
||||
console.log(this.state.searchPhase);
|
||||
Axios.post("/getUserHandles", {
|
||||
userHandle: this.state.searchPhase
|
||||
})
|
||||
.then(res => {
|
||||
console.log(res);
|
||||
|
||||
this.setState({
|
||||
searchResult: res.data
|
||||
});
|
||||
componentDidMount() {
|
||||
this.setState({loading: true});
|
||||
axios.get("/getAllHandles")
|
||||
.then((res) => {
|
||||
this.setState({
|
||||
handles: res.data,
|
||||
loading: false
|
||||
}, () => {
|
||||
console.log(res.data);
|
||||
fuse = new Fuse(this.state.handles, fuseOptions); // "list" is the item array
|
||||
})
|
||||
.catch(err => {
|
||||
console.log(err);
|
||||
});
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
handleInput(event) {
|
||||
// handleSearch = () => {
|
||||
// console.log(this.state.searchPhase);
|
||||
// axios.post("/getUserHandles", {
|
||||
// userHandle: this.state.searchPhase
|
||||
// })
|
||||
// .then(res => {
|
||||
// console.log(res);
|
||||
|
||||
// this.setState({
|
||||
// searchResult: res.data
|
||||
// });
|
||||
// })
|
||||
// .catch(err => {
|
||||
// console.log(err);
|
||||
// });
|
||||
// };
|
||||
|
||||
handleChange = (event) => {
|
||||
let result = fuse.search(event.target.value);
|
||||
let parsed = [];
|
||||
result.forEach((res) => {
|
||||
console.log(res)
|
||||
parsed.push(this.state.handles[res])
|
||||
})
|
||||
this.setState({
|
||||
searchPhase: event.target.value
|
||||
});
|
||||
console.log(this.state.searchPhase);
|
||||
searchResult: parsed.length !== 0 ? parsed : "No Results"
|
||||
})
|
||||
}
|
||||
|
||||
handleRedirect() {
|
||||
@ -41,38 +78,49 @@ export class Search extends Component {
|
||||
}
|
||||
|
||||
render() {
|
||||
let resultMarkup = this.state.searchResult ? (
|
||||
<Router>
|
||||
<div>
|
||||
<a href={`/user/${this.state.searchResult}`}>
|
||||
{this.state.searchResult}
|
||||
</a>
|
||||
</div>
|
||||
</Router>
|
||||
) : (
|
||||
// console.log(this.state.searchResult)
|
||||
<p> No result </p>
|
||||
);
|
||||
let resultMarkup = this.state.searchResult && this.state.searchResult !== "No Results" ? (
|
||||
this.state.searchResult.map(res =>
|
||||
<Router>
|
||||
<div>
|
||||
<a href={`/user/${res}`}>
|
||||
{res}
|
||||
</a>
|
||||
</div>
|
||||
</Router>
|
||||
)
|
||||
)
|
||||
:
|
||||
this.state.searchResult === "No Results" ?
|
||||
(
|
||||
<p> No results </p>
|
||||
)
|
||||
:
|
||||
(
|
||||
null
|
||||
)
|
||||
|
||||
return (
|
||||
<Grid>
|
||||
this.state.loading
|
||||
?
|
||||
<CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress>
|
||||
:
|
||||
<Grid>
|
||||
<TextField
|
||||
id="standard-required"
|
||||
label="Search"
|
||||
defaultValue="username"
|
||||
margin="normal"
|
||||
value={this.state.searchPhase}
|
||||
onChange={event => this.handleInput(event)}
|
||||
/>
|
||||
<Grid>
|
||||
<TextField
|
||||
id="standard-required"
|
||||
label="Username"
|
||||
margin="normal"
|
||||
// value={this.state.searchPhrase}
|
||||
onChange={this.handleChange}
|
||||
/>
|
||||
</Grid>
|
||||
<Grid>
|
||||
{/* <Button color="primary" onClick={this.handleSearch}>
|
||||
Search
|
||||
</Button> */}
|
||||
</Grid>
|
||||
<Grid>{resultMarkup}</Grid>
|
||||
</Grid>
|
||||
<Grid>
|
||||
<Button color="primary" onClick={this.handleSearch}>
|
||||
Search
|
||||
</Button>
|
||||
</Grid>
|
||||
<Grid>{resultMarkup}</Grid>
|
||||
</Grid>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user