diff --git a/src/composables/useStorageLocal.ts b/src/composables/useStorageLocal.ts index b1708935..50858b09 100644 --- a/src/composables/useStorageLocal.ts +++ b/src/composables/useStorageLocal.ts @@ -2,8 +2,8 @@ import { storage } from 'webextension-polyfill' import type { MaybeRef, RemovableRef, - StorageAsyncOptions, StorageLikeAsync, + UseStorageAsyncOptions, } from '@vueuse/core' import { useStorageAsync, @@ -26,5 +26,5 @@ const storageLocal: StorageLikeAsync = { export const useStorageLocal = ( key: string, initialValue: MaybeRef, - options?: StorageAsyncOptions, + options?: UseStorageAsyncOptions, ): RemovableRef => useStorageAsync(key, initialValue, storageLocal, options) diff --git a/src/contentScripts/index.ts b/src/contentScripts/index.ts index dd37888e..aaa9ee7d 100644 --- a/src/contentScripts/index.ts +++ b/src/contentScripts/index.ts @@ -19,6 +19,7 @@ import { SVG_ICONS, getCookie, i18n, setCookie } from '~/utils' if ( /https?:\/\/bilibili.com\/?$/.test(currentUrl) || /https?:\/\/www.bilibili.com\/?$/.test(currentUrl) + || /https?:\/\/www.bilibili.com\/index.html$/.test(currentUrl) || /https?:\/\/bilibili.com\/\?spm_id_from=.*/.test(currentUrl) || /https?:\/\/www.bilibili.com\/\?spm_id_from=(.)*/.test(currentUrl) // || /https?:\/\/www.bilibili.com\/video\/.*/.test(currentUrl) diff --git a/src/contentScripts/views/App.vue b/src/contentScripts/views/App.vue index 022d8646..d6e0e74e 100644 --- a/src/contentScripts/views/App.vue +++ b/src/contentScripts/views/App.vue @@ -4,6 +4,7 @@ import 'uno.css' import { useI18n } from 'vue-i18n' import browser from 'webextension-polyfill' import Home from './Home/Home.vue' +import Search from './Search/Search.vue' import { isShowTopbar } from '~/logic/storage' import { language } from '~/logic' import '~/styles/index.ts' @@ -13,6 +14,7 @@ const { locale } = useI18n() const [showSettings, toggle] = useToggle(false) const isDark = useDark() const toggleDark = useToggle(isDark) +const activatedPage = ref<'search' | 'home'>('home') window.onload = async () => { // if there is first-time load extension, set the default language by browser display language @@ -41,8 +43,45 @@ window.onload = async () => { - - + +
+
+ + + +
+
+ +
+ + + + +
+