From 53623fad76274e39206b8e073e371775ea96946b Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Mon, 17 May 2021 12:16:10 +0200
Subject: ui: Migrate to FontAwesome 5 React library

This change updates the frontend to use the FontAwesome 5 React library
that renders SVG icons as opposed to CSS icon fonts. This migration
resolves a couple of issues we had with server-side rendering of the
previous FontAwesome icons.
---
 .../app/sidebars/topology/machine/DeleteMachineContainer.js         | 4 +++-
 .../containers/app/sidebars/topology/rack/DeleteRackContainer.js    | 4 +++-
 .../containers/app/sidebars/topology/room/DeleteRoomContainer.js    | 4 +++-
 .../src/containers/app/sidebars/topology/room/EditRoomContainer.js  | 6 ++++--
 opendc-web/opendc-web-ui/src/containers/auth/Login.js               | 4 +++-
 .../opendc-web-ui/src/containers/projects/NewProjectContainer.js    | 4 +++-
 6 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'opendc-web/opendc-web-ui/src/containers')

diff --git a/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/machine/DeleteMachineContainer.js b/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/machine/DeleteMachineContainer.js
index f3344424..54e406f4 100644
--- a/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/machine/DeleteMachineContainer.js
+++ b/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/machine/DeleteMachineContainer.js
@@ -3,6 +3,8 @@ import { useDispatch } from 'react-redux'
 import ConfirmationModal from '../../../../../components/modals/ConfirmationModal'
 import { deleteMachine } from '../../../../../redux/actions/topology/machine'
 import { Button } from 'reactstrap'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faTrash } from '@fortawesome/free-solid-svg-icons'
 
 const DeleteMachineContainer = () => {
     const dispatch = useDispatch()
@@ -16,7 +18,7 @@ const DeleteMachineContainer = () => {
     return (
         <>
             <Button color="danger" outline block onClick={() => setVisible(true)}>
-                <span className="fa fa-trash mr-2" />
+                <FontAwesomeIcon icon={faTrash} className="mr-2" />
                 Delete this machine
             </Button>
             <ConfirmationModal
diff --git a/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/rack/DeleteRackContainer.js b/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/rack/DeleteRackContainer.js
index 290803c2..4463530e 100644
--- a/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/rack/DeleteRackContainer.js
+++ b/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/rack/DeleteRackContainer.js
@@ -3,6 +3,8 @@ import { useDispatch } from 'react-redux'
 import ConfirmationModal from '../../../../../components/modals/ConfirmationModal'
 import { deleteRack } from '../../../../../redux/actions/topology/rack'
 import { Button } from 'reactstrap'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faTrash } from '@fortawesome/free-solid-svg-icons'
 
 const DeleteRackContainer = () => {
     const dispatch = useDispatch()
@@ -16,7 +18,7 @@ const DeleteRackContainer = () => {
     return (
         <>
             <Button color="danger" outline block onClick={() => setVisible(true)}>
-                <span className="fa fa-trash mr-2" />
+                <FontAwesomeIcon icon={faTrash} className="mr-2" />
                 Delete this rack
             </Button>
             <ConfirmationModal
diff --git a/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/room/DeleteRoomContainer.js b/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/room/DeleteRoomContainer.js
index 3560c381..0fbbb036 100644
--- a/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/room/DeleteRoomContainer.js
+++ b/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/room/DeleteRoomContainer.js
@@ -3,6 +3,8 @@ import { useDispatch } from 'react-redux'
 import { Button } from 'reactstrap'
 import ConfirmationModal from '../../../../../components/modals/ConfirmationModal'
 import { deleteRoom } from '../../../../../redux/actions/topology/room'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faTrash } from '@fortawesome/free-solid-svg-icons'
 
 const DeleteRoomContainer = () => {
     const dispatch = useDispatch()
@@ -16,7 +18,7 @@ const DeleteRoomContainer = () => {
     return (
         <>
             <Button color="danger" outline block onClick={() => setVisible(true)}>
-                <span className="fa fa-trash mr-2" />
+                <FontAwesomeIcon icon={faTrash} className="mr-2" />
                 Delete this room
             </Button>
             <ConfirmationModal
diff --git a/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/room/EditRoomContainer.js b/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/room/EditRoomContainer.js
index 2ecdfbcf..ec4f586b 100644
--- a/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/room/EditRoomContainer.js
+++ b/opendc-web/opendc-web-ui/src/containers/app/sidebars/topology/room/EditRoomContainer.js
@@ -2,6 +2,8 @@ import React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { finishRoomEdit, startRoomEdit } from '../../../../../redux/actions/topology/building'
 import { Button } from 'reactstrap'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faCheck, faPencilAlt } from '@fortawesome/free-solid-svg-icons'
 
 const EditRoomContainer = () => {
     const isEditing = useSelector((state) => state.construction.currentRoomInConstruction !== '-1')
@@ -13,7 +15,7 @@ const EditRoomContainer = () => {
 
     return isEditing ? (
         <Button color="info" outline block onClick={onFinish}>
-            <span className="fa fa-check mr-2" />
+            <FontAwesomeIcon icon={faCheck} className="mr-2" />
             Finish editing room
         </Button>
     ) : (
@@ -24,7 +26,7 @@ const EditRoomContainer = () => {
             disabled={isInRackConstructionMode}
             onClick={() => (isInRackConstructionMode ? undefined : onEdit())}
         >
-            <span className="fa fa-pencil mr-2" />
+            <FontAwesomeIcon icon={faPencilAlt} className="mr-2" />
             Edit the tiles of this room
         </Button>
     )
diff --git a/opendc-web/opendc-web-ui/src/containers/auth/Login.js b/opendc-web/opendc-web-ui/src/containers/auth/Login.js
index 8459ef5f..d8083d89 100644
--- a/opendc-web/opendc-web-ui/src/containers/auth/Login.js
+++ b/opendc-web/opendc-web-ui/src/containers/auth/Login.js
@@ -1,6 +1,8 @@
 import React from 'react'
 import { Button } from 'reactstrap'
 import { useAuth } from '../../auth'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faSignInAlt } from '@fortawesome/free-solid-svg-icons'
 
 function Login({ visible, className }) {
     const { loginWithRedirect } = useAuth()
@@ -11,7 +13,7 @@ function Login({ visible, className }) {
 
     return (
         <Button color="primary" onClick={() => loginWithRedirect()} className={className}>
-            <span aria-hidden className="fa fa-sign-in" /> Sign In
+            <FontAwesomeIcon icon={faSignInAlt} /> Sign In
         </Button>
     )
 }
diff --git a/opendc-web/opendc-web-ui/src/containers/projects/NewProjectContainer.js b/opendc-web/opendc-web-ui/src/containers/projects/NewProjectContainer.js
index a0e607b2..e03b5c07 100644
--- a/opendc-web/opendc-web-ui/src/containers/projects/NewProjectContainer.js
+++ b/opendc-web/opendc-web-ui/src/containers/projects/NewProjectContainer.js
@@ -3,6 +3,8 @@ import { useDispatch } from 'react-redux'
 import { addProject } from '../../redux/actions/projects'
 import TextInputModal from '../../components/modals/TextInputModal'
 import { Button } from 'reactstrap'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faPlus } from '@fortawesome/free-solid-svg-icons'
 
 /**
  * A container for creating a new project.
@@ -21,7 +23,7 @@ const NewProjectContainer = () => {
         <>
             <div className="bottom-btn-container">
                 <Button color="primary" className="float-right" onClick={() => setVisible(true)}>
-                    <span className="fa fa-plus mr-2" />
+                    <FontAwesomeIcon icon={faPlus} className="mr-2" />
                     New Project
                 </Button>
             </div>
-- 
cgit v1.2.3