Skip to content

Commit c028d72

Browse files
committed
Merge branch 'Andrea' of https://github.com/CodeURJC-DAW-2021-22/webapp9 into Carlos
2 parents 26f9073 + bad7e16 commit c028d72

Some content is hidden

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

51 files changed

+1066
-460
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
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;
109
import org.springframework.security.config.Customizer;
1110
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
1211
import org.springframework.security.config.annotation.web.builders.HttpSecurity;

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

Lines changed: 0 additions & 2 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;
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.web.bind.annotation.GetMapping;
4+
5+
public class SPAController {
6+
7+
@GetMapping("/**/{path:[^\\.]*}")
8+
public String redirect() {
9+
return "forward:/";
10+
}
11+
12+
}

frontend/angular.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"src/assets"
2828
],
2929
"styles": [
30+
"node_modules/bootstrap/dist/css/bootstrap.min.css",
3031
"src/styles.css"
3132
],
3233
"scripts": []

0 commit comments

Comments
 (0)