diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9a84d9f7a..0195e9b43 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,6 +22,8 @@ jobs: ${{ runner.os }}-build- ${{ runner.os }}- - name: Install Dependencies + env: + FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }} run: cd front && npm install - name: Run tests and code coverage run: cd front && npm run coverage-ci \ No newline at end of file diff --git a/infra/dev/.front.env.example b/front/.env.example similarity index 51% rename from infra/dev/.front.env.example rename to front/.env.example index 062896457..544d0d4c0 100644 --- a/infra/dev/.front.env.example +++ b/front/.env.example @@ -1 +1,2 @@ REACT_APP_API_URL=http://localhost:3000 +FONTAWESOME_NPM_AUTH_TOKEN=REPLACE_ME \ No newline at end of file diff --git a/front/.npmrc b/front/.npmrc new file mode 100644 index 000000000..1e023808d --- /dev/null +++ b/front/.npmrc @@ -0,0 +1,2 @@ +@fortawesome:registry=https://npm.fontawesome.com/ +//npm.fontawesome.com/:_authToken=${FONTAWESOME_NPM_AUTH_TOKEN} \ No newline at end of file diff --git a/front/package-lock.json b/front/package-lock.json index f6b1834eb..c4bcced4a 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -12,8 +12,8 @@ "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.5", "@fortawesome/fontawesome-svg-core": "^6.2.1", - "@fortawesome/free-regular-svg-icons": "^6.2.1", - "@fortawesome/free-solid-svg-icons": "^6.2.1", + "@fortawesome/pro-regular-svg-icons": "^6.4.0", + "@fortawesome/pro-solid-svg-icons": "^6.4.0", "@fortawesome/react-fontawesome": "^0.2.0", "@tanstack/react-table": "^8.8.5", "@types/node": "^16.18.4", @@ -3092,11 +3092,10 @@ "node": ">=6" } }, - "node_modules/@fortawesome/free-regular-svg-icons": { + "node_modules/@fortawesome/pro-regular-svg-icons": { "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.4.0.tgz", - "integrity": "sha512-ZfycI7D0KWPZtf7wtMFnQxs8qjBXArRzczABuMQqecA/nXohquJ5J/RCR77PmY5qGWkxAZDxpnUFVXKwtY/jPw==", - "hasInstallScript": true, + "resolved": "https://npm.fontawesome.com/@fortawesome/pro-regular-svg-icons/-/6.4.0/pro-regular-svg-icons-6.4.0.tgz", + "integrity": "sha512-yEJgoA/31qfIsD27kAg31BODCD+bvgievPp4R39F3kUp/+mu05qX6xgW366RUfs4CnTWSw0fFpc4AhFwC7xbJw==", "dependencies": { "@fortawesome/fontawesome-common-types": "6.4.0" }, @@ -3104,11 +3103,10 @@ "node": ">=6" } }, - "node_modules/@fortawesome/free-solid-svg-icons": { + "node_modules/@fortawesome/pro-solid-svg-icons": { "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.0.tgz", - "integrity": "sha512-kutPeRGWm8V5dltFP1zGjQOEAzaLZj4StdQhWVZnfGFCvAPVvHh8qk5bRrU4KXnRRRNni5tKQI9PBAdI6MP8nQ==", - "hasInstallScript": true, + "resolved": "https://npm.fontawesome.com/@fortawesome/pro-solid-svg-icons/-/6.4.0/pro-solid-svg-icons-6.4.0.tgz", + "integrity": "sha512-R54gxoqHAZdlSCmE7JYpQKT64Jgw59nQIyabT6oh3jsb70O4A3ea+ojVBCKsvoW4UhYe1IOXS1o4PqDEW8Y7Tg==", "dependencies": { "@fortawesome/fontawesome-common-types": "6.4.0" }, diff --git a/front/package.json b/front/package.json index f7e589b14..49916794f 100644 --- a/front/package.json +++ b/front/package.json @@ -7,8 +7,8 @@ "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.5", "@fortawesome/fontawesome-svg-core": "^6.2.1", - "@fortawesome/free-regular-svg-icons": "^6.2.1", - "@fortawesome/free-solid-svg-icons": "^6.2.1", + "@fortawesome/pro-regular-svg-icons": "^6.4.0", + "@fortawesome/pro-solid-svg-icons": "^6.4.0", "@fortawesome/react-fontawesome": "^0.2.0", "@tanstack/react-table": "^8.8.5", "@types/node": "^16.18.4", @@ -89,7 +89,6 @@ "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", - "react-scripts": "5.0.1", "@types/jest": "^27.5.2", "@typescript-eslint/eslint-plugin": "^5.45.0", "babel-plugin-named-exports-order": "^0.0.2", @@ -104,6 +103,7 @@ "eslint-plugin-storybook": "^0.6.11", "prettier": "^2.8.0", "prop-types": "^15.8.1", + "react-scripts": "5.0.1", "storybook": "^7.0.2", "typescript": "^4.9.3", "webpack": "^5.75.0" diff --git a/front/src/layout/navbar/Navbar.tsx b/front/src/layout/navbar/Navbar.tsx index e9fd9c4fa..41ddaac11 100644 --- a/front/src/layout/navbar/Navbar.tsx +++ b/front/src/layout/navbar/Navbar.tsx @@ -5,8 +5,8 @@ import { Workspace } from '../../interfaces/workspace.interface'; import NavItem from './NavItem'; import NavTitle from './NavTitle'; import WorkspaceContainer from './WorkspaceContainer'; -import { faUser } from '@fortawesome/free-regular-svg-icons'; -import { faBuilding } from '@fortawesome/free-regular-svg-icons'; +import { faUser } from '@fortawesome/pro-regular-svg-icons'; +import { faBuildings } from '@fortawesome/pro-regular-svg-icons'; const NavbarContainer = styled.div` display: flex; @@ -48,7 +48,7 @@ function Navbar({ workspace }: OwnProps) { + <> ); diff --git a/front/src/pages/people/People.tsx b/front/src/pages/people/People.tsx index 031feb6e3..ff18ce585 100644 --- a/front/src/pages/people/People.tsx +++ b/front/src/pages/people/People.tsx @@ -1,11 +1,11 @@ import { - faBuilding, + faBuildings, faCalendar, faEnvelope, faRectangleList, faUser, -} from '@fortawesome/free-regular-svg-icons'; -import { faList, faMapPin, faPhone } from '@fortawesome/free-solid-svg-icons'; +} from '@fortawesome/pro-regular-svg-icons'; +import { faList, faMapPin, faPhone } from '@fortawesome/pro-solid-svg-icons'; import WithTopBarContainer from '../../layout/containers/WithTopBarContainer'; import Table from '../../components/table/Table'; import { Company } from '../../interfaces/company.interface'; @@ -123,7 +123,7 @@ const columns = [ ), }), columnHelper.accessor('company', { - header: () => , + header: () => , cell: (props) => (