renun/BewlyBewly
1
0
Fork 0
mirror of https://github.com/BewlyBewly/BewlyBewly.git synced 2025-04-14 13:15:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #294 from hakadao/main

Browse Source 
sync: main to dev
This commit is contained in:
Hakadao
2024-02-15 02:51:03 +08:00
committed by GitHub
parent 5864e2b09a cbf8d8bc47
commit bce74ba617
13 changed files with 107 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/contentScripts/views/Favorites/Favorites.vue
View File

@@ -204,7 +204,6 @@ function handleUnfavorite(favoriteResource: FavoriteResource) {
<TransitionGroup name="list">
<VideoCard
v-for="item in favoriteResources" :id="item.id" :key="item.id"
:item="item"
:duration="item.duration"
:title="item.title"
:cover="item.cover"
@@ -223,7 +222,7 @@ function handleUnfavorite(favoriteResource: FavoriteResource) {
rounded="$bew-radius"
text="!white xl"
bg="black opacity-60 hover:$bew-error-color-80"
@click.stop="handleUnfavorite(item)"
@click.prevent="handleUnfavorite(item)"
>
<Tooltip :content="$t('favorites.unfavorite')" placement="bottom" type="dark">
<ic-baseline-clear />

30
src/contentScripts/views/History/History.vue
View File

@@ -2,7 +2,7 @@
import { useDateFormat } from '@vueuse/core'
import { useI18n } from 'vue-i18n'
import { getCSRF, openLinkToNewTab, removeHttpFromUrl } from '~/utils/main'
import { getCSRF, removeHttpFromUrl } from '~/utils/main'
import { calcCurrentTime } from '~/utils/dataFormatter'
import { Business } from '~/models/video/history'
import type { List as HistoryItem, HistoryResult } from '~/models/video/history'
@@ -241,12 +241,12 @@ function jumpToLoginPage() {
<TransitionGroup name="list">
<a
v-for="(historyItem, index) in historyList"
:key="historyItem.kid"
:key="historyItem.kid" :href="getHistoryUrl(historyItem)"
target="_blank"
block
class="group"
flex
cursor-pointer
@click="openLinkToNewTab(`${getHistoryUrl(historyItem)}`)"
>
<!-- time slot -->
<div
@@ -376,24 +376,22 @@ function jumpToLoginPage() {
<!-- Description -->
<div flex justify-between w-full>
<div flex="~ col">
<a :href="`${getHistoryUrl(historyItem)}`" target="_blank" @click.stop="">
<a
:href="`${getHistoryUrl(historyItem)}`" target="_blank" rel="noopener noreferrer"
:title="historyItem.show_title ? historyItem.show_title : historyItem.title"
>
<h3
class="keep-two-lines"
overflow="hidden"
text="lg overflow-ellipsis"
>
{{
historyItem.show_title
? historyItem.show_title
: historyItem.title
}}
{{ historyItem.show_title ? historyItem.show_title : historyItem.title }}
</h3>
</a>
<a
un-text="$bew-text-2 sm"
m="t-4 b-2"
flex="~"
items-center
flex="~ items-center"
cursor-pointer
w-fit
rounded="$bew-radius"
@@ -401,13 +399,7 @@ function jumpToLoginPage() {
hover:bg="$bew-theme-color-10"
duration-300
pr-2
:href="
historyItem.author_mid
? `https://space.bilibili.com/${historyItem.author_mid}`
: historyItem.uri
"
target="_blank"
@click.stop=""
:href="historyItem.author_mid ? `https://space.bilibili.com/${historyItem.author_mid}` : historyItem.uri" target="_blank" rel="noopener noreferrer"
>
<img
:src="
@@ -452,7 +444,7 @@ function jumpToLoginPage() {
opacity-0 group-hover:opacity-100
p-2
duration-300
@click.stop="deleteHistoryItem(index, historyItem)"
@click.prevent="deleteHistoryItem(index, historyItem)"
>
<tabler:trash />
</button>

4
src/contentScripts/views/Home/components/ForYou.vue
View File

@@ -201,6 +201,7 @@ function jumpToLoginPage() {
:published-timestamp="video.pubdate"
:bvid="video.bvid"
:cid="video.cid"
:uri="video.uri"
show-preview
/>
</template>
@@ -219,7 +220,8 @@ function jumpToLoginPage() {
:bvid="video.bvid"
:view-str="video.cover_left_text_1"
:danmaku-str="video.cover_left_text_2"
:cid="video?.player_args?.cid "
:cid="video?.player_args?.cid"
:uri="video.uri"
show-preview
/>
</template>

14
src/contentScripts/views/WatchLater/WatchLater.vue
View File

@@ -116,11 +116,9 @@ function jumpToLoginPage() {
<a
v-for="(item, index) in watchLaterList"
:key="item.aid"
block
:href="`https://www.bilibili.com/video/${item.bvid}`" target="_blank" rel="noopener noreferrer"
class="group"
flex
cursor-pointer
@click="openLinkToNewTab(`https://www.bilibili.com/list/watchlater?bvid=${item.bvid}`)"
block flex cursor-pointer
>
<section
rounded="$bew-radius"
@@ -196,8 +194,7 @@ function jumpToLoginPage() {
class="keep-two-lines"
overflow="hidden"
un-text="lg overflow-ellipsis"
:href="removeHttpFromUrl(`https://www.bilibili.com/list/watchlater?bvid=${item.bvid}`)" target="_blank"
@click.stop=""
:href="removeHttpFromUrl(`https://www.bilibili.com/list/watchlater?bvid=${item.bvid}`)" target="_blank" rel="noopener noreferrer"
>
{{ item.title }}
</a>
@@ -213,8 +210,7 @@ function jumpToLoginPage() {
hover:bg="$bew-theme-color-10"
duration-300
pr-2
:href="`//space.bilibili.com/${item.owner.mid}`" target="_blank"
@click.stop=""
:href="`//space.bilibili.com/${item.owner.mid}`" target="_blank" rel="noopener noreferrer"
>
<img
:src="removeHttpFromUrl(`${item.owner.face}@40w_40h_1c`)"
@@ -244,7 +240,7 @@ function jumpToLoginPage() {
opacity-0 group-hover:opacity-100
p-2
duration-300
@click.stop="deleteWatchLaterItem(index, item.aid)"
@click.prevent="deleteWatchLaterItem(index, item.aid)"
>
<tabler:trash />
</button>