diff --git a/src/client.js b/src/client.js
new file mode 100644
index 00000000..ba2f5459
--- /dev/null
+++ b/src/client.js
@@ -0,0 +1,12 @@
+import { ApolloClient, HttpLink, InMemoryCache } from '@apollo/client'
+
+import fetch from 'cross-fetch'
+
+let uri = '/api/graphql'
+console.log('GraphQL URI in Client:', uri)
+const client = new ApolloClient({
+ link: new HttpLink({ uri, fetch }),
+ cache: new InMemoryCache(),
+})
+
+export default client
diff --git a/src/components/SearchBar.js b/src/components/SearchBar.js
index 9381114e..b92d1655 100644
--- a/src/components/SearchBar.js
+++ b/src/components/SearchBar.js
@@ -1,22 +1,20 @@
-import { useState } from 'react'
import { AiOutlineSearch } from 'react-icons/ai'
import CollegeResult from '../app/components/CollegeResult'
-import searchAlgorithm from '@/utils/searchAlgorithm'
-const SearchBar = ({ data }) => {
+import searchAlgorithm from '../utils/searchAlgorithm'
+import { useState } from 'react'
+
+const SearchBar = ({ data, loading }) => {
const [open, setOpen] = useState(false)
const [filterData, setFilterData] = useState([])
-
const handleSearch = (e) => {
let input = e.target.value.trim().toLowerCase()
- const filterData = searchAlgorithm(input)
+ const filterData = searchAlgorithm(input, data).sort((a, b) => b.score - a.score)
setOpen(input.length !== 0)
setFilterData(filterData)
}
-
let searchResults = filterData?.map((item, index) =>
)
-
- if (searchResults.length === 0) searchResults =
No results found
-
+ if (!loading && searchResults.length === 0) searchResults =
No results found
+ if (loading) searchResults =
Loading....
return (
diff --git a/src/queries/queries.js b/src/queries/queries.js
new file mode 100644
index 00000000..d524496c
--- /dev/null
+++ b/src/queries/queries.js
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client'
+export const query = gql`
+ query getUniversityList {
+ universityList {
+ id
+ name
+ score
+ country
+ city
+ }
+ }
+`
diff --git a/src/utils/searchAlgorithm.js b/src/utils/searchAlgorithm.js
index 23d189be..8ef4d4b5 100644
--- a/src/utils/searchAlgorithm.js
+++ b/src/utils/searchAlgorithm.js
@@ -1,7 +1,10 @@
import { matchSorter } from 'match-sorter'
-import colleges from '../../data/university_data.json'
-const searchAlgorithm = (input) => {
- return matchSorter(colleges, input, { keys: ['name', 'address'] })
+const searchAlgorithm = (input, data) => {
+ if (input && data) {
+ return matchSorter(data, input, { keys: ['name', 'country', 'city'] })
+ } else {
+ return []
+ }
}
export default searchAlgorithm