X Tutup
Skip to content

Commit 95c67f0

Browse files
RaysmondRaysmond
committed
Update ui
1 parent bda76a7 commit 95c67f0

File tree

15 files changed

+30
-27
lines changed

15 files changed

+30
-27
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
.gradle
33
build
44
bin
5+
scripts
56
*.iml

‎build.gradle‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ dependencies {
5252

5353
// spring data
5454
compile 'org.springframework.data:spring-data-jpa:+'
55-
compile 'org.springframework.data:spring-data-mongodb:+'
5655

5756
// MySQL
5857
compile 'mysql:mysql-connector-java:+'
@@ -79,13 +78,8 @@ dependencies {
7978
compile 'org.webjars:jquery:2.1.4'
8079
compile 'org.webjars:bootstrap:3.3.5'
8180
compile 'org.webjars:font-awesome:4.3.0-3'
82-
compile 'org.webjars:angularjs:1.4.4'
83-
compile 'org.webjars:bootstrap-select:1.7.3-1'
8481
compile 'org.webjars:ace:1.2.0'
8582

86-
// compile 'org.webjars:d3js:3.5.6'
87-
// compile 'org.webjars.npm:jointjs:0.9.4'
88-
8983
// test
9084
testCompile("org.springframework.boot:spring-boot-starter-test")
9185
testCompile 'junit:junit:+'
@@ -124,12 +118,6 @@ buildscript {
124118
}
125119
}
126120

127-
jar {
128-
baseName = 'spring-blog'
129-
version = '0.1'
130-
}
131-
132-
133121
// Don't use Jetty8, even it's a servlet 3.0+ container,
134122
// but not support non-jar WebApplicationInitializer scanning.
135123
// It will cause "No Spring WebApplicationInitializer types detected on classpath"

‎src/main/java/com/raysmond/blog/admin/controllers/PostController.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.raysmond.blog.admin.controllers;
22

3+
import com.raysmond.blog.config.interceptors.RequestProcessingTimeInterceptor;
34
import com.raysmond.blog.forms.PostForm;
45
import com.raysmond.blog.models.Post;
56
import com.raysmond.blog.models.User;
@@ -9,9 +10,12 @@
910
import com.raysmond.blog.repositories.UserRepository;
1011
import com.raysmond.blog.services.MarkdownService;
1112
import com.raysmond.blog.services.PostService;
13+
import org.slf4j.Logger;
14+
import org.slf4j.LoggerFactory;
1215
import org.springframework.beans.factory.annotation.Autowired;
1316
import org.springframework.data.domain.Page;
1417
import org.springframework.data.domain.PageRequest;
18+
import org.springframework.data.domain.Sort;
1519
import org.springframework.stereotype.Controller;
1620
import org.springframework.ui.Model;
1721
import org.springframework.validation.BindingResult;
@@ -44,9 +48,11 @@ public class PostController {
4448

4549
private static final int PAGE_SIZE = 10;
4650

51+
private Logger logger = LoggerFactory.getLogger(PostController.class);
52+
4753
@RequestMapping(value = "")
4854
public String index(@RequestParam(defaultValue = "0") int page, Model model){
49-
Page<Post> _posts = posts.findAll(new PageRequest(page, PAGE_SIZE));
55+
Page<Post> _posts = posts.findAll(new PageRequest(page, PAGE_SIZE, Sort.Direction.DESC, "id"));
5056
model.addAttribute("posts", _posts);
5157
return "admin/posts_index";
5258
}
@@ -67,7 +73,7 @@ public String editPost(@PathVariable Long postId, Model model){
6773
return "admin/posts_edit";
6874
}
6975

70-
@RequestMapping(value = "{postId:[0-9]+}/edit", method = RequestMethod.DELETE)
76+
@RequestMapping(value = "{postId:[0-9]+}/delete", method = {RequestMethod.DELETE, RequestMethod.POST})
7177
public String deletePost(@PathVariable Long postId){
7278
posts.delete(postId);
7379
return "redirect:/admin/posts";
@@ -100,7 +106,6 @@ public String update(@PathVariable Long postId, @Valid PostForm postForm, Bindin
100106
post.setPostFormat(postForm.getPostFormat());
101107

102108
postService.updatePost(post);
103-
104109
return "redirect:/admin/posts";
105110
}
106111
}

‎src/main/java/com/raysmond/blog/config/JpaConfig.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ public DataSource configureDataSource() {
4343
config.setJdbcUrl(url);
4444
config.setUsername(username);
4545
config.setPassword(password);
46+
47+
config.addDataSourceProperty("useUnicode", "true");
48+
config.addDataSourceProperty("characterEncoding", "utf8");
4649
config.addDataSourceProperty("cachePrepStmts", "true");
4750
config.addDataSourceProperty("prepStmtCacheSize", "250");
4851
config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");

‎src/main/java/com/raysmond/blog/services/UserService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class UserService implements UserDetailsService {
2121
@PostConstruct
2222
protected void initialize() {
2323
if (users.findByEmail("user@raysmond.com") == null) {
24-
users.save(new User("user@raysmond.com", "user", "ROLE_OPERATOR"));
24+
users.save(new User("user@raysmond.com", "user", "ROLE_USER"));
2525
users.save(new User("admin@raysmond.com", "admin", "ROLE_ADMIN"));
2626
}
2727
}

‎src/main/webapp/resources/css/theme.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ body {
22
-webkit-font-smoothing: antialiased;
33
color: #434343;
44
background: #efefef;
5+
line-height: 1.6;
56
}
67

78
pre{

‎src/main/webapp/views/admin/layout/admin.jade‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
!!! 5
2-
html
2+
html(lang="zh-CN")
33
head
44
include head
55
block head

‎src/main/webapp/views/admin/posts_edit.jade‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ block content
3636
var MarkdownMode = ace.require("ace/mode/markdown").Mode;
3737
editor.getSession().setMode(new MarkdownMode());
3838

39+
editor.getSession().setUseWrapMode(true);
40+
3941
$("form").submit(function(){
4042
$("#content").val(editor.getValue());
4143
return true;

‎src/main/webapp/views/admin/posts_index.jade‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ block content
3131
i.fa.fa-eye
3232
a.btn.btn-xs.btn-primary(href="#{basePath}/admin/posts/#{post.getId()}/edit")
3333
i.fa.fa-edit
34-
a.btn.btn-xs.btn-danger(href="#{basePath}/admin/posts/#{post.getId()}/delete")
34+
a.btn.btn-xs.btn-danger.btn-delete(href="javascript:$('#form-#{post.getId()}').submit();", postId="#{post.id}")
3535
i.fa.fa-trash-o
36-
36+
37+
form(id="form-#{post.getId()}",style="visibility: hidden", method="post", action="#{basePath}/admin/posts/#{post.getId()}/delete")
38+
input(type="hidden", name='_csrf', value='#{_csrf.token}')
39+

‎src/main/webapp/views/admin/posts_new.jade‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ block content
3333
var MarkdownMode = ace.require("ace/mode/markdown").Mode;
3434
editor.getSession().setMode(new MarkdownMode());
3535

36+
editor.getSession().setUseWrapMode(true);
37+
3638
$("form").submit(function(){
3739
$("#content").val(editor.getValue());
3840
return true;

0 commit comments

Comments
 (0)
X Tutup