Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updating dependencies in prod #352

Merged
merged 96 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
09773a5
Update main.yml
nelsontr Nov 4, 2023
ec34aef
Readme change (#253)
nelsontr Nov 4, 2023
bebde5e
Update main.yml
nelsontr Nov 4, 2023
f0d1020
Update main.yml
nelsontr Nov 4, 2023
132ffcc
Update dependency react-bootstrap to v2.9.1 (#245)
renovate[bot] Nov 5, 2023
2261b91
Update dependency react-select to v5.7.7 (#243)
renovate[bot] Nov 5, 2023
64dbff0
Update dependency react-router-dom to v6.18.0 (#232)
renovate[bot] Nov 5, 2023
095f7a5
Updating client/package-lock.json
nelsontr Nov 5, 2023
ab3a685
Update dependency natural to v6.8.0 (#244)
renovate[bot] Nov 6, 2023
fda3050
Update dependency html-react-parser to v5 (#249)
renovate[bot] Nov 19, 2023
ce5c916
Update dependency express-fileupload to v1.4.2 (#242)
renovate[bot] Nov 19, 2023
58cb0e3
Update dependency react-icons to v4.12.0 (#260)
renovate[bot] Nov 19, 2023
04e059b
Update renovate.json
nelsontr Dec 2, 2023
a60272b
Update renovate.json
nelsontr Dec 2, 2023
7705ced
changing node and npm version in github action
nelsontr Dec 8, 2023
93422dd
Axios Dependency Update (#268)
nelsontr Dec 8, 2023
65917f0
Update dependency react-select to v5.8.0 (#255)
renovate[bot] Dec 8, 2023
2b16c38
Update dependency @testing-library/react to v14.1.2 (#256)
renovate[bot] Dec 8, 2023
992f429
Update dependency react-router-dom to v6.20.1 (#261)
renovate[bot] Dec 8, 2023
25b94bd
Update dependency express-fileupload to v1.4.3 (#263)
renovate[bot] Dec 8, 2023
d8552e8
Bump @adobe/css-tools from 4.3.1 to 4.3.2 in /client (#264)
dependabot[bot] Dec 8, 2023
ba80066
Update dependency nodemon to v3.0.2 (#265)
renovate[bot] Dec 8, 2023
187ae15
Update dependency axios to v1.6.2 (#269)
renovate[bot] Dec 8, 2023
f54340a
remove unnecessary files
nelsontr Dec 8, 2023
29dea0e
Merge branch 'prod' into master
nelsontr Dec 8, 2023
60eb32d
Update dependency natural to v6.10.4 (#262)
renovate[bot] Jan 21, 2024
a06f0d2
Update dependency html-react-parser to v5.1.1 (#267)
renovate[bot] Jan 21, 2024
091139b
Update dependency axios to v1.6.5 (#275)
renovate[bot] Jan 21, 2024
7551695
Update dependency htmlparser2 to v9.1.0 (#276)
renovate[bot] Jan 21, 2024
5886841
Update appleboy/ssh-action action to v1.0.3 (#274)
renovate[bot] Jan 21, 2024
827cd64
Update actions/setup-node action to v4.0.1 (#272)
renovate[bot] Jan 21, 2024
24429a5
Update dependency nodemon to v3.0.3 (#281)
renovate[bot] Jan 21, 2024
99f2fbc
add BasedInLisbon logo to the website (#286)
Pereira2303 Feb 28, 2024
720209f
Bump follow-redirects from 1.15.4 to 1.15.6 in /server (#288)
dependabot[bot] Mar 19, 2024
741c485
Bump follow-redirects from 1.15.4 to 1.15.6 in /client (#287)
dependabot[bot] Mar 19, 2024
27aa0d9
Update dependency @testing-library/react to v14.2.1 (#284)
renovate[bot] Mar 19, 2024
8a1ae8f
Update dependency axios to v1.6.8 (#283)
renovate[bot] Mar 19, 2024
e4a7d41
Update dependency react-router-dom to v6.22.3 (#271)
renovate[bot] Mar 19, 2024
2ca4d9c
Update dependency react-icons to v5 (#282)
renovate[bot] Mar 19, 2024
6d04786
Update dependency dotenv to v16.4.5 (#280)
renovate[bot] Mar 19, 2024
d44946d
Update dependency autoprefixer to v10.4.18 (#279)
renovate[bot] Mar 19, 2024
2aba6e4
Update actions/setup-node action to v4.0.2 (#289)
renovate[bot] Mar 19, 2024
b7d00ba
Update dependency express to v4.18.3 (#291)
renovate[bot] Mar 19, 2024
0dbb0f5
Update dependency nodemon to v3.1.0 (#294)
renovate[bot] Mar 19, 2024
51a0bc0
Bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /client (#298)
dependabot[bot] Mar 23, 2024
815589d
Update dependency react-bootstrap to v2.10.2 (#273)
renovate[bot] Mar 31, 2024
9957a2d
Update dependency bootstrap to v5.3.3 (#290)
renovate[bot] Mar 31, 2024
7a46ea3
Update dependency express-fileupload to v1.5.0 (#292)
renovate[bot] Mar 31, 2024
efc86c2
Update dependency @testing-library/react to v14.2.2 (#295)
renovate[bot] Mar 31, 2024
a8f76ac
Update dependency autoprefixer to v10.4.19 (#297)
renovate[bot] Mar 31, 2024
4ca155e
Bump express from 4.18.2 to 4.19.2 in /client (#299)
dependabot[bot] Mar 31, 2024
b9c7c97
Bump express from 4.18.3 to 4.19.2 in /server (#300)
dependabot[bot] Mar 31, 2024
5b9a21a
Merge branch 'prod' into master
MrQuatrelle Apr 9, 2024
d03e9c8
Update package.json
MrQuatrelle Apr 9, 2024
0f4342c
Update collabs image (#313)
nelsontr May 16, 2024
8786c11
Bump ejs from 3.1.9 to 3.1.10 in /client (#312)
dependabot[bot] May 16, 2024
cb15e49
Update actions/checkout action to v4.1.6 (#311)
renovate[bot] May 16, 2024
99175bb
Update dependency @testing-library/react to v14.3.1 (#309)
renovate[bot] May 16, 2024
ac1d423
Update dependency react-icons to v5.2.1 (#308)
renovate[bot] May 16, 2024
bc0b2de
Update dependency react-multi-carousel to v2.8.5 (#303)
renovate[bot] May 16, 2024
f8031bb
Update dependency pg to v8.11.5 (#302)
renovate[bot] May 16, 2024
6a7a584
Update dependency html-react-parser to v5.1.10 (#285)
renovate[bot] May 16, 2024
7a78cc7
updating xlsx package
nelsontr May 16, 2024
6b23193
Update dependency react-router-dom to v6.23.1 (#314)
renovate[bot] May 16, 2024
45e0bf7
Update react monorepo to v18.3.1 (#315)
renovate[bot] May 16, 2024
a5d5cb3
docker-compose.yml build (#318)
nelsontr May 23, 2024
a5ac212
doc: correct installation md
nelsontr May 23, 2024
c433de2
chore(deps): update dependency nodemon to v3.1.2 (#321)
renovate[bot] Jun 3, 2024
dd51dc0
Update dependency axios to v1.7.2 (#317)
renovate[bot] Jun 3, 2024
568993e
Updated "Churrasco EIC" image (#324)
Francisca105 Jun 17, 2024
2399c2d
Bump braces from 3.0.2 to 3.0.3 in /server (#326)
dependabot[bot] Jun 17, 2024
651a913
chore(deps): update actions/checkout action to v4.1.7 (#325)
renovate[bot] Jun 17, 2024
bce6eff
fix(deps): update dependency pg to v8.12.0 (#323)
renovate[bot] Jun 17, 2024
1bdf18c
chore(deps): update dependency nodemon to v3.1.3 (#322)
renovate[bot] Jun 17, 2024
217fda7
Bump braces from 3.0.2 to 3.0.3 in /client (#327)
dependabot[bot] Jun 17, 2024
8e14d78
fix(deps): update dependency react-bootstrap to v2.10.4 (#329)
renovate[bot] Jul 11, 2024
d74f1be
chore(deps): update dependency nodemon to v3.1.4 (#330)
renovate[bot] Jul 11, 2024
825736a
fix(deps): update dependency react-router-dom to v6.24.1 (#331)
renovate[bot] Jul 11, 2024
ee748b9
chore(deps): update actions/setup-node action to v4.0.3 (#332)
renovate[bot] Jul 11, 2024
9d8257d
fix(deps): update mantine monorepo to v6.0.22 (#334)
renovate[bot] Sep 14, 2024
912a175
fix(deps): update dependency react-router-dom to v6.26.2 (#335)
renovate[bot] Sep 14, 2024
c2f72a4
chore(deps): update dependency autoprefixer to v10.4.20 (#338)
renovate[bot] Sep 14, 2024
c777e60
fix(deps): update dependency axios to v1.7.4 [security] (#340)
renovate[bot] Sep 14, 2024
eeec4e7
Bump micromatch from 4.0.5 to 4.0.8 in /client (#342)
dependabot[bot] Sep 14, 2024
80f85d0
fix(deps): update dependency axios to v1.7.7 (#350)
renovate[bot] Sep 14, 2024
b07bf3c
Bump serve-static and express in /server (#348)
dependabot[bot] Sep 14, 2024
9afbf8e
fix(deps): update dependency react-icons to v5.3.0 (#346)
renovate[bot] Sep 14, 2024
17bb996
Bump webpack from 5.89.0 to 5.94.0 in /client (#341)
dependabot[bot] Sep 14, 2024
9702eed
fix(deps): update dependency express-fileupload to v1.5.1 (#333)
renovate[bot] Sep 15, 2024
fd8bbf6
fix(deps): update dependency html-react-parser to v5.1.16 (#336)
renovate[bot] Sep 15, 2024
6e660e0
fix(deps): update dependency natural to v6.12.0 (#293)
renovate[bot] Sep 15, 2024
377a5d3
fix(deps): update security deps
nelsontr Sep 15, 2024
f76a016
fix(deps): update dependency natural to v8 (#349)
renovate[bot] Sep 15, 2024
d2ec546
fix(deps): update test deps
nelsontr Sep 15, 2024
e37471b
chore(deps): updating mantine to v7 (#351)
nelsontr Sep 17, 2024
549fd8d
Merge branch 'prod' into prod-update-deps
nelsontr Sep 17, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/checkout@v4.1.7

- name: Setup Node
uses: actions/setup-node@v4.0.2
uses: actions/setup-node@v4.0.3
with:
node-version: 21.4.0

Expand Down
5,928 changes: 3,064 additions & 2,864 deletions client/package-lock.json

Large diffs are not rendered by default.

24 changes: 14 additions & 10 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,29 @@
"proxy": "http://localhost:3001",
"type": "module",
"dependencies": {
"@mantine/core": "^6.0.8",
"@mantine/hooks": "^6.0.8",
"axios": "1.7.2",
"@mantine/core": "^7.12.2",
"@mantine/hooks": "^7.12.2",
"axios": "1.7.7",
"bootstrap": "5.3.3",
"html-react-parser": "^5.0.0",
"react": "18.3.1",
"react-bootstrap": "2.10.2",
"react-bootstrap": "2.10.4",
"react-device-detect": "^2.2.2",
"react-dom": "18.3.1",
"react-icons": "^5.0.0",
"react-multi-carousel": "^2.8.2",
"react-router-dom": "6.23.1",

"react-router-dom": "6.26.2",
"react-scripts": "^5.0.1",
"react-select": "^5.7.0",
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
},
"overrides": {
"autoprefixer": "10.4.19"
"autoprefixer": ">=10.4.20",
"body-parser": ">=1.20.3",
"express": ">=4.21.0",
"path-to-regexp": ">=0.1.10",
"send": ">=0.19.0",
"serve-static": ">=1.16.0"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -42,8 +46,8 @@
]
},
"devDependencies": {
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0"
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^16.0.0"
},
"jest": {
"moduleNameMapper": {
Expand Down
18 changes: 11 additions & 7 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import {
Route,
Navigate
} from "react-router-dom";
import { MantineProvider } from '@mantine/core';

import "./App.css";
import '@mantine/core/styles.css'; // importing required mantine styles
import "bootstrap/dist/css/bootstrap.min.css"; // importing required bootstrap styles

import UserDataContext from "./UserDataContext.js";
Expand Down Expand Up @@ -100,13 +102,15 @@ const App = () => {

return (
<UserDataContext.Provider value={{ userData, setUserData }}>
<BrowserRouter>
<Layout>
<Suspense fallback={<LoadSpinner />}>
<DefinedRoutes />
</Suspense>
</Layout>
</BrowserRouter>
<MantineProvider>
<BrowserRouter>
<Layout>
<Suspense fallback={<LoadSpinner />}>
<DefinedRoutes />
</Suspense>
</Layout>
</BrowserRouter>
</MantineProvider>
</UserDataContext.Provider>
);
};
Expand Down
6 changes: 3 additions & 3 deletions client/src/components/gacPage/EmailsAndRenewalButtons.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const EmailsAndRenewalButtons = ({ members }) => {
label="Ver Emails de Sócios Regulares"
>
<Button
leftIcon={<MdEmail size="1.25em" />}
leftSection={<MdEmail size="1.25em" />}
onClick={handleShowRegularEmails}
>
Sócios Regulares
Expand All @@ -68,7 +68,7 @@ export const EmailsAndRenewalButtons = ({ members }) => {
label="Ver Emails de Sócios Eleitores"
>
<Button
leftIcon={<MdEmail size="1.25em" />}
leftSection={<MdEmail size="1.25em" />}
onClick={handleShowRenewEmails}
>
Sócios Eleitores
Expand All @@ -82,7 +82,7 @@ export const EmailsAndRenewalButtons = ({ members }) => {
>
<Button
color="red"
leftIcon={<MdAutorenew size="1.25em" />}
leftSection={<MdAutorenew size="1.25em" />}
onClick={handleshowRenewMembers}
>
Renovações
Expand Down
23 changes: 12 additions & 11 deletions client/src/components/gacPage/MembersRow.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
Avatar,
Badge,
Group,
Table,
Text,
Tooltip,
Anchor,
Expand All @@ -25,10 +26,10 @@ const colorStatus = {

export const memberRow = (members, collabs, handleMoreInfo) => {
const rows = members?.map((member, index) => (
<tr key={member.username} className={style.tableClass} style={index % 2 === 1
<Table.Tr key={member.username} className={style.tableClass} style={index % 2 === 1
? { backgroundColor: "rgb(53, 209, 250,0.025)" }
: { backgroundColor: "rgb(36, 139, 227,0.075)" }}>
<td style={{borderRadius: "1em 0 0 1em"}}>
<Table.Td style={{borderRadius: "1em 0 0 1em"}}>
<Group spacing="md">
<Avatar size={60} src={fenixPhoto(member.username)} radius={20} />
<div>
Expand Down Expand Up @@ -56,16 +57,16 @@ export const memberRow = (members, collabs, handleMoreInfo) => {
</Text>
</div>
</Group>
</td>
</Table.Td>

<td className={style.EmailTable}>
<Table.Td className={style.EmailTable}>
<Anchor href={`mailto:${member.email}`} size="md">
<Text fz="sm" fw={500}>
{member.email}
</Text>
</Anchor>
</td>
<td>
</Table.Td>
<Table.Td>
<Badge
fullWidth
size="lg"
Expand All @@ -76,9 +77,9 @@ export const memberRow = (members, collabs, handleMoreInfo) => {
>
{member.status.replace(/([A-Z])/g, " $1").trim()}
</Badge>
</td>
<td style={{borderRadius: "0 1em 1em 0"}}>
<Group spacing={0} position="right">
</Table.Td>
<Table.Td style={{borderRadius: "0 1em 1em 0"}}>
<Group spacing={0} justify="center">
<Tooltip
position="top"
withArrow
Expand Down Expand Up @@ -113,8 +114,8 @@ export const memberRow = (members, collabs, handleMoreInfo) => {
</ActionIcon>
</Tooltip>
</Group>
</td>
</tr>
</Table.Td>
</Table.Tr>
));

return rows;
Expand Down
18 changes: 9 additions & 9 deletions client/src/components/gacPage/MembersTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ export function MembersTable({ members }) {
/>
<ScrollArea>
<Table verticalSpacing="sm">
<thead>
<tr>
<th>Nome</th>
<th className={style.EmailTable}>Email</th>
<th>Estado</th>
<th />
</tr>
</thead>
<tbody>{rows}</tbody>
<Table.Thead>
<Table.Tr>
<Table.Th>Nome</Table.Th>
<Table.Th className={style.EmailTable}>Email</Table.Th>
<Table.Th>Estado</Table.Th>
<Table.Th />
</Table.Tr>
</Table.Thead>
<Table.Tbody>{rows}</Table.Tbody>
</Table>
</ScrollArea>
</>
Expand Down
30 changes: 2 additions & 28 deletions client/src/components/mantine/GradientSegmentedControl.jsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,7 @@
import { createStyles, SegmentedControl, rem } from '@mantine/core';

const useStyles = createStyles((theme) => ({
root: {
backgroundColor: theme.colorScheme === 'dark' ? theme.colors.dark[6] : theme.white,
boxShadow: theme.shadows.md,
border: `${rem(1)} solid ${
theme.colorScheme === 'dark' ? theme.colors.dark[4] : theme.colors.gray[1]
}`,
},

indicator: {
backgroundImage: theme.fn.gradient({ from: 'var(--first-color)', to: 'var(--forth-color)' }),
},

control: {
border: '0 !important',
},

label: {
'&, &:hover': {
'&[data-active]': {
color: theme.white,
},
},
},
}));
import { SegmentedControl } from '@mantine/core';
import classes from './GradientSegmentedControl.module.css';

export function GradientSegmentedControl({ data, setValue }) {
const { classes } = useStyles();
return (
<SegmentedControl
radius="xl"
Expand Down
28 changes: 28 additions & 0 deletions client/src/components/mantine/GradientSegmentedControl.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
.root {
background-color: light-dark(var(--mantine-color-white), var(--mantine-color-dark-6));
box-shadow: var(--mantine-shadow-md);
border: rem(1px) solid light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-4));
}

.indicator {
background-image: linear-gradient(
to right,
#2863FD,
#5ee8fa
);
}

.control {
&::before {
display: none;
}
}

.label {
&,
&:hover {
&[data-active] {
color: var(--mantine-color-white);
}
}
}
2 changes: 1 addition & 1 deletion client/src/pages/GacPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const GacPage = () => {
variant="pills"
color="gray"
defaultValue="active"
onTabChange={setActiveTab}
onChange={setActiveTab}
>
<Tabs.List className={style.tabsList}>
<Tabs.Tab style={{ fontWeight: "bold" }} value="active">
Expand Down
7 changes: 4 additions & 3 deletions client/src/tests/integration/pages/MemberPage.test.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import "@testing-library/jest-dom";
import { render, screen, cleanup, fireEvent } from "@testing-library/react";
import { act } from "react";
import { within } from "@testing-library/dom";
import { render, screen, cleanup, fireEvent } from "@testing-library/react";

import { electionsMock, userDataMock } from "../mockData/MemberPage";
import MemberPage from "../../../pages/MemberPage";
import UserDataContext from "../../../UserDataContext.js";
import { act } from "react-dom/test-utils";
import { electionsMock, userDataMock } from "../mockData/MemberPage";

describe("MembersPage", () => {

Expand Down
Loading