webapps/term_concordancer
18
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Enable running concordancer (frontend) outside servers root folder.

Browse Source
This commit is contained in:
rrejc
2022-12-14 14:40:12 +01:00
parent 49d6401bfa
commit d830c523a9
19 changed files with 37 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/Rsdo.Concordancer.Api/Controllers/WebAppController.cs
-42
View File
@@ -1,42 +0,0 @@
using System;
using System.IO;
using System.Linq;
using System.Net.Mime;
using HtmlAgilityPack;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Rsdo.Concordancer.Core.Constants;
namespace Rsdo.Concordancer.Api.Controllers
{
public class WebAppController : Controller
{
private readonly IConfiguration configuration;
private readonly IWebHostEnvironment webHostEnvironment;
public WebAppController(IConfiguration configuration, IWebHostEnvironment webHostEnvironment)
{
this.configuration = configuration;
this.webHostEnvironment = webHostEnvironment;
}
public IActionResult Index()
{
var indexFilePath = webHostEnvironment.WebRootFileProvider.GetFileInfo("index.html").PhysicalPath;
var html = new HtmlDocument();
html.Load(indexFilePath);
var baseAppPath = configuration[ConfigurationKey.Web.BaseAppPath] ?? string.Empty;
var scriptNode = HtmlNode.CreateNode($"<script>window.baseAppPath = '{baseAppPath}';</script>");
var headNode = html.DocumentNode.SelectSingleNode("//head");
headNode.ChildNodes.Add(scriptNode);
var indexStream = new MemoryStream();
html.Save(indexStream);
indexStream.Position = 0;
return File(indexStream, MediaTypeNames.Text.Html);
}
}
}
src/apps/Rsdo.Concordancer.Api/Dockerfile
+13 -1
View File
@@ -4,6 +4,12 @@ EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
# INSTALL NODE.JS
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
&& apt-get install -y \
nodejs \
&& rm -rf /var/lib/apt/lists/*
# COPY LOCAL NUGET PACKAGES
WORKDIR /nuget
COPY local-packages/. .
@@ -36,8 +42,14 @@ COPY src/core/Rsdo.Concordancer.Infrastructure/. Rsdo.Concordancer.Infrastructur
COPY src/core/Rsdo.Concordancer.ServiceModel/. Rsdo.Concordancer.ServiceModel/
COPY src/core/Rsdo.Concordancer.Services/. Rsdo.Concordancer.Services/
# BUILD
# BUILD WEBAPP AND AFTER THAT API, WHICH INCLUDES WEBAPP
FROM build AS publish
WORKDIR /src/apps/Rsdo.Concordancer.Api/WebApp
ARG WEBAPP_PUBLIC_URL=''
ENV PUBLIC_URL=${WEBAPP_PUBLIC_URL}
RUN npm install && npm run build
WORKDIR /src/apps/Rsdo.Concordancer.Api
RUN dotnet publish "Rsdo.Concordancer.Api.csproj" -c Release -o /app/publish
src/apps/Rsdo.Concordancer.Api/Rsdo.Concordancer.Api.csproj
+1 -2
View File
@@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<EnableNETAnalyzers>false</EnableNETAnalyzers>
<Version>1.0.0</Version>
<Version>1.0.1</Version>
</PropertyGroup>
<ItemGroup>
@@ -12,7 +12,6 @@
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Hangfire" Version="1.7.31" />
<PackageReference Include="Hangfire.PostgreSql" Version="1.9.9" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
<PackageReference Include="Rsdo.StyleCop" Version="1.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
src/apps/Rsdo.Concordancer.Api/Startup.cs
+1 -1
View File
@@ -144,7 +144,7 @@ public class Startup
{
endpoints.MapControllers();
endpoints.MapHangfireDashboard("/hangfire");
endpoints.MapFallbackToController("Index", "WebApp");
endpoints.MapFallbackToFile("index.html");
});
}
}
src/apps/Rsdo.Concordancer.Api/WebApp/package-lock.json
Generated
+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",
src/apps/Rsdo.Concordancer.Api/WebApp/package.json
+1 -1
View File
@@ -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",
src/apps/Rsdo.Concordancer.Api/WebApp/public/index.html
+1 -4
View File
@@ -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
src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceDetails.js
+1 -1
View File
@@ -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: {
src/apps/Rsdo.Concordancer.Api/WebApp/src/components/index/IndexStatistics.js
+1 -1
View File
@@ -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'
src/apps/Rsdo.Concordancer.Api/WebApp/src/index.js
+2 -1
View File
@@ -13,10 +13,11 @@ 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>
src/apps/Rsdo.Concordancer.Api/WebApp/src/pages/concordance/ConcordanceResults.js
+2 -2
View File
@@ -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);
src/apps/Rsdo.Concordancer.Api/WebApp/src/pages/list/ListResults.js
+2 -2
View File
@@ -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);
src/apps/Rsdo.Concordancer.SystemManager/Rsdo.Concordancer.SystemManager.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<TargetFramework>net6.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<EnableNETAnalyzers>false</EnableNETAnalyzers>
<Version>1.0.0</Version>
<Version>1.0.1</Version>
</PropertyGroup>
<ItemGroup>
src/core/Rsdo.Concordancer.Core/Constants/ConfigurationKey.cs
-5
View File
@@ -16,9 +16,4 @@ public static class ConfigurationKey
{
public const string ClasslaTokenizerUrl = "RSDO:Tokenizer:ClasslaUrl";
}
public static class Web
{
public const string BaseAppPath = "RSDO:Web:BaseAppPath";
}
}
src/core/Rsdo.Concordancer.Core/Rsdo.Concordancer.Core.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<EnableNETAnalyzers>false</EnableNETAnalyzers>
<Version>1.0.0</Version>
<Version>1.0.1</Version>
</PropertyGroup>
<ItemGroup>
src/core/Rsdo.Concordancer.Data/Rsdo.Concordancer.Data.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<EnableNETAnalyzers>false</EnableNETAnalyzers>
<Version>1.0.0</Version>
<Version>1.0.1</Version>
</PropertyGroup>
<ItemGroup>
src/core/Rsdo.Concordancer.Infrastructure/Rsdo.Concordancer.Infrastructure.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<EnableNETAnalyzers>false</EnableNETAnalyzers>
<Version>1.0.0</Version>
<Version>1.0.1</Version>
</PropertyGroup>
<ItemGroup>
src/core/Rsdo.Concordancer.ServiceModel/Rsdo.Concordancer.ServiceModel.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<EnableNETAnalyzers>false</EnableNETAnalyzers>
<Version>1.0.0</Version>
<Version>1.0.1</Version>
</PropertyGroup>
<ItemGroup>
src/core/Rsdo.Concordancer.Services/Rsdo.Concordancer.Services.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<EnableNETAnalyzers>false</EnableNETAnalyzers>
<Version>1.0.0</Version>
<Version>1.0.1</Version>
</PropertyGroup>
<ItemGroup>