From 0facbe70b88421d8a19e478121bcf65795b05d2c Mon Sep 17 00:00:00 2001 From: blinkospace Date: Tue, 7 Jan 2025 13:59:14 +0800 Subject: [PATCH] chore: bump to v0.1.2 --- package.json | 2 +- src-tauri/tauri.conf.json | 2 +- src/lib/api.ts | 3 +++ src/pages/Home.tsx | 14 +++++++++----- src/store/baseStore.ts | 17 ++++++++++------- src/store/blinkoStore.tsx | 22 +++++++++++++--------- 6 files changed, 37 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index ecbbe35..b9b3283 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "blinko-snap", "private": true, - "version": "0.1.1", + "version": "0.1.2", "type": "module", "scripts": { "dev": "vite", diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index e1b59af..8d7f55a 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Blinko Snap", - "version": "0.1.1", + "version": "0.1.2", "identifier": "com.blinko-snap.app", "build": { "beforeDevCommand": "pnpm run dev", diff --git a/src/lib/api.ts b/src/lib/api.ts index 12e5ffd..b51286b 100644 --- a/src/lib/api.ts +++ b/src/lib/api.ts @@ -9,6 +9,9 @@ interface ApiConfig extends AxiosRequestConfig { export const api = async (url: string, method: 'GET' | 'POST' = 'GET', data?: any, config: ApiConfig = {}) => { const endpoint = RootStore.Get(BlinkoSnapStore).settings.value?.blinkoEndpoint const token = RootStore.Get(BlinkoSnapStore).settings.value?.blinkoToken + if (!endpoint || !token) { + return null + } const _URL = new URL(`${endpoint?.endsWith('/') ? endpoint : endpoint + '/'}api${url}`) const headers: Record = { diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index 0bc0e4a..55e4e98 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -13,11 +13,15 @@ export const Home = observer(() => { const blinkoSnap = RootStore.Get(BlinkoSnapStore); const blinko = RootStore.Get(BlinkoStore); useEffect(() => { - blinkoSnap.settings.call().then(res => { - if (!res.blinkoEndpoint || !res.blinkoToken) { - RootStore.Get(BaseStore).navigate('settings') - } - }); + try { + blinkoSnap.settings.call().then(res => { + if (res?.blinkoEndpoint || res?.blinkoToken) { + RootStore.Get(BaseStore).navigate('settings') + } + }); + } catch (err) { + + } }, []); return ( diff --git a/src/store/baseStore.ts b/src/store/baseStore.ts index b240bd7..115c181 100644 --- a/src/store/baseStore.ts +++ b/src/store/baseStore.ts @@ -71,11 +71,14 @@ export class BaseStore implements Store { } async registerShortcut(shortcut: string) { - await register(shortcut, (event) => { - if (event.state === 'Pressed') { - this.toggleVisible() - } - }) + try { + await register(shortcut, (event) => { + if (event.state === 'Pressed') { + this.toggleVisible() + } + }) + } catch (error) { + } } async initTheme() { @@ -102,7 +105,7 @@ export class BaseStore implements Store { this.navigate('settings'); await setSetting('isFirstLoaded', 'true'); } - if(settings?.language){ + if (settings?.language) { i18next.changeLanguage(settings.language) } if (settings?.shortcut) { @@ -113,7 +116,7 @@ export class BaseStore implements Store { RootStore.Get(BlinkoStore).loadAllData() } catch (error) { console.error('Application initialization failed:', error); - throw error; + // throw error; } } } \ No newline at end of file diff --git a/src/store/blinkoStore.tsx b/src/store/blinkoStore.tsx index 906613c..7262268 100644 --- a/src/store/blinkoStore.tsx +++ b/src/store/blinkoStore.tsx @@ -133,15 +133,19 @@ export class BlinkoStore implements Store { }) loadAllData() { - this.tagList.call() - const blinkoSnap = RootStore.Get(BlinkoSnapStore) - this.config.call().then(async res => { - await blinkoSnap.settings.call() - if(res?.data?.language != blinkoSnap.settings.value?.language){ - setSetting('language', res?.data?.language) - i18next.changeLanguage(res?.data?.language) - } - }) + try { + // this.tagList.call() + const blinkoSnap = RootStore.Get(BlinkoSnapStore) + this.config.call().then(async res => { + await blinkoSnap.settings.call() + if (res?.data?.language != blinkoSnap.settings.value?.language) { + setSetting('language', res?.data?.language) + i18next.changeLanguage(res?.data?.language) + } + }) + } catch (error) { + + } } constructor() {