fix all shit

daggerok · daggerok · commit 65c83e183382 · 2017-10-04T10:26:26.000+03:00
diff --git a/build.gradle b/build.gradle
@@ -1,17 +1,12 @@
-buildscript {
-  repositories { jcenter() }
-  dependencies {
-    classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.RELEASE"
-  }
+plugins {
+  id "java"
+  id "idea"
+  id "org.springframework.boot" version "1.5.7.RELEASE"
 }
 
-apply plugin: 'java'
-apply plugin: 'idea'
-apply plugin: 'spring-boot'
-
 jar {
-  baseName = 'server-side-react-spring-boot'
-  version = '0.0.1'
+  baseName = "server-side-react-spring-boot"
+  version = "0.0.1"
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_8
@@ -20,25 +15,26 @@ targetCompatibility = JavaVersion.VERSION_1_8
 repositories { jcenter() }
 
 dependencies {
-  compile 'org.springframework.boot:spring-boot-starter-actuator',
-          'org.springframework.boot:spring-boot-starter-mustache',
-          'org.springframework.boot:spring-boot-starter-data-rest',
-          'org.springframework.boot:spring-boot-starter-data-jpa',
-          'org.springframework.boot:spring-boot-devtools',
-          'org.projectlombok:lombok'
-  runtime 'com.h2database:h2'
-  testCompile 'org.springframework.boot:spring-boot-starter-test'
+  compile "org.springframework.boot:spring-boot-starter-actuator",
+          "org.springframework.boot:spring-boot-starter-mustache",
+          "org.springframework.boot:spring-boot-starter-data-rest",
+          "org.springframework.boot:spring-boot-starter-data-jpa",
+          "org.springframework.boot:spring-boot-devtools",
+          "org.projectlombok:lombok"
+  runtime "com.h2database:h2"
+  testCompile "org.springframework.boot:spring-boot-starter-test"
 }
 
 task ui(type: Exec) {
-  workingDir './ui'
+  workingDir "$projectDir/ui"
   commandLine "npm", "run", "build"
 }
 
-build.shouldRunAfter ui
+assemble.shouldRunAfter ui
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '3.0'
+  gradleVersion = "4.2.1"
+  distributionType = "ALL"
 }
 
 // bash build/libs/*.jar
diff --git a/src/main/java/daggerok/react/ReactServerSideRenderingController.java b/src/main/java/daggerok/react/ReactServerSideRenderingController.java
@@ -26,8 +26,8 @@ public ReactServerSideRenderingController(React react,
         this.objectMapper = objectMapper;
     }
 
-    @GetMapping("/")
     @SneakyThrows
+    @GetMapping({"/", "/404", "/not-found"})
     public String index(Model model) {
         val posts = postRestRepository.findAll();
         model.addAttribute("data", react.renderApp(posts));
diff --git a/src/main/java/daggerok/web/FallbackConfig.java b/src/main/java/daggerok/web/FallbackConfig.java
@@ -0,0 +1,19 @@
+package daggerok.web;
+
+import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
+import org.springframework.boot.web.servlet.ErrorPage;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.springframework.http.HttpStatus.NOT_FOUND;
+
+@Configuration
+public class FallbackConfig {
+
+  @Bean
+  public EmbeddedServletContainerCustomizer embeddedServletContainerCustomizer() {
+    return container -> container.addErrorPages(
+        new ErrorPage(NOT_FOUND, "/404")
+    );
+  }
+}
diff --git a/src/main/java/daggerok/web/FallbackHandler.java b/src/main/java/daggerok/web/FallbackHandler.java
@@ -18,7 +18,7 @@
  * Created by mak on 9/7/16.
  */
 @Slf4j
-@Controller
+//@Controller
 @RequiredArgsConstructor
 public class FallbackHandler implements ErrorController {
 
diff --git a/src/main/resources/templates/index.hbs b/src/main/resources/templates/index.hbs
@@ -7,7 +7,8 @@
   <link href="{{springMacroRequestContext.request.contextPath}}/app.css" rel="stylesheet"></head>
 <body class="container">
 <!-- 1) render data from backend server side (see daggerok.react.ReactServerSideRenderingController.index) -->
-<div id="app">{{{html}}}</div>
+<div id="app">{{{data}}}</div>
+<div id="app">{{{posts}}}</div>
 <script src="{{springMacroRequestContext.request.contextPath}}/app.js"></script>
 <!-- 2) up and running dynamic part of application after it static initial page was loader -->
 <script type="text/javascript">
diff --git a/ui/src/main.js b/ui/src/main.js
@@ -52,6 +52,3 @@ global.renderServer = function(java) {
   // console.log('server posts', posts);
   return renderToString(<App><Main posts={posts}/></App>);
 };
-
-import $ from 'jquery';
-window.$ = $;

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ public ReactServerSideRenderingController(React react,`
`26`	`26`	`this.objectMapper = objectMapper;`
`27`	`27`	`}`
`28`	`28`
`29`		`- @GetMapping("/")`
`30`	`29`	`@SneakyThrows`
	`30`	`+ @GetMapping({"/", "/404", "/not-found"})`
`31`	`31`	`public String index(Model model) {`
`32`	`32`	`val posts = postRestRepository.findAll();`
`33`	`33`	`model.addAttribute("data", react.renderApp(posts));`