Febbweiss/springboot-react-webpack
1
0
Fork 0
mirror of https://github.com/Febbweiss/springboot-react-webpack.git synced 2026-03-04 22:25:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes JS compilation location + adds header and footer

Browse Source
This commit is contained in:
fecaille
2016-03-11 08:54:45 +01:00
parent 4e5bb4f361
commit 676dfbbc97
3 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
pom.xml
View File

@@ -17,7 +17,7 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<jasmine.version>2.4.1</jasmine.version> <jasmine.version>2.4.1</jasmine.version>
<jasmine-ajax.version>3.2.0</jasmine-ajax.version> <jasmine-ajax.version>3.2.0</jasmine-ajax.version>
@@ -40,36 +40,36 @@
<artifactId>spring-boot-starter-thymeleaf</artifactId> <artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency> </dependency>
<!-- Security --> <!-- Security -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.thymeleaf.extras</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>thymeleaf-extras-springsecurity4</artifactId> <artifactId>spring-boot-starter-security</artifactId>
</dependency> </dependency>
<!-- Persistence --> <dependency>
<dependency> <groupId>org.thymeleaf.extras</groupId>
<groupId>org.springframework</groupId> <artifactId>thymeleaf-extras-springsecurity4</artifactId>
<artifactId>spring-jdbc</artifactId> </dependency>
</dependency> <!-- Persistence -->
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId> <artifactId>spring-jdbc</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId> <artifactId>spring-tx</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.springframework</groupId>
<artifactId>hibernate-entitymanager</artifactId> <artifactId>spring-orm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hsqldb</groupId> <groupId>org.hibernate</groupId>
<artifactId>hsqldb</artifactId> <artifactId>hibernate-entitymanager</artifactId>
</dependency> </dependency>
<!-- Testing --> <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
<!-- Testing -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
@@ -92,10 +92,10 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>jquery-mockjax</artifactId> <artifactId>jquery-mockjax</artifactId>
<version>1.5.3</version> <version>1.5.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- Monitoring --> <!-- Monitoring -->
<dependency> <dependency>
@@ -296,14 +296,14 @@
<preloadSource>/webjars/jquery.mockjax.js</preloadSource> <preloadSource>/webjars/jquery.mockjax.js</preloadSource>
<preloadSource>${project.basedir}/src/test/resources/jasmine/config.js</preloadSource> <preloadSource>${project.basedir}/src/test/resources/jasmine/config.js</preloadSource>
</preloadSources> </preloadSources>
<jsSrcDir>${project.build.directory}/classes/static/js</jsSrcDir> <jsSrcDir>${project.build.directory}/classes/static/js</jsSrcDir>
<sourceIncludes> <sourceIncludes>
<include>**/*.js</include> <include>**/*.js</include>
</sourceIncludes> </sourceIncludes>
<sourceExcludes> <sourceExcludes>
<exclude>**/react-bootstrap.js</exclude> <exclude>**/react-bootstrap.js</exclude>
<exclude>**/app.render.js</exclude> <exclude>**/app.render.js</exclude>
</sourceExcludes> </sourceExcludes>
<jsTestSrcDir>${project.basedir}/src/test/resources/static/js</jsTestSrcDir> <jsTestSrcDir>${project.basedir}/src/test/resources/static/js</jsTestSrcDir>
<specIncludes> <specIncludes>
<include>**/*.spec.js</include> <include>**/*.spec.js</include>

2
src/main/resources/templates/fragments/header.html
View File

@@ -6,7 +6,7 @@
<body> <body>
<div class="container" th:fragment="header"> <div class="container" th:fragment="header">
<div class="row"> <div class="row">
<div class="navbar navbar-inverse"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" <button type="button" class="navbar-toggle" data-toggle="collapse"

1
src/main/resources/templates/index.html
View File

@@ -20,5 +20,6 @@
<script src="/js/comments.js"></script> <script src="/js/comments.js"></script>
<script src="/js/app.js"></script> <script src="/js/app.js"></script>
<script src="/js/app.render.js"></script> <script src="/js/app.render.js"></script>
<script src="/js/test.js"></script>
</body> </body>
</html> </html>