Skip to content

Commit

Permalink
Merge pull request #141 from Arquisoft/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
CANCI0 authored Apr 25, 2024
2 parents e19ce7f + 3f5623c commit 928e2f3
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions gatewayservice/gateway-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ app.get("/health", (req, res) => {
res.json({ status: "OK" });
});

returnError = (res, error) => {
var returnError = (res, error) => {
console.log(error);
res.status(error.response.status).json({ error: error.response.data.error });
}
Expand Down Expand Up @@ -246,7 +246,7 @@ app.get("/ranking", async (req, res) => {
}
});

openapiPath='./openapi.yaml'
var openapiPath='./openapi.yaml'
if (fs.existsSync(openapiPath)) {
const file = fs.readFileSync(openapiPath, 'utf8');

Expand Down
2 changes: 1 addition & 1 deletion webapp/src/pages/Social/GroupDetails.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ const GroupDetails = () => {
</Thead>
<Tbody>
{group.members.map((member, index) => (
<Tr key={index}>
<Tr>
<Td>
<Avatar
size="sm"
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/pages/Social/UsersPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const UserList = ({ users, handleAddFriend }) => {
</Thead>
<Tbody>
{users.map((user, index) => (
<Tr key={index} data-testid={`user-row-${index}`}>
<Tr data-testid={`user-row-${index}`}>
<Td>
<Flex flexDirection="column" alignItems="center">
<Avatar name={user.username} />
Expand Down
8 changes: 4 additions & 4 deletions webapp/src/pages/WrongRoute/WrongRoute.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ const WrongRoute = () => {
const { t } = useTranslation();

return (
<div id="notfound">
<div class="notfound-bg">
<div>
<div>
<div></div>
<div></div>
<div></div>
<div></div>
</div>
<div class="notfound">
<div class="notfound-404">
<div>
<div>
<h1>404</h1>
</div>
<h2>{t('pages.wrongroute.title')}</h2>
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/pages/WrongRoute/WrongRoute.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ test("renders 404 message", () => {
</Router>
</I18nextProvider>
);
const errorMessage = screen.getByText(/404/i);

expect(getByText("404")).toBeInTheDocument();
expect(getByText("Página no encontrada")).toBeInTheDocument();
expect(
Expand Down

0 comments on commit 928e2f3

Please sign in to comment.