Skip to content

Commit aa6ffa7

Browse files
minORCray-oxd
andauthored
DBC22-1833: Added FontAwesome Pro license token and package
* DBC22-1833: Added FontAwesome Pro license token and package * DBC1833: Update dockerfile and docker compose * DBC22-1833: updated .env.example --------- Co-authored-by: ray <ray@oxd.com>
1 parent 2c10d51 commit aa6ffa7

File tree

7 files changed

+62
-13
lines changed

7 files changed

+62
-13
lines changed

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ REDIS_PORT=<6379/other port of database server>
4040
# Node
4141
NODE_ENV=<development/test/production>
4242
NODE_OPTIONS=<openssl-legacy-provider>
43+
FONTAWESOME_PACKAGE_TOKEN=<fontawesome package token>
4344

4445
# React
4546
REACT_APP_API_HOST=<localhost:8000/other hostname:port or IP:port of Django server>

compose/frontend/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ RUN chown node:root /app
77
# Install dependencies
88
COPY ./src/frontend/package.json /app/
99
COPY ./src/frontend/package-lock.json /app/
10+
COPY ./src/frontend/.npmrc /app/
11+
ARG FONTAWESOME_PACKAGE_TOKEN
1012
RUN npm install
1113

1214
# Add rest of the client code

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ services:
4242
dockerfile: ./compose/frontend/Dockerfile
4343
args:
4444
DEBUG_BUILD: true
45+
FONTAWESOME_PACKAGE_TOKEN: ${FONTAWESOME_PACKAGE_TOKEN}
4546
stdin_open: true
4647
tty: true
4748
ports:

src/frontend/.npmrc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@fortawesome:registry=https://npm.fontawesome.com/
2+
@awesome.me:registry=https://npm.fontawesome.com/
3+
//npm.fontawesome.com/:_authToken=${FONTAWESOME_PACKAGE_TOKEN}
4+
npmScopes:
5+
fortawesome:
6+
npmAlwaysAuth: true
7+
npmRegistryServer: "https://npm.fontawesome.com/"
8+
npmAuthToken: ${FONTAWESOME_PACKAGE_TOKEN}
9+
awesome.me:
10+
npmAlwaysAuth: true
11+
npmRegistryServer: "https://npm.fontawesome.com/"
12+
npmAuthToken: ${FONTAWESOME_PACKAGE_TOKEN}

src/frontend/package-lock.json

Lines changed: 34 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/frontend/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
"private": true,
55
"dependencies": {
66
"@bcgov/bc-sans": "^1.0.1",
7-
"@fortawesome/fontawesome-svg-core": "^6.2.1",
7+
"@fortawesome/fontawesome-svg-core": "^6.5.1",
88
"@fortawesome/free-brands-svg-icons": "^6.4.2",
99
"@fortawesome/free-regular-svg-icons": "^6.2.1",
1010
"@fortawesome/free-solid-svg-icons": "^6.2.1",
11+
"@fortawesome/pro-solid-svg-icons": "^6.5.1",
1112
"@fortawesome/react-fontawesome": "^0.2.0",
1213
"@reduxjs/toolkit": "^1.9.6",
1314
"@tanstack/react-table": "^8.9.3",

src/frontend/src/Components/Filters.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,18 @@ export default function Filters(props) {
8080

8181
// const tooltipReststops = (
8282
// <Tooltip id="tooltip" className="tooltip-content">
83-
// <p>Locations of provincial rest stops run by the province.</p>
83+
// <p>Locations of rest stops run by the province.</p>
8484
// </Tooltip>
8585
// );
8686

8787
// const tooltipWeather = (
8888
// <Tooltip id="tooltip" className="tooltip-content">
89-
// <p>Current weather and predictions for a region from Environment Canada.
90-
// Winter forecasts for high mountain passes, also from Environment Canada.
91-
// Find out how the road is at the moment and what nearby weather stations predict for it in this specific location.</p>
89+
// <p>Learn about weather conditions that could affect your route including:
90+
// <ul>
91+
// <li>Current weather for a region from Environment Canada</li>
92+
// <li>Find out how the road is at the moment at nearby weather stations in this specific location</li>
93+
// </ul>
94+
// </p>
9295
// </Tooltip>
9396
// );
9497

@@ -315,7 +318,9 @@ export default function Filters(props) {
315318
<span className="tooltip-info">?</span>
316319
</OverlayTrigger>
317320
</div>
318-
321+
*/}
322+
323+
{/*
319324
<div className={'filter-item filter-item--weather'}>
320325
<span className="filter-item__icon">
321326
<FontAwesomeIcon icon={faCloudSun} alt="weather" />

0 commit comments

Comments
 (0)