diff --git a/pom.xml b/pom.xml
index 15d774d..fa33135 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
osm.surveyor.plateau
task-bldg
- 0.0.1-SNAPSHOT
+ 0.0.2-SNAPSHOT
war
task-bldg
TaskingManager for Plateau BLDG
diff --git a/src/main/java/osm/surveyor/task/city/CityController.java b/src/main/java/osm/surveyor/task/city/CityController.java
index 874d527..21f68c4 100644
--- a/src/main/java/osm/surveyor/task/city/CityController.java
+++ b/src/main/java/osm/surveyor/task/city/CityController.java
@@ -17,36 +17,36 @@
public class CityController {
private final CityRepository repository;
- @GetMapping("/task-bldg/city")
+ @GetMapping("/city")
public String showList(Model model) {
model.addAttribute("cities", repository.findAll());
return "cities";
}
- @GetMapping("/task-bldg/city/add")
+ @GetMapping("/city/add")
public String addCity(@ModelAttribute City city) {
return "form";
}
- @PostMapping("/task-bldg/city/process")
+ @PostMapping("/city/process")
public String process(@Validated @ModelAttribute City city, BindingResult result) {
if (result.hasErrors()) {
return "form";
}
repository.save(city);
- return "redirect:/task-bldg/city";
+ return "redirect:/city";
}
- @GetMapping("/task-bldg/city/edit/{citycode}")
+ @GetMapping("/city/edit/{citycode}")
public String editCity(@PathVariable String citycode, Model model) {
model.addAttribute("city", repository.findByCitycode(citycode));
return "form";
}
- @GetMapping("/task-bldg/city/delete/{citycode}")
+ @GetMapping("/city/delete/{citycode}")
public String deleteCity(@PathVariable String citycode) {
repository.deleteByCitycode(citycode);
- return "redirect:/task-bldg/city";
+ return "redirect:/city";
}
}
diff --git a/src/main/java/osm/surveyor/task/city/CitymeshController.java b/src/main/java/osm/surveyor/task/city/CitymeshController.java
index 0ba8f2d..8e7f036 100644
--- a/src/main/java/osm/surveyor/task/city/CitymeshController.java
+++ b/src/main/java/osm/surveyor/task/city/CitymeshController.java
@@ -17,7 +17,7 @@
private final CitymeshRepository meshRepository;
private final CityRepository cityRepository;
- @GetMapping("/task-bldg/mesh/{citycode}")
+ @GetMapping("/mesh/{citycode}")
public String showList(@PathVariable String citycode, Model model) {
City city = cityRepository.findByCitycode(citycode);
List tasks = meshRepository.findByCitycode(citycode);
diff --git a/src/main/java/osm/surveyor/task/city/TaskController.java b/src/main/java/osm/surveyor/task/city/TaskController.java
index 593e3c6..7ce017b 100644
--- a/src/main/java/osm/surveyor/task/city/TaskController.java
+++ b/src/main/java/osm/surveyor/task/city/TaskController.java
@@ -40,7 +40,7 @@
* @param model
* @return
*/
- @GetMapping("/task-bldg/tasks")
+ @GetMapping("/tasks")
public String showList(@AuthenticationPrincipal UserDetails user, Model model,
@RequestParam(name="citycode") String citycode,
@RequestParam(name="meshcode") String meshcode)
@@ -75,7 +75,7 @@
* @param task
* @return
*/
- @GetMapping("/task-bldg/task/add")
+ @GetMapping("/task/add")
public String addTask(@AuthenticationPrincipal UserDetails user,
Model model,
@RequestParam(name="op") String op,
@@ -161,7 +161,7 @@
}
}
- @PostMapping("/task-bldg/task/process")
+ @PostMapping("/task/process")
public String process(@AuthenticationPrincipal UserDetails user,
@Validated @ModelAttribute Task task,
BindingResult result)
@@ -172,7 +172,7 @@
}
service.add(task, user);
- return "redirect:/task-bldg/tasks?citycode="+ task.getCitycode() +"&meshcode="+ task.getMeshcode();
+ return "redirect:/tasks?citycode="+ task.getCitycode() +"&meshcode="+ task.getMeshcode();
}
/**
diff --git a/src/main/java/osm/surveyor/task/user/config/SecurityConfig.java b/src/main/java/osm/surveyor/task/user/config/SecurityConfig.java
index 820091d..52b1c19 100644
--- a/src/main/java/osm/surveyor/task/user/config/SecurityConfig.java
+++ b/src/main/java/osm/surveyor/task/user/config/SecurityConfig.java
@@ -31,14 +31,14 @@
// セキュリティ設定を、無視（ignoring）するパスを指定します
// 通常、cssやjs、imgなどの静的リソースを指定します
web.ignoring().antMatchers(
- "/task-bldg/favicon.ico",
- "/task-bldg/custom/**",
- "/task-bldg/pref/**",
- "/task-bldg/js/**",
- "/task-bldg/css/**",
- "/task-bldg/img/**",
- "/task-bldg/data/**",
- "/task-bldg/webjars/**",
+ "/favicon.ico",
+ "/custom/**",
+ "/pref/**",
+ "/js/**",
+ "/css/**",
+ "/img/**",
+ "/data/**",
+ "/webjars/**",
"/h2-console/**"
);
}
@@ -47,20 +47,20 @@
protected void configure(HttpSecurity http) throws Exception {
http.authorizeRequests()
// 「/login」と「/error」をアクセス可能にします
- .antMatchers("/task-bldg/login", "/task-bldg/error", "/task-bldg/register").permitAll()
- .antMatchers("/task-bldg/admin/**").hasRole(Role.ADMIN.name())
+ .antMatchers("/login", "/error", "/register").permitAll()
+ .antMatchers("/admin/**").hasRole(Role.ADMIN.name())
.anyRequest().authenticated()
.and()
.formLogin()
// ログイン時のURLを指定
- .loginPage("/task-bldg/login")
+ .loginPage("/login")
// 認証後にリダイレクトする場所を指定
- .defaultSuccessUrl("/task-bldg/city")
+ .defaultSuccessUrl("/city")
.and()
// ログアウトの設定
.logout()
// ログアウト時のURLを指定
- .logoutRequestMatcher(new AntPathRequestMatcher("/task-bldg/logout"))
+ .logoutRequestMatcher(new AntPathRequestMatcher("/logout"))
.and()
// Remember-Meの認証を許可します
// これを設定すると、ブラウザを閉じて、
diff --git a/src/main/java/osm/surveyor/task/user/controller/SecurityController.java b/src/main/java/osm/surveyor/task/user/controller/SecurityController.java
index 50100a5..bfcd35f 100644
--- a/src/main/java/osm/surveyor/task/user/controller/SecurityController.java
+++ b/src/main/java/osm/surveyor/task/user/controller/SecurityController.java
@@ -22,12 +22,12 @@
private final SiteUserRepository userRepository;
private final PasswordEncoder passwordEncoder;
- @GetMapping("/task-bldg/login")
+ @GetMapping("/login")
public String success() {
return "login";
}
- @GetMapping("/task-bldg/")
+ @GetMapping("/")
public String showList(Authentication loginUser, Model model) {
if (loginUser == null) {
model.addAttribute("username", "");
@@ -37,21 +37,21 @@
model.addAttribute("username", loginUser.getName());
model.addAttribute("role", loginUser.getAuthorities());
}
- return "redirect:/task-bldg/city";
+ return "redirect:/city";
}
- @GetMapping("/task-bldg/admin/list")
+ @GetMapping("/admin/list")
public String showAdminList(Model model) {
model.addAttribute("users", userRepository.findAll());
return "list";
}
- @GetMapping("/task-bldg/register")
+ @GetMapping("/register")
public String register(@ModelAttribute("user") SiteUser user) {
return "register";
}
- @PostMapping("/task-bldg/register")
+ @PostMapping("/register")
public String process(@Validated @ModelAttribute("user") SiteUser user, BindingResult result) {
if (result.hasErrors()) {
return "register";
@@ -65,6 +65,6 @@
}
userRepository.save(user);
- return "redirect:/task-bldg/login?register";
+ return "redirect:/login?register";
}
}
diff --git a/src/main/resources/templates/fragments/sidebar.html b/src/main/resources/templates/fragments/sidebar.html
index 2b4db84..21eb189 100644
--- a/src/main/resources/templates/fragments/sidebar.html
+++ b/src/main/resources/templates/fragments/sidebar.html
@@ -17,7 +17,7 @@