Skip to content

Commit 02e944c

Browse files
thesocialdevthesocialdev
authored
Merge pull request #1694 from AletheiaFact/Change-all-messages-antd-for-mui
Change all messages antd for mui
2 parents 2943f31 + f7c2b48 commit 02e944c

27 files changed

+222
-167
lines changed

‎public/locales/en/sources.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"sourceCardButton": "Access the source",
55
"sourceCreateCTAButton": "Create source",
66
"sourcesCreateSuccess": "Source created successfully",
7-
"sourcesCreateError": "Error while creating the source"
7+
"sourcesCreateError": "Error while creating the source",
8+
"sourcesErrorFetching": "Error fetching source"
89
}

‎public/locales/pt/sources.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"sourceCardButton": "Acesse a fonte",
55
"sourceCreateCTAButton": "Incluir fonte",
66
"sourcesCreateSuccess": "Fonte criado com sucesso",
7-
"sourcesCreateError": "Erro ao criar a fonte"
7+
"sourcesCreateError": "Erro ao criar a fonte",
8+
"sourcesErrorFetching": "Erro ao buscar a fonte"
89
}

‎src/api/badgesApi.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import axios from "axios";
2-
import { message } from "antd";
2+
import { MessageManager } from "../components/Messages";
33

44
const request = axios.create({
55
withCredentials: true,
@@ -10,11 +10,11 @@ const createBadge = (badge, users, t) => {
1010
return request
1111
.post(`/`, { ...badge, users })
1212
.then((response) => {
13-
message.success(t("badges:badgeSaved"));
13+
MessageManager.showMessage("success", `${t("badges:badgeSaved")}`);
1414
return response.data;
1515
})
1616
.catch((err) => {
17-
message.error(err.response.data?.message);
17+
MessageManager.showMessage("error", err.response.data?.message);
1818
throw err;
1919
});
2020
};
@@ -23,11 +23,11 @@ const updateBadge = (badge, users, t) => {
2323
return request
2424
.put(`/${badge._id}`, { ...badge, users })
2525
.then((response) => {
26-
message.success(t("badges:badgeSaved"));
26+
MessageManager.showMessage("success", `${t("badges:badgeSaved")}`);
2727
return response.data;
2828
})
2929
.catch((err) => {
30-
message.error(err.response.data?.message);
30+
MessageManager.showMessage("error", err.response.data?.message);
3131
throw err;
3232
});
3333
};
@@ -39,7 +39,7 @@ const getBadges = () => {
3939
return response.data;
4040
})
4141
.catch((err) => {
42-
message.error(err.response.data?.message);
42+
MessageManager.showMessage("error", err.response.data?.message);
4343
throw err;
4444
});
4545
};

‎src/api/claim.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import axios from "axios";
2-
import { message } from "antd";
2+
import { MessageManager } from "../components/Messages";
33
import { NameSpaceEnum } from "../types/Namespace";
44

55
const request = axios.create({
@@ -53,7 +53,7 @@ const getById = (id, t, params = {}) => {
5353
return response.data;
5454
})
5555
.catch(() => {
56-
message.error(t("claim:errorWhileFetching"));
56+
MessageManager.showMessage("error", `${t("claim:errorWhileFetching")}`)
5757
});
5858
};
5959

