Skip to content
Snippets Groups Projects
Commit 42b3a1d0 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

working index.html

parent 2a3c82d9
No related branches found
No related tags found
3 merge requests!1700Resolve "introduce new frontend to the jar file build process",!1644Draft: Resolve "cache drug/mirna/chemicals data in the background",!1637Resolve "remove tomcat requirement"
Hide whitespace changes
Inline Side-by-side
frontend-js/pom.xml
+ 3
− 2
View file @ 42b3a1d0
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<goal>copy-resources</goal> <goal>copy-resources</goal>
</goals> </goals>
<configuration> <configuration>
<outputDirectory>${basedir}/src/main/resources/frontend/</outputDirectory> <outputDirectory>${basedir}/src/main/resources/resources/</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>${basedir}/dist/</directory> <directory>${basedir}/dist/</directory>
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<goal>copy-resources</goal> <goal>copy-resources</goal>
</goals> </goals>
<configuration> <configuration>
<outputDirectory>${basedir}/src/main/resources/frontend/images</outputDirectory> <outputDirectory>${basedir}/src/main/resources/resources/images</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>${basedir}/src/main/css/images</directory> <directory>${basedir}/src/main/css/images</directory>
...@@ -141,6 +141,7 @@ ...@@ -141,6 +141,7 @@
<includes> <includes>
<include>**/*.css</include> <include>**/*.css</include>
<include>**/*.png</include> <include>**/*.png</include>
<include>**/*.jpg</include>
<include>**/*.txt</include> <include>**/*.txt</include>
<include>**/*.js</include> <include>**/*.js</include>
<include>**/*.map</include> <include>**/*.map</include>
......
web/src/main/java/lcsb/mapviewer/web/app/WebConfig.java
+ 1
− 2
View file @ 42b3a1d0
...@@ -20,8 +20,7 @@ public class WebConfig implements WebMvcConfigurer { ...@@ -20,8 +20,7 @@ public class WebConfig implements WebMvcConfigurer {
@Override @Override
public void addResourceHandlers(final ResourceHandlerRegistry registry) { public void addResourceHandlers(final ResourceHandlerRegistry registry) {
registry.addResourceHandler("/**") registry.addResourceHandler("/**")
.addResourceLocations("/", "classpath:/") .addResourceLocations("/", "classpath:/");
.addResourceLocations("/");
; ;
} }
......
web/src/main/resources/templates/index.html
+ 5
− 6
View file @ 42b3a1d0
...@@ -3,14 +3,13 @@ ...@@ -3,14 +3,13 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html> <html>
<head> <head>
<link type="text/css" rel="stylesheet" th:href="@{'/frontend/minerva.css'(v=${version})}"> <link type="text/css" rel="stylesheet" th:href="@{'/resources/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/style.css'(v=${version})}">
<link rel="shortcut icon" href="./resources/images/favicon.png" <link rel="shortcut icon" th:href="@{'/resources/images/favicon.png'(v=${version})}" type="image/png" />
type="image/png" />
<script type="text/javascript" th:src="@{'/frontend/BrowserCheck.js'(v=${version})}"></script> <script type="text/javascript" th:src="@{'/resources/BrowserCheck.js'(v=${version})}"></script>
<script type="text/javascript" th:src="@{'/frontend/minerva.js'(v=${version})}"></script> <script type="text/javascript" th:src="@{'/resources/minerva.js'(v=${version})}"></script>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment