Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Downgrade tabler icons to v1 #114

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@mantine/form": "^7.0.0",
"@mantine/hooks": "^7.0.0",
"@mantine/notifications": "^7.0.0",
"@tabler/icons-react": "^2.44.0",
"@tabler/icons": "^1.116.1",
"@tanstack/react-query": "^4.23.0",
"@tanstack/react-query-devtools": "^4.23.0",
"@types/file-saver": "^2.0.5",
Expand Down
2 changes: 1 addition & 1 deletion src/components/BacklogView/BacklogView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
TextInput,
Title,
} from "@mantine/core"
import { IconSearch } from "@tabler/icons-react"
import { IconSearch } from "@tabler/icons"
import { useQueries, useQuery } from "@tanstack/react-query"
import { ChangeEvent, useEffect, useState } from "react"
import { DragDropContext } from "@hello-pangea/dnd"
Expand Down
2 changes: 1 addition & 1 deletion src/components/BacklogView/Issue/DeleteButton.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ActionIcon, Transition, Popover, Box } from "@mantine/core"
import { IconTrash } from "@tabler/icons-react"
import { IconTrash } from "@tabler/icons"
import { useEffect, useState } from "react"
import { useHover } from "@mantine/hooks";
import { DeleteIssueAlert } from "../../DetailView/Components/DeleteIssue/DeleteIssueAlert"
Expand Down
2 changes: 1 addition & 1 deletion src/components/BacklogView/Issue/IssueIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
IconBug,
IconBolt,
IconEdit,
} from "@tabler/icons-react"
} from "@tabler/icons"
import { ReactElement } from "react";

export function IssueIcon({ type }: { type: string }) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/BacklogView/IssuesWrapper/SprintsPanel.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Accordion, Badge, Flex, Group, Text, Title } from "@mantine/core"
import { IconChevronRight } from "@tabler/icons-react"
import { IconChevronRight } from "@tabler/icons"
import { Issue, Sprint } from "types"
import {
pluralize,
Expand Down
2 changes: 1 addition & 1 deletion src/components/BacklogView/ReloadButton.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ActionIcon } from "@mantine/core"
import { IconReload } from "@tabler/icons-react"
import { IconReload } from "@tabler/icons"
import { useQueryClient } from "@tanstack/react-query"

export function ReloadButton({ ...props }) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/CreateIssue/Fields/AttachmentFileInput.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FileInput, Text } from "@mantine/core"
import { UseFormReturnType } from "@mantine/form"
import { IconFileUpload } from "@tabler/icons-react"
import { IconFileUpload } from "@tabler/icons"
import { Issue } from "types"

export function AttachmentFileInput({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Box, Button, Group, Loader, TextInput } from "@mantine/core"
import { showNotification } from "@mantine/notifications"
import { IconPlus } from "@tabler/icons-react"
import { IconPlus } from "@tabler/icons"
import { useQuery, useQueryClient } from "@tanstack/react-query"
import { useState } from "react"
import { createSubtaskMutation } from "./queries"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
Center,
LoadingOverlay,
} from "@mantine/core"
import { IconCloudDownload, IconPlus, IconTrash } from "@tabler/icons-react"
import { IconCloudDownload, IconPlus, IconTrash } from "@tabler/icons"
import { showNotification } from "@mantine/notifications"
import { useQuery, useQueryClient } from "@tanstack/react-query"
import FileSaver from "file-saver"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Button, Popover } from "@mantine/core"
import { IconTrash } from "@tabler/icons-react"
import { IconTrash } from "@tabler/icons"
import { useState } from "react";
import { DeleteIssueAlert } from "./DeleteIssueAlert"
import { useColorScheme } from "../../../../common/color-scheme";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Button, Stack, Alert } from "@mantine/core"
import { IconAlertCircle } from "@tabler/icons-react"
import { IconAlertCircle } from "@tabler/icons"
import { useQueryClient } from "@tanstack/react-query"
import { deleteIssueMutation } from "./queries"

Expand Down
2 changes: 1 addition & 1 deletion src/components/DetailView/Components/IssueStatusMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Box, Button, Menu } from "@mantine/core"
import { useState } from "react"
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
import { IconCaretDown } from "@tabler/icons-react";
import { IconCaretDown } from "@tabler/icons";
import { getIssueTypes, setStatus } from "../../CreateIssue/queryFunctions";
import classes from "./IssueStatusMenu.module.css";

