diff --git a/client/app/components/InterestGraph.tsx b/client/app/components/InterestGraph.tsx index 02b704c..7f22209 100644 --- a/client/app/components/InterestGraph.tsx +++ b/client/app/components/InterestGraph.tsx @@ -1,17 +1,8 @@ import { useQuery } from "@tanstack/react-query"; -import { - getActivity, - getInterest, - type getActivityArgs, - type getInterestArgs, - type ListenActivityItem, -} from "api/api"; -import Popup from "./Popup"; -import { useState } from "react"; +import { getInterest, type getInterestArgs } from "api/api"; import { useTheme } from "~/hooks/useTheme"; -import ActivityOptsSelector from "./ActivityOptsSelector"; import type { Theme } from "~/styles/themes.css"; -import { Area, AreaChart, Line, LineChart, Tooltip } from "recharts"; +import { Area, AreaChart } from "recharts"; import { RechartsDevtools } from "@recharts/devtools"; function getPrimaryColor(theme: Theme): string { @@ -34,7 +25,7 @@ interface Props { } export default function InterestGraph({ - buckets = 14, + buckets = 16, artistId = 0, albumId = 0, trackId = 0, @@ -71,6 +62,10 @@ export default function InterestGraph({ ); } + // Note: I would really like to have the animation for the graph, however + // the line graph can get weirdly clipped before the animation is done + // so I think I just have to remove it for now. + return (

Interest over time

@@ -81,13 +76,13 @@ export default function InterestGraph({ maxWidth: 440, overflow: "visible", }} - margin={{ top: 5, right: 0, left: 0, bottom: 10 }} data={data} + margin={{ top: 15, bottom: 20 }} > - + @@ -105,11 +100,11 @@ export default function InterestGraph({ stroke={color} fill="none" strokeWidth={2} - animationDuration={750} + animationDuration={0} animationEasing="ease-in-out" dot={false} activeDot={false} - style={{ filter: `drop-shadow(0px 0px 5px ${color})` }} + style={{ filter: `drop-shadow(0px 0px 0px ${color})` }} />
diff --git a/client/app/routes/MediaItems/MediaLayout.tsx b/client/app/routes/MediaItems/MediaLayout.tsx index 45190e9..c675fc6 100644 --- a/client/app/routes/MediaItems/MediaLayout.tsx +++ b/client/app/routes/MediaItems/MediaLayout.tsx @@ -99,97 +99,99 @@ export default function MediaLayout(props: Props) {

{props.title}

{props.subContent} - {user && ( -
- {props.musicbrainzId && ( - - - - )} - {props.type === "Track" && ( - <> - - - - )} - - - {props.type !== "Track" && ( + + + )} + {user && ( + <> + {props.type === "Track" && ( + <> + + + + )} - )} - - - - - - -
- )} + + {props.type !== "Track" && ( + + )} + + + + + + + + )} + {props.children} diff --git a/internal/importer/koito.go b/internal/importer/koito.go index e120454..0f8df74 100644 --- a/internal/importer/koito.go +++ b/internal/importer/koito.go @@ -42,6 +42,10 @@ func ImportKoitoFile(ctx context.Context, store db.DB, filename string) error { count := 0 for i := range data.Listens { + if !inImportTimeWindow(data.Listens[i].ListenedAt) { + l.Debug().Msgf("Skipping import due to import time rules") + continue + } // use this for save/get mbid for all artist/album/track var mbid uuid.UUID