From 42b3a1d075c1d709b8387f77d31be2776af13187 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <p.gawron@atcomp.pl>
Date: Tue, 23 Jan 2024 15:30:00 +0100
Subject: [PATCH] working index.html
---
frontend-js/pom.xml | 5 +++--
.../main/java/lcsb/mapviewer/web/app/WebConfig.java | 3 +--
web/src/main/resources/resources/{css => }/style.css | 0
web/src/main/resources/templates/index.html | 11 +++++------
4 files changed, 9 insertions(+), 10 deletions(-)
rename web/src/main/resources/resources/{css => }/style.css (100%)
diff --git a/frontend-js/pom.xml b/frontend-js/pom.xml
index 346112e7fc..a371c74ba4 100644
--- a/frontend-js/pom.xml
+++ b/frontend-js/pom.xml
@@ -95,7 +95,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/src/main/resources/frontend/</outputDirectory>
+ <outputDirectory>${basedir}/src/main/resources/resources/</outputDirectory>
<resources>
<resource>
<directory>${basedir}/dist/</directory>
@@ -115,7 +115,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/src/main/resources/frontend/images</outputDirectory>
+ <outputDirectory>${basedir}/src/main/resources/resources/images</outputDirectory>
<resources>
<resource>
<directory>${basedir}/src/main/css/images</directory>
@@ -141,6 +141,7 @@
<includes>
<include>**/*.css</include>
<include>**/*.png</include>
+ <include>**/*.jpg</include>
<include>**/*.txt</include>
<include>**/*.js</include>
<include>**/*.map</include>
diff --git a/web/src/main/java/lcsb/mapviewer/web/app/WebConfig.java b/web/src/main/java/lcsb/mapviewer/web/app/WebConfig.java
index 26f8c9472c..e6d9b6a05e 100644
--- a/web/src/main/java/lcsb/mapviewer/web/app/WebConfig.java
+++ b/web/src/main/java/lcsb/mapviewer/web/app/WebConfig.java
@@ -20,8 +20,7 @@ public class WebConfig implements WebMvcConfigurer {
@Override
public void addResourceHandlers(final ResourceHandlerRegistry registry) {
registry.addResourceHandler("/**")
- .addResourceLocations("/", "classpath:/")
- .addResourceLocations("/");
+ .addResourceLocations("/", "classpath:/");
;
}
diff --git a/web/src/main/resources/resources/css/style.css b/web/src/main/resources/resources/style.css
similarity index 100%
rename from web/src/main/resources/resources/css/style.css
rename to web/src/main/resources/resources/style.css
diff --git a/web/src/main/resources/templates/index.html b/web/src/main/resources/templates/index.html
index b3e081abb5..5f75b78ca6 100644
--- a/web/src/main/resources/templates/index.html
+++ b/web/src/main/resources/templates/index.html
@@ -3,14 +3,13 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
- <link type="text/css" rel="stylesheet" th:href="@{'/frontend/minerva.css'(v=${version})}">
- <link type="text/css" rel="stylesheet" th:href="@{'/frontend/style.css'(v=${version})}">
+ <link type="text/css" rel="stylesheet" th:href="@{'/resources/minerva.css'(v=${version})}">
+ <link type="text/css" rel="stylesheet" th:href="@{'/resources/style.css'(v=${version})}">
- <link rel="shortcut icon" href="./resources/images/favicon.png"
- type="image/png" />
+ <link rel="shortcut icon" th:href="@{'/resources/images/favicon.png'(v=${version})}" type="image/png" />
- <script type="text/javascript" th:src="@{'/frontend/BrowserCheck.js'(v=${version})}"></script>
- <script type="text/javascript" th:src="@{'/frontend/minerva.js'(v=${version})}"></script>
+ <script type="text/javascript" th:src="@{'/resources/BrowserCheck.js'(v=${version})}"></script>
+ <script type="text/javascript" th:src="@{'/resources/minerva.js'(v=${version})}"></script>
<script type="text/javascript">
//<![CDATA[
--
GitLab