Skip to content

Commit

Permalink
updating dependencies in prod (#352)
Browse files Browse the repository at this point in the history
* Update main.yml

* Readme change (#253)

* Update main.yml

* Update main.yml

* Update dependency react-bootstrap to v2.9.1 (#245)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency react-select to v5.7.7 (#243)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency react-router-dom to v6.18.0 (#232)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Updating client/package-lock.json

* Update dependency natural to v6.8.0 (#244)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency html-react-parser to v5 (#249)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency express-fileupload to v1.4.2 (#242)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency react-icons to v4.12.0 (#260)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update renovate.json

Adding automerge for High/Very High PR

* Update renovate.json

* changing node and npm version in github action

* Axios Dependency Update (#268)

* Bump axios from 0.27.2 to 1.6.0 in /server

Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v0.27.2...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump axios from 0.27.2 to 1.6.0 in /client

Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v0.27.2...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* axios update

* add extension of dependencies to files

* add axios import to files

* added versions of Node and NPM to README.md

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update dependency react-select to v5.8.0 (#255)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @testing-library/react to v14.1.2 (#256)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency react-router-dom to v6.20.1 (#261)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency express-fileupload to v1.4.3 (#263)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Bump @adobe/css-tools from 4.3.1 to 4.3.2 in /client (#264)

Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.3.1 to 4.3.2.
- [Changelog](https://github.com/adobe/css-tools/blob/main/History.md)
- [Commits](https://github.com/adobe/css-tools/commits)

---
updated-dependencies:
- dependency-name: "@adobe/css-tools"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update dependency nodemon to v3.0.2 (#265)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency axios to v1.6.2 (#269)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* remove unnecessary files

* Update dependency natural to v6.10.4 (#262)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency html-react-parser to v5.1.1 (#267)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency axios to v1.6.5 (#275)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency htmlparser2 to v9.1.0 (#276)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update appleboy/ssh-action action to v1.0.3 (#274)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update actions/setup-node action to v4.0.1 (#272)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency nodemon to v3.0.3 (#281)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* add BasedInLisbon logo to the website (#286)

* Bump follow-redirects from 1.15.4 to 1.15.6 in /server (#288)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.4...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump follow-redirects from 1.15.4 to 1.15.6 in /client (#287)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.4...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update dependency @testing-library/react to v14.2.1 (#284)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency axios to v1.6.8 (#283)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency react-router-dom to v6.22.3 (#271)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency react-icons to v5 (#282)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency dotenv to v16.4.5 (#280)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency autoprefixer to v10.4.18 (#279)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update actions/setup-node action to v4.0.2 (#289)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency express to v4.18.3 (#291)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency nodemon to v3.1.0 (#294)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /client (#298)

Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4.
- [Release notes](https://github.com/webpack/webpack-dev-middleware/releases)
- [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md)
- [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4)

---
updated-dependencies:
- dependency-name: webpack-dev-middleware
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update dependency react-bootstrap to v2.10.2 (#273)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency bootstrap to v5.3.3 (#290)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency express-fileupload to v1.5.0 (#292)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @testing-library/react to v14.2.2 (#295)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency autoprefixer to v10.4.19 (#297)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Bump express from 4.18.2 to 4.19.2 in /client (#299)

Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@4.18.2...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump express from 4.18.3 to 4.19.2 in /server (#300)

Bumps [express](https://github.com/expressjs/express) from 4.18.3 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@4.18.3...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update package.json

* Update collabs image (#313)

* removing old members

* adding new collaborators

* Bump ejs from 3.1.9 to 3.1.10 in /client (#312)

Bumps [ejs](https://github.com/mde/ejs) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/mde/ejs/releases)
- [Commits](mde/ejs@v3.1.9...v3.1.10)

---
updated-dependencies:
- dependency-name: ejs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update actions/checkout action to v4.1.6 (#311)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @testing-library/react to v14.3.1 (#309)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency react-icons to v5.2.1 (#308)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency react-multi-carousel to v2.8.5 (#303)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency pg to v8.11.5 (#302)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency html-react-parser to v5.1.10 (#285)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* updating xlsx package

* Update dependency react-router-dom to v6.23.1 (#314)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update react monorepo to v18.3.1 (#315)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* docker-compose.yml build (#318)

* build: add docker-compose configuration

* doc: add Docker documentation and reorganizing docs

* doc: add Docker documentation and reorganizing docs

* doc: reorganizing docs

* doc: adding proxy change needed

* refactor: doc to readme and dockerfile

* refactor: doc to readme and dockerfile

* refactor: doc to readme and dockerfile

* fix: refactor docker command to correct location

* doc: correct installation md

* chore(deps): update dependency nodemon to v3.1.2 (#321)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency axios to v1.7.2 (#317)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Updated "Churrasco EIC" image (#324)

* Bump braces from 3.0.2 to 3.0.3 in /server (#326)

Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](micromatch/braces@3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): update actions/checkout action to v4.1.7 (#325)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency pg to v8.12.0 (#323)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency nodemon to v3.1.3 (#322)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Bump braces from 3.0.2 to 3.0.3 in /client (#327)

Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](micromatch/braces@3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(deps): update dependency react-bootstrap to v2.10.4 (#329)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency nodemon to v3.1.4 (#330)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency react-router-dom to v6.24.1 (#331)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update actions/setup-node action to v4.0.3 (#332)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update mantine monorepo to v6.0.22 (#334)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency react-router-dom to v6.26.2 (#335)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency autoprefixer to v10.4.20 (#338)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency axios to v1.7.4 [security] (#340)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Bump micromatch from 4.0.5 to 4.0.8 in /client (#342)

Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)
- [Commits](micromatch/micromatch@4.0.5...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(deps): update dependency axios to v1.7.7 (#350)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Bump serve-static and express in /server (#348)

Bumps [serve-static](https://github.com/expressjs/serve-static) to 1.16.2 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together.


Updates `serve-static` from 1.15.0 to 1.16.2
- [Release notes](https://github.com/expressjs/serve-static/releases)
- [Changelog](https://github.com/expressjs/serve-static/blob/v1.16.2/HISTORY.md)
- [Commits](expressjs/serve-static@v1.15.0...v1.16.2)

Updates `express` from 4.19.2 to 4.21.0
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md)
- [Commits](expressjs/express@4.19.2...4.21.0)

---
updated-dependencies:
- dependency-name: serve-static
  dependency-type: indirect
- dependency-name: express
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(deps): update dependency react-icons to v5.3.0 (#346)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Bump webpack from 5.89.0 to 5.94.0 in /client (#341)

Bumps [webpack](https://github.com/webpack/webpack) from 5.89.0 to 5.94.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](webpack/webpack@v5.89.0...v5.94.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(deps): update dependency express-fileupload to v1.5.1 (#333)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency html-react-parser to v5.1.16 (#336)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency natural to v6.12.0 (#293)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update security deps

* fix(deps): update dependency natural to v8 (#349)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update test deps

* chore(deps): updating mantine to v7 (#351)

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Diogo Pereira <[email protected]>
Co-authored-by: Miguel Mendo <[email protected]>
Co-authored-by: Francisca105 <[email protected]>
  • Loading branch information
6 people authored Sep 17, 2024
1 parent 8e89f13 commit 4da34a0
Show file tree
Hide file tree
Showing 13 changed files with 4,505 additions and 3,120 deletions.
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/[email protected]

- name: Setup Node
uses: actions/[email protected].2
uses: actions/[email protected].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

0 comments on commit 4da34a0

Please sign in to comment.