From c4315d136cd464180269119cad4222f0c5fb4dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20M=2E=20P=C3=A9rez?= Date: Tue, 26 Dec 2023 14:52:28 +0100 Subject: [PATCH] Move musicalyst to card below list --- components/main.tsx | 30 ++------------ components/tryMusicalyst.tsx | 56 +++++++++++++++++++++++++ components/ui/card.tsx | 79 ++++++++++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+), 27 deletions(-) create mode 100644 components/tryMusicalyst.tsx create mode 100644 components/ui/card.tsx diff --git a/components/main.tsx b/components/main.tsx index 09758db..ad2393d 100644 --- a/components/main.tsx +++ b/components/main.tsx @@ -1,4 +1,3 @@ -import { Progress } from "@/components/ui/progress"; import { Translation, useTranslation } from 'react-i18next'; import { PlaylistDeduplicator, @@ -6,6 +5,7 @@ import { } from '../dedup/deduplicator'; import { SpotifyTrackType, SpotifyUserType } from '../dedup/spotifyApi'; +import { Progress } from "@/components/ui/progress"; import React from 'react'; import Process from '../dedup/process'; import { PlaylistModel } from '../dedup/types'; @@ -14,6 +14,7 @@ import BuyMeACoffee from './bmc'; import { DuplicateTrackList } from './duplicateTrackList'; import { DuplicateTrackListItem } from './duplicateTrackListItem'; import Panel from './panel'; +import TryMusicalyst from "./tryMusicalyst"; const Status = ({ toProcess }) => { const { t } = useTranslation(); @@ -207,32 +208,6 @@ export default class Main extends React.Component<{ {(t) => t('process.status.complete.nodups.body')} - {this.state.hasUsedSpotifyTop === false ? ( -
-

- - - {(t) => t('spotifytop.heading')} - - {' '} - - {(t) => t('spotifytop.description')} - {' '} - - {(t) => t('spotifytop.check1')} - ,{' '} - - Musicalyst - - {' '} - {(t) => t('spotifytop.check2')} -

-
- ) : null} )} {(this.state.toProcess > 0 || this.state.progress < 100) && ( @@ -361,6 +336,7 @@ export default class Main extends React.Component<{ ))} )} + {this.state.toProcess == 0 && }