diff --git a/src/components/WeatherModal/WeatherGraphs.tsx b/src/components/WeatherModal/WeatherGraphs.tsx index 64aeb55..125a53b 100644 --- a/src/components/WeatherModal/WeatherGraphs.tsx +++ b/src/components/WeatherModal/WeatherGraphs.tsx @@ -69,6 +69,19 @@ export default function WeatherGraphs({ /> } /> + - @@ -148,22 +148,6 @@ export default function WeatherGraphs({ dataKey={(data: HourlyForecast) => { return data.relativeHumidity.value; }} - stroke={'var(--mantine-color-accent-0)'} - strokeWidth={2} - fill={'url(#colorHumidity)'} - dot={{ - stroke: 'var(--mantine-color-accent-0)', - strokeWidth: 0, - fill: 'var(--mantine-color-accent-0)', - }} - /> - { - return data.probabilityOfPrecipitation.value; - }} stroke={'var(--mantine-color-primary-0)'} strokeWidth={2} fill={'url(#colorPrecipitation)'} @@ -173,6 +157,22 @@ export default function WeatherGraphs({ fill: 'var(--mantine-color-primary-0)', }} /> + { + return data.probabilityOfPrecipitation.value; + }} + stroke={'var(--mantine-color-accent-0)'} + strokeWidth={2} + fill={'url(#colorHumidity)'} + dot={{ + stroke: 'var(--mantine-color-accent-0)', + strokeWidth: 0, + fill: 'var(--mantine-color-accent-0)', + }} + /> diff --git a/src/pages/homepage/components/Applications/Applications.tsx b/src/pages/homepage/components/Applications/Applications.tsx index 553bfe6..6dfcd12 100644 --- a/src/pages/homepage/components/Applications/Applications.tsx +++ b/src/pages/homepage/components/Applications/Applications.tsx @@ -9,7 +9,7 @@ function Applications({ contentType }: { contentType: string[] }) { const { data: applicationData, isFetching: isApplicationDataFetching } = useQueryAPI({ endpoint: 'api/enabledApplications', }); - const { isMobile, appSort, appDensity } = useCommonHooks(); + const { appSort, appDensity } = useCommonHooks(); const [applications, setApplications] = useState([]); useEffect(() => { @@ -53,9 +53,7 @@ function Applications({ contentType }: { contentType: string[] }) { display: 'grid', gridColumnGap: '5px', gridRowGap: '5px', - gridTemplateColumns: isMobile - ? '1fr 1fr 1fr' - : `repeat(${appDensity}, 1fr)`, + gridTemplateColumns: `repeat(${appDensity}, 1fr)`, gridTemplateRows: '64px', }} > diff --git a/src/pages/homepage/components/Bookmarks/BookmarkItem.tsx b/src/pages/homepage/components/Bookmarks/BookmarkItem.tsx index 2df96d6..1a7fce5 100644 --- a/src/pages/homepage/components/Bookmarks/BookmarkItem.tsx +++ b/src/pages/homepage/components/Bookmarks/BookmarkItem.tsx @@ -9,6 +9,11 @@ function BookmarkItem({ bookmark }: { bookmark: Bookmark }) { classNames={textClasses} component='a' href={bookmark.url} + style={{ + textOverflow: 'ellipsis', + overflow: 'hidden', + width: '100%', + }} > {bookmark.name} diff --git a/src/pages/homepage/components/Bookmarks/Bookmarks.tsx b/src/pages/homepage/components/Bookmarks/Bookmarks.tsx index df63b78..3135509 100644 --- a/src/pages/homepage/components/Bookmarks/Bookmarks.tsx +++ b/src/pages/homepage/components/Bookmarks/Bookmarks.tsx @@ -12,7 +12,7 @@ function Bookmarks({ contentType }: { contentType: string[] }) { const { data: groupData, isFetched: groupsIsFetched } = useQueryAPI({ endpoint: 'api/bookmarkCategories', }); - const { isMobile, bookmarkSort, bookmarkDensity } = useCommonHooks(); + const { bookmarkSort, bookmarkDensity } = useCommonHooks(); const [bookmarks, setBookmarks] = useState([]); const [groups, setGroups] = useState([]); @@ -38,13 +38,11 @@ function Bookmarks({ contentType }: { contentType: string[] }) { if (a.id && b.id) { return a.id < b.id ? 1 : -1; } - return -1; case 'Oldest': if (a.id && b.id) { return a.id > b.id ? 1 : -1; } - return -1; case 'Custom': return a.categoryIndex > b.categoryIndex ? 1 : -1; @@ -70,9 +68,7 @@ function Bookmarks({ contentType }: { contentType: string[] }) { flexWrap: 'nowrap', gridColumnGap: '20px', gridRowGap: '0px', - gridTemplateColumns: isMobile - ? '1fr 1fr' - : `repeat(${bookmarkDensity}, 1fr)`, + gridTemplateColumns: `repeat(${bookmarkDensity}, 1fr)`, gridTemplateRows: 'auto', }} > diff --git a/src/pages/homepage/components/SettingsButton/SettingsButton.tsx b/src/pages/homepage/components/SettingsButton/SettingsButton.tsx index 82bbed7..65bf16b 100644 --- a/src/pages/homepage/components/SettingsButton/SettingsButton.tsx +++ b/src/pages/homepage/components/SettingsButton/SettingsButton.tsx @@ -266,8 +266,11 @@ function SettingsButton() { labelProps={{ display: 'none' }} placeholder='Pick a playlist...' value={currentThemePlaylist} - data={ - themePlaylistData + data={[ + 'All', + 'Backgrounds', + 'No Backgrounds', + ...(themePlaylistData ?.map((playlist: ThemePlaylist) => { return { value: playlist.name, @@ -276,8 +279,8 @@ function SettingsButton() { }) .toSorted((a: ComboboxItem, b: ComboboxItem) => a.label.localeCompare(b.label), - ) ?? [] - } + ) ?? []), + ]} w='92%' classNames={{ root: selectClasses.menuSelectRoot,