From e11248f2dc6cd708572615d6b84155d2ab4e9212 Mon Sep 17 00:00:00 2001 From: YoniKiriaty Date: Wed, 18 Feb 2026 20:45:13 +0200 Subject: [PATCH 1/3] Yoni - halfway done to migrating --- .../src/scouter/components/ConfirmDeletePopup.tsx | 7 ++++--- .../frontend/src/strategy/GeneralDataTable.tsx | 9 +++++---- .../src/strategy/components/AccuracyChart.tsx | 11 ++++++----- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/apps/scouting/frontend/src/scouter/components/ConfirmDeletePopup.tsx b/apps/scouting/frontend/src/scouter/components/ConfirmDeletePopup.tsx index b14da01..ef18975 100644 --- a/apps/scouting/frontend/src/scouter/components/ConfirmDeletePopup.tsx +++ b/apps/scouting/frontend/src/scouter/components/ConfirmDeletePopup.tsx @@ -1,6 +1,7 @@ // בס"ד import type { FC } from "react"; -import { AlertTriangle, X } from "lucide-react"; +import { FiAlertTriangle } from "react-icons/fi"; +import { IoClose } from "react-icons/io5"; interface ConfirmDeletePopupProps { onDelete: () => void; @@ -28,13 +29,13 @@ export const ConfirmDeletePopup: FC = ({ onClick={close} className="absolute top-4 right-4 text-slate-500 hover:text-slate-200 transition-colors" > - +
{/* Warning Icon */}
- +

diff --git a/apps/scouting/frontend/src/strategy/GeneralDataTable.tsx b/apps/scouting/frontend/src/strategy/GeneralDataTable.tsx index 38b6e56..e1898c2 100644 --- a/apps/scouting/frontend/src/strategy/GeneralDataTable.tsx +++ b/apps/scouting/frontend/src/strategy/GeneralDataTable.tsx @@ -15,7 +15,8 @@ import type { } from "@repo/scouting_types"; import type React from "react"; import { useState, useEffect, useMemo } from "react"; -import { ChevronUp, ChevronDown, ChevronsUpDown } from "lucide-react"; +import { FaChevronDown, FaChevronUp } from "react-icons/fa"; +import { HiOutlineChevronUpDown } from "react-icons/hi2"; interface TableRow { teamNumber: number; @@ -134,11 +135,11 @@ export const GeneralDataTable: React.FC = ({ )} {header.column.getIsSorted() === "asc" ? ( - + ) : header.column.getIsSorted() === "desc" ? ( - + ) : ( - + )}

diff --git a/apps/scouting/frontend/src/strategy/components/AccuracyChart.tsx b/apps/scouting/frontend/src/strategy/components/AccuracyChart.tsx index f9be36e..f07e8a5 100644 --- a/apps/scouting/frontend/src/strategy/components/AccuracyChart.tsx +++ b/apps/scouting/frontend/src/strategy/components/AccuracyChart.tsx @@ -1,6 +1,8 @@ // בס"ד import type { FC } from "react"; -import { Target, Crosshair, Locate } from "lucide-react"; +import { FiTarget, FiCrosshair } from "react-icons/fi"; +import { IoLocate } from "react-icons/io5"; + import { firstElement } from "@repo/array-functions"; interface AccuracyChartProps { @@ -29,17 +31,17 @@ export const AccuracyChart: FC = ({ metrics }) => { { label: "Meter", value: metrics.meter, - icon: , + icon: , }, { label: "2 Meters", value: metrics.twoMeter, - icon: , + icon: , }, { label: "More", value: metrics.more, - icon: , + icon: , }, ]; @@ -50,7 +52,6 @@ export const AccuracyChart: FC = ({ metrics }) => { key={card.label} className="relative overflow-hidden bg-slate-900/40 backdrop-blur-md border border-white/5 p-3 rounded-2xl flex flex-col items-center gap-1 shadow-xl" > -
From 3ba988d218baa3afaac5215046b8d3c8f756a22e Mon Sep 17 00:00:00 2001 From: YoniKiriaty Date: Wed, 18 Feb 2026 21:04:10 +0200 Subject: [PATCH 2/3] Yoni - replaced everything --- .../src/strategy/components/PhaseToggle.tsx | 17 +++++++++-------- .../src/strategy/components/TeamSelect.tsx | 7 ++++--- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/apps/scouting/frontend/src/strategy/components/PhaseToggle.tsx b/apps/scouting/frontend/src/strategy/components/PhaseToggle.tsx index cc2a7c5..9d5d00a 100644 --- a/apps/scouting/frontend/src/strategy/components/PhaseToggle.tsx +++ b/apps/scouting/frontend/src/strategy/components/PhaseToggle.tsx @@ -1,7 +1,10 @@ // בס"ד -import type { FC, ForwardRefExoticComponent, RefAttributes } from "react"; -import { Zap, Play, LayoutGrid, type LucideProps } from "lucide-react"; +import type { FC } from "react"; +import { FiZap } from "react-icons/fi"; import type { GamePhase } from "@repo/scouting_types"; +import type { IconType } from "react-icons/lib"; +import { IoPlayOutline } from "react-icons/io5"; +import { LuLayoutGrid } from "react-icons/lu"; const ACTIVE_SIZE = 3; const INACTIVE_SIZE = 2; @@ -12,13 +15,11 @@ export const PhaseToggle: FC<{ const options: { id: GamePhase; label: string; - icon: ForwardRefExoticComponent< - Omit & RefAttributes - >; + icon: IconType; }[] = [ - { id: "auto", label: "Auto", icon: Play }, - { id: "tele", label: "Tele", icon: Zap }, - { id: "fullGame", label: "Full", icon: LayoutGrid }, + { id: "auto", label: "Auto", icon: IoPlayOutline }, + { id: "tele", label: "Tele", icon: FiZap }, + { id: "fullGame", label: "Full", icon: LuLayoutGrid }, ]; const handlePress = (mode: GamePhase) => { diff --git a/apps/scouting/frontend/src/strategy/components/TeamSelect.tsx b/apps/scouting/frontend/src/strategy/components/TeamSelect.tsx index 8dd2b13..917fbb0 100644 --- a/apps/scouting/frontend/src/strategy/components/TeamSelect.tsx +++ b/apps/scouting/frontend/src/strategy/components/TeamSelect.tsx @@ -1,7 +1,8 @@ // בס"ד import { FRC_TEAMS } from "@repo/frc"; import type { FC } from "react"; -import { Users, Hash } from "lucide-react"; +import { LuUsers } from "react-icons/lu"; +import { LuHash } from "react-icons/lu"; interface TeamSelectProps { teamNumber?: number; @@ -17,7 +18,7 @@ export const TeamSelect: FC = ({
- +
{ @@ -32,7 +33,7 @@ export const TeamSelect: FC = ({
- +