Skip to content

Commit 779d3da

Browse files
committed
Merge branch 'mani'
2 parents 7afd4fb + c9ef932 commit 779d3da

File tree

235 files changed

+2569
-584
lines changed

Some content is hidden

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

235 files changed

+2569
-584
lines changed
116 KB
Binary file not shown.
245 KB
Binary file not shown.
273 KB
Binary file not shown.
426 KB
Binary file not shown.
163 KB
Binary file not shown.
518 KB
Binary file not shown.
178 KB
Binary file not shown.

backend/gamelink/src/main/java/urjc/gamelink/Configuration/Security/WebSecurityConfig.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@
66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.springframework.context.annotation.Bean;
88
import org.springframework.context.annotation.Configuration;
9-
import org.springframework.http.HttpStatus;
10-
import org.springframework.security.config.Customizer;
119
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
1210
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
1311
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
14-
import org.springframework.security.config.annotation.web.configurers.ExceptionHandlingConfigurer;
1512
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
1613
import org.springframework.security.crypto.password.PasswordEncoder;
1714

@@ -22,7 +19,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
2219

2320
@Autowired
2421
RepositoryUserDetailsService userDetailsService;
25-
private Customizer<ExceptionHandlingConfigurer<HttpSecurity>> GlobalControllerExceptionHandler;
2622

2723

2824
@Bean

backend/gamelink/src/main/java/urjc/gamelink/Controllers/GamelinkWebController.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@
1414
import org.springframework.beans.factory.annotation.Autowired;
1515
import org.springframework.core.io.ClassPathResource;
1616
import org.springframework.core.io.Resource;
17-
import org.springframework.core.io.UrlResource;
1817
import org.springframework.data.domain.Page;
1918
import org.springframework.data.domain.PageRequest;
20-
import org.springframework.http.HttpStatus;
2119
import org.springframework.security.crypto.password.PasswordEncoder;
2220
import org.springframework.stereotype.Controller;
2321
import org.springframework.ui.Model;
@@ -65,7 +63,7 @@ public void addAttributes(Model model, HttpServletRequest request) {
6563
}
6664
}
6765

68-
@GetMapping("/")
66+
@GetMapping("/home")
6967
public String home(Model model, HttpSession session) {
7068
Page<News> news = ns.findAll(PageRequest.of(0, 3));
7169

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package urjc.gamelink.Controllers;
2+
3+
import org.springframework.stereotype.Controller;
4+
import org.springframework.web.bind.annotation.GetMapping;
5+
6+
@Controller
7+
public class SPAController {
8+
@GetMapping({"/new/*/{path:[^\\.]*}", "/{path:new[^\\.]*}"})
9+
public String redirect() {
10+
return "forward:/new/index.html";
11+
}
12+
}

0 commit comments

Comments
 (0)