Added production support for search
This commit is contained in:
parent
c2d5a90df5
commit
19bbc337bf
2 changed files with 56 additions and 22 deletions
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"apps": [
|
"apps": [
|
||||||
{
|
{
|
||||||
"name": "my pi hole",
|
"name": "Pihole",
|
||||||
"displayURL": "example.com",
|
"displayURL": "example.com",
|
||||||
"URL": "https://example.com",
|
"URL": "https://example.com",
|
||||||
"icon": "vpn_lock"
|
"icon": "vpn_lock"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import React, { useState } from 'react';
|
import React, { useCallback, useEffect, useState } from 'react';
|
||||||
import styled from 'styled-components';
|
import styled from 'styled-components';
|
||||||
|
|
||||||
import searchData from './data/search.json';
|
import { ErrorMessage } from './elements';
|
||||||
|
|
||||||
import selectedTheme from './themeManager';
|
import selectedTheme from './themeManager';
|
||||||
|
|
||||||
|
@ -15,29 +15,40 @@ const SearchInput = styled.input`
|
||||||
color: ${selectedTheme.mainColor};
|
color: ${selectedTheme.mainColor};
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const handleQueryWithProvider = query => {
|
const handleResponse = response => {
|
||||||
let queryArray = query.split(' ');
|
if (response.ok) {
|
||||||
|
return response.json();
|
||||||
let prefix = queryArray[0];
|
|
||||||
|
|
||||||
queryArray.shift();
|
|
||||||
|
|
||||||
let searchQuery = queryArray.join(' ');
|
|
||||||
|
|
||||||
var foundProvider = false;
|
|
||||||
searchData.providers.forEach(provider => {
|
|
||||||
if (provider.prefix === prefix) {
|
|
||||||
foundProvider = true;
|
|
||||||
window.location = provider.url + searchQuery;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!foundProvider) {
|
|
||||||
window.location = 'https://google.com/search?q=' + query;
|
|
||||||
}
|
}
|
||||||
|
throw new Error('Failed to load app data.');
|
||||||
|
};
|
||||||
|
|
||||||
|
const useSearchProviders = () => {
|
||||||
|
const [searchProviders, setSearchProviders] = useState({
|
||||||
|
providers: [],
|
||||||
|
error: false
|
||||||
|
});
|
||||||
|
const fetchSearchProviders = useCallback(() => {
|
||||||
|
(process.env.NODE_ENV === 'production'
|
||||||
|
? fetch('/search.json').then(handleResponse)
|
||||||
|
: import('./data/search.json')
|
||||||
|
)
|
||||||
|
.then(jsonResponse => {
|
||||||
|
setSearchProviders({ ...jsonResponse, error: false });
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
setSearchProviders({ providers: [], error: error.message });
|
||||||
|
});
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
fetchSearchProviders();
|
||||||
|
}, [fetchSearchProviders]);
|
||||||
|
return searchProviders;
|
||||||
};
|
};
|
||||||
|
|
||||||
const SearchBar = () => {
|
const SearchBar = () => {
|
||||||
|
const searchProviders = useSearchProviders();
|
||||||
|
|
||||||
let [input, setInput] = useState();
|
let [input, setInput] = useState();
|
||||||
|
|
||||||
const handleSearchQuery = e => {
|
const handleSearchQuery = e => {
|
||||||
|
@ -52,8 +63,31 @@ const SearchBar = () => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleQueryWithProvider = query => {
|
||||||
|
let queryArray = query.split(' ');
|
||||||
|
let prefix = queryArray[0];
|
||||||
|
queryArray.shift();
|
||||||
|
|
||||||
|
let searchQuery = queryArray.join(' ');
|
||||||
|
|
||||||
|
var foundProvider = false;
|
||||||
|
searchProviders.providers.forEach(provider => {
|
||||||
|
if (provider.prefix === prefix) {
|
||||||
|
foundProvider = true;
|
||||||
|
window.location = provider.url + searchQuery;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!foundProvider) {
|
||||||
|
window.location = 'https://google.com/search?q=' + query;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<form onSubmit={e => handleSearchQuery(e)}>
|
<form onSubmit={e => handleSearchQuery(e)}>
|
||||||
|
{searchProviders.error && (
|
||||||
|
<ErrorMessage>{searchProviders.error}</ErrorMessage>
|
||||||
|
)}
|
||||||
<SearchInput
|
<SearchInput
|
||||||
type="text"
|
type="text"
|
||||||
onChange={e => setInput(e.target.value)}
|
onChange={e => setInput(e.target.value)}
|
||||||
|
|
Loading…
Reference in a new issue