Expand Down
2 changes: 1 addition & 1 deletion src/components/DetailView/Components/SubTask/Subtask.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Box, Group, Loader, Text, ThemeIcon } from "@mantine/core"
import { IconBinaryTree2, IconTrash } from "@tabler/icons-react"
import { IconBinaryTree2, IconTrash } from "@tabler/icons"
import { useQueryClient } from "@tanstack/react-query"
import { IssueSummary } from "../IssueSummary"
import { deleteSubtaskMutation } from "./queries"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Box, Group, Loader, Text, ThemeIcon } from "@mantine/core"
import { IconBinaryTree2, IconTrash } from "@tabler/icons-react"
import { IconBinaryTree2, IconTrash } from "@tabler/icons"
import { useQueryClient } from "@tanstack/react-query"
import { IssueSummary } from "../IssueSummary"
import { deleteSubtaskMutation } from "./queries"
Expand Down
2 changes: 1 addition & 1 deletion src/components/EpicView/EpicCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
import {useHover} from "@mantine/hooks";
import {useState} from "react";
import {useQueryClient} from "@tanstack/react-query";
import {IconBolt} from "@tabler/icons-react";
import {IconBolt} from "@tabler/icons";
import {DeleteButton} from "../BacklogView/Issue/DeleteButton";
import {EpicDetailView} from "../EpicDetailView/EpicDetailView";
import {StatusType} from "../../../types/status";
Expand Down
2 changes: 1 addition & 1 deletion src/components/Login/Login.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Button, Container, Divider, Group, Image, Paper, rgba} from "@mantine/core"
import { IconCloud, IconServer } from "@tabler/icons-react"
import { IconCloud, IconServer } from "@tabler/icons"
import { ipcRenderer } from "electron"
import { useState } from "react"
import { useTranslation } from "react-i18next"
Expand Down
18 changes: 6 additions & 12 deletions src/components/ProjectsView/Table/ProjectsTable.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import { ScrollArea, Table, Text, TextInput, Center, Group, UnstyledButton } from "@mantine/core"
import {
Icon,
IconChevronDown,
IconChevronUp,
IconSearch,
IconSelector,
} from "@tabler/icons-react"
import { IconChevronDown, IconChevronUp, IconSearch, IconSelector, TablerIcon } from "@tabler/icons"
import { Project } from "types"
import { useEffect, useState, ChangeEvent } from "react"
import { useNavigate } from "react-router-dom"
Expand Down Expand Up @@ -52,11 +46,11 @@ export function ProjectsTable({ data }: { data: Project[] }) {
}

const header = data && data.length > 0 && Object.keys(data[0]).map((key) => {
let SortIcon: Icon
let Icon: TablerIcon
if (sortBy === key) {
if (reverseSortDirection) SortIcon = IconChevronUp
else SortIcon = IconChevronDown
} else SortIcon = IconSelector
if (reverseSortDirection) Icon = IconChevronUp
else Icon = IconChevronDown
} else Icon = IconSelector

return (
<Table.Th key={key}>
Expand All @@ -66,7 +60,7 @@ export function ProjectsTable({ data }: { data: Project[] }) {
{key.toLocaleUpperCase()}
</Text>
<Center className={classes.headerSortIcon}>
<SortIcon size={14} stroke={1.5} />
<Icon size={14} stroke={1.5} />
</Center>
</Group>
</UnstyledButton>
Expand Down
2 changes: 1 addition & 1 deletion src/components/StoryMapView/Cards/Add/AddCard.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PaperProps } from "@mantine/core"
import { IconPlus } from "@tabler/icons-react"
import { IconPlus } from "@tabler/icons"
import { MouseEventHandler } from "react"
import { Draggable } from "@hello-pangea/dnd"
import { BaseCard } from "../Base/BaseCard"
Expand Down
2 changes: 1 addition & 1 deletion src/components/StoryMapView/Cards/Add/AddCase.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IconPlus } from "@tabler/icons-react"
import { IconPlus } from "@tabler/icons"
import { MouseEventHandler } from "react"
import { BaseCard } from "../Base/BaseCard"

Expand Down
2 changes: 1 addition & 1 deletion src/components/StoryMapView/Components/DeleteButton.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ActionIcon, Transition } from "@mantine/core"
import { IconTrash } from "@tabler/icons-react"
import { IconTrash } from "@tabler/icons"
import { MouseEventHandler } from "react"

