No commit message

upvorg · Nov 2, 2024 · b9284d5 · b9284d5
1 parent d5840e6
commit b9284d5
Show file tree

Hide file tree

Showing 9 changed files with 1,038 additions and 1,075 deletions.
diff --git a/package.json b/package.json
@@ -13,11 +13,11 @@
     "gen:sw": "pnpm --filter @web/sw run build"
   },
   "dependencies": {
-    "@babel/core": "^7.25.8",
-    "@babel/preset-env": "^7.25.8",
-    "@babel/preset-react": "^7.25.7",
-    "@types/node": "^20.16.12",
-    "@types/react": "^18.3.11",
+    "@babel/core": "^7.26.0",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-react": "^7.25.9",
+    "@types/node": "^20.17.5",
+    "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "babel-loader": "^9.2.1",
     "bulma": "^0.9.4",
@@ -36,26 +36,26 @@
   "devDependencies": {
     "@svgr/webpack": "^8.1.0",
     "autoprefixer": "^10.4.20",
-    "browserslist": "^4.24.0",
+    "browserslist": "^4.24.2",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^12.0.2",
     "cross-env": "^7.0.3",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.0",
     "esbuild-loader": "^4.2.2",
     "file-loader": "^6.2.0",
-    "html-webpack-plugin": "^5.6.2",
-    "mini-css-extract-plugin": "^2.9.1",
+    "html-webpack-plugin": "^5.6.3",
+    "mini-css-extract-plugin": "^2.9.2",
     "postcss": "^8.4.47",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-loader": "^8.1.1",
     "postcss-preset-env": "^9.6.0",
     "resolve-url-loader": "^5.0.0",
-    "sass": "^1.80.2",
+    "sass": "^1.80.6",
     "sass-loader": "^14.2.1",
     "style-loader": "^4.0.0",
     "terser-webpack-plugin": "^5.3.10",
-    "webpack": "^5.95.0",
+    "webpack": "^5.96.1",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.1.0",

diff --git a/packages/index/src/components/list-section/index.scss b/packages/index/src/components/list-section/index.scss
@@ -1,7 +1,7 @@
 $min-height: 350px;
 
 .upv-grid {
-  margin: 28px auto;
+  margin: 38px auto;
   display: grid;
   width: 100%;
   grid-gap: 20px 12px;
@@ -31,8 +31,8 @@ $min-height: 350px;
       }
     }
 
-    &.is-live .upv-card-list .list-body{
-      grid-template-columns: repeat(2, 1fr)!important;
+    &.is-live .upv-card-list .list-body {
+      grid-template-columns: repeat(2, 1fr) !important;
     }
   }
 
@@ -48,7 +48,7 @@ $min-height: 350px;
     }
   }
 
