diff --git a/package.json b/package.json index 6419a80..58681d4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "triggerfrontend", "private": true, - "version": "0.1.0", + "version": "1.0.0", "type": "module", "scripts": { "dev": "vite", diff --git a/src/pages/settings/components/Applications/Applications.tsx b/src/pages/settings/components/Applications/Applications.tsx index 8b87467..92f7262 100644 --- a/src/pages/settings/components/Applications/Applications.tsx +++ b/src/pages/settings/components/Applications/Applications.tsx @@ -246,7 +246,7 @@ const ApplicationSettings = () => { } /> 0 ? setDragging : undefined} openModal={openModal} title={'Applications'} tooltip={{ diff --git a/src/pages/settings/components/Bookmarks/Bookmarks.tsx b/src/pages/settings/components/Bookmarks/Bookmarks.tsx index 2dd4c47..9208b61 100644 --- a/src/pages/settings/components/Bookmarks/Bookmarks.tsx +++ b/src/pages/settings/components/Bookmarks/Bookmarks.tsx @@ -183,7 +183,7 @@ const BookmarkSettings = () => { } /> 0 ? setDragging : undefined} openModal={openModal} title={'Bookmarks'} tooltip={{ diff --git a/src/pages/settings/components/Theming/ThemeCard.tsx b/src/pages/settings/components/Theming/ThemeCard.tsx index 9482732..0431c25 100644 --- a/src/pages/settings/components/Theming/ThemeCard.tsx +++ b/src/pages/settings/components/Theming/ThemeCard.tsx @@ -346,6 +346,7 @@ function ThemeCard({ className={actionIconClasses.themeEditButton} classNames={actionIconClasses} onClick={openModal} + disabled={cardTheme.name === theme.name} > diff --git a/src/pages/settings/components/Theming/ThemeModal.tsx b/src/pages/settings/components/Theming/ThemeModal.tsx index 1b50490..cc58f74 100644 --- a/src/pages/settings/components/Theming/ThemeModal.tsx +++ b/src/pages/settings/components/Theming/ThemeModal.tsx @@ -85,10 +85,12 @@ function ThemeModal({ {item.replace(/\.[^/.]+$/, '')} @@ -100,8 +102,9 @@ function ThemeModal({ backdropFilter: 'blur(10px) brightness(.25)', padding: '.5rem', marginTop: '2rem', + marginBottom: -1, borderTopLeftRadius: 4, - color: 'var(--mantine-color-accent-0)', + color: 'white', }} > {re.exec(item.toUpperCase())?.[1]} diff --git a/src/pages/settings/components/Theming/ThemePlaylists.tsx b/src/pages/settings/components/Theming/ThemePlaylists.tsx index 46f5608..98e87e1 100644 --- a/src/pages/settings/components/Theming/ThemePlaylists.tsx +++ b/src/pages/settings/components/Theming/ThemePlaylists.tsx @@ -257,8 +257,8 @@ function ThemePlaylists() { pos={'relative'} mb={isMobile ? '6rem' : undefined} > - {themePlaylists.length > 0 ? ( - + {themePlaylists.length > 1 ? ( + {themePlaylists .filter((playlist: ThemePlaylist) => playlist.default === 0) .sort((a: ThemePlaylist, b: ThemePlaylist) => diff --git a/src/pages/settings/components/Theming/Themes.tsx b/src/pages/settings/components/Theming/Themes.tsx index 8ac2f6a..fdda20f 100644 --- a/src/pages/settings/components/Theming/Themes.tsx +++ b/src/pages/settings/components/Theming/Themes.tsx @@ -3,7 +3,7 @@ import { useDebouncedValue, useDisclosure } from '@mantine/hooks'; import { useCommonHooks, useMutationAPI, useQueryAPI } from 'hooks'; import { useEffect, useState } from 'react'; import { FaDice } from 'react-icons/fa'; -import { FiChevronRight } from 'react-icons/fi'; +import { FiChevronRight, FiEdit, FiMousePointer, FiStopCircle } from 'react-icons/fi'; import { useNavigate } from 'react-router-dom'; import { switchClasses, textClasses } from 'styles'; import type { Theme, ThemePlaylist } from 'types'; @@ -162,8 +162,9 @@ function ThemesSettings() { justify='center' align='center' pos={'relative'} + display={'flex'} mt={isMobile ? '11.5rem' : '7rem'} - mb={isMobile ? '12rem' : '6.5rem'} + mb={isMobile ? '100%' : '6.5rem'} > Current Settings: - + {currentThemePlaylist === 'All' ? 'All' : currentThemePlaylist} @@ -284,8 +286,22 @@ function ThemesSettings() { setCurrentTheme(theme.name); } }} + style={{ + aspectRatio: isMobile ? 1 : undefined, + padding: isMobile ? 0 : undefined, + }} > - {currentThemePlaylist === 'All' ? 'Select Playlist' : 'Disable Playlist'} + {currentThemePlaylist === 'All' ? ( + isMobile ? ( + + ) : ( + 'Select Playlist' + ) + ) : isMobile ? ( + + ) : ( + 'Disable Playlist' + )} { openBackgroundModal(); }} > - Manage Backgrounds + {isMobile ? : 'Manage Backgrounds'}