Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/componenet/Join.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,14 @@ function Join() {
return;
}

const trimmedData = Object.fromEntries(
Object.entries(formData).map(([key, value]) =>
[key, typeof value === 'string' ? value.trim() : value]
)
);

try {
const response = await axios.post(`${process.env.REACT_APP_SERVER_URL}/api/join`, formData, {
const response = await axios.post(`${process.env.REACT_APP_SERVER_URL}/api/join`, trimmedData, {
headers: {
'Content-Type': 'application/json',
},
Expand Down
2 changes: 1 addition & 1 deletion src/componenet/Login.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function Login({ onLogin }) {
}

try {
const response = await axios.post(`${process.env.REACT_APP_SERVER_URL}/login?username=${username}&password=${password}`, {
const response = await axios.post(`${process.env.REACT_APP_SERVER_URL}/login?username=${username.trim()}&password=${password.trim()}`, {
username,
password,
}, { withCredentials: true });
Expand Down
10 changes: 8 additions & 2 deletions src/componenet/SoccerTeamModify.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ function SoccerTeamModify() {
};

const handleDayClick = (teamDay) => {
console.log(teamDay.day)
setTeamData(prevState => {
const { day } = prevState;
if (day.includes(teamDay)) {
Expand All @@ -103,8 +102,15 @@ function SoccerTeamModify() {
if (!validate()) {
return;
}

const trimmedData = Object.fromEntries(
Object.entries(teamData).map(([key, value]) =>
[key, typeof value === 'string' ? value.trim() : value]
)
);

const data = new FormData();
data.append('data', new Blob([JSON.stringify(teamData)], { type: 'application/json' }));
data.append('data', new Blob([JSON.stringify(trimmedData)], { type: 'application/json' }));
Array.from(files).forEach(file => {
data.append('files', file);
});
Expand Down
8 changes: 7 additions & 1 deletion src/componenet/SoccerTeamWrite.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,14 @@ function SoccerTeamWrite() {
return;
}

const trimmedData = Object.fromEntries(
Object.entries(formData).map(([key, value]) =>
[key, typeof value === 'string' ? value.trim() : value]
)
);

const data = new FormData();
data.append('data', new Blob([JSON.stringify(formData)], { type: 'application/json' }));
data.append('data', new Blob([JSON.stringify(trimmedData)], { type: 'application/json' }));
Array.from(files).forEach(file => {
data.append('files', file);
});
Expand Down
11 changes: 5 additions & 6 deletions src/soccerTeam/PlayerModify.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,11 @@ function PlayerModify() {
return;
}

const trimmedData = {
...formData,
title: formData.title.trim(),
content: formData.content.trim(),
position: formData.position.trim()
};
const trimmedData = Object.fromEntries(
Object.entries(formData).map(([key, value]) =>
[key, typeof value === 'string' ? value.trim() : value]
)
);

try {
const token = localStorage.getItem("token");
Expand Down
10 changes: 7 additions & 3 deletions src/soccerTeam/PlayerWrite.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,17 @@ function PlayerWrite() {
return;
}

const trimmedData = Object.fromEntries(
Object.entries(formData).map(([key, value]) =>
[key, typeof value === 'string' ? value.trim() : value]
)
);

const token = localStorage.getItem('token');
try {
await axios.post(`${process.env.REACT_APP_SERVER_URL}/api/enroll`, {
...formData,
...trimmedData,
teamId: teamIdx,
title: formData.title,
content: formData.content
}, {
headers: {
'Authorization': token
Expand Down