Bug fixes

This commit is contained in:
Sean Edmunds
2025-06-19 16:48:34 -05:00
parent 07c0a1df56
commit 89913155c6
7 changed files with 40 additions and 18 deletions

View File

@@ -1,7 +1,7 @@
{ {
"name": "triggerfrontend", "name": "triggerfrontend",
"private": true, "private": true,
"version": "0.1.0", "version": "1.0.0",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

View File

@@ -246,7 +246,7 @@ const ApplicationSettings = () => {
} }
/> />
<SettingsHeader <SettingsHeader
setDragging={setDragging} setDragging={applications.length > 0 ? setDragging : undefined}
openModal={openModal} openModal={openModal}
title={'Applications'} title={'Applications'}
tooltip={{ tooltip={{

View File

@@ -183,7 +183,7 @@ const BookmarkSettings = () => {
} }
/> />
<SettingsHeader <SettingsHeader
setDragging={setDragging} setDragging={groups.length > 0 ? setDragging : undefined}
openModal={openModal} openModal={openModal}
title={'Bookmarks'} title={'Bookmarks'}
tooltip={{ tooltip={{

View File

@@ -346,6 +346,7 @@ function ThemeCard({
className={actionIconClasses.themeEditButton} className={actionIconClasses.themeEditButton}
classNames={actionIconClasses} classNames={actionIconClasses}
onClick={openModal} onClick={openModal}
disabled={cardTheme.name === theme.name}
> >
<FiTrash color='red' /> <FiTrash color='red' />
</ActionIcon> </ActionIcon>

View File

@@ -85,10 +85,12 @@ function ThemeModal({
<Text <Text
style={{ style={{
width: 'min-content', width: 'min-content',
height: 'min-content',
backdropFilter: 'blur(10px) brightness(.25)', backdropFilter: 'blur(10px) brightness(.25)',
padding: '.5rem', padding: '.5rem',
borderRadius: 4, borderBottomRightRadius: 4,
marginTop: '-2.15rem',
marginLeft: '-.5rem',
color: 'white',
}} }}
> >
{item.replace(/\.[^/.]+$/, '')} {item.replace(/\.[^/.]+$/, '')}
@@ -100,8 +102,9 @@ function ThemeModal({
backdropFilter: 'blur(10px) brightness(.25)', backdropFilter: 'blur(10px) brightness(.25)',
padding: '.5rem', padding: '.5rem',
marginTop: '2rem', marginTop: '2rem',
marginBottom: -1,
borderTopLeftRadius: 4, borderTopLeftRadius: 4,
color: 'var(--mantine-color-accent-0)', color: 'white',
}} }}
> >
{re.exec(item.toUpperCase())?.[1]} {re.exec(item.toUpperCase())?.[1]}

View File

@@ -257,8 +257,8 @@ function ThemePlaylists() {
pos={'relative'} pos={'relative'}
mb={isMobile ? '6rem' : undefined} mb={isMobile ? '6rem' : undefined}
> >
{themePlaylists.length > 0 ? ( {themePlaylists.length > 1 ? (
<SimpleGrid cols={4}> <SimpleGrid cols={isMobile ? 1 : 4}>
{themePlaylists {themePlaylists
.filter((playlist: ThemePlaylist) => playlist.default === 0) .filter((playlist: ThemePlaylist) => playlist.default === 0)
.sort((a: ThemePlaylist, b: ThemePlaylist) => .sort((a: ThemePlaylist, b: ThemePlaylist) =>

View File

@@ -3,7 +3,7 @@ import { useDebouncedValue, useDisclosure } from '@mantine/hooks';
import { useCommonHooks, useMutationAPI, useQueryAPI } from 'hooks'; import { useCommonHooks, useMutationAPI, useQueryAPI } from 'hooks';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { FaDice } from 'react-icons/fa'; 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 { useNavigate } from 'react-router-dom';
import { switchClasses, textClasses } from 'styles'; import { switchClasses, textClasses } from 'styles';
import type { Theme, ThemePlaylist } from 'types'; import type { Theme, ThemePlaylist } from 'types';
@@ -162,8 +162,9 @@ function ThemesSettings() {
justify='center' justify='center'
align='center' align='center'
pos={'relative'} pos={'relative'}
display={'flex'}
mt={isMobile ? '11.5rem' : '7rem'} mt={isMobile ? '11.5rem' : '7rem'}
mb={isMobile ? '12rem' : '6.5rem'} mb={isMobile ? '100%' : '6.5rem'}
> >
<Overlay <Overlay
display={currentTheme === 'random' && debouncedSearch === '' ? 'flex' : 'none'} display={currentTheme === 'random' && debouncedSearch === '' ? 'flex' : 'none'}
@@ -231,8 +232,6 @@ function ThemesSettings() {
)} )}
</Group> </Group>
<Group <Group
align='center'
justify='center'
style={{ style={{
backdropFilter: 'blur(10px) brightness(.75)', backdropFilter: 'blur(10px) brightness(.75)',
zIndex: 199, zIndex: 199,
@@ -240,9 +239,7 @@ function ThemesSettings() {
paddingBottom: '1.5rem', paddingBottom: '1.5rem',
paddingLeft: '1rem', paddingLeft: '1rem',
paddingRight: '1rem', paddingRight: '1rem',
height: 'min-content',
width: '100%', width: '100%',
marginTop: 0,
position: 'absolute', position: 'absolute',
bottom: isMobile ? '3.25rem' : 0, bottom: isMobile ? '3.25rem' : 0,
}} }}
@@ -252,10 +249,15 @@ function ThemesSettings() {
miw={isMobile ? 100 : undefined} miw={isMobile ? 100 : undefined}
className={textClasses.settingsSubTitle} className={textClasses.settingsSubTitle}
classNames={textClasses} classNames={textClasses}
fz={isMobile ? '1rem' : undefined}
> >
Current Settings: Current Settings:
</Text> </Text>
<Group pos={isMobile ? undefined : 'absolute'} w={'100%'} justify='center'> <Group
pos={isMobile ? undefined : 'absolute'}
w={isMobile ? undefined : '100%'}
justify='center'
>
<Group align='center' justify='center'> <Group align='center' justify='center'>
<Text <Text
style={{ style={{
@@ -269,7 +271,7 @@ function ThemesSettings() {
style={{ style={{
color: 'var(--mantine-color-primary-0)', color: 'var(--mantine-color-primary-0)',
fontWeight: 'bold', fontWeight: 'bold',
fontSize: '1.2rem', fontSize: isMobile ? '.8rem' : '1.2rem',
}} }}
> >
{currentThemePlaylist === 'All' ? 'All' : currentThemePlaylist} {currentThemePlaylist === 'All' ? 'All' : currentThemePlaylist}
@@ -284,8 +286,22 @@ function ThemesSettings() {
setCurrentTheme(theme.name); setCurrentTheme(theme.name);
} }
}} }}
style={{
aspectRatio: isMobile ? 1 : undefined,
padding: isMobile ? 0 : undefined,
}}
> >
{currentThemePlaylist === 'All' ? 'Select Playlist' : 'Disable Playlist'} {currentThemePlaylist === 'All' ? (
isMobile ? (
<FiMousePointer />
) : (
'Select Playlist'
)
) : isMobile ? (
<FiStopCircle />
) : (
'Disable Playlist'
)}
</Button> </Button>
<Tooltip <Tooltip
label='Shuffle is always on when a playlist is active.' label='Shuffle is always on when a playlist is active.'
@@ -321,12 +337,14 @@ function ThemesSettings() {
<Button <Button
style={{ style={{
zIndex: 200, zIndex: 200,
aspectRatio: isMobile ? 1 : undefined,
padding: isMobile ? 0 : undefined,
}} }}
onClick={() => { onClick={() => {
openBackgroundModal(); openBackgroundModal();
}} }}
> >
Manage Backgrounds {isMobile ? <FiEdit /> : 'Manage Backgrounds'}
</Button> </Button>
</Group> </Group>
</Group> </Group>