[js] presun ID attr k FA komponentam, aktualizace js deps

diky oprave FortAwesome/react-fontawesome#324
rodlukas · Mar 5, 2020 · dd86c9a · dd86c9a
1 parent 030da2d
commit dd86c9a
Show file tree

Hide file tree

Showing 8 changed files with 368 additions and 179 deletions.
diff --git a/frontend/src/components/AttendancePaidButton.tsx b/frontend/src/components/AttendancePaidButton.tsx
@@ -24,15 +24,14 @@ const AttendancePaidButton: React.FC<Props> = props => {
     const title = "Označit lekci jako " + (props.paid ? "NE" : "") + "ZAPLACENOU"
     return (
         <>
-            <span id={"AttendancePaidButton_" + props.attendanceId}>
-                <FontAwesomeIcon
-                    icon={faUsdCircle}
-                    size="2x"
-                    className={className}
-                    onClick={onClick}
-                    data-qa="lecture_attendance_paid"
-                />
-            </span>
+            <FontAwesomeIcon
+                id={"AttendancePaidButton_" + props.attendanceId}
+                icon={faUsdCircle}
+                size="2x"
+                className={className}
+                onClick={onClick}
+                data-qa="lecture_attendance_paid"
+            />
             <UncontrolledTooltipWrapper
                 placement="right"
                 target={"AttendancePaidButton_" + props.attendanceId}>

diff --git a/frontend/src/components/AttendanceRemindPay.tsx b/frontend/src/components/AttendanceRemindPay.tsx
@@ -13,14 +13,13 @@ const AttendanceRemindPay: React.FC<Props> = ({ attendance }) => {
     if (!attendance.remind_pay) return null
     return (
         <>
-            <span id={"RemindPay_" + attendance.id}>
-                <FontAwesomeIcon
-                    icon={faCommentAltDollar}
-                    size="lg"
-                    className="text-secondary"
-                    transform="up-4"
-                />
-            </span>
+            <FontAwesomeIcon
+                id={"RemindPay_" + attendance.id}
+                icon={faCommentAltDollar}
+                size="lg"
+                className="text-secondary"
+                transform="up-4"
+            />
             <UncontrolledTooltipWrapper target={"RemindPay_" + attendance.id}>
                 Příště platit
             </UncontrolledTooltipWrapper>

diff --git a/frontend/src/components/Bank.tsx b/frontend/src/components/Bank.tsx
@@ -126,13 +126,12 @@ export default class Bank extends React.PureComponent<{}, State> {
                                     </span>
                                     ) pro zaplacení nájmu!
                                 </UncontrolledTooltipWrapper>
-                                <span id="Bank_RentWarning">
-                                    <FontAwesomeIcon
-                                        icon={faExclamationCircle}
-                                        className="text-danger"
-                                        size="lg"
-                                    />
-                                </span>
+                                <FontAwesomeIcon
+                                    id="Bank_RentWarning"
+                                    icon={faExclamationCircle}
+                                    className="text-danger"
+                                    size="lg"
+                                />
                             </>
                         )}
                     </h4>

diff --git a/frontend/src/components/PrepaidCounters.tsx b/frontend/src/components/PrepaidCounters.tsx
@@ -84,17 +84,15 @@ const PrepaidCounters: React.FC<Props> = props => {
                                                 Tento klient není aktivní (přestože skupina aktivní
                                                 je), není tedy možné přidávat této skupině lekce
                                             </UncontrolledTooltipWrapper>
-                                            <span
+                                            <FontAwesomeIcon
                                                 id={
                                                     "PrepaidCounters_InactiveClientAlert_" +
                                                     membership.client.id
-                                                }>
-                                                <FontAwesomeIcon
-                                                    icon={faExclamationTriangle}
-                                                    className={"text-danger"}
-                                                    size="1x"
-                                                />
-                                            </span>
+                                                }
+                                                icon={faExclamationTriangle}
+                                                className={"text-danger"}
+                                                size="1x"
+                                            />
                                         </>
                                     )}
                                 </h5>

diff --git a/frontend/src/components/Tooltip.tsx b/frontend/src/components/Tooltip.tsx
@@ -14,9 +14,12 @@ const Tooltip: React.FC<Props> = ({ postfix, text }) => (
         <UncontrolledTooltipWrapper placement="bottom" target={"Tooltip_" + postfix}>
             {text}
         </UncontrolledTooltipWrapper>
-        <span id={"Tooltip_" + postfix}>
-            <FontAwesomeIcon icon={faInfoCircle} className="text-warning" size="lg" />
-        </span>
+        <FontAwesomeIcon
+            id={"Tooltip_" + postfix}
+            icon={faInfoCircle}
+            className="text-warning"
+            size="lg"
+        />
     </>
 )
 

diff --git a/frontend/src/pages/Groups.tsx b/frontend/src/pages/Groups.tsx
@@ -111,17 +111,15 @@ class Groups extends React.Component<Props, State> {
                                                             je skupina aktivní), není tedy možné
                                                             přidávat lekce
                                                         </UncontrolledTooltipWrapper>
-                                                        <span
+                                                        <FontAwesomeIcon
                                                             id={
                                                                 "Group_ActiveGroupWithInactiveClientAlert_" +
                                                                 group.id
-                                                            }>
-                                                            <FontAwesomeIcon
-                                                                icon={faExclamationTriangle}
-                                                                className={"text-danger"}
-                                                                size="1x"
-                                                            />
-                                                        </span>
+                                                            }
+                                                            icon={faExclamationTriangle}
+                                                            className={"text-danger"}
+                                                            size="1x"
+                                                        />
                                                     </>
                                                 )}
                                         </td>

diff --git a/frontend/src/pages/Settings.tsx b/frontend/src/pages/Settings.tsx
@@ -311,13 +311,12 @@ class Settings extends React.Component<Props, State> {
                                     rel="noopener noreferrer"
                                     href="https://github.com/rodlukas/UP-admin"
                                     className="ml-1">
-                                    <span id="Settings_GHRepo">
-                                        <FontAwesomeIcon
-                                            icon={faGithub}
-                                            size="lg"
-                                            data-qa="lecture_attendance_paid"
-                                        />
-                                    </span>
+                                    <FontAwesomeIcon
+                                        id="Settings_GHRepo"
+                                        icon={faGithub}
+                                        size="lg"
+                                        data-qa="lecture_attendance_paid"
+                                    />
                                     <UncontrolledTooltipWrapper target="Settings_GHRepo">
                                         GitHub repozitář ÚPadmin
                                     </UncontrolledTooltipWrapper>