Skip to content

Commit

Permalink
Merge pull request #518 from MTES-MCT/fix-frontend-controller
Browse files Browse the repository at this point in the history
 fix: update routes in FrontendRoutesController
  • Loading branch information
lwih authored Jan 23, 2025
2 parents 7b50e12 + 91ed282 commit d30672d
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ variables:
value: "postgres:15.10-alpine"
description: "Image de la base de données"
PROJECT_VERSION:
value: "2.4.17"
value: "2.4.18"
description: "Version du projet à déployer"
SERVER_ENV_INT:
value: "int-rapportnav-appli01"
Expand Down
2 changes: 1 addition & 1 deletion backend/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.lang.System.getenv

group = "fr.gouv.dgampa"
version = "2.4.17"
version = "2.4.18"
description = "RapportNav"

val kotlinVersion by extra("1.9.24")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,17 @@ import org.springframework.web.bind.annotation.GetMapping
@Controller
class FrontendRoutesController {

@GetMapping("/{path:^(?!api|graphql|static|error).*}")
fun redirectToFrontend(): String {
return "forward:/index.html"
}
@GetMapping(
value = [
"/",
"/login",
"/signup",
"/pam/**",
"/ulam/**",
"/v2/**"
]
)
fun redirectToFrontend(): String {
return "forward:/index.html"
}
}
4 changes: 2 additions & 2 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "frontend",
"version": "2.4.17",
"version": "2.4.18",
"private": true,
"type": "module",
"engines": {
Expand Down

0 comments on commit d30672d

Please sign in to comment.