Skip to content

Commit 3172fc9

Browse files
JavaTMPJavaTMP
committed
update front end dependencies and generate distribution files
1 parent a119eeb commit 3172fc9

94 files changed

Lines changed: 537 additions & 551 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎JavaTMP-App-Starter/package-lock.json‎

Lines changed: 54 additions & 79 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎JavaTMP-App-Starter/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"dependencies": {
2323
"autosize": "^4.0.2",
24-
"bootstrap": "^4.5.2",
24+
"bootstrap": "^4.5.3",
2525
"bootstrap-colorselector": "^0.1.0",
2626
"bootstrap-daterangepicker": "^3.1.0",
2727
"bootstrap-maxlength": "^1.10.0",
@@ -30,8 +30,8 @@
3030
"bootstrap-slider": "^11.0.2",
3131
"cropperjs": "^1.5.9",
3232
"jquery-cropper": "^1.0.1",
33-
"datatables.net": "^1.10.22",
34-
"datatables.net-bs4": "^1.10.22",
33+
"datatables.net": "^1.10.23",
34+
"datatables.net-bs4": "^1.10.23",
3535
"datatables.net-fixedheader": "^3.1.7",
3636
"datatables.net-fixedheader-bs4": "^3.1.7",
3737
"datatables.net-responsive": "^2.2.6",
@@ -56,7 +56,7 @@
5656
"jquery.counterup": "^2.1.0",
5757
"malihu-custom-scrollbar-plugin": "^3.1.5",
5858
"metismenu": "^3.0.6",
59-
"moment": "^2.29.0",
59+
"moment": "^2.29.1",
6060
"nprogress": "^0.2.0",
6161
"popper.js": "^1.16.1",
6262
"select2": "^4.0.13",
@@ -69,18 +69,18 @@
6969
"bootstrap-card-extender": "^1.0.2",
7070
"bootstrap-alert-wrapper": "^1.0.3",
7171
"jquery.fancytree": "^2.37.0",
72-
"bootswatch": "^4.5.2",
73-
"file-saver": "^2.0.2",
72+
"bootswatch": "^4.5.3",
73+
"file-saver": "^2.0.5",
7474
"numeral": "2.0.6",
75-
"@fortawesome/fontawesome-free": "^5.15.0",
76-
"moment-timezone": "^0.5.31",
75+
"@fortawesome/fontawesome-free": "^5.15.1",
76+
"moment-timezone": "^0.5.32",
7777
"material-design-icons": "^3.0.1",
7878
"form-serializer": "^2.5.0",
7979
"handlebars": "^4.7.6",
8080
"jquery.easing": "^1.4.1",
8181
"aos": "^2.3.4",
8282
"animate.css": "^4.1.1",
83-
"bootstrap-input-spinner": "^1.16.5",
83+
"bootstrap-input-spinner": "^1.16.8",
8484
"jQuery-QueryBuilder": "^2.5.0",
8585
"formdata-polyfill": "3.0.20"
8686
},
@@ -100,7 +100,7 @@
100100
"pump": "^3.0.0",
101101
"async": "^3.2.0",
102102
"gulp-uglify-es": "^2.0.0",
103-
"yargs": "^16.0.3"
103+
"yargs": "^16.2.0"
104104
},
105105
"napa-config": {
106106
"cache": false,

‎JavaTMP-App-Starter/src/main/java/com/javatmp/module/content/controller/UpdateContent.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
import com.javatmp.fw.domain.ResponseMessage;
44
import com.javatmp.module.content.entity.Content;
55
import com.javatmp.module.content.service.ContentService;
6-
import javax.servlet.http.HttpServletRequest;
7-
import javax.servlet.http.HttpServletResponse;
86
import lombok.extern.slf4j.Slf4j;
97
import org.springframework.beans.factory.annotation.Autowired;
108
import org.springframework.stereotype.Controller;
9+
import org.springframework.ui.Model;
1110
import org.springframework.web.bind.annotation.GetMapping;
1211
import org.springframework.web.bind.annotation.PostMapping;
1312
import org.springframework.web.bind.annotation.ResponseBody;
1413

14+
import javax.servlet.http.HttpServletRequest;
15+
import javax.servlet.http.HttpServletResponse;
16+
1517
@Slf4j
1618
@Controller
1719
public class UpdateContent {
@@ -20,12 +22,12 @@ public class UpdateContent {
2022
ContentService contentService;
2123

2224
@GetMapping(value = "/content/UpdateContent")
23-
public String doGet(Content content, HttpServletRequest request, HttpServletResponse response) {
24-
log.info("request user is [" + (content) + "]");
25+
public String doGet(Content content, Model model) {
26+
log.info("request content is [" + (content) + "]");
2527
content = this.contentService.getOne(content.getContentId());
2628
log.info("DB user to be Updated is [" + (content) + "]");
2729

28-
request.setAttribute("content", content);
30+
model.addAttribute("content", content);
2931
return "/pages/content/UpdateContent.jsp";
3032
}
3133

‎JavaTMP-App-Starter/src/main/resources/static/assets/dist/css/javatmp-ace-rtl.min.css‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎JavaTMP-App-Starter/src/main/resources/static/assets/dist/css/javatmp-ace.min.css‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎JavaTMP-App-Starter/src/main/resources/static/assets/dist/css/javatmp-blazing-berry-rtl.min.css‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎JavaTMP-App-Starter/src/main/resources/static/assets/dist/css/javatmp-blazing-berry.min.css‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎JavaTMP-App-Starter/src/main/resources/static/assets/dist/css/javatmp-cerulean-rtl.min.css‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎JavaTMP-App-Starter/src/main/resources/static/assets/dist/css/javatmp-cerulean.min.css‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎JavaTMP-App-Starter/src/main/resources/static/assets/dist/css/javatmp-cosmo-rtl.min.css‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)