Skip to content
Snippets Groups Projects
Commit feff9ccf authored by fz2907's avatar fz2907
Browse files

Merge branch 'frontend_backend_connection' into 'sprint_1' 

Changed the example controller and changed spring port to 8081

See merge request !3
parents b10a12cb 9fb93d03
No related branches found
No related tags found
3 merge requests!27Sprint 1 done,!7Changed DB port from 3306 to 3307. So it will not interrupt with your own local MySQL,!3Changed the example controller and changed spring port to 8081
Hide whitespace changes
Inline Side-by-side
Showing
with 102 additions and 51 deletions
.idea/.gitignore deleted 100644 → 0
+ 0
− 3
View file @ b10a12cb
# Default ignored files
/shelf/
/workspace.xml
BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/controllers/ExampleController.java
+ 6
− 6
View file @ feff9ccf
......@@ -29,7 +29,7 @@ public class ExampleController {
* @return a ResponseModel in String format
*/
@GetMapping
public String getExample() {
public ResponseModel getExample() {
logger.info("You reached the getExample() function.");
return ResponseModel.generateResponse(
......@@ -44,7 +44,7 @@ public class ExampleController {
* @return a ResponseModel in String format
*/
@GetMapping("/{userId}")
public String getExampleWithInput(@PathVariable long userId){
public ResponseModel getExampleWithInput(@PathVariable long userId){
return ResponseModel.generateResponse(
"This this a example String response",
HttpStatus.OK,
......@@ -57,7 +57,7 @@ public class ExampleController {
* @return a ResponseModel in String format
*/
@GetMapping("/detail/{userId}")
public String getExampleDetailWithInput(@PathVariable long userId){
public ResponseModel getExampleDetailWithInput(@PathVariable long userId){
return ResponseModel.generateResponse(
"This this a example String response",
HttpStatus.OK,
......@@ -69,7 +69,7 @@ public class ExampleController {
* @return an example user info in the data field
*/
@RequestMapping("/getUser")
public String getExampleUser(){
public ResponseModel getExampleUser(){
ExampleModel user = new ExampleModel(233, "example-user");
return ResponseModel.generateResponse(
"There is your example user info",
......@@ -83,7 +83,7 @@ public class ExampleController {
* @param newUser the JSON input in the request body
*/
@PostMapping("/newUser")
public String handlePost(@RequestBody ExampleModel newUser){
public ResponseModel handlePost(@RequestBody ExampleModel newUser){
logger.info("You reached the handlePost() function.");
return ResponseModel.generateResponse(
"I received your new user data, check it in data section",
......@@ -97,7 +97,7 @@ public class ExampleController {
* @return info
*/
@DeleteMapping("/logout/{userId}")
public String logout(@PathVariable long userId){
public ResponseModel logout(@PathVariable long userId){
logger.warn("You reached the logout() function.");
return ResponseModel.generateResponse(
"I received your logout request",
......
BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/models/ExampleModel.java
+ 10
− 0
View file @ feff9ccf
/**
* This class this a data model example
*/
package vt.CS5934.SwitchRoom.models;
import lombok.Data;
......@@ -11,3 +15,9 @@ public class ExampleModel {
this.userId = userId;
}
}
/*
Change logs:
Date | Author | Description
2022-10-12 | Fangzheng Zhang | create class and init
*/
\ No newline at end of file
BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/models/ResponseModel.java
+ 28
− 26
View file @ feff9ccf
package vt.CS5934.SwitchRoom.models;
/**
* This class is ResponseModel for http request response.
*/
import com.google.gson.Gson;
package vt.CS5934.SwitchRoom.models;
import lombok.Data;
import org.springframework.http.HttpStatus;
import java.util.HashMap;
import java.util.Map;
@Data
public class ResponseModel {
Map<String, Object> map;
public static String generateResponse(String message, HttpStatus status, Object data) {
Gson gson = new Gson();
Map<String, Object> map = new HashMap<>();
map.put("message", message);
map.put("status", status.value());
map.put("data", data);
return gson.toJson(map);
String message;
HttpStatus status;
Object data;
public static ResponseModel generateResponse(String message, HttpStatus status, Object data) {
ResponseModel responseModel = new ResponseModel();
//Map<String, Object> map = new HashMap<>();
responseModel.message = message;
responseModel.status = status;
responseModel.data = data;
return responseModel;
}
public ResponseModel(){
map = new HashMap<>();
map.put("message", "");
map.put("status", HttpStatus.NOT_ACCEPTABLE);
map.put("data", null);
message = "";
status = HttpStatus.NOT_ACCEPTABLE;
data = null;
}
public void setMessage(String message){
map.put("message",message);
this.message = message;
}
public void setStatus(HttpStatus status){
map.put("status", status.value());
this.status = status;
}
public void setMessage(Object data){
map.put("data",data);
this.data = data;
}
}
public String build(){
Gson gson = new Gson();
return gson.toJson(map);
}
}
\ No newline at end of file
/*
Change logs:
Date | Author | Description
2022-10-12 | Fangzheng Zhang | create class and init
*/
\ No newline at end of file
BackendFolder/SwitchRoom/src/main/resources/application.properties
+ 1
− 1
View file @ feff9ccf
server.port=8081
\ No newline at end of file
FrontendFolder/switch-room/package-lock.json
+ 30
− 15
View file @ feff9ccf
......@@ -13264,7 +13264,8 @@
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz",
"integrity": "sha512-HSYWPqrunRE5ZZs8kVwiY6oWcn95qf/OQabwLfprhdpFWAGtLStShjsGED2aDpSSeGAskQETrtR/5h7VqgIlBA==",
"dev": true
"dev": true,
"requires": {}
},
"@vue/cli-service": {
"version": "5.0.8",
......@@ -13770,13 +13771,15 @@
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
"integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
"dev": true
"dev": true,
"requires": {}
},
"acorn-jsx": {
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
"dev": true
"dev": true,
"requires": {}
},
"acorn-walk": {
"version": "8.2.0",
......@@ -13835,7 +13838,8 @@
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
"dev": true
"dev": true,
"requires": {}
},
"ansi-colors": {
"version": "4.1.3",
......@@ -14632,7 +14636,8 @@
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
"integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
"dev": true
"dev": true,
"requires": {}
},
"css-loader": {
"version": "6.7.1",
......@@ -14803,7 +14808,8 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
"integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
"dev": true
"dev": true,
"requires": {}
},
"csso": {
"version": "4.2.0",
......@@ -16259,7 +16265,8 @@
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
"dev": true
"dev": true,
"requires": {}
},
"ieee754": {
"version": "1.2.1",
......@@ -17626,25 +17633,29 @@
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
"integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
"dev": true
"dev": true,
"requires": {}
},
"postcss-discard-duplicates": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
"integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
"dev": true
"dev": true,
"requires": {}
},
"postcss-discard-empty": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
"integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
"dev": true
"dev": true,
"requires": {}
},
"postcss-discard-overridden": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
"integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
"dev": true
"dev": true,
"requires": {}
},
"postcss-loader": {
"version": "6.2.1",
......@@ -17734,7 +17745,8 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
"dev": true
"dev": true,
"requires": {}
},
"postcss-modules-local-by-default": {
"version": "4.0.0",
......@@ -17769,7 +17781,8 @@
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
"integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
"dev": true
"dev": true,
"requires": {}
},
"postcss-normalize-display-values": {
"version": "5.1.0",
......@@ -19582,7 +19595,8 @@
"version": "8.9.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
"integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
"dev": true
"dev": true,
"requires": {}
}
}
},
......@@ -19709,7 +19723,8 @@
"version": "7.5.9",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
"integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
"dev": true
"dev": true,
"requires": {}
},
"y18n": {
"version": "5.0.8",
......
FrontendFolder/switch-room/src/services/HttpRequestService.js 0 → 100644
+ 27
− 0
View file @ feff9ccf
/**
* This class will help to send the http request to server side.
*/
const URL = location.protocol +"//"+ location.hostname + ":8081/";
export default{
sendGetRequest(path){
let url = URL + path;
return fetch(url)
.then((response)=>{
if(response.ok){
return
}
})
}
}
/*
Change logs:
Date | Author | Description
2022-10-12 | Fangzheng Zhang | create class and init
*/
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment