Skip to content

Commit 686a57b

Browse files
authored
feat/qg-273: реализован возврат на исходную страницу со страницы формы записи журнала (#278)
closes #273
2 parents fb8d9ee + 0f31c71 commit 686a57b

File tree

103 files changed

+91
-82
lines changed

Some content is hidden

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

103 files changed

+91
-82
lines changed

app/src/main/kotlin/pro/qyoga/app/infra/WebSecurityConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class WebSecurityConfig(
5959
"/img/**",
6060
"/js/**",
6161
"/fonts/**",
62-
"/fontawesome*/**",
62+
"/vendor/**",
6363
"/test/*"
6464
)
6565
.permitAll()

app/src/main/kotlin/pro/qyoga/app/therapist/clients/journal/edit_entry/create/CreateJournalEntryPageController.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package pro.qyoga.app.therapist.clients.journal.edit_entry.create
22

33
import org.springframework.data.repository.findByIdOrNull
4+
import org.springframework.http.ResponseEntity
45
import org.springframework.security.core.annotation.AuthenticationPrincipal
56
import org.springframework.stereotype.Controller
67
import org.springframework.web.bind.annotation.GetMapping
@@ -9,7 +10,6 @@ import org.springframework.web.bind.annotation.PathVariable
910
import org.springframework.web.bind.annotation.PostMapping
1011
import org.springframework.web.servlet.ModelAndView
1112
import pro.azhidkov.platform.kotlin.isFailureOf
12-
import pro.azhidkov.platform.spring.http.hxRedirect
1313
import pro.qyoga.app.platform.notFound
1414
import pro.qyoga.app.therapist.clients.ClientPageModel
1515
import pro.qyoga.app.therapist.clients.ClientPageTab
@@ -68,7 +68,10 @@ class CreateJournalEntryPageController(
6868

6969
return when {
7070
result.isSuccess ->
71-
hxRedirect("/therapist/clients/$clientId/journal", "HX-Trigger" to "formSaved")
71+
ResponseEntity
72+
.ok()
73+
.header("HX-Trigger", "formSaved")
74+
.build<Unit>()
7275

7376
result.isFailureOf<DuplicatedDate>() -> {
7477
val ex = result.exceptionOrNull() as DuplicatedDate

app/src/main/resources/static/styles/styles-qyoga.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
@view-transition {
2+
navigation: auto;
3+
}
4+
5+
::view-transition-old(root),
6+
::view-transition-new(root) {
7+
animation-duration: 0.01s;
8+
}
9+
110
.nav-pills .nav-link.active {
211
color: #0d503c;
312
background-color: #20c997;

app/src/main/resources/static/js/alipnejs-mask-3.14.8.min.js renamed to app/src/main/resources/static/vendor/alpinejs/js/alipnejs-mask-3.14.8.min.js

File renamed without changes.

app/src/main/resources/static/js/alpinejs-3.14.8.min.js renamed to app/src/main/resources/static/vendor/alpinejs/js/alpinejs-3.14.8.min.js

File renamed without changes.

app/src/main/resources/static/styles/bootstrap/bootstrap-grid.css renamed to app/src/main/resources/static/vendor/bootstrap/css/bootstrap-grid.css

File renamed without changes.

app/src/main/resources/static/styles/bootstrap/bootstrap-grid.css.map renamed to app/src/main/resources/static/vendor/bootstrap/css/bootstrap-grid.css.map

File renamed without changes.

app/src/main/resources/static/styles/bootstrap/bootstrap-grid.min.css renamed to app/src/main/resources/static/vendor/bootstrap/css/bootstrap-grid.min.css

File renamed without changes.

app/src/main/resources/static/styles/bootstrap/bootstrap-grid.min.css.map renamed to app/src/main/resources/static/vendor/bootstrap/css/bootstrap-grid.min.css.map

File renamed without changes.

app/src/main/resources/static/styles/bootstrap/bootstrap-grid.rtl.css renamed to app/src/main/resources/static/vendor/bootstrap/css/bootstrap-grid.rtl.css

File renamed without changes.

0 commit comments

Comments
 (0)