@@ -62,7 +62,7 @@ const saveSpeech = (t, claim = {}) => {
6262
.post("/", claim)
6363
.then((response) => {
6464
const { title } = response.data;
65-
message.success(
65+
MessageManager.showMessage("success",
6666
`"${title}" ${t("claimForm:successCreateMessage")}`
6767
);
6868
return response.data;
@@ -73,7 +73,7 @@ const saveSpeech = (t, claim = {}) => {
7373
// TODO: Track errors with Sentry
7474
}
7575
const { data } = response;
76-
message.error(
76+
MessageManager.showMessage("error",
7777
data && data.message
7878
? data.message
7979
: t("claimForm:errorCreateMessage")
@@ -86,14 +86,14 @@ const saveImage = (t, claimImage = {}) => {
8686
.post("/image", claimImage)
8787
.then((response) => {
8888
const { title } = response.data;
89-
message.success(
89+
MessageManager.showMessage("success",
9090
`"${title}" ${t("claimForm:successCreateMessage")}`
9191
);
9292
return response.data;
9393
})
9494
.catch((err) => {
9595
const response = err && err.response;
96-
message.error(
96+
MessageManager.showMessage("error",
9797
response?.data && response?.data.message
9898
? response?.data.message
9999
: t("claimForm:errorCreateMessage")
@@ -106,7 +106,7 @@ const saveDebate = (t, debate = {}) => {
106106
.post("/debate", debate)
107107
.then((response) => {
108108
const { title } = response.data;
109-
message.success(
109+
MessageManager.showMessage("success",
110110
`"${title}" ${t("claimForm:successCreateMessage")}`
111111
);
112112
return response.data;
@@ -125,7 +125,7 @@ const saveUnattributed = (t, unattributed = {}) => {
125125
.post("/unattributed", unattributed)
126126
.then((response) => {
127127
const { title } = response.data;
128-
message.success(
128+
MessageManager.showMessage("success",
129129
`"${title}" ${t("claimForm:successCreateMessage")}`
130130
);
131131
return response.data;
@@ -155,7 +155,7 @@ const updateDebate = (
155155
// TODO: Track errors with Sentry
156156
}
157157
const { data } = response;
158-
message.error(
158+
MessageManager.showMessage("error",
159159
data && data.message
160160
? data.message
161161
: t("claimForm:errorUpdateMessage")
@@ -167,11 +167,11 @@ const deleteClaim = (id: string, t: any) => {
167167
return request
168168
.delete(`/${id}`)
169169
.then(() => {
170-
message.success(t("claim:deleteSuccess"));
170+
MessageManager.showMessage("success", t("claim:deleteSuccess"));
171171
})
172172
.catch((err) => {
173173
console.error(err);
174-
message.error(t("claim:deleteError"));
174+
MessageManager.showMessage("error", t("claim:deleteError"));
175175
});
176176
};
177177

@@ -189,13 +189,13 @@ const updateClaimHiddenStatus = (
189189
description,
190190
})
191191
.then(() => {
192-
message.success(
192+
MessageManager.showMessage("success",
193193
t(`claim:${isHidden ? "hideSuccess" : "unhideSuccess"}`)
194194
);
195195
})
196196
.catch((err) => {
197197
console.error(err);
198-
message.error(t(`claim:${isHidden ? "hideError" : "unhideError"}`));
198+
MessageManager.showMessage("error", t(`claim:${isHidden ? "hideError" : "unhideError"}`));
199199
});
200200
};
201201

‎src/api/claimReviewApi.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { message } from "antd";
1+
import { MessageManager } from "../components/Messages";
22
import axios from "axios";
33
import { NameSpaceEnum } from "../types/Namespace";
44

@@ -50,13 +50,13 @@ const updateClaimReviewHiddenStatus = (
5050
return request
5151
.put(`/review/${id}`, { isHidden, description, recaptcha })
5252
.then((response) => {
53-
message.success(
53+
MessageManager.showMessage("success",
5454
t(`claimReview:${isHidden ? "hideSuccess" : "unhideSuccess"}`)
5555
);
5656
return response.data;
5757
})
5858
.catch((err) => {
59-
message.error(
59+
MessageManager.showMessage("error",
6060
t(`claimReview:${isHidden ? "hideError" : "unhideError"}`)
6161
);
6262
throw err;
@@ -67,11 +67,11 @@ const deleteClaimReview = (id: string, t: any) => {
6767
return request
6868
.delete(`/review/${id}`)
6969
.then(() => {
70-
message.success(t("claim:deleteSuccess"));
70+
MessageManager.showMessage("success", t("claim:deleteSuccess"));
7171
})
7272
.catch((err) => {
7373
console.error(err);
74-
message.error(t("claim:deleteError"));
74+
MessageManager.showMessage("error",t("claim:deleteError"));
7575
});
7676
};
7777

‎src/api/comment.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import axios from "axios";
2-
import { message } from "antd";
2+
import { MessageManager } from "../components/Messages";
33

44
const request = axios.create({
55
withCredentials: true,
@@ -13,7 +13,7 @@ const createComment = (comment) => {
1313
return response.data;
1414
})
1515
.catch((err) => {
16-
message.error(err.response.data?.message);
16+
MessageManager.showMessage("error", err.response.data?.message);
1717
throw err;
1818
});
1919
};
@@ -25,7 +25,7 @@ const updateComments = (comments) => {
2525
return response.data;
2626
})
2727
.catch((err) => {
28-
message.error(err.response.data?.message);
28+
MessageManager.showMessage("error", err.response.data?.message);
2929
throw err;
3030
});
3131
};
@@ -37,7 +37,7 @@ const updateComment = (commentId, comment) => {
3737
return response.data;
3838
})
3939
.catch((err) => {
40-
message.error(err.response.data?.message);
40+
MessageManager.showMessage("error", err.response.data?.message);
4141
throw err;
4242
});
4343
};
@@ -49,7 +49,7 @@ const createReplyComment = (commentId, newComment) => {
4949
return response.data;
5050
})
5151
.catch((err) => {
52-
message.error(err.response.data?.message);
52+
MessageManager.showMessage("error", err.response.data?.message);
5353
throw err;
5454
});
5555
};
@@ -61,7 +61,7 @@ const deleteReplyComment = (commentId, replyCommentId) => {
6161
return response.data;
6262
})
6363
.catch((err) => {
64-
message.error(err.response.data?.message);
64+
MessageManager.showMessage("error", err.response.data?.message);
6565
throw err;
6666
});
6767
};

‎src/api/dailyReport.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { message } from "antd";
1+
import { MessageManager } from "../components/Messages";
22
import axios from "axios";
33

44
const request = axios.create({
@@ -10,11 +10,11 @@ const sendDailyReportEmail = (topic, nameSpace, t) => {
1010
return request
1111
.post(`/topic/${topic}/send/${nameSpace}`)
1212
.then((response) => {
13-
message.success(t("notification:sendDailyReportSuccess"));
13+
MessageManager.showMessage("success", t("notification:sendDailyReportSuccess"));
1414
return response.data;
1515
})
1616
.catch((err) => {
17-
message.error(t("notification:sendDailyReportError"));
17+
MessageManager.showMessage("error",t("notification:sendDailyReportError"));
1818
throw err;
1919
});
2020
};

‎src/api/editor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import axios from "axios";
2-
import { message } from "antd";
2+
import { MessageManager } from "../components/Messages";
33

44
const request = axios.create({
55
withCredentials: true,
@@ -13,7 +13,7 @@ const update = (reference, editorContentObject, t) => {
1313
return response;
1414
})
1515
.catch((err) => {
16-
message.error(t(`claim:${err.response.data?.message}`));
16+
MessageManager.showMessage("error", t(`claim:${err.response.data?.message}`));
1717
throw err;
1818
});
1919
};

‎src/api/image.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import axios from "axios";
2-
import { message } from "antd";
2+
import { MessageManager } from "../components/Messages";
33

44
const request = axios.create({
55
withCredentials: true,
@@ -24,7 +24,7 @@ const uploadImage = (files, t) => {
2424
return response.data;
2525
})
2626
.catch((err) => {
27-
message.error(t(`claim:${err.response.data.message}`));
27+
MessageManager.showMessage("error", t(`claim:${err.response.data.message}`));
2828
throw err;
2929
});
3030
};
@@ -33,11 +33,11 @@ const createClaimTypeImage = (file) => {
3333
return request
3434
.post("/create", file)
3535
.then((response) => {
36-
message.success("upload success");
36+
MessageManager.showMessage("success", "upload success");
3737
return response.data;
3838
})
3939
.catch((err) => {
40-
message.error("upload failed");
40+
MessageManager.showMessage("error", "upload failed");
4141
throw err;
4242
});
4343
};

‎src/api/namespace.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import axios from "axios";
2-
import { message } from "antd";
2+
import { MessageManager } from "../components/Messages";
33

44
const request = axios.create({
55
withCredentials: true,
@@ -10,11 +10,11 @@ const createNameSpace = (nameSpace, t) => {
1010
return request
1111
.post(`/`, { ...nameSpace })
1212
.then((response) => {
13-
message.success(t("namespaces:nameSpaceSaved"));
13+
MessageManager.showMessage("success", t("namespaces:nameSpaceSaved"));
1414
return response.data;
1515
})
1616
.catch((err) => {
17-
message.error(err.response.data?.message);
17+
MessageManager.showMessage("error", err.response.data?.message);
1818
throw err;
1919
});
2020
};
@@ -23,11 +23,11 @@ const updateNameSpace = (nameSpace, t) => {
2323
return request
2424
.put(`/${nameSpace._id}`, { ...nameSpace })
2525
.then((response) => {
26-
message.success(t("namespaces:nameSpaceSaved"));
26+
MessageManager.showMessage("success", t("namespaces:nameSpaceSaved"));
2727
return response.data;
2828
})
2929
.catch((err) => {
30-
message.error(err.response.data?.message);
30+
MessageManager.showMessage("error", err.response.data?.message);
3131
throw err;
3232
});
3333
};
@@ -39,7 +39,7 @@ const getNameSpaces = () => {
3939
return response.data;
4040
})
4141
.catch((err) => {
42-
message.error(err.response.data?.message);
42+
MessageManager.showMessage("error", err.response.data?.message);
4343
throw err;
4444
});
4545
};

0 commit comments

Comments
 (0)