admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2025-01-31 (pull request #2101)

Browse Source 
release/2025-01-31 - fix teams icon
This commit is contained in:
Dave Richer
2025-02-04 18:48:35 +00:00
parent b40c433865 2146672916
commit 4bf68b637f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/production-board-kanban/production-board-kanban-card.component.jsx
View File

@@ -21,7 +21,7 @@ import dayjs from "../../utils/day";
import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component"; import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
import OwnerNameDisplay from "../owner-name-display/owner-name-display.component"; import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx"; import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
import { SiMicrosoftteams } from "react-icons/si"; import { PiMicrosoftTeamsLogo } from "react-icons/pi";
const cardColor = (ssbuckets, totalHrs) => { const cardColor = (ssbuckets, totalHrs) => {
const bucket = ssbuckets.find((bucket) => bucket.gte <= totalHrs && (!bucket.lt || bucket.lt > totalHrs)); const bucket = ssbuckets.find((bucket) => bucket.gte <= totalHrs && (!bucket.lt || bucket.lt > totalHrs));
@@ -424,7 +424,7 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe
noIcon={true} noIcon={true}
linkText={ linkText={
<div className="share-to-teams-badge"> <div className="share-to-teams-badge">
<SiMicrosoftteams /> <PiMicrosoftTeamsLogo />
</div> </div>
} }
urlOverride={`${window.location.origin}/manage/jobs/${card.id}`} urlOverride={`${window.location.origin}/manage/jobs/${card.id}`}

4
client/src/components/share-to-teams/share-to-teams.component.jsx
View File

@@ -1,7 +1,7 @@
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { Button } from "antd"; import { Button } from "antd";
import { useLocation } from "react-router-dom"; import { useLocation } from "react-router-dom";
import { SiMicrosoftteams } from "react-icons/si"; import { PiMicrosoftTeamsLogo } from "react-icons/pi";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
@@ -90,7 +90,7 @@ const ShareToTeamsComponent = ({
color: "#FFFFFF", color: "#FFFFFF",
...buttonStyle ...buttonStyle
}} }}
icon={<SiMicrosoftteams style={{ color: "#FFFFFF", ...buttonIconStyle }} />} icon={<PiMicrosoftTeamsLogo style={{ color: "#FFFFFF", ...buttonIconStyle }} />}
onClick={handleShare} onClick={handleShare}
title={linkText === null ? t("general.actions.sharetoteams") : linkText} title={linkText === null ? t("general.actions.sharetoteams") : linkText}
/> />