-  &.is-live .upv-card-list .list-body{
+  &.is-live .upv-card-list .list-body {
     grid-template-columns: repeat(3, 1fr);
   }
 
@@ -69,7 +69,7 @@ $min-height: 350px;
       align-items: center;
       z-index: 1;
       // height: 28px;
-      margin-bottom: 12px;
+      margin-bottom: 18px;
 
       > div {
         display: flex;
@@ -117,7 +117,7 @@ $min-height: 350px;
     .list-body {
       width: 100%;
       display: grid;
-      grid-gap: 20px 12px;
+      grid-gap: 38px 25px;
       grid-column: span 5;
       grid-template-columns: repeat(6, 1fr);
 

diff --git a/packages/index/src/components/list-section/index.tsx b/packages/index/src/components/list-section/index.tsx
@@ -10,9 +10,19 @@ interface ListSectionProps {
   moreUrl?: string
   icon?: string
   isLive?: boolean
+  isFeed?: boolean
 }
 
-export default function ListSection({ title, icon, videos, asideTitle, aside, moreUrl, isLive }: ListSectionProps) {
+export default function ListSection({
+  title,
+  icon,
+  videos,
+  asideTitle,
+  aside,
+  moreUrl,
+  isLive,
+  isFeed
+}: ListSectionProps) {
   return (
     <div className={cls('upv-grid', { 'col-2': asideTitle, 'is-live': isLive })}>
       <div className={'upv-card-list'}>
@@ -50,7 +60,7 @@ export default function ListSection({ title, icon, videos, asideTitle, aside, mo
           {videos && videos?.length > 0 ? (
             videos.map((item, index) => {
               if (isLive) return <LiveCard key={index} {...(item as any)} />
-              return <VideoCard key={index} info={item} />
+              return <VideoCard key={index} info={item} isFeed={isFeed} />
             })
           ) : videos === undefined ? (
             <div className="empty">No Data</div>

diff --git a/packages/index/src/components/rank-list/index.tsx b/packages/index/src/components/rank-list/index.tsx
@@ -6,7 +6,7 @@ import classNames from 'classnames'
 import { cliclisAdapter } from '../../enime.adp'
 
 export default function RankList() {
-  const [day, setDay] = useState(90)
+  const [day, setDay] = useState(7)
   const [list, setList] = useState<R.Post[]>()
 
   useEffect(() => {
@@ -18,7 +18,7 @@ export default function RankList() {
   return (
     <div className="rank-video-list">
       <div className="tags" style={{ marginBottom: '6px' }}>
-        {[3, 7, 30, 90, 365].map((n) => (
+        {[1, 7, 30, 90, 365].map((n) => (
           <a
             className={classNames('tag is-hoverable', {
               'is-primary': day == n

diff --git a/packages/index/src/components/video-card/index.tsx b/packages/index/src/components/video-card/index.tsx
@@ -3,7 +3,7 @@ import './index.scss'
 import { useEffect, useRef } from 'react'
 
 import AspectRatio from '@web/shared/components/AspectRatio'
-import { getTimeDistance } from '@web/shared/utils/date'
+// import { getTimeDistance } from '@web/shared/utils/date'
 import classNames from 'classnames'
 import { Link } from 'wouter'
 
@@ -23,7 +23,9 @@ if (!nativeLazySupported) {
           const img = container.querySelector('img')!
           img.src = img.dataset.src!
           img.onload = () => {
-            container.querySelector('.upv-video-card__loading')!.classList.add('upv-video-card__loading--hidden')
+            container
+              .querySelector('.upv-video-card__loading')!
+              .classList.add('upv-video-card__loading--hidden')
           }
           img.onerror = () => {
             container.querySelector('.upv-video-card__error')!.classList.add('upv-video-card__error--show')
@@ -35,17 +37,20 @@ if (!nativeLazySupported) {
   )
 }
 
-export default function VideoCard({ info }: { info: R.Post }) {
+export default function VideoCard({ info, isFeed }: { info: R.Post; isFeed?: boolean }) {
   const target = info.Type === 'video' ? `/v/${info.ID}` : `/p/${info.ID}`
   const $el = useRef<HTMLDivElement | null>(null)
+  const feedName = ((info as any)?.Episodes as unknown as R.Video[])?.at(-1)?.Title
 
   useEffect(() => {
     if (_IntersectionObserver && $el.current?.dataset.cover) {
       _IntersectionObserver.observe($el.current)
       return () => {
         if ($el.current) {
           _IntersectionObserver.unobserve($el.current)
-          $el.current.querySelector('.upv-video-card__loading')!.classList.remove('upv-video-card__loading--hidden')
+          $el.current
+            .querySelector('.upv-video-card__loading')!
+            .classList.remove('upv-video-card__loading--hidden')
           $el.current.querySelector('.upv-video-card__error')!.classList.remove('upv-video-card__error--show')
         }
       }
@@ -69,14 +74,14 @@ export default function VideoCard({ info }: { info: R.Post }) {
                 />
                 {!nativeLazySupported && [
                   <div className="upv-video-card__loading">LOADING</div>,
-                  <div className="upv-video-card__error">ERROR</div>,
+                  <div className="upv-video-card__error">ERROR</div>
                 ]}
               </>
             )}
 
             <div
               className={classNames('upv-video-card__nocover', {
-                'upv-video-card__nocover--show': !info.Cover,
+                'upv-video-card__nocover--show': !info.Cover
               })}
             >
               <span className={classNames({ large: info.Title.length <= 4 })}>
@@ -87,11 +92,12 @@ export default function VideoCard({ info }: { info: R.Post }) {
         </div>
       </Link>
       <div className="upv-video-card__content">
-        <div className="upv-video-card__content__title">{info.Title}</div>
+        <div className="upv-video-card__content__title">{isFeed ? feedName || info.Title : info.Title}</div>
         <div className="upv-video-card__content__author">
-          <span>{info.Creator?.Nickname || '-'}</span>
+          {isFeed && feedName && info.Title}
+          {/* <span>{info.Creator?.Nickname || '-'}</span>
           {' · '}
-          <span>{getTimeDistance(info.CreatedAt)}</span>
+          <span>{getTimeDistance(info.CreatedAt)}</span> */}
         </div>
       </div>
     </div>

diff --git a/packages/index/src/enime.adp.ts b/packages/index/src/enime.adp.ts
@@ -116,20 +116,20 @@ export const clicliAdapter = (item: any) => {
       Avatar: 'https://q1.qlogo.cn/g?b=qq&nk=7619376472&s=640',
       Bio: '这个人很酷，什么都没有留下'
     },
-    episodes: item.content.split('\n').map((ep: any) => ({
-      ID: ep.split('$')[0],
-      Episode: ep.split('$')[0],
-      Cover: getSuo(item.content),
-      Title: ep.split('$')[0],
-      TitleJapanese: '',
-      TitleRomanji: '',
-      VideoUrl: '',
-      Synopsis: '',
-      Uid: 1,
-      Pid: item.id,
-      CreatedAt: item.time,
-      UpdatedAt: item.time
-    }))
+    Episodes: item.videos
+      .split('\n')
+      .filter(Boolean)
+      .map((v, i) => {
+        const [chunkString, src] = v.split('$')
+        const [Episode, Title] = chunkString.split(' ')
+        return {
+          Episode: Title ? Episode : i,
+          Title: Title || Episode,
+          VideoUrl: src,
+          title: Title || Episode,
+          src
+        }
+      })
   }
 }
 

diff --git a/packages/index/src/pages/index/index.tsx b/packages/index/src/pages/index/index.tsx
@@ -62,6 +62,7 @@ export default function IndexPage() {
       {indexConfig.map((config, index) => {
         return (
           <ListSection
+            isFeed={true}
             key={index}
             videos={state[index]}
             isLive={index == -1}

diff --git a/packages/index/src/pages/player/index.tsx b/packages/index/src/pages/player/index.tsx
@@ -44,7 +44,7 @@ export default function PlayerPage({ id }: any) {
       .then((_) => {
         if (!_.data || _.data.Type !== 'video') {
           toast.error('视频不见了', {
-            duration: 90000,
+            duration: 90000
           })
           return
         }
@@ -70,7 +70,7 @@ export default function PlayerPage({ id }: any) {
                 return {
                   ...it,
                   title: it.Title,
-                  src: it.VideoUrl,
+                  src: it.VideoUrl
                 }
               })
             )
@@ -102,8 +102,8 @@ export default function PlayerPage({ id }: any) {
         {
           Episode: 1,
           Title: 'live',
-          VideoUrl: `https://www.tm0.net/live/uu${id}.m3u8?hls_ctx=85097108`,
-        } as any,
+          VideoUrl: `https://www.tm0.net/live/uu${id}.m3u8?hls_ctx=85097108`
+        } as any
       ])
       return
     }
@@ -114,22 +114,8 @@ export default function PlayerPage({ id }: any) {
       .then((it) => clicliAdapter(it.result))
       .then((it) => {
         setState(it)
-        const videos = it.videos
-          .split('\n')
-          .filter(Boolean)
-          .map((v, i) => {
-            const [chunkString, src] = v.split('$')
-            const [Episode, Title] = chunkString.split(' ')
-            return {
-              Episode: Title ? Episode : i,
-              Title: Title || Episode,
-              VideoUrl: src,
-              title: Title || Episode,
-              src,
-            }
-          })
-        setVideo(videos)
-        player.current?.context.playlist.changeSourceList(videos)
+        setVideo(it.Episodes)
+        player.current?.context.playlist.changeSourceList(it.Episodes)
       })
   }, [isAdp])
 
@@ -148,7 +134,7 @@ export default function PlayerPage({ id }: any) {
           }
           return !it
         })
-      },
+      }
     })
   }, [])
 
@@ -236,7 +222,7 @@ export default function PlayerPage({ id }: any) {
     CollectionCount,
     Content,
     Meta,
-    Cover,
+    Cover
   } = state
 
   return (
@@ -279,7 +265,7 @@ export default function PlayerPage({ id }: any) {
                     <a key={i}>
                       <li
                         className={classNames('list-item has-tooltip-bottom', {
-                          cursor: i === lastEpisode,
+                          cursor: i === lastEpisode
                         })}
                         onClick={() => update(id, i, 0)}
                         title={item.Title}
@@ -367,10 +353,12 @@ export default function PlayerPage({ id }: any) {
                     .split(' ')
                     .map((tag) => ({
                       title: tag,
-                      href: `/pv/tag?type=video&title=${tag}&tag=${tag}`,
+                      href: `/pv/tag?type=video&title=${tag}&tag=${tag}`
                     }))
                     .concat(
-                      IsOriginal == 2 ? { title: '原创', href: `/pv/tag?type=video&is_original=2&title=原创` } : []
+                      IsOriginal == 2
+                        ? { title: '原创', href: `/pv/tag?type=video&is_original=2&title=原创` }
+                        : []
                     )
                 : []
             }