export function DeleteButton({
Expand Down
2 changes: 1 addition & 1 deletion src/components/StoryMapView/Components/Zoom.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Affix, Group, ActionIcon, Text } from "@mantine/core"
import { IconMinus, IconPlus } from "@tabler/icons-react"
import { IconMinus, IconPlus } from "@tabler/icons"

export function Zoom({
setZoomValue,
Expand Down
2 changes: 1 addition & 1 deletion src/components/StoryMapView/Level/AddLevel.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Button } from "@mantine/core"
import { IconPlus } from "@tabler/icons-react"
import { IconPlus } from "@tabler/icons"
import { getRndInteger, LEVEL_PREFIX } from "../helpers/utils"
import { useStoryMapStore } from "../StoryMapStore"

Expand Down
2 changes: 1 addition & 1 deletion src/components/StoryMapView/Level/LevelControl.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Accordion, AccordionControlProps, ActionIcon, Center, TextInput} from "@mantine/core"
import { IconTrash } from "@tabler/icons-react"
import { IconTrash } from "@tabler/icons"
import { useState } from "react"
import { useStoryMapStore } from "../StoryMapStore"
import { SubActionLevel } from "../Types"
Expand Down
2 changes: 1 addition & 1 deletion src/components/StoryMapView/StoryMap/AddStoryMapCard.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IconPlus } from "@tabler/icons-react"
import { IconPlus } from "@tabler/icons"
import { BaseCard } from "../Cards/Base/BaseCard"
import { getRndInteger, STORY_MAP_PREFIX } from "../helpers/utils"
import { useStoryMapStore } from "../StoryMapStore"
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/ColorSchemeToggle.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ActionIcon, useMantineColorScheme } from "@mantine/core"
import { IconSun, IconMoonStars } from "@tabler/icons-react"
import { IconSun, IconMoonStars } from "@tabler/icons"

export function ColorSchemeToggle({ ...props }) {
const { colorScheme, toggleColorScheme } = useMantineColorScheme()
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/UserSelect/UserSelectMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
UnstyledButton,
ScrollArea,
} from "@mantine/core"
import { IconChevronDown } from "@tabler/icons-react"
import { IconChevronDown } from "@tabler/icons"
import { useQuery } from "@tanstack/react-query"
import { useState } from "react"
import { User } from "../../../../types"
Expand Down
2 changes: 1 addition & 1 deletion src/components/layout/StoryMapMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
IconLayoutDashboard,
IconMap,
IconTrash,
} from "@tabler/icons-react"
} from "@tabler/icons"
import { useNavigate } from "react-router-dom"
import { useStoryMapStore } from "../StoryMapView/StoryMapStore"

Expand Down
16 changes: 4 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1485,18 +1485,10 @@
dependencies:
defer-to-connect "^2.0.0"

"@tabler/icons-react@^2.44.0":
version "2.44.0"
resolved "https://registry.yarnpkg.com/@tabler/icons-react/-/icons-react-2.44.0.tgz#8119d3b6321ebaf98400fba7932e280d008125f8"
integrity sha512-10qwrqJ/QBNgY4YYer9PjWmCwm3wv9aVK8kGAkFKkwu6UJURVLZ2ea+oFh5j6vSXnA1zMtUG+X8anR5fZ67Isw==
dependencies:
"@tabler/icons" "2.44.0"
prop-types "^15.7.2"

"@tabler/[email protected]":
version "2.44.0"
resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-2.44.0.tgz#9f3cf86150b23e84a6eaf9d29ab2b2aaa8c7eed6"
integrity sha512-WPPtihDcAwEm1QZM9MXQw6+r/R2/qx7KMU1eegsi9DsqBLAb0W2kbt6e/syvd6j9c+6XNpRVBW1ziGqSWQAWOg==
"@tabler/icons@^1.116.1":
version "1.119.0"
resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-1.119.0.tgz#8c590bc5a563c8673a78ccd451bedabd584b376e"
integrity sha512-Fk3Qq4w2SXcTjc/n1cuL5bccPkylrOMo7cYpQIf/yw6zP76LQV9dtLcHQUjFiUnaYuswR645CnURIhlafyAh9g==

"@tanstack/match-sorter-utils@^8.7.0":
version "8.8.4"
Expand Down
Loading