From db5730dfdd359faecfb9c010b07dad65f441b213 Mon Sep 17 00:00:00 2001
From: qier222 <qier222@outlook.com>
Date: Tue, 5 Apr 2022 02:32:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=B6=E4=BB=96=E5=B0=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/App.tsx                                   |  2 +-
 src/renderer/assets/icons/windows-max.svg              |  1 -
 src/renderer/assets/icons/windows-maximize.svg         |  1 +
 .../icons/{windows-min.svg => windows-minimize.svg}    |  0
 .../{windows-unmax.svg => windows-un-maximize.svg}     |  0
 src/renderer/components/FMCard.tsx                     |  7 ++++++-
 src/renderer/components/Router.tsx                     | 10 ++++++++++
 src/renderer/components/TitleBar.tsx                   |  4 ++--
 src/renderer/interface.d.ts                            |  2 +-
 src/renderer/pages/Podcast.tsx                         |  5 +++++
 src/renderer/pages/Settings.tsx                        |  5 +++++
 src/renderer/styles/global.scss                        |  3 ++-
 12 files changed, 33 insertions(+), 7 deletions(-)
 delete mode 100644 src/renderer/assets/icons/windows-max.svg
 create mode 100644 src/renderer/assets/icons/windows-maximize.svg
 rename src/renderer/assets/icons/{windows-min.svg => windows-minimize.svg} (100%)
 rename src/renderer/assets/icons/{windows-unmax.svg => windows-un-maximize.svg} (100%)
 create mode 100644 src/renderer/pages/Podcast.tsx
 create mode 100644 src/renderer/pages/Settings.tsx

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 03e29bc..f02bb07 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -5,7 +5,7 @@ import Player from '@/components/Player'
 import Sidebar from '@/components/Sidebar'
 import reactQueryClient from '@/utils/reactQueryClient'
 import Main from './components/Main'
