Enable running concordancer (frontend) outside servers root folder.

This commit is contained in:
2022-12-14 14:40:12 +01:00
parent 49d6401bfa
commit d830c523a9
19 changed files with 37 additions and 75 deletions
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "concordancer-web",
"version": "0.1.0",
"version": "1.0.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "concordancer-web",
"version": "0.1.0",
"version": "1.0.0",
"dependencies": {
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
@@ -1,6 +1,6 @@
{
"name": "concordancer-web",
"version": "1.0.0",
"version": "1.0.1",
"private": true,
"dependencies": {
"@testing-library/jest-dom": "^5.16.5",
@@ -5,10 +5,7 @@
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<base href="%PUBLIC_URL%/" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
@@ -20,7 +20,7 @@ const ConcordanceDetails = (props) => {
const search = useSearch();
const body = search.getDetailsRequest(props.paragraphId, props.tokenOrder);
const fetchDetails = () => fetch(`${window.baseAppPath}/concordancer/corpus/${search.corpusId}/concordances/details`, {
const fetchDetails = () => fetch(`${process.env.PUBLIC_URL}/concordancer/corpus/${search.corpusId}/concordances/details`, {
method: 'POST',
body: JSON.stringify(body),
headers: {
@@ -79,4 +79,4 @@ const ConcordanceDetails = (props) => {
}
};
export default ConcordanceDetails;
export default ConcordanceDetails;
@@ -9,7 +9,7 @@ const IndexStatistics = () => {
const search = useSearch();
const corpusId = search.corpusId;
const fetchStatistics = () => fetch(`${window.baseAppPath}/concordancer/corpus/${corpusId}/stats`, {
const fetchStatistics = () => fetch(`${process.env.PUBLIC_URL}/concordancer/corpus/${corpusId}/stats`, {
method: 'GET',
headers: {
'Content-Type': 'application/json'
@@ -31,4 +31,4 @@ const IndexStatistics = () => {
);
};
export default IndexStatistics;
export default IndexStatistics;
@@ -13,11 +13,12 @@ if (language) {
i18n.changeLanguage(language);
}
const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href');
const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
<React.StrictMode>
<BrowserRouter basename={window.baseAppPath}>
<BrowserRouter basename={baseUrl}>
<App />
</BrowserRouter>
</React.StrictMode>
);
);
@@ -21,7 +21,7 @@ const ConcordanceResults = () => {
const body = search.getSearchRequest();
const fetchConcordances = () => fetch(`${window.baseAppPath}/concordancer/corpus/${search.corpusId}/concordances/search`, {
const fetchConcordances = () => fetch(`${process.env.PUBLIC_URL}/concordancer/corpus/${search.corpusId}/concordances/search`, {
method: 'POST',
body: JSON.stringify(body),
headers: {
@@ -34,7 +34,7 @@ const ConcordanceResults = () => {
const { isLoading, isSuccess, isError, data, error } = useQuery(['concordances', body], fetchConcordances, { keepPreviousData: true, refetchOnWindowFocus: false });
const [isVisible, setIsVisible] = useState(false);
const download = useDownload(`${window.baseAppPath}/concordancer/corpus/${search.corpusId}/concordances/export`);
const download = useDownload(`${process.env.PUBLIC_URL}/concordancer/corpus/${search.corpusId}/concordances/export`);
const onExportClose = () => {
setIsVisible(false);
@@ -84,4 +84,4 @@ const ConcordanceResults = () => {
};
};
export default ConcordanceResults;
export default ConcordanceResults;
@@ -20,7 +20,7 @@ const ListResults = () => {
const history = useHistory();
const body = search.getSearchRequest();
const fetchList = () => fetch(`${window.baseAppPath}/concordancer/corpus/${search.corpusId}/list/search`, {
const fetchList = () => fetch(`${process.env.PUBLIC_URL}/concordancer/corpus/${search.corpusId}/list/search`, {
method: 'POST',
body: JSON.stringify(body),
headers: {
@@ -33,7 +33,7 @@ const ListResults = () => {
const { isLoading, isSuccess, isError, data, error } = useQuery(['list', body], fetchList, { keepPreviousData: true, refetchOnWindowFocus: false });
const [isVisible, setIsVisible] = useState(false);
const download = useDownload(`${window.baseAppPath}/concordancer/corpus/${search.corpusId}/list/export`);
const download = useDownload(`${process.env.PUBLIC_URL}/concordancer/corpus/${search.corpusId}/list/export`);
const onExportClose = () => {
setIsVisible(false);