-import TitleBar from './components/Titlebar'
+import TitleBar from './components/TitleBar'
 
 const App = () => {
   return (
diff --git a/src/renderer/assets/icons/windows-max.svg b/src/renderer/assets/icons/windows-max.svg
deleted file mode 100644
index 79aa709..0000000
--- a/src/renderer/assets/icons/windows-max.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M3 5.75A2.75 2.75 0 0 1 5.75 3h12.5A2.75 2.75 0 0 1 21 5.75v12.5A2.75 2.75 0 0 1 18.25 21H5.75A2.75 2.75 0 0 1 3 18.25V5.75ZM5.75 4.5c-.69 0-1.25.56-1.25 1.25v12.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25H5.75Z" fill="currentColor"/></svg>
diff --git a/src/renderer/assets/icons/windows-maximize.svg b/src/renderer/assets/icons/windows-maximize.svg
new file mode 100644
index 0000000..d523709
--- /dev/null
+++ b/src/renderer/assets/icons/windows-maximize.svg
@@ -0,0 +1 @@
+<svg width="24" height="24" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M5.75 3h12.5A2.75 2.75 0 0 1 21 5.75v12.5A2.75 2.75 0 0 1 18.25 21H5.75A2.75 2.75 0 0 1 3 18.25V5.75A2.75 2.75 0 0 1 5.75 3Zm0 1.5c-.69 0-1.25.56-1.25 1.25v12.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25H5.75Z" fill="currentColor"/></svg>
diff --git a/src/renderer/assets/icons/windows-min.svg b/src/renderer/assets/icons/windows-minimize.svg
similarity index 100%
rename from src/renderer/assets/icons/windows-min.svg
rename to src/renderer/assets/icons/windows-minimize.svg
diff --git a/src/renderer/assets/icons/windows-unmax.svg b/src/renderer/assets/icons/windows-un-maximize.svg
similarity index 100%
rename from src/renderer/assets/icons/windows-unmax.svg
rename to src/renderer/assets/icons/windows-un-maximize.svg
diff --git a/src/renderer/components/FMCard.tsx b/src/renderer/components/FMCard.tsx
index 168f829..a10b8cf 100644
--- a/src/renderer/components/FMCard.tsx
+++ b/src/renderer/components/FMCard.tsx
@@ -55,6 +55,7 @@ const MediaControls = () => {
 }
 
 const FMCard = () => {
+  const navigate = useNavigate()
   const [background, setBackground] = useState('')
 
   const playerSnapshot = useSnapshot(player)
@@ -83,7 +84,11 @@ const FMCard = () => {
       style={{ background }}
     >
       {coverUrl ? (
-        <img className='rounded-lg shadow-2xl' src={coverUrl} />
+        <img
+          onClick={() => track?.al?.id && navigate(`/album/${track.al.id}`)}
+          className='rounded-lg shadow-2xl'
+          src={coverUrl}
+        />
       ) : (
         <div className='aspect-square h-full rounded-lg bg-gray-200 dark:bg-white/5'></div>
       )}
diff --git a/src/renderer/components/Router.tsx b/src/renderer/components/Router.tsx
index 4b5db71..0ff9f8d 100644
--- a/src/renderer/components/Router.tsx
+++ b/src/renderer/components/Router.tsx
@@ -7,16 +7,26 @@ import Playlist from '@/pages/Playlist'
 import Artist from '@/pages/Artist'
 import Search from '@/pages/Search'
 import Library from '@/pages/Library'
+import Podcast from '@/pages/Podcast'
+import Settings from '@/pages/Settings'
 
 const routes: RouteObject[] = [
   {
     path: '/',
     element: <Home />,
   },
+  {
+    path: '/podcast',
+    element: <Podcast />,
+  },
   {
     path: '/library',
     element: <Library />,
   },
+  {
+    path: '/settings',
+    element: <Settings />,
+  },
   {
     path: '/login',
     element: <Login />,
diff --git a/src/renderer/components/TitleBar.tsx b/src/renderer/components/TitleBar.tsx
index e9a9f5d..9bb5035 100644
--- a/src/renderer/components/TitleBar.tsx
+++ b/src/renderer/components/TitleBar.tsx
@@ -6,10 +6,10 @@ const TitleBar = () => {
       <div className='ml-2 text-sm text-gray-500'>YesPlayMusic</div>
       <div className='flex h-full'>
         <button className='flex w-[2.875rem] items-center justify-center hover:bg-[#e9e9e9]'>
-          <SvgIcon className='h-3 w-3' name='windows-min' />
+          <SvgIcon className='h-3 w-3' name='windows-minimize' />
         </button>
         <button className='flex w-[2.875rem] items-center justify-center hover:bg-[#e9e9e9]'>
-          <SvgIcon className='h-3 w-3' name='windows-max' />
+          <SvgIcon className='h-3 w-3' name='windows-maximize' />
         </button>
         <button className='flex w-[2.875rem] items-center justify-center hover:bg-[#c42b1c] hover:text-white'>
           <SvgIcon className='h-3 w-3' name='windows-close' />
diff --git a/src/renderer/interface.d.ts b/src/renderer/interface.d.ts
index bfb9255..9412bce 100644
--- a/src/renderer/interface.d.ts
+++ b/src/renderer/interface.d.ts
@@ -11,7 +11,7 @@ declare interface Playlist {
   adType?: number
   alg?: string
   anonimous?: boolean
-  artists?: []
+  artists?: Artist[]
   backgroundCoverId?: number
   backgroundCoverUrl?: string | null
   creator: User
diff --git a/src/renderer/pages/Podcast.tsx b/src/renderer/pages/Podcast.tsx
new file mode 100644
index 0000000..f82a44e
--- /dev/null
+++ b/src/renderer/pages/Podcast.tsx
@@ -0,0 +1,5 @@
+const Podcast = () => {
+  return <div>施工中...</div>
+}
+
+export default Podcast
diff --git a/src/renderer/pages/Settings.tsx b/src/renderer/pages/Settings.tsx
new file mode 100644
index 0000000..ce9bc33
--- /dev/null
+++ b/src/renderer/pages/Settings.tsx
@@ -0,0 +1,5 @@
+const Settings = () => {
+  return <div></div>
+}
+
+export default Settings
diff --git a/src/renderer/styles/global.scss b/src/renderer/styles/global.scss
index 6af159c..8ab516d 100644
--- a/src/renderer/styles/global.scss
+++ b/src/renderer/styles/global.scss
@@ -112,6 +112,7 @@ button {
   cursor: default;
 }
 
-img {
+img,
+a {
   -webkit-user-drag: